summaryrefslogtreecommitdiff
path: root/ext/phar
diff options
context:
space:
mode:
Diffstat (limited to 'ext/phar')
-rw-r--r--ext/phar/phar.c6
-rwxr-xr-xext/phar/phar_object.c4
-rw-r--r--ext/phar/php_phar.h2
-rwxr-xr-xext/phar/tests/phar_begin_setstub_commit.phpt4
-rw-r--r--ext/phar/tests/phar_begin_setstub_commitU.phpt4
-rw-r--r--ext/phar/tests/phar_buildfromdirectory6.phpt2
-rwxr-xr-xext/phar/tests/tar/phar_begin_setstub_commit.phpt4
-rw-r--r--ext/phar/tests/tar/phar_begin_setstub_commitU.phpt4
-rwxr-xr-xext/phar/tests/zip/phar_begin_setstub_commit.phpt4
-rw-r--r--ext/phar/tests/zip/phar_begin_setstub_commitU.phpt4
-rw-r--r--ext/phar/tests/zip/phar_stub.phpt6
11 files changed, 19 insertions, 25 deletions
diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index 571ae4577..9b8233d7d 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: phar.c 286338 2009-07-26 01:03:47Z cellog $ */
+/* $Id: phar.c 290435 2009-11-09 17:21:15Z rasmus $ */
#define PHAR_MAIN 1
#include "phar_internal.h"
@@ -3665,7 +3665,7 @@ PHP_MINFO_FUNCTION(phar) /* {{{ */
php_info_print_table_header(2, "Phar: PHP Archive support", "enabled");
php_info_print_table_row(2, "Phar EXT version", PHP_PHAR_VERSION);
php_info_print_table_row(2, "Phar API version", PHP_PHAR_API_VERSION);
- php_info_print_table_row(2, "CVS revision", "$Revision: 286338 $");
+ php_info_print_table_row(2, "SVN revision", "$Revision: 290435 $");
php_info_print_table_row(2, "Phar-based phar archives", "enabled");
php_info_print_table_row(2, "Tar-based phar archives", "enabled");
php_info_print_table_row(2, "ZIP-based phar archives", "enabled");
@@ -3706,7 +3706,7 @@ PHP_MINFO_FUNCTION(phar) /* {{{ */
/* {{{ phar_module_entry
*/
-static zend_module_dep phar_deps[] = {
+static const zend_module_dep phar_deps[] = {
ZEND_MOD_OPTIONAL("apc")
ZEND_MOD_OPTIONAL("bz2")
ZEND_MOD_OPTIONAL("openssl")
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 69e8e382b..9c6d8847c 100755
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: phar_object.c 286518 2009-07-29 16:17:57Z felipe $ */
+/* $Id: phar_object.c 290647 2009-11-13 00:58:11Z cellog $ */
#include "phar_internal.h"
#include "func_interceptors.h"
@@ -2945,7 +2945,7 @@ PHP_METHOD(Phar, isBuffering)
{
PHAR_ARCHIVE_OBJECT();
- RETURN_BOOL(!phar_obj->arc.archive->donotflush);
+ RETURN_BOOL(phar_obj->arc.archive->donotflush);
}
/* }}} */
diff --git a/ext/phar/php_phar.h b/ext/phar/php_phar.h
index 494ef6717..198ac7679 100644
--- a/ext/phar/php_phar.h
+++ b/ext/phar/php_phar.h
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_phar.h 290601 2009-11-12 17:43:23Z johannes $ */
+/* $Id: php_phar.h 290527 2009-11-11 21:02:59Z cellog $ */
#ifndef PHP_PHAR_H
#define PHP_PHAR_H
diff --git a/ext/phar/tests/phar_begin_setstub_commit.phpt b/ext/phar/tests/phar_begin_setstub_commit.phpt
index 42556c3fb..9d3e38323 100755
--- a/ext/phar/tests/phar_begin_setstub_commit.phpt
+++ b/ext/phar/tests/phar_begin_setstub_commit.phpt
@@ -36,8 +36,8 @@ var_dump($p->getStub());
unlink(dirname(__FILE__) . '/brandnewphar.phar');
?>
--EXPECT--
-bool(true)
bool(false)
+bool(true)
string(5) "Hello"
string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
@@ -45,7 +45,7 @@ string(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
===COMMIT===
-bool(true)
+bool(false)
string(5) "Hello"
string(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
diff --git a/ext/phar/tests/phar_begin_setstub_commitU.phpt b/ext/phar/tests/phar_begin_setstub_commitU.phpt
index c7665576b..805e76232 100644
--- a/ext/phar/tests/phar_begin_setstub_commitU.phpt
+++ b/ext/phar/tests/phar_begin_setstub_commitU.phpt
@@ -36,8 +36,8 @@ var_dump($p->getStub());
unlink(dirname(__FILE__) . '/brandnewphar.phar');
?>
--EXPECT--
-bool(true)
bool(false)
+bool(true)
unicode(5) "Hello"
string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
@@ -45,7 +45,7 @@ unicode(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
===COMMIT===
-bool(true)
+bool(false)
unicode(5) "Hello"
unicode(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
diff --git a/ext/phar/tests/phar_buildfromdirectory6.phpt b/ext/phar/tests/phar_buildfromdirectory6.phpt
index 2edd0962f..99566c192 100644
--- a/ext/phar/tests/phar_buildfromdirectory6.phpt
+++ b/ext/phar/tests/phar_buildfromdirectory6.phpt
@@ -15,7 +15,7 @@ foreach(range(1, 4) as $i) {
try {
$phar = new Phar(dirname(__FILE__) . '/buildfromdirectory.phar');
- var_dump($phar->buildFromDirectory(dirname(__FILE__) . '/testdir', '/\.php/'));
+ var_dump($phar->buildFromDirectory(dirname(__FILE__) . '/testdir', '/\.php$/'));
} catch (Exception $e) {
var_dump(get_class($e));
echo $e->getMessage() . "\n";
diff --git a/ext/phar/tests/tar/phar_begin_setstub_commit.phpt b/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
index 693b7eda9..d18f32ed3 100755
--- a/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
+++ b/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
@@ -37,8 +37,8 @@ unlink(dirname(__FILE__) . '/brandnewphar.phar.tar');
?>
--EXPECT--
bool(true)
-bool(true)
bool(false)
+bool(true)
string(5) "Hello"
string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
@@ -46,7 +46,7 @@ string(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
===COMMIT===
-bool(true)
+bool(false)
string(5) "Hello"
string(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
diff --git a/ext/phar/tests/tar/phar_begin_setstub_commitU.phpt b/ext/phar/tests/tar/phar_begin_setstub_commitU.phpt
index 06b2bed37..d058b3616 100644
--- a/ext/phar/tests/tar/phar_begin_setstub_commitU.phpt
+++ b/ext/phar/tests/tar/phar_begin_setstub_commitU.phpt
@@ -37,8 +37,8 @@ unlink(dirname(__FILE__) . '/brandnewphar.phar.tar');
?>
--EXPECT--
bool(true)
-bool(true)
bool(false)
+bool(true)
unicode(5) "Hello"
string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
@@ -46,7 +46,7 @@ unicode(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
===COMMIT===
-bool(true)
+bool(false)
unicode(5) "Hello"
unicode(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
diff --git a/ext/phar/tests/zip/phar_begin_setstub_commit.phpt b/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
index e0f14cc36..dc59f2f3a 100755
--- a/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
+++ b/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
@@ -50,8 +50,8 @@ unlink(dirname(__FILE__) . '/myfakestub.php');
?>
--EXPECT--
bool(true)
-bool(true)
bool(false)
+bool(true)
string(5) "Hello"
string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
@@ -59,7 +59,7 @@ string(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
===COMMIT===
-bool(true)
+bool(false)
string(5) "Hello"
string(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
diff --git a/ext/phar/tests/zip/phar_begin_setstub_commitU.phpt b/ext/phar/tests/zip/phar_begin_setstub_commitU.phpt
index 43a140f9a..2956fc6f4 100644
--- a/ext/phar/tests/zip/phar_begin_setstub_commitU.phpt
+++ b/ext/phar/tests/zip/phar_begin_setstub_commitU.phpt
@@ -50,8 +50,8 @@ unlink(dirname(__FILE__) . '/myfakestub.php');
?>
--EXPECT--
bool(true)
-bool(true)
bool(false)
+bool(true)
unicode(5) "Hello"
string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
@@ -59,7 +59,7 @@ unicode(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
"
===COMMIT===
-bool(true)
+bool(false)
unicode(5) "Hello"
unicode(5) "World"
string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
diff --git a/ext/phar/tests/zip/phar_stub.phpt b/ext/phar/tests/zip/phar_stub.phpt
index 302a894d7..72c1f17d7 100644
--- a/ext/phar/tests/zip/phar_stub.phpt
+++ b/ext/phar/tests/zip/phar_stub.phpt
@@ -19,12 +19,6 @@ $p['b'] = 'b';
$p['c'] = 'c';
copy($fname2, $fname);
-$a = stat($pname . '/a');
-$b = stat($pname2 . '/a');
-if ($a['mtime'] != $b['mtime']) {
- echo "timestamp changed, was $a[mtime], now $b[mtime]!\n";
-}
-
$phar = new Phar($fname);
echo $phar->getStub();
generated by cgit v1.2.3 (git 2.46.0) at 2026-07-17 09:18:34 +0000