fix test

diff --git a/ext/phar/tests/ini_set_off.phpt b/ext/phar/tests/ini_set_off.phpt
index 63122d77c2bdf08ac496744bc1d88ff8d1d9b338..58b368839937973524f983efff0732fe4488a27c 100644 (file)
--- a/ext/phar/tests/ini_set_off.phpt
+++ b/ext/phar/tests/ini_set_off.phpt
@@ -11,8 +11,43 @@ var_dump(ini_set('phar.require_hash', 1));
 var_dump(ini_set('phar.readonly', 1));
 var_dump(ini_get('phar.require_hash'));
 var_dump(ini_get('phar.readonly'));
+ini_set('phar.require_hash', 0);
+ini_set('phar.readonly', 0);
+var_dump(Phar::canWrite());
+?>
+yes
+<?php
+var_dump(ini_set('phar.require_hash', 'yes'));
+var_dump(ini_set('phar.readonly', 'yes'));
+var_dump(ini_get('phar.require_hash'));
+var_dump(ini_get('phar.readonly'));
+var_dump(Phar::canWrite());
+ini_set('phar.require_hash', 0);
+ini_set('phar.readonly', 0);
+?>
+on
+<?php
+var_dump(ini_set('phar.require_hash', 'on'));
+var_dump(ini_set('phar.readonly', 'on'));
+var_dump(ini_get('phar.require_hash'));
+var_dump(ini_get('phar.readonly'));
+var_dump(Phar::canWrite());
+ini_set('phar.require_hash', 0);
+ini_set('phar.readonly', 0);
+?>
+true
+<?php
+var_dump(ini_set('phar.require_hash', 'true'));
+var_dump(ini_set('phar.readonly', 'true'));
+var_dump(Phar::canWrite());
+var_dump(ini_get('phar.require_hash'));
+var_dump(ini_get('phar.readonly'));
+?>
+0
+<?php
 var_dump(ini_set('phar.require_hash', 0));
 var_dump(ini_set('phar.readonly', 0));
+var_dump(Phar::canWrite());
 var_dump(ini_get('phar.require_hash'));
 var_dump(ini_get('phar.readonly'));
 __HALT_COMPILER();
@@ -22,7 +57,28 @@ string(1) "0"
 string(1) "0"
 string(1) "1"
 string(1) "1"
-string(1) "1"
-string(1) "1"
+bool(false)
+yes
+string(1) "0"
+string(1) "0"
+string(3) "yes"
+string(3) "yes"
+bool(true)
+on
+string(1) "0"
+string(1) "0"
+string(2) "on"
+string(2) "on"
+bool(true)
+true
+string(1) "0"
 string(1) "0"
+bool(true)
+string(4) "true"
+string(4) "true"
+0
+string(4) "true"
+string(4) "true"
+bool(false)
 string(1) "0"
+string(1) "0"
\ No newline at end of file

diff --git a/ext/phar/tests/phar_begin_setstub_commit.phpt b/ext/phar/tests/phar_begin_setstub_commit.phpt
index e8537f989e20bd723f7e468ad24b36262b06e44b..14d8081d8601128b11a1ac56e5dd06fc775c7a7e 100755 (executable)
--- a/ext/phar/tests/phar_begin_setstub_commit.phpt
+++ b/ext/phar/tests/phar_begin_setstub_commit.phpt
@@ -9,9 +9,9 @@ phar.readonly=0
 <?php
 $p = new Phar(dirname(__FILE__) . '/brandnewphar.phar', 0, 'brandnewphar.phar');
 //var_dump($p->getStub());
-var_dump($p->inTransaction());
+var_dump($p->isFlushingToPhar());
 $p->begin();
-var_dump($p->inTransaction());
+var_dump($p->isFlushingToPhar());
 $p['a.php'] = '<?php var_dump("Hello");';
 $p->setStub('<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>');
 include 'phar://brandnewphar.phar/a.php';
@@ -22,7 +22,7 @@ include 'phar://brandnewphar.phar/b.php';
 var_dump($p->getStub());
 $p->commit();
 echo "===COMMIT===\n";
-var_dump($p->inTransaction());
+var_dump($p->isFlushingToPhar());
 include 'phar://brandnewphar.phar/a.php';
 include 'phar://brandnewphar.phar/b.php';
 var_dump($p->getStub());