Merge branch 'PHP-7.4'

cmb69 · cmb69 · commit f2dbe4297b29 · 2019-12-10T13:20:55.000+01:00
* PHP-7.4:
  Improve error message
diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c
@@ -3455,7 +3455,7 @@ static void get_unlinked_dependency(zend_class_entry *ce, const char **kind, con
 		}
 #ifdef ZEND_WIN32
 		if (p->type == ZEND_INTERNAL_CLASS) {
-			*kind = "Internal parent (Windows only limitation)";
+			*kind = "Windows can't link to internal parent ";
 			*name = ZSTR_VAL(ce->parent_name);
 			return;
 		}

Original file line number	Diff line number	Diff line change
`@@ -3455,7 +3455,7 @@ static void get_unlinked_dependency(zend_class_entry ce, const char *kind, con`
`3455`	`3455`	`}`
`3456`	`3456`	`#ifdef ZEND_WIN32`
`3457`	`3457`	`if (p->type == ZEND_INTERNAL_CLASS) {`
`3458`		`- *kind = "Internal parent (Windows only limitation)";`
	`3458`	`+ *kind = "Windows can't link to internal parent ";`
`3459`	`3459`	`*name = ZSTR_VAL(ce->parent_name);`
`3460`	`3460`	`return;`
`3461`	`3461`	`}`