From: Steph Fox <sfox@php.net>
Date: Tue, 29 Apr 2008 12:26:58 +0000 (+0000)
Subject: - Allow setStub() to continue working
X-Git-Tag: RELEASE_2_0_0b1~145
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a970147ad47bf51f057d7b84c4ab4dbeccdeb0c;p=php

- Allow setStub() to continue working
- Fix tests broken by earlier commit
---

diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index e201d59de1..9b55bfc5ff 100644
--- 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 3f982a9a1e..216c353dd4 100644
--- 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 b0e360af9b..e79c0fe91f 100644
--- 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 de2ccbe10f..e4155deb3b 100644
--- 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 aa29cbb82d..dcc0dd1f09 100644
--- 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()));