review: switched service probe fixture cleanup to --CLEAN--

Author: NickSdot

ext/pdo/tests/pdo_test_skip_cache.phpt

@@ -46,24 +46,26 @@ unset($environment['PDOTEST_ATTR']);
 $helperDirectory = getenv('REDIR_TEST_DIR') ?: __DIR__;
 $helper = var_export($helperDirectory . '/pdo_test.inc', true);
 $code = "require $helper; PDOTest::skip();";
-try {
-    $first = run_pdo_skip_check($code, $environment);
+$first = run_pdo_skip_check($code, $environment);
 
-    $cacheFiles = glob($cacheDirectory . '/pdo-*');
-    if (count($cacheFiles) !== 1) {
-        throw new Exception('Expected exactly one cache file');
-    }
-    $cacheFile = $cacheFiles[0];
-    $cachedReason = file_get_contents($cacheFile);
-    file_put_contents($cacheFile, 'cached connection failure');
+$cacheFiles = glob($cacheDirectory . '/pdo-*');
+if (count($cacheFiles) !== 1) {
+    throw new Exception('Expected exactly one cache file');
+}
+$cacheFile = $cacheFiles[0];
+$cachedReason = file_get_contents($cacheFile);
+file_put_contents($cacheFile, 'cached connection failure');
 
-    $second = run_pdo_skip_check($code, $environment);
-    echo "$first\n$cachedReason\n$second\n";
-} finally {
-    foreach (glob($cacheDirectory . '/*') as $file) {
-        unlink($file);
+$second = run_pdo_skip_check($code, $environment);
+echo "$first\n$cachedReason\n$second\n";
+?>
+--CLEAN--
+<?php
+foreach (glob(__DIR__ . '/pdo_test_skip_cache_*') ?: [] as $directory) {
+    foreach (glob($directory . '/*') ?: [] as $file) {
+        @unlink($file);
     }
-    rmdir($cacheDirectory);
+    @rmdir($directory);
 }
 ?>
 --EXPECT--

ext/snmp/tests/snmp_skip_cache.phpt

@@ -44,26 +44,28 @@ $environment['TEST_PHP_SHARED_CACHE_DIR'] = $cacheDirectory;
 
 $helper = var_export(__DIR__ . '/skipif.inc', true);
 $code = "require $helper; echo \"available\\n\";";
-try {
-    $first = run_snmp_skip_check($code, $environment);
+$first = run_snmp_skip_check($code, $environment);
 
-    $cacheFiles = glob($cacheDirectory . '/snmp-*');
-    if (count($cacheFiles) !== 1) {
-        throw new Exception('Expected exactly one cache file');
-    }
-    $cacheFile = $cacheFiles[0];
-    $cachedReason = file_get_contents($cacheFile);
-    file_put_contents($cacheFile, 'cached agent failure');
+$cacheFiles = glob($cacheDirectory . '/snmp-*');
+if (count($cacheFiles) !== 1) {
+    throw new Exception('Expected exactly one cache file');
+}
+$cacheFile = $cacheFiles[0];
+$cachedReason = file_get_contents($cacheFile);
+file_put_contents($cacheFile, 'cached agent failure');
 
-    $second = run_snmp_skip_check($code, $environment);
-    echo "$first\n";
-    echo "$cachedReason\n";
-    echo $second;
-} finally {
-    foreach (glob($cacheDirectory . '/*') as $file) {
-        unlink($file);
+$second = run_snmp_skip_check($code, $environment);
+echo "$first\n";
+echo "$cachedReason\n";
+echo $second;
+?>
+--CLEAN--
+<?php
+foreach (glob(__DIR__ . '/snmp_skip_cache_*') ?: [] as $directory) {
+    foreach (glob($directory . '/*') ?: [] as $file) {
+        @unlink($file);
     }
-    rmdir($cacheDirectory);
+    @rmdir($directory);
 }
 ?>
 --EXPECT--