Updating conversion tests to check for more conversion parameters than one. Note that these will all fail against current CVS.

@Greg: We need to clarify conversion policy across the board.

8 files changed, 139 insertions, 8 deletions

diff --git a/ext/phar/tests/phar_convert_tar.phpt b/ext/phar/tests/phar_convert_tar.phpt
index 9651f44e63..810acfc113 100644
--- a/ext/phar/tests/phar_convert_tar.phpt
+++ b/ext/phar/tests/phar_convert_tar.phpt
@@ -7,6 +7,7 @@ phar.require_hash=0
 phar.readonly=0
 --FILE--
 <?php
+
 $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php';
 $pname = 'phar://' . $fname;
 $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.php';
@@ -22,12 +23,19 @@ $files['c'] = 'c';
 include 'files/phar_test.inc';
 
 $phar = new Phar($fname);
+var_dump($phar->isTar());
+var_dump($phar->getStub());
+
 $phar->convertToTar();
 var_dump($phar->isTar());
+var_dump($phar->getStub());
+
 copy($fname, $fname2);
 
 $phar = new Phar($fname2);
 var_dump($phar->isTar());
+var_dump($phar->getStub());
+
 ?>
 ===DONE===
 --CLEAN--
@@ -37,6 +45,12 @@ unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php
 __HALT_COMPILER();
 ?>
 --EXPECT--
+bool(false)
+string(48) "<?php echo "first stub\n"; __HALT_COMPILER(); ?>"
 bool(true)
+string(60) "<?php // tar-based phar archive stub file
+__HALT_COMPILER();"
 bool(true)
+string(60) "<?php // tar-based phar archive stub file
+__HALT_COMPILER();"
 ===DONE===
diff --git a/ext/phar/tests/phar_convert_tar2.phpt b/ext/phar/tests/phar_convert_tar2.phpt
index 6b6c0cc1dd..fd6b9002c9 100644
--- a/ext/phar/tests/phar_convert_tar2.phpt
+++ b/ext/phar/tests/phar_convert_tar2.phpt
@@ -8,6 +8,7 @@ phar.require_hash=0
 phar.readonly=0
 --FILE--
 <?php
+
 $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php';
 $pname = 'phar://' . $fname;
 $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.php';
@@ -23,14 +24,22 @@ $files['c'] = 'c';
 include 'files/phar_test.inc';
 
 $phar = new Phar($fname);
+var_dump($phar->isTar());
+var_dump($phar->isCompressed());
+var_dump($phar->getStub());
+
 $phar->convertToTar(Phar::GZ);
 var_dump($phar->isTar());
 var_dump($phar->isCompressed());
+var_dump($phar->getStub());
+
 copy($fname, $fname2);
 
 $phar = new Phar($fname2);
 var_dump($phar->isTar());
 var_dump($phar->isCompressed() == Phar::GZ);
+var_dump($phar->getStub());
+
 ?>
 ===DONE===
 --CLEAN--
@@ -40,8 +49,15 @@ unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php
 __HALT_COMPILER();
 ?>
 --EXPECT--
-bool(true)
 bool(false)
+bool(false)
+string(48) "<?php echo "first stub\n"; __HALT_COMPILER(); ?>"
+bool(true)
+int(4096)
+string(60) "<?php // tar-based phar archive stub file
+__HALT_COMPILER();"
 bool(true)
 bool(true)
+string(60) "<?php // tar-based phar archive stub file
+__HALT_COMPILER();"
 ===DONE===
diff --git a/ext/phar/tests/phar_convert_tar3.phpt b/ext/phar/tests/phar_convert_tar3.phpt
index 2bdf621fc2..3ea2556bf6 100644
--- a/ext/phar/tests/phar_convert_tar3.phpt
+++ b/ext/phar/tests/phar_convert_tar3.phpt
@@ -1,13 +1,14 @@
 --TEST--
-Phar::convertToTar() bzipped
+Phar::convertToTar() gzipped
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
-<?php if (!extension_loaded("bz2")) die("skip"); ?>
+<?php if (!extension_loaded("zlib")) die("skip"); ?>
 --INI--
 phar.require_hash=0
 phar.readonly=0
 --FILE--
 <?php
+
 $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php';
 $pname = 'phar://' . $fname;
 $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.php';
@@ -23,14 +24,22 @@ $files['c'] = 'c';
 include 'files/phar_test.inc';
 
 $phar = new Phar($fname);
+var_dump($phar->isTar());
+var_dump($phar->isCompressed());
+var_dump($phar->getStub());
+
 $phar->convertToTar(Phar::BZ2);
 var_dump($phar->isTar());
 var_dump($phar->isCompressed());
+var_dump($phar->getStub());
+
 copy($fname, $fname2);
 
 $phar = new Phar($fname2);
 var_dump($phar->isTar());
 var_dump($phar->isCompressed() == Phar::BZ2);
+var_dump($phar->getStub());
+
 ?>
 ===DONE===
 --CLEAN--
@@ -40,8 +49,15 @@ unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php
 __HALT_COMPILER();
 ?>
 --EXPECT--
-bool(true)
 bool(false)
+bool(false)
+string(48) "<?php echo "first stub\n"; __HALT_COMPILER(); ?>"
+bool(true)
+int(8192)
+string(60) "<?php // tar-based phar archive stub file
+__HALT_COMPILER();"
 bool(true)
 bool(true)
+string(60) "<?php // tar-based phar archive stub file
+__HALT_COMPILER();"
 ===DONE===
diff --git a/ext/phar/tests/phar_convert_zip.phpt b/ext/phar/tests/phar_convert_zip.phpt
index ac88f86018..9853174941 100644
--- a/ext/phar/tests/phar_convert_zip.phpt
+++ b/ext/phar/tests/phar_convert_zip.phpt
@@ -7,6 +7,7 @@ phar.require_hash=0
 phar.readonly=0
 --FILE--
 <?php
+
 $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php';
 $pname = 'phar://' . $fname;
 $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.php';
@@ -22,12 +23,19 @@ $files['c'] = 'c';
 include 'files/phar_test.inc';
 
 $phar = new Phar($fname);
+var_dump($phar->isZip());
+var_dump($phar->getStub());
+
 $phar->convertToZip();
 var_dump($phar->isZip());
+var_dump($phar->getStub());
+
 copy($fname, $fname2);
 
 $phar = new Phar($fname2);
 var_dump($phar->isZip());
+var_dump($phar->getStub());
+
 ?>
 ===DONE===
 --CLEAN--
@@ -37,6 +45,12 @@ unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php
 __HALT_COMPILER();
 ?>
 --EXPECT--
+bool(false)
+string(48) "<?php echo "first stub\n"; __HALT_COMPILER(); ?>"
 bool(true)
+string(60) "<?php // zip-based phar archive stub file
+__HALT_COMPILER();"
 bool(true)
+string(60) "<?php // zip-based phar archive stub file
+__HALT_COMPILER();"
 ===DONE===
diff --git a/ext/phar/tests/tar/phar_convert_phar.phpt b/ext/phar/tests/tar/phar_convert_phar.phpt
index 7095f61956..6a40e92445 100644
--- a/ext/phar/tests/tar/phar_convert_phar.phpt
+++ b/ext/phar/tests/tar/phar_convert_phar.phpt
@@ -7,21 +7,33 @@ phar.require_hash=0
 phar.readonly=0
 --FILE--
 <?php
+
 $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php';
 $pname = 'phar://' . $fname;
 $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.php';
 $pname2 = 'phar://' . $fname;
 
 $phar = new Phar($fname);
+$phar->stopBuffering();
+var_dump($phar->isTar());
+var_dump(strlen($phar->getStub()));
+
 $phar->convertToTar();
 var_dump($phar->isTar());
+var_dump($phar->getStub());
+
 $phar['a'] = 'hi there';
+
 $phar->convertToPhar();
 var_dump($phar->isPhar());
+var_dump(strlen($phar->getStub()));
+
 copy($fname, $fname2);
 
 $phar = new Phar($fname2);
 var_dump($phar->isPhar());
+var_dump(strlen($phar->getStub()));
+
 ?>
 ===DONE===
 --CLEAN--
@@ -31,7 +43,13 @@ unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php
 __HALT_COMPILER();
 ?>
 --EXPECT--
+bool(false)
+int(6571)
 bool(true)
+string(60) "<?php // tar-based phar archive stub file
+__HALT_COMPILER();"
 bool(true)
+int(6571)
 bool(true)
+int(6571)
 ===DONE===
diff --git a/ext/phar/tests/tar/phar_convert_phar2.phpt b/ext/phar/tests/tar/phar_convert_phar2.phpt
index dedbdd8380..0218686f1e 100644
--- a/ext/phar/tests/tar/phar_convert_phar2.phpt
+++ b/ext/phar/tests/tar/phar_convert_phar2.phpt
@@ -8,24 +8,35 @@ phar.require_hash=0
 phar.readonly=0
 --FILE--
 <?php
+
 $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php';
 $pname = 'phar://' . $fname;
 $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.php';
 $pname2 = 'phar://' . $fname;
 
 $phar = new Phar($fname);
+$phar->stopBuffering();
+var_dump($phar->isTar());
+var_dump(strlen($phar->getStub()));
+
 $phar->convertToTar();
 var_dump($phar->isTar());
+var_dump($phar->getStub());
+
 $phar['a'] = 'hi there';
-$phar = new Phar($fname);
+
 $phar->convertToPhar(Phar::GZ);
 var_dump($phar->isPhar());
 var_dump($phar->isCompressed());
+var_dump(strlen($phar->getStub()));
+
 copy($fname, $fname2);
 
 $phar = new Phar($fname2);
 var_dump($phar->isPhar());
 var_dump($phar->isCompressed() == Phar::GZ);
+var_dump(strlen($phar->getStub()));
+
 ?>
 ===DONE===
 --CLEAN--
@@ -35,9 +46,15 @@ unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php
 __HALT_COMPILER();
 ?>
 --EXPECT--
+bool(false)
+int(6571)
 bool(true)
+string(60) "<?php // tar-based phar archive stub file
+__HALT_COMPILER();"
 bool(true)
-bool(false)
+int(4096)
+int(6571)
 bool(true)
 bool(true)
+int(6571)
 ===DONE===
diff --git a/ext/phar/tests/tar/phar_convert_phar3.phpt b/ext/phar/tests/tar/phar_convert_phar3.phpt
index 23d3a3a81f..d49463cc82 100644
--- a/ext/phar/tests/tar/phar_convert_phar3.phpt
+++ b/ext/phar/tests/tar/phar_convert_phar3.phpt
@@ -8,24 +8,35 @@ phar.require_hash=0
 phar.readonly=0
 --FILE--
 <?php
+
 $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php';
 $pname = 'phar://' . $fname;
 $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.php';
 $pname2 = 'phar://' . $fname;
 
 $phar = new Phar($fname);
+$phar->stopBuffering();
+var_dump($phar->isTar());
+var_dump(strlen($phar->getStub()));
+
 $phar->convertToTar();
 var_dump($phar->isTar());
+var_dump($phar->getStub());
+
 $phar['a'] = 'hi there';
-$phar = new Phar($fname);
+
 $phar->convertToPhar(Phar::BZ2);
 var_dump($phar->isPhar());
 var_dump($phar->isCompressed());
+var_dump(strlen($phar->getStub()));
+
 copy($fname, $fname2);
 
 $phar = new Phar($fname2);
 var_dump($phar->isPhar());
 var_dump($phar->isCompressed() == Phar::BZ2);
+var_dump(strlen($phar->getStub()));
+
 ?>
 ===DONE===
 --CLEAN--
@@ -35,9 +46,15 @@ unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php
 __HALT_COMPILER();
 ?>
 --EXPECT--
+bool(false)
+int(6571)
 bool(true)
+string(60) "<?php // tar-based phar archive stub file
+__HALT_COMPILER();"
 bool(true)
-bool(false)
+int(8192)
+int(6571)
 bool(true)
 bool(true)
+int(6571)
 ===DONE===
diff --git a/ext/phar/tests/zip/phar_convert_phar.phpt b/ext/phar/tests/zip/phar_convert_phar.phpt
index 337682e7d8..7dffecd3a1 100644
--- a/ext/phar/tests/zip/phar_convert_phar.phpt
+++ b/ext/phar/tests/zip/phar_convert_phar.phpt
@@ -7,21 +7,33 @@ phar.require_hash=0
 phar.readonly=0
 --FILE--
 <?php
+
 $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php';
 $pname = 'phar://' . $fname;
 $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.phar.php';
 $pname2 = 'phar://' . $fname;
 
 $phar = new Phar($fname);
+$phar->stopBuffering();
+var_dump($phar->isZip());
+var_dump(strlen($phar->getStub()));
+
 $phar->convertToZip();
 var_dump($phar->isZip());
+var_dump($phar->getStub());
+
 $phar['a'] = 'hi there';
+
 $phar->convertToPhar();
 var_dump($phar->isPhar());
+var_dump(strlen($phar->getStub()));
+
 copy($fname, $fname2);
 
 $phar = new Phar($fname2);
 var_dump($phar->isPhar());
+var_dump(strlen($phar->getStub()));
+
 ?>
 ===DONE===
 --CLEAN--
@@ -31,7 +43,14 @@ unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.2.phar.php
 __HALT_COMPILER();
 ?>
 --EXPECT--
+bool(false)
+string(50) "<?php echo "first stub\n"; __HALT_COMPILER(); ?>
+"
 bool(true)
+string(60) "<?php // zip-based phar archive stub file
+__HALT_COMPILER();"
 bool(true)
+int(6571)
 bool(true)
+int(6571)
 ===DONE===