Test improvements

Author: ndossche

ext/phar/tests/buildFromIterator_user_overrides/getMTime.phpt

@@ -37,7 +37,7 @@ class MyIterator extends RecursiveDirectoryIterator {
     }
 }
 
-$workdir = __DIR__.'/001';
+$workdir = __DIR__.'/getMTime';
 mkdir($workdir . '/content', recursive: true);
 file_put_contents($workdir . '/content/hello.txt', "Hello world.");
 
@@ -61,7 +61,7 @@ var_dump($result['content/hello.txt']->getCTime());
 ?>
 --CLEAN--
 <?php
-$workdir = __DIR__.'/001';
+$workdir = __DIR__.'/getMTime';
 @unlink($workdir . '/test.phar');
 @unlink($workdir . '/content/hello.txt');
 @rmdir($workdir . '/content');

ext/phar/tests/buildFromIterator_user_overrides/getMTime_byRef.phpt

@@ -26,7 +26,7 @@ class MyIterator extends RecursiveDirectoryIterator {
     }
 }
 
-$workdir = __DIR__.'/007';
+$workdir = __DIR__.'/getMTime_byRef';
 mkdir($workdir . '/content', recursive: true);
 file_put_contents($workdir . '/content/hello.txt', "Hello world.");
 
@@ -50,7 +50,7 @@ var_dump($result['content/hello.txt']->getCTime());
 ?>
 --CLEAN--
 <?php
-$workdir = __DIR__.'/007';
+$workdir = __DIR__.'/getMTime_byRef';
 @unlink($workdir . '/test.phar');
 @unlink($workdir . '/content/hello.txt');
 @rmdir($workdir . '/content');

ext/phar/tests/buildFromIterator_user_overrides/getMTime_errors.phpt

@@ -61,7 +61,7 @@ class MyIterator extends RecursiveDirectoryIterator {
     }
 }
 
-$workdir = __DIR__.'/002';
+$workdir = __DIR__.'/getMTime_errors';
 mkdir($workdir . '/content', recursive: true);
 file_put_contents($workdir . '/content/hello.txt', "Hello world.");
 
@@ -88,7 +88,7 @@ for ($i = 0; $i < 4; $i++) {
 ?>
 --CLEAN--
 <?php
-$workdir = __DIR__.'/002';
+$workdir = __DIR__.'/getMTime_errors';
 @unlink($workdir . '/content/hello.txt');
 @unlink($workdir . '/test3.phar');
 @unlink($workdir . '/test2.phar');
@@ -105,13 +105,13 @@ Entry content%chello.txt cannot be created: timestamp is limited to 32-bit
 --- Iteration 1 ---
 [ Found: %shello.txt ]
 [MTime]
-Entry content/hello.txt cannot be created: getMTime() must return an int
+Entry content%chello.txt cannot be created: getMTime() must return an int
 --- Iteration 2 ---
 [ Found: %shello.txt ]
 [MTime]
-Entry content/hello.txt cannot be created: getMTime() must return an int
+Entry content%chello.txt cannot be created: getMTime() must return an int
 Previous: Throwing an exception inside getMTime()
 --- Iteration 3 ---
-[ Found: %scontent/hello.txt ]
+[ Found: %shello.txt ]
 [MTime]
-Entry content/hello.txt cannot be created: getMTime() must return an int
+Entry content%chello.txt cannot be created: getMTime() must return an int

ext/phar/tests/buildFromIterator_user_overrides/getPathname.phpt

@@ -27,7 +27,7 @@ class MyIterator extends RecursiveDirectoryIterator {
     }
 }
 
-$workdir = __DIR__.'/004';
+$workdir = __DIR__.'/getPathname';
 mkdir($workdir . '/content', recursive: true);
 file_put_contents($workdir . '/content/hello1.txt', "Hello world 1.");
 file_put_contents($workdir . '/content/hello2.txt', "Hello world 2.");
@@ -49,7 +49,7 @@ var_dump(isset($result['content/hello2.txt']));
 ?>
 --CLEAN--
 <?php
-$workdir = __DIR__.'/004';
+$workdir = __DIR__.'/getPathname';
 @unlink($workdir . '/test.phar');
 @unlink($workdir . '/content/hello1.txt');
 @unlink($workdir . '/content/hello2.txt');

ext/phar/tests/buildFromIterator_user_overrides/getPathname_byRef.phpt

@@ -26,7 +26,7 @@ class MyIterator extends RecursiveDirectoryIterator {
     }
 }
 
-$workdir = __DIR__.'/005';
+$workdir = __DIR__.'/getPathname_byRef';
 mkdir($workdir . '/content', recursive: true);
 file_put_contents($workdir . '/content/hello.txt', "Hello world 1.");
 
@@ -46,13 +46,13 @@ var_dump(isset($result['content/hello.txt']));
 ?>
 --CLEAN--
 <?php
-$workdir = __DIR__.'/005';
+$workdir = __DIR__.'/getPathname_byRef';
 @unlink($workdir . '/test.phar');
 @unlink($workdir . '/content/hello.txt');
 @rmdir($workdir . '/content');
 @rmdir($workdir);
 ?>
 --EXPECTF--
-[ Found: %scontent/hello.txt ]
+[ Found: %scontent%chello.txt ]
 [getPathname]
 bool(true)

ext/phar/tests/buildFromIterator_user_overrides/getPathname_exception.phpt

@@ -26,7 +26,7 @@ class MyIterator extends RecursiveDirectoryIterator {
     }
 }
 
-$workdir = __DIR__.'/003';
+$workdir = __DIR__.'/getPathname_exception';
 mkdir($workdir . '/content', recursive: true);
 file_put_contents($workdir . '/content/hello.txt', "Hello world.");
 
@@ -50,7 +50,7 @@ $phar->stopBuffering();
 ?>
 --CLEAN--
 <?php
-$workdir = __DIR__.'/003';
+$workdir = __DIR__.'/getPathname_exception';
 @unlink($workdir . '/content/hello.txt');
 @rmdir($workdir . '/content');
 @rmdir($workdir);

ext/phar/tests/buildFromIterator_user_overrides/getPathname_wrong_type.phpt

@@ -26,7 +26,7 @@ class MyIterator extends RecursiveDirectoryIterator {
     }
 }
 
-$workdir = __DIR__.'/006';
+$workdir = __DIR__.'/getPathname_wrong_type';
 mkdir($workdir . '/content', recursive: true);
 file_put_contents($workdir . '/content/hello.txt', "Hello world.");
 
@@ -47,12 +47,12 @@ $phar->stopBuffering();
 ?>
 --CLEAN--
 <?php
-$workdir = __DIR__.'/006';
+$workdir = __DIR__.'/getPathname_wrong_type';
 @unlink($workdir . '/content/hello.txt');
 @rmdir($workdir . '/content');
 @rmdir($workdir);
 ?>
 --EXPECTF--
-[ Found: %scontent/hello.txt ]
+[ Found: %scontent%chello.txt ]
 [getPathname]
 getPathname() must return a string