archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- Allow setStub() to continue working

Browse source 
- Fix tests broken by earlier commit
This commit is contained in:
Steph Fox 2008-04-29 12:26:58 +00:00
parent 8559a2dbde
commit 8a970147ad
5 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/phar/phar.c
View file

@ -2092,7 +2092,7 @@ int phar_flush(phar_archive_data *phar, char *user_stub, long len, int convert,
return EOF; return EOF;
} }
if (!zend_hash_num_elements(&phar->manifest)) { if (!zend_hash_num_elements(&phar->manifest) && !user_stub) {
return EOF; return EOF;
} }

1
ext/phar/tests/tar/phar_convert_phar.phpt
View file

@ -13,6 +13,7 @@ $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.phar';
$fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.3.phar'; $fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.3.phar';
$phar = new Phar($fname); $phar = new Phar($fname);
$phar['a.txt'] = 'some text';
$phar->stopBuffering(); $phar->stopBuffering();
var_dump($phar->isTar()); var_dump($phar->isTar());
var_dump(strlen($phar->getStub())); var_dump(strlen($phar->getStub()));

1
ext/phar/tests/tar/phar_convert_phar2.phpt
View file

@ -13,6 +13,7 @@ $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar';
$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.phar'; $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.phar';
$phar = new Phar($fname); $phar = new Phar($fname);
$phar['a.txt'] = 'some text';
$phar->stopBuffering(); $phar->stopBuffering();
var_dump($phar->isTar()); var_dump($phar->isTar());
var_dump(strlen($phar->getStub())); var_dump(strlen($phar->getStub()));

1
ext/phar/tests/tar/phar_convert_phar3.phpt
View file

@ -13,6 +13,7 @@ $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar';
$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.phar'; $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.phar';
$phar = new Phar($fname); $phar = new Phar($fname);
$phar['a.txt'] = 'some text';
$phar->stopBuffering(); $phar->stopBuffering();
var_dump($phar->isTar()); var_dump($phar->isTar());
var_dump(strlen($phar->getStub())); var_dump(strlen($phar->getStub()));

1
ext/phar/tests/zip/phar_convert_phar.phpt
View file

@ -13,6 +13,7 @@ $fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '2.phar';
$fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.3.phar'; $fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.3.phar';
$phar = new Phar($fname); $phar = new Phar($fname);
$phar['a.txt'] = 'some text';
$phar->stopBuffering(); $phar->stopBuffering();
var_dump($phar->isZip()); var_dump($phar->isZip());
var_dump(strlen($phar->getStub())); var_dump(strlen($phar->getStub()));