Merge branch 'PHP-7.4'

cmb69 · cmb69 · commit 44ebbf0de109 · 2019-02-20T19:41:25.000+01:00
* PHP-7.4:
  fix #77642: typo "incompatibe" in Zend/zend_compile.c [ci skip]
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -3930,7 +3930,7 @@ void zend_compile_static_call(znode *result, zend_ast *ast, uint32_t type) /* {{
 				  || (CG(active_class_entry)
 				   && !(CG(active_class_entry)->ce_flags & ZEND_ACC_LINKED))
 				  || !zend_check_protected(zend_get_function_root_class(fbc), CG(active_class_entry)))) {
-					/* incompatibe function */
+					/* incompatible function */
 					fbc = NULL;
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -3930,7 +3930,7 @@ void zend_compile_static_call(znode result, zend_ast ast, uint32_t type) /* {{`
`3930`	`3930`	`\|\| (CG(active_class_entry)`
`3931`	`3931`	`&& !(CG(active_class_entry)->ce_flags & ZEND_ACC_LINKED))`
`3932`	`3932`	`\|\| !zend_check_protected(zend_get_function_root_class(fbc), CG(active_class_entry)))) {`
`3933`		`- /* incompatibe function */`
	`3933`	`+ /* incompatible function */`
`3934`	`3934`	`fbc = NULL;`
`3935`	`3935`	`}`
`3936`	`3936`	`}`