Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix brittle test

1 files changed, 10 insertions, 3 deletions

diff --git a/ext/opcache/tests/bug78189.phpt b/ext/opcache/tests/bug78189.phpt
index 49891c8d63..d97d8e9470 100644
--- a/ext/opcache/tests/bug78189.phpt
+++ b/ext/opcache/tests/bug78189.phpt
@@ -14,9 +14,16 @@ opcache.file_cache_only=1
 <?php
 $tmpdir = sys_get_temp_dir();
 $pattern = $tmpdir . '/*/*/' . str_replace(':', '', __DIR__) . '/bug78189.php.bin';
-foreach (glob($pattern) as $filename) {
-    var_dump(preg_match('~/[0-9a-f]{32}/~', substr($filename, strlen($tmpdir), 34)));
+$filenames = glob($pattern);
+if (count($filenames)) {
+    foreach ($filenames as $filename) {
+        $part = substr($filename, strlen($tmpdir), 34);
+        if (!preg_match('~/[0-9a-f]{32}/~', $part)) {
+            echo "invalid opcache folder: $part\n";
+        }
+    }
+} else {
+    echo "no opcache file found!\n";
 }
 ?>
 --EXPECT--
-int(1)