Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fixed bug #78185 (File cache no longer works)

diff --cc ext/opcache/ZendAccelerator.c
index 85e0de94ddb456ab2f4a6c86833cd0e162d29843,4baa779aeab34610ce0153cbb0cf48e4cc836c04..c8f640bfeb2a9f065bddc117c7613f3a994d837c
--- 1/ext/opcache/ZendAccelerator.c
--- 2/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@@ -1892,7 -1918,15 +1892,12 @@@ zend_op_array *persistent_compile_file(
                /* The Accelerator is disabled, act as if without the Accelerator */
                ZCG(cache_opline) = NULL;
                ZCG(cache_persistent_script) = NULL;
 -#ifdef HAVE_OPCACHE_FILE_CACHE
+               if (file_handle->filename
+                && ZCG(accel_directives).file_cache
+                && ZCG(enabled) && accel_startup_ok) {
+                       return file_cache_compile_file(file_handle, type);
+               }
 -#endif
                return accelerator_orig_compile_file(file_handle, type);
 -#ifdef HAVE_OPCACHE_FILE_CACHE
        } else if (file_cache_only) {
                ZCG(cache_opline) = NULL;
                ZCG(cache_persistent_script) = NULL;