Make tests more consistent

Author: ndossche

ext/phar/tests/buildFromIterator_user_overrides/getMTime_errors.phpt

@@ -112,6 +112,6 @@ Entry content/hello.txt cannot be created: getMTime() must return an int
 Entry content/hello.txt cannot be created: getMTime() must return an int
 Previous: Throwing an exception inside getMTime()
 --- Iteration 3 ---
-[ Found: /run/media/niels/MoreData/php-src-multitasking/ext/phar/tests/buildFromIterator_user_overrides/002/content/hello.txt ]
+[ Found: %scontent/hello.txt ]
 [MTime]
 Entry content/hello.txt cannot be created: getMTime() must return an int

ext/phar/tests/buildFromIterator_user_overrides/getPathname.phpt

@@ -13,6 +13,7 @@ N. Dossche
 
 class MyGlobIterator extends GlobIterator {
     public function getPathname(): string {
+        echo "[getPathname]\n";
         var_dump(parent::getPathname());
         // For testing: always return hello2 such that it will be the only file
         return str_replace("hello1.txt", "hello2.txt", parent::getPathname());
@@ -57,8 +58,10 @@ $workdir = __DIR__.'/004';
 ?>
 --EXPECTF--
 [ Found: %shello%d.txt ]
+[getPathname]
 string(%d) "%shello1.txt"
 [ Found: %shello%d.txt ]
+[getPathname]
 string(%d) "%shello1.txt"
 bool(false)
 bool(true)

ext/phar/tests/buildFromIterator_user_overrides/getPathname_byRef.phpt

@@ -13,13 +13,15 @@ N. Dossche
 
 class MyGlobIterator extends GlobIterator {
     public function &getPathname(): string {
+        echo "[getPathname]\n";
         static $data = parent::getPathname();
         return $data;
     }
 }
 
 class MyIterator extends RecursiveDirectoryIterator {
     public function current(): SplFileInfo {
+        echo "[ Found: " . parent::current()->getPathname() . " ]\n";
         return new MyGlobIterator(parent::current()->getPath() . '/*');
     }
 }
@@ -51,4 +53,6 @@ $workdir = __DIR__.'/005';
 @rmdir($workdir);
 ?>
 --EXPECTF--
+[ Found: %scontent/hello.txt ]
+[getPathname]
 bool(true)

ext/phar/tests/buildFromIterator_user_overrides/getPathname_exception.phpt

@@ -13,6 +13,7 @@ N. Dossche
 
 class MyGlobIterator extends GlobIterator {
     public function getPathname(): string {
+        echo "[getPathname]\n";
         var_dump(parent::getPathname());
         throw new Error('exception in getPathname()');
     }
@@ -53,5 +54,6 @@ $workdir = __DIR__.'/003';
 ?>
 --EXPECTF--
 [ Found: %shello.txt ]
+[getPathname]
 string(%d) "%shello.txt"
 exception in getPathname()

ext/phar/tests/buildFromIterator_user_overrides/getPathname_wrong_type.phpt

@@ -14,12 +14,14 @@ N. Dossche
 class MyGlobIterator extends GlobIterator {
     #[\ReturnTypeWillChange]
     public function getPathname(): int {
+        echo "[getPathname]\n";
         return 1;
     }
 }
 
 class MyIterator extends RecursiveDirectoryIterator {
     public function current(): SplFileInfo {
+        echo "[ Found: " . parent::current()->getPathname() . " ]\n";
         return new MyGlobIterator(parent::current()->getPath() . '/*');
     }
 }
@@ -50,5 +52,7 @@ $workdir = __DIR__.'/006';
 @rmdir($workdir . '/content');
 @rmdir($workdir);
 ?>
---EXPECT--
+--EXPECTF--
+[ Found: %scontent/hello.txt ]
+[getPathname]
 getPathname() must return a string