Merge branch 'opcache/opcache_is_script_cached_file' of https://github.com/iamacarpet/php-src into opcache/opcache_is_script_cached_file

Author: iamacarpet

ext/opcache/tests/cleanup_helper.inc

@@ -0,0 +1,19 @@
+<?php
+
+function removeDirRecursive($dir) {
+    if (!is_dir($dir)) return;
+    try {
+        $iterator = new RecursiveIteratorIterator(
+            new RecursiveDirectoryIterator($dir, RecursiveDirectoryIterator::SKIP_DOTS),
+            RecursiveIteratorIterator::CHILD_FIRST
+        );
+        foreach ($iterator as $fileinfo) {
+            if ($fileinfo->isDir()) {
+                @rmdir($fileinfo->getRealPath());
+            } else {
+                @unlink($fileinfo->getRealPath());
+            }
+        }
+        @rmdir($dir);
+    } catch (UnexpectedValueException $e) { @rmdir($dir); } catch (Exception $e) { @rmdir($dir); }
+}

ext/opcache/tests/gh16979_check_file_cache_function.phpt

@@ -33,7 +33,7 @@ var_dump(opcache_is_script_cached_in_file_cache(__FILE__));
 ?>
 --CLEAN--
 <?php
-require __DIR__ . '/cleanup_helper.inc.php'
+require __DIR__ . '/cleanup_helper.inc';
 
 $baseCacheDir = __DIR__ . '/gh16979_cache';
 

ext/opcache/zend_accelerator_module.c

@@ -368,27 +368,21 @@ static int filename_is_in_cache(zend_string *filename)
 
 static int filename_is_in_file_cache(zend_string *filename)
 {
-	zend_string *realpath;
-
-	realpath = zend_resolve_path(filename);
-
+	zend_string *realpath = zend_resolve_path(filename);
 	if (!realpath) {
 		return 0;
 	}
 
 	zend_file_handle handle;
-
 	zend_stream_init_filename_ex(&handle, filename);
 	handle.opened_path = realpath;
 
 	zend_persistent_script *result = zend_file_cache_script_load_ex(&handle, true);
-
 	zend_destroy_file_handle(&handle);
 
 	return result != NULL;
 }
 
-
 static int accel_file_in_cache(INTERNAL_FUNCTION_PARAMETERS)
 {
 	if (ZEND_NUM_ARGS() == 1) {