Use separate files in phar tests

8 files changed, 75 insertions, 75 deletions

diff --git a/ext/phar/tests/phar_begin_setstub_commit.phpt b/ext/phar/tests/phar_begin_setstub_commit.phpt
index 029870a45b..ed257f2c52 100644
--- a/ext/phar/tests/phar_begin_setstub_commit.phpt
+++ b/ext/phar/tests/phar_begin_setstub_commit.phpt
@@ -9,44 +9,44 @@ phar.require_hash=0
 phar.readonly=0
 --FILE--
 <?php
-$p = new Phar(dirname(__FILE__) . '/brandnewphar.phar', 0, 'brandnewphar.phar');
+$p = new Phar(dirname(__FILE__) . '/phar_begin_setstub_commit.phar', 0, 'phar_begin_setstub_commit.phar');
 //var_dump($p->getStub());
 var_dump($p->isBuffering());
 $p->startBuffering();
 var_dump($p->isBuffering());
 $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';
+$p->setStub('<?php var_dump("First"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER(); ?>');
+include 'phar://phar_begin_setstub_commit.phar/a.php';
 var_dump($p->getStub());
 $p['b.php'] = '<?php var_dump("World");';
-$p->setStub('<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER();');
-include 'phar://brandnewphar.phar/b.php';
+$p->setStub('<?php var_dump("Second"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER();');
+include 'phar://phar_begin_setstub_commit.phar/b.php';
 var_dump($p->getStub());
 $p->stopBuffering();
 echo "===COMMIT===\n";
 var_dump($p->isBuffering());
-include 'phar://brandnewphar.phar/a.php';
-include 'phar://brandnewphar.phar/b.php';
+include 'phar://phar_begin_setstub_commit.phar/a.php';
+include 'phar://phar_begin_setstub_commit.phar/b.php';
 var_dump($p->getStub());
 ?>
 ===DONE===
 --CLEAN--
 <?php
-unlink(dirname(__FILE__) . '/brandnewphar.phar');
+unlink(dirname(__FILE__) . '/phar_begin_setstub_commit.phar');
 ?>
---EXPECT--
+--EXPECTF--
 bool(false)
 bool(true)
 string(5) "Hello"
-string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
+string(%d) "<?php var_dump("First"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER(); ?>
 "
 string(5) "World"
-string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
+string(%d) "<?php var_dump("Second"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER(); ?>
 "
 ===COMMIT===
 bool(false)
 string(5) "Hello"
 string(5) "World"
-string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
+string(%d) "<?php var_dump("Second"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER(); ?>
 "
 ===DONE===
diff --git a/ext/phar/tests/phar_commitwrite.phpt b/ext/phar/tests/phar_commitwrite.phpt
index 8d7068f19a..9671737272 100644
--- a/ext/phar/tests/phar_commitwrite.phpt
+++ b/ext/phar/tests/phar_commitwrite.phpt
@@ -7,7 +7,7 @@ phar.require_hash=0
 phar.readonly=0
 --FILE--
 <?php
-$p = new Phar(dirname(__FILE__) . '/brandnewphar.phar', 0, 'brandnewphar.phar');
+$p = new Phar(dirname(__FILE__) . '/phar_commitwrite.phar', 0, 'phar_commitwrite.phar');
 $p['file1.txt'] = 'hi';
 $p->stopBuffering();
 var_dump(strlen($p->getStub()));
@@ -16,8 +16,8 @@ function __autoload(\$class)
 {
     include 'phar://' . str_replace('_', '/', \$class);
 }
-Phar::mapPhar('brandnewphar.phar');
-include 'phar://brandnewphar.phar/startup.php';
+Phar::mapPhar('phar_commitwrite.phar');
+include 'phar://phar_commitwrite.phar/startup.php';
 __HALT_COMPILER();
 ?>");
 var_dump($p->getStub());
@@ -25,18 +25,18 @@ var_dump($p->getStub());
 ===DONE===
 --CLEAN--
 <?php
-unlink(dirname(__FILE__) . '/brandnewphar.phar');
+unlink(dirname(__FILE__) . '/phar_commitwrite.phar');
 __HALT_COMPILER();
 ?>
---EXPECT--
+--EXPECTF--
 int(6641)
-string(200) "<?php
+string(%d) "<?php
 function __autoload($class)
 {
     include 'phar://' . str_replace('_', '/', $class);
 }
-Phar::mapPhar('brandnewphar.phar');
-include 'phar://brandnewphar.phar/startup.php';
+Phar::mapPhar('phar_commitwrite.phar');
+include 'phar://phar_commitwrite.phar/startup.php';
 __HALT_COMPILER(); ?>
 "
 ===DONE===
diff --git a/ext/phar/tests/phar_create_in_cwd.phpt b/ext/phar/tests/phar_create_in_cwd.phpt
index 0e0903d1dd..52120fa7f9 100644
--- a/ext/phar/tests/phar_create_in_cwd.phpt
+++ b/ext/phar/tests/phar_create_in_cwd.phpt
@@ -9,7 +9,7 @@ phar.readonly=0
 <?php
 chdir(dirname(__FILE__));
 try {
-	$p = new Phar('brandnewphar.phar');
+	$p = new Phar('phar_create_in_cwd.phar');
 	$p['file1.txt'] = 'hi';
 	var_dump(strlen($p->getStub()));
 	$p->setStub("<?php
@@ -17,8 +17,8 @@ function __autoload(\$class)
 {
     include 'phar://' . str_replace('_', '/', \$class);
 }
-Phar::mapPhar('brandnewphar.phar');
-include 'phar://brandnewphar.phar/startup.php';
+Phar::mapPhar('phar_create_in_cwd.phar');
+include 'phar://phar_create_in_cwd.phar/startup.php';
 __HALT_COMPILER();
 ?>");
 	var_dump($p->getStub());
@@ -29,17 +29,17 @@ __HALT_COMPILER();
 ===DONE===
 --CLEAN--
 <?php
-unlink(dirname(__FILE__) . '/brandnewphar.phar');
+unlink(dirname(__FILE__) . '/phar_create_in_cwd.phar');
 ?>
---EXPECT--
+--EXPECTF--
 int(6641)
-string(200) "<?php
+string(%d) "<?php
 function __autoload($class)
 {
     include 'phar://' . str_replace('_', '/', $class);
 }
-Phar::mapPhar('brandnewphar.phar');
-include 'phar://brandnewphar.phar/startup.php';
+Phar::mapPhar('phar_create_in_cwd.phar');
+include 'phar://phar_create_in_cwd.phar/startup.php';
 __HALT_COMPILER(); ?>
 "
 ===DONE===
diff --git a/ext/phar/tests/phar_setsignaturealgo1.phpt b/ext/phar/tests/phar_setsignaturealgo1.phpt
index a6d59ff470..503a659bce 100644
--- a/ext/phar/tests/phar_setsignaturealgo1.phpt
+++ b/ext/phar/tests/phar_setsignaturealgo1.phpt
@@ -9,7 +9,7 @@ phar.require_hash=0
 phar.readonly=0
 --FILE--
 <?php
-$p = new Phar(dirname(__FILE__) . '/brandnewphar.phar', 0, 'brandnewphar.phar');
+$p = new Phar(dirname(__FILE__) . '/phar_setsignaturealgo1.phar', 0, 'phar_setsignaturealgo1.phar');
 $p['file1.txt'] = 'hi';
 var_dump($p->getSignature());
 $p->setSignatureAlgorithm(Phar::MD5);
@@ -38,7 +38,7 @@ echo $e->getMessage();
 ===DONE===
 --CLEAN--
 <?php
-unlink(dirname(__FILE__) . '/brandnewphar.phar');
+unlink(dirname(__FILE__) . '/phar_setsignaturealgo1.phar');
 ?>
 --EXPECTF--
 array(2) {
diff --git a/ext/phar/tests/tar/phar_begin_setstub_commit.phpt b/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
index d362637cc6..b7e9c708ca 100644
--- a/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
+++ b/ext/phar/tests/tar/phar_begin_setstub_commit.phpt
@@ -8,46 +8,46 @@ if (!extension_loaded("phar")) die("skip");
 phar.readonly=0
 --FILE--
 <?php
-$p = new Phar(dirname(__FILE__) . '/brandnewphar.phar.tar', 0, 'brandnewphar.phar');
+$p = new Phar(dirname(__FILE__) . '/phar_begin_setstub_commit.phar.tar', 0, 'phar_begin_setstub_commit.phar');
 var_dump($p->isFileFormat(Phar::TAR));
 //var_dump($p->getStub());
 var_dump($p->isBuffering());
 $p->startBuffering();
 var_dump($p->isBuffering());
 $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';
+$p->setStub('<?php var_dump("First"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER(); ?>');
+include 'phar://phar_begin_setstub_commit.phar/a.php';
 var_dump($p->getStub());
 $p['b.php'] = '<?php var_dump("World");';
-$p->setStub('<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER();');
-include 'phar://brandnewphar.phar/b.php';
+$p->setStub('<?php var_dump("Second"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER();');
+include 'phar://phar_begin_setstub_commit.phar/b.php';
 var_dump($p->getStub());
 $p->stopBuffering();
 echo "===COMMIT===\n";
 var_dump($p->isBuffering());
-include 'phar://brandnewphar.phar/a.php';
-include 'phar://brandnewphar.phar/b.php';
+include 'phar://phar_begin_setstub_commit.phar/a.php';
+include 'phar://phar_begin_setstub_commit.phar/b.php';
 var_dump($p->getStub());
 ?>
 ===DONE===
 --CLEAN--
 <?php
-unlink(dirname(__FILE__) . '/brandnewphar.phar.tar');
+unlink(dirname(__FILE__) . '/phar_begin_setstub_commit.phar.tar');
 ?>
---EXPECT--
+--EXPECTF--
 bool(true)
 bool(false)
 bool(true)
 string(5) "Hello"
-string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
+string(%d) "<?php var_dump("First"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER(); ?>
 "
 string(5) "World"
-string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
+string(%d) "<?php var_dump("Second"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER(); ?>
 "
 ===COMMIT===
 bool(false)
 string(5) "Hello"
 string(5) "World"
-string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
+string(%d) "<?php var_dump("Second"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER(); ?>
 "
 ===DONE===
diff --git a/ext/phar/tests/tar/phar_commitwrite.phpt b/ext/phar/tests/tar/phar_commitwrite.phpt
index cdfc449c1c..1f6d744917 100644
--- a/ext/phar/tests/tar/phar_commitwrite.phpt
+++ b/ext/phar/tests/tar/phar_commitwrite.phpt
@@ -7,7 +7,7 @@ phar.require_hash=0
 phar.readonly=0
 --FILE--
 <?php
-$p = new Phar(dirname(__FILE__) . '/brandnewphar.phar.tar', 0, 'brandnewphar.phar');
+$p = new Phar(dirname(__FILE__) . '/phar_commitwrite.phar.tar', 0, 'phar_commitwrite.phar');
 $p['file1.txt'] = 'hi';
 $p->stopBuffering();
 var_dump($p->getStub());
@@ -16,8 +16,8 @@ function __autoload(\$class)
 {
     include 'phar://' . str_replace('_', '/', \$class);
 }
-Phar::mapPhar('brandnewphar.phar');
-include 'phar://brandnewphar.phar/startup.php';
+Phar::mapPhar('phar_commitwrite.phar');
+include 'phar://phar_commitwrite.phar/startup.php';
 __HALT_COMPILER();
 ?>");
 var_dump($p->getStub());
@@ -26,18 +26,18 @@ var_dump($p->isFileFormat(Phar::TAR));
 ===DONE===
 --CLEAN--
 <?php
-unlink(dirname(__FILE__) . '/brandnewphar.phar.tar');
+unlink(dirname(__FILE__) . '/phar_commitwrite.phar.tar');
 ?>
---EXPECT--
+--EXPECTF--
 string(60) "<?php // tar-based phar archive stub file
 __HALT_COMPILER();"
-string(200) "<?php
+string(%d) "<?php
 function __autoload($class)
 {
     include 'phar://' . str_replace('_', '/', $class);
 }
-Phar::mapPhar('brandnewphar.phar');
-include 'phar://brandnewphar.phar/startup.php';
+Phar::mapPhar('phar_commitwrite.phar');
+include 'phar://phar_commitwrite.phar/startup.php';
 __HALT_COMPILER(); ?>
 "
 bool(true)
diff --git a/ext/phar/tests/zip/phar_begin_setstub_commit.phpt b/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
index 75122a54a3..b9da14cd75 100644
--- a/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
+++ b/ext/phar/tests/zip/phar_begin_setstub_commit.phpt
@@ -8,34 +8,34 @@ if (!extension_loaded("phar")) die("skip");
 phar.readonly=0
 --FILE--
 <?php
-$p = new Phar(dirname(__FILE__) . '/brandnewphar.phar.zip', 0, 'brandnewphar.phar');
+$p = new Phar(dirname(__FILE__) . '/phar_begin_setstub_commit.phar.zip', 0, 'phar_begin_setstub_commit.phar');
 var_dump($p->isFileFormat(Phar::ZIP));
 //var_dump($p->getStub());
 var_dump($p->isBuffering());
 $p->startBuffering();
 var_dump($p->isBuffering());
 $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';
+$p->setStub('<?php var_dump("First"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER(); ?>');
+include 'phar://phar_begin_setstub_commit.phar/a.php';
 var_dump($p->getStub());
 $p['b.php'] = '<?php var_dump("World");';
-$p->setStub('<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER();');
-include 'phar://brandnewphar.phar/b.php';
+$p->setStub('<?php var_dump("Second"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER();');
+include 'phar://phar_begin_setstub_commit.phar/b.php';
 var_dump($p->getStub());
 $p->stopBuffering();
 echo "===COMMIT===\n";
 var_dump($p->isBuffering());
-include 'phar://brandnewphar.phar/a.php';
-include 'phar://brandnewphar.phar/b.php';
+include 'phar://phar_begin_setstub_commit.phar/a.php';
+include 'phar://phar_begin_setstub_commit.phar/b.php';
 var_dump($p->getStub());
 
 // add portion to test setting stub from resource
-file_put_contents(dirname(__FILE__) . '/myfakestub.php', '<?php var_dump("First resource"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>');
+file_put_contents(dirname(__FILE__) . '/myfakestub.php', '<?php var_dump("First resource"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER(); ?>');
 $a = fopen(dirname(__FILE__) . '/myfakestub.php', 'rb');
 $p->setStub($a);
 var_dump($p->getStub());
-$c = strlen('<?php var_dump("First resource"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>');
-file_put_contents(dirname(__FILE__) . '/myfakestub.php', '<?php var_dump("First resource"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>' . 'extra stuff');
+$c = strlen('<?php var_dump("First resource"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER(); ?>');
+file_put_contents(dirname(__FILE__) . '/myfakestub.php', '<?php var_dump("First resource"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER(); ?>' . 'extra stuff');
 fseek($a, 0);
 $p->setStub($a, $c);
 var_dump($p->getStub());
@@ -44,27 +44,27 @@ fclose($a);
 ===DONE===
 --CLEAN--
 <?php
-unlink(dirname(__FILE__) . '/brandnewphar.phar.zip');
+unlink(dirname(__FILE__) . '/phar_begin_setstub_commit.phar.zip');
 unlink(dirname(__FILE__) . '/myfakestub.php');
 ?>
---EXPECT--
+--EXPECTF--
 bool(true)
 bool(false)
 bool(true)
 string(5) "Hello"
-string(84) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
+string(%d) "<?php var_dump("First"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER(); ?>
 "
 string(5) "World"
-string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
+string(%d) "<?php var_dump("Second"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER(); ?>
 "
 ===COMMIT===
 bool(false)
 string(5) "Hello"
 string(5) "World"
-string(85) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
+string(%d) "<?php var_dump("Second"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER(); ?>
 "
-string(93) "<?php var_dump("First resource"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
+string(%d) "<?php var_dump("First resource"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER(); ?>
 "
-string(93) "<?php var_dump("First resource"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>
+string(%d) "<?php var_dump("First resource"); Phar::mapPhar("phar_begin_setstub_commit.phar"); __HALT_COMPILER(); ?>
 "
 ===DONE===
diff --git a/ext/phar/tests/zip/phar_commitwrite.phpt b/ext/phar/tests/zip/phar_commitwrite.phpt
index cb7fa0f35c..fa9efc7bd2 100644
--- a/ext/phar/tests/zip/phar_commitwrite.phpt
+++ b/ext/phar/tests/zip/phar_commitwrite.phpt
@@ -7,7 +7,7 @@ phar.require_hash=0
 phar.readonly=0
 --FILE--
 <?php
-$p = new Phar(dirname(__FILE__) . '/brandnewphar.phar.zip', 0, 'brandnewphar.phar');
+$p = new Phar(dirname(__FILE__) . '/phar_commitwrite.phar.zip', 0, 'phar_commitwrite.phar');
 $p['file1.txt'] = 'hi';
 $p->stopBuffering();
 var_dump($p->getStub());
@@ -16,8 +16,8 @@ function __autoload(\$class)
 {
     include 'phar://' . str_replace('_', '/', \$class);
 }
-Phar::mapPhar('brandnewphar.phar');
-include 'phar://brandnewphar.phar/startup.php';
+Phar::mapPhar('phar_commitwrite.phar');
+include 'phar://phar_commitwrite.phar/startup.php';
 __HALT_COMPILER();
 ?>");
 var_dump($p->getStub());
@@ -26,18 +26,18 @@ var_dump($p->isFileFormat(Phar::ZIP));
 ===DONE===
 --CLEAN--
 <?php
-unlink(dirname(__FILE__) . '/brandnewphar.phar.zip');
+unlink(dirname(__FILE__) . '/phar_commitwrite.phar.zip');
 ?>
---EXPECT--
+--EXPECTF--
 string(60) "<?php // zip-based phar archive stub file
 __HALT_COMPILER();"
-string(200) "<?php
+string(%d) "<?php
 function __autoload($class)
 {
     include 'phar://' . str_replace('_', '/', $class);
 }
-Phar::mapPhar('brandnewphar.phar');
-include 'phar://brandnewphar.phar/startup.php';
+Phar::mapPhar('phar_commitwrite.phar');
+include 'phar://phar_commitwrite.phar/startup.php';
 __HALT_COMPILER(); ?>
 "
 bool(true)