- Allow setStub() to continue working

- Fix tests broken by earlier commit

diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index e201d59de1fb518063bf1ffe9862c9c09c0378b2..9b55bfc5ff8b5ce3d1e079ded457eb2059b559eb 100644 (file)
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -2092,7 +2092,7 @@ int phar_flush(phar_archive_data *phar, char *user_stub, long len, int convert,
                return EOF;
        }
 
-       if (!zend_hash_num_elements(&phar->manifest)) {
+       if (!zend_hash_num_elements(&phar->manifest) && !user_stub) {
                return EOF;
        }
 

diff --git a/ext/phar/tests/tar/phar_convert_phar.phpt b/ext/phar/tests/tar/phar_convert_phar.phpt
index 3f982a9a1eddbd492c1a8dc98b33fa04621ef947..216c353dd4397a865d5f57555ee9f0c24e9c6ed6 100644 (file)
--- a/ext/phar/tests/tar/phar_convert_phar.phpt
+++ b/ext/phar/tests/tar/phar_convert_phar.phpt
@@ -13,6 +13,7 @@ $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.phar';
 $fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.3.phar';
 
 $phar = new Phar($fname);
+$phar['a.txt'] = 'some text';
 $phar->stopBuffering();
 var_dump($phar->isTar());
 var_dump(strlen($phar->getStub()));

diff --git a/ext/phar/tests/tar/phar_convert_phar2.phpt b/ext/phar/tests/tar/phar_convert_phar2.phpt
index b0e360af9be031ed3ea10bc3d57aaa0263d7fb2e..e79c0fe91f0f94ea3b6bae2b8d55f2625919c110 100644 (file)
--- a/ext/phar/tests/tar/phar_convert_phar2.phpt
+++ b/ext/phar/tests/tar/phar_convert_phar2.phpt
@@ -13,6 +13,7 @@ $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar';
 $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.phar';
 
 $phar = new Phar($fname);
+$phar['a.txt'] = 'some text';
 $phar->stopBuffering();
 var_dump($phar->isTar());
 var_dump(strlen($phar->getStub()));

diff --git a/ext/phar/tests/tar/phar_convert_phar3.phpt b/ext/phar/tests/tar/phar_convert_phar3.phpt
index de2ccbe10f3fcdfc10f308ed07892a6d21c6933d..e4155deb3b4c82135acbf4fffb6af1ebfc5b53cf 100644 (file)
--- a/ext/phar/tests/tar/phar_convert_phar3.phpt
+++ b/ext/phar/tests/tar/phar_convert_phar3.phpt
@@ -13,6 +13,7 @@ $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar';
 $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.phar';
 
 $phar = new Phar($fname);
+$phar['a.txt'] = 'some text';
 $phar->stopBuffering();
 var_dump($phar->isTar());
 var_dump(strlen($phar->getStub()));

diff --git a/ext/phar/tests/zip/phar_convert_phar.phpt b/ext/phar/tests/zip/phar_convert_phar.phpt
index aa29cbb82d54aaff5d42029f5deff3699b1fc5ab..dcc0dd1f097a8b51e805920c872327d7e93ce36c 100644 (file)
--- a/ext/phar/tests/zip/phar_convert_phar.phpt
+++ b/ext/phar/tests/zip/phar_convert_phar.phpt
@@ -13,6 +13,7 @@ $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.phar';
 $fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.3.phar';
 
 $phar = new Phar($fname);
+$phar['a.txt'] = 'some text';
 $phar->stopBuffering();
 var_dump($phar->isZip());
 var_dump(strlen($phar->getStub()));