review: switched concurrency fixture cleanup to --CLEAN--

Author: NickSdot

tests/run-test/max_concurrency_conflicts.phpt

@@ -90,11 +90,15 @@ var_dump($exitCode);
 if ($exitCode !== 0) {
     echo $output;
 }
-
-foreach (glob($root . '/*') as $file) {
-    unlink($file);
+?>
+--CLEAN--
+<?php
+foreach (glob(__DIR__ . '/max_concurrency_conflicts_*') ?: [] as $root) {
+    foreach (glob($root . '/*') ?: [] as $file) {
+        @unlink($file);
+    }
+    @rmdir($root);
 }
-rmdir($root);
 ?>
 --EXPECT--
 PASSED one.phpt

tests/run-test/scoped_conflicts.phpt

@@ -120,19 +120,23 @@ var_dump($exitCode);
 if ($exitCode !== 0) {
     echo $output;
 }
-
-foreach (glob($root . '/active-*') as $marker) {
-    unlink($marker);
-}
-unlink($results);
-foreach ([$group, $external] as $directory) {
-    foreach (glob($directory . '/*') as $file) {
-        unlink($file);
+?>
+--CLEAN--
+<?php
+foreach (glob(__DIR__ . '/scoped_conflicts_*') ?: [] as $root) {
+    foreach ([$root . '/a-group', $root . '/z-external'] as $directory) {
+        foreach (glob($directory . '/*') ?: [] as $file) {
+            @unlink($file);
+        }
+        @rmdir($directory);
+    }
+    foreach (glob($root . '/*') ?: [] as $file) {
+        if (is_file($file)) {
+            @unlink($file);
+        }
     }
+    @rmdir($root);
 }
-rmdir($group);
-rmdir($external);
-rmdir($root);
 ?>
 --EXPECT--
 PASSED one.phpt