Fixed bug #78230

(cherry picked from commit 4892bbc167)

NEWS

@@ -1,12 +1,6 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-20 Jun 2019, PHP 7.3.7RC2
-
-- Opcache:
-  . Fixed bug #78106 (Path resolution fails if opcache disabled during request).
-    (Nikita)
-
-13 Jun 2019, PHP 7.3.7RC1
+04 Jul 2019, PHP 7.3.7
 
 - Core:
   . Fixed bug #76980 (Interface gets skipped if autoloader throws an exception).
@@ -29,6 +23,8 @@ PHP                                                                        NEWS
 - Opcache:
   . Fixed bug #78015 (Incorrect evaluation of expressions involving partials
     arrays in SCCP). (Nikita)
+  . Fixed bug #78106 (Path resolution fails if opcache disabled during request).
+    (Nikita)
 
 - OpenSSL:
   . Fixed bug #78079 (openssl_encrypt_ccm.phpt fails with OpenSSL 1.1.1c).

Zend/zend.h

@@ -20,7 +20,7 @@
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION "3.3.7RC2"
+#define ZEND_VERSION "3.3.7"
 
 #define ZEND_ENGINE_3
 

configure.ac

@@ -108,7 +108,7 @@ int zend_sprintf(char *buffer, const char *format, ...);
 PHP_MAJOR_VERSION=7
 PHP_MINOR_VERSION=3
 PHP_RELEASE_VERSION=7
-PHP_EXTRA_VERSION="RC2"
+PHP_EXTRA_VERSION=""
 PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION"
 PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION`
 

ext/opcache/Optimizer/sccp.c

@@ -2204,6 +2204,7 @@ static int try_remove_definition(sccp_ctx *ctx, int var_num, zend_ssa_var *var,
 				if (opline->opcode == ZEND_DO_ICALL) {
 					removed_ops = remove_call(ctx, opline, ssa_op);
 				} else if (opline->opcode == ZEND_TYPE_CHECK
+						&& opline->op1_type & (IS_VAR|IS_TMP_VAR)
 						&& !value_known(&ctx->values[ssa_op->op1_use])) {
 					/* For TYPE_CHECK we may compute the result value without knowing the
 					 * operand, based on type inference information. Make sure the operand is

ext/opcache/ZendAccelerator.c

@@ -1918,6 +1918,13 @@ zend_op_array *persistent_compile_file(zend_file_handle *file_handle, int type)
 		/* 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) {

ext/opcache/tests/bug78185.phpt

@@ -0,0 +1,37 @@
+--TEST--
+Bug #78185: file cache only no longer works
+--INI--
+opcache.enable_cli=1
+opcache.optimization_level=-1
+opcache.file_cache={PWD}
+opcache.file_cache_only=1
+--FILE--
+<?php
+if (substr(PHP_OS, 0, 3) !== 'WIN') {
+	$pattern = __DIR__ . '/*/' . __DIR__ . '/*78185.php.bin';
+} else {
+	$pattern = __DIR__ . '/*/*/' . str_replace(':', '', __DIR__) . '/*78185.php.bin';
+}
+foreach (glob($pattern) as $p) {
+	var_dump($p);
+}
+?>
+--CLEAN--
+<?php
+if (substr(PHP_OS, 0, 3) !== 'WIN') {
+	$pattern = __DIR__ . '/*/' . __DIR__ . '/*78185.php.bin';
+} else {
+	$pattern = __DIR__ . '/*/*/' . str_replace(':', '', __DIR__) . '/*78185.php.bin';
+}
+foreach (glob($pattern) as $p) {
+	unlink($p);
+	$p = dirname($p);
+	while(strlen($p) > strlen(__DIR__)) {
+		rmdir($p);
+		$p = dirname($p);
+	}
+}
+?>
+--EXPECTF--
+string(%d) "%s78185.php.bin"
+

ext/opcache/tests/bug78230.phpt

@@ -0,0 +1,29 @@
+--TEST--
+Bug #78230: Incorrect type check optimization
+--FILE--
+<?php
+
+function test($x) {
+    $y = (array) $x;
+    var_dump(is_array($y));
+}
+
+$ary = [1, 2];
+$ary[] = 3;
+test($ary);
+$ary[] = 4;
+var_dump($ary);
+
+?>
+--EXPECT--
+bool(true)
+array(4) {
+  [0]=>
+  int(1)
+  [1]=>
+  int(2)
+  [2]=>
+  int(3)
+  [3]=>
+  int(4)
+}

main/php_version.h

@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 7
 #define PHP_MINOR_VERSION 3
 #define PHP_RELEASE_VERSION 7
-#define PHP_EXTRA_VERSION "RC2"
-#define PHP_VERSION "7.3.7RC2"
+#define PHP_EXTRA_VERSION ""
+#define PHP_VERSION "7.3.7"
 #define PHP_VERSION_ID 70307