From: Greg Beaver <cellog@php.net>
Date: Fri, 14 Dec 2007 18:54:54 +0000 (+0000)
Subject: fix test
X-Git-Tag: RELEASE_2_0_0a1~1167
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f01adb004819aa80b8124228af8cda63f18aec0e;p=php

fix test
---

diff --git a/ext/phar/tests/extracted_001.phpt b/ext/phar/tests/extracted_001.phpt
index 8f1254d3d1..a84f9708ce 100755
--- a/ext/phar/tests/extracted_001.phpt
+++ b/ext/phar/tests/extracted_001.phpt
@@ -29,7 +29,7 @@ array(1) {
   ["phar_test.phar"]=>
   string(%d) "%s"
 }
-string(29) "<?php var_dump(__FILE__); ?>
+string(%d) "<?php var_dump(__FILE__); ?>
 "
 string(%d) "%sextracted.inc"
 ===DONE===
diff --git a/ext/phar/tests/phar_buildfromiterator8.phpt b/ext/phar/tests/phar_buildfromiterator8.phpt
index 7e9307ecc5..aa22c11803 100644
--- a/ext/phar/tests/phar_buildfromiterator8.phpt
+++ b/ext/phar/tests/phar_buildfromiterator8.phpt
@@ -25,70 +25,70 @@ __HALT_COMPILER();
 --EXPECTF--
 array(33) {
   ["001.phpt"]=>
-  string(51) "%s001.phpt"
+  string(%d) "%s001.phpt"
   ["002.phpt"]=>
-  string(51) "%s002.phpt"
+  string(%d) "%s002.phpt"
   ["003.phpt"]=>
-  string(51) "%s003.phpt"
+  string(%d) "%s003.phpt"
   ["004.phpt"]=>
-  string(51) "%s004.phpt"
+  string(%d) "%s004.phpt"
   ["005.phpt"]=>
-  string(51) "%s005.phpt"
+  string(%d) "%s005.phpt"
   ["006.phpt"]=>
-  string(51) "%s006.phpt"
+  string(%d) "%s006.phpt"
   ["007.phpt"]=>
-  string(51) "%s007.phpt"
+  string(%d) "%s007.phpt"
   ["008.phpt"]=>
-  string(51) "%s008.phpt"
+  string(%d) "%s008.phpt"
   ["009.phpt"]=>
-  string(51) "%s009.phpt"
+  string(%d) "%s009.phpt"
   ["010.phpt"]=>
-  string(51) "%s010.phpt"
+  string(%d) "%s010.phpt"
   ["011.phpt"]=>
-  string(51) "%s011.phpt"
+  string(%d) "%s011.phpt"
   ["012.phpt"]=>
-  string(51) "%s012.phpt"
+  string(%d) "%s012.phpt"
   ["013.phpt"]=>
-  string(51) "%s013.phpt"
+  string(%d) "%s013.phpt"
   ["014.phpt"]=>
-  string(51) "%s014.phpt"
+  string(%d) "%s014.phpt"
   ["015.phpt"]=>
-  string(51) "%s015.phpt"
+  string(%d) "%s015.phpt"
   ["016.phpt"]=>
-  string(51) "%s016.phpt"
+  string(%d) "%s016.phpt"
   ["017.phpt"]=>
-  string(51) "%s017.phpt"
+  string(%d) "%s017.phpt"
   ["018.phpt"]=>
-  string(51) "%s018.phpt"
+  string(%d) "%s018.phpt"
   ["019.phpt"]=>
-  string(51) "%s019.phpt"
+  string(%d) "%s019.phpt"
   ["020.phpt"]=>
-  string(51) "%s020.phpt"
+  string(%d) "%s020.phpt"
   ["021.phpt"]=>
-  string(51) "%s021.phpt"
+  string(%d) "%s021.phpt"
   ["022.phpt"]=>
-  string(51) "%s022.phpt"
+  string(%d) "%s022.phpt"
   ["023.phpt"]=>
-  string(51) "%s023.phpt"
+  string(%d) "%s023.phpt"
   ["024.phpt"]=>
-  string(51) "%s024.phpt"
+  string(%d) "%s024.phpt"
   ["025.phpt"]=>
-  string(51) "%s025.phpt"
+  string(%d) "%s025.phpt"
   ["026.phpt"]=>
-  string(51) "%s026.phpt"
+  string(%d) "%s026.phpt"
   ["027.phpt"]=>
-  string(51) "%s027.phpt"
+  string(%d) "%s027.phpt"
   ["028.phpt"]=>
-  string(51) "%s028.phpt"
+  string(%d) "%s028.phpt"
   ["029.phpt"]=>
-  string(51) "%s029.phpt"
+  string(%d) "%s029.phpt"
   ["030.phpt"]=>
-  string(51) "%s030.phpt"
+  string(%d) "%s030.phpt"
   ["031.phpt"]=>
-  string(51) "%s031.phpt"
+  string(%d) "%s031.phpt"
   ["032.phpt"]=>
-  string(51) "%s032.phpt"
+  string(%d) "%s032.phpt"
   ["033.phpt"]=>
-  string(51) "%s033.phpt"
+  string(%d) "%s033.phpt"
 }
 ===DONE===
diff --git a/ext/phar/tests/phar_oo_002.phpt b/ext/phar/tests/phar_oo_002.phpt
index 18c5f69e43..30e668217f 100755
--- a/ext/phar/tests/phar_oo_002.phpt
+++ b/ext/phar/tests/phar_oo_002.phpt
@@ -15,7 +15,7 @@ $phar = new Phar($fname);
 $phar->setInfoClass('SplFileInfo');
 foreach($phar as $name => $ent)
 {
-	var_dump(str_replace(dirname(__FILE__), '*', $name));
+	var_dump(str_replace(str_replace('\\', '/', dirname(__FILE__)), '*', $name));
 	var_dump($ent->getFilename());
 	var_dump($ent->getSize());
 	var_dump($ent->getType());
@@ -35,7 +35,7 @@ echo "==RECURSIVE==\n";
 $phar = new Phar($fname);
 foreach(new RecursiveIteratorIterator($phar) as $name => $ent)
 {
-	var_dump(str_replace(dirname(__FILE__), '*', $name));
+	var_dump(str_replace(str_replace('\\', '/', dirname(__FILE__)), '*', $name));
 	var_dump(str_replace('\\', '/', $ent->getFilename()));
 	var_dump($ent->getCompressedSize());
 	var_dump($ent->isCRCChecked());
@@ -50,8 +50,8 @@ foreach(new RecursiveIteratorIterator($phar) as $name => $ent)
 unlink(dirname(__FILE__) . '/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
---EXPECT--
-string(36) "phar://*/phar_oo_test.phar.php/a.php"
+--EXPECTF--
+string(36) "phar://*/phar_oo_test.phar.php%ca.php"
 string(5) "a.php"
 int(32)
 string(4) "file"
@@ -64,7 +64,7 @@ bool(false)
 int(1141214400)
 int(1141214400)
 int(1141214400)
-string(32) "phar://*/phar_oo_test.phar.php/b"
+string(32) "phar://*/phar_oo_test.phar.php%cb"
 string(1) "b"
 int(0)
 string(3) "dir"
@@ -77,7 +77,7 @@ bool(false)
 int(1141214400)
 int(1141214400)
 int(1141214400)
-string(36) "phar://*/phar_oo_test.phar.php/b.php"
+string(36) "phar://*/phar_oo_test.phar.php%cb.php"
 string(5) "b.php"
 int(32)
 string(4) "file"
@@ -90,7 +90,7 @@ bool(false)
 int(1141214400)
 int(1141214400)
 int(1141214400)
-string(36) "phar://*/phar_oo_test.phar.php/e.php"
+string(36) "phar://*/phar_oo_test.phar.php%ce.php"
 string(5) "e.php"
 int(32)
 string(4) "file"
@@ -104,31 +104,31 @@ int(1141214400)
 int(1141214400)
 int(1141214400)
 ==RECURSIVE==
-string(36) "phar://*/phar_oo_test.phar.php/a.php"
+string(36) "phar://*/phar_oo_test.phar.php%ca.php"
 string(5) "a.php"
 int(32)
 bool(false)
 NULL
 int(0)
-string(38) "phar://*/phar_oo_test.phar.php/b/c.php"
+string(38) "phar://*/phar_oo_test.phar.php%cb%cc.php"
 string(5) "c.php"
 int(34)
 bool(false)
 NULL
 int(0)
-string(38) "phar://*/phar_oo_test.phar.php/b/d.php"
+string(38) "phar://*/phar_oo_test.phar.php%cb%cd.php"
 string(5) "d.php"
 int(34)
 bool(false)
 NULL
 int(0)
-string(36) "phar://*/phar_oo_test.phar.php/b.php"
+string(36) "phar://*/phar_oo_test.phar.php%cb.php"
 string(5) "b.php"
 int(32)
 bool(false)
 NULL
 int(0)
-string(36) "phar://*/phar_oo_test.phar.php/e.php"
+string(36) "phar://*/phar_oo_test.phar.php%ce.php"
 string(5) "e.php"
 int(32)
 bool(false)
diff --git a/ext/phar/tests/phar_oo_005.phpt b/ext/phar/tests/phar_oo_005.phpt
index 4c3d3a1e97..126b71a4d9 100755
--- a/ext/phar/tests/phar_oo_005.phpt
+++ b/ext/phar/tests/phar_oo_005.phpt
@@ -9,6 +9,7 @@ phar.require_hash=0
 <?php
 
 require_once 'phar_oo_test.inc';
+$fname = str_replace('\\', '/', $fname);
 
 $it = new RecursiveDirectoryIterator('phar://'.$fname);
 $it = new RecursiveIteratorIterator($it);
@@ -17,10 +18,10 @@ foreach($it as $name => $ent)
 {
 	var_dump(str_replace(array('\\', $fname), array('/', '*'), $name));
 	var_dump(str_replace(array('\\', $fname), array('/', '*'), $ent->getPathname()));
-	var_dump($it->getSubPath());
-	var_dump($it->getSubPathName());
+	var_dump(str_replace('\\', '/', $it->getSubPath()));
+	var_dump(str_replace('\\', '/', $it->getSubPathName()));
 	$sub = $it->getPathInfo();
-	var_dump($sub->getFilename());
+	var_dump(str_replace('\\', '/', $sub->getFilename()));
 }
 
 ?>