Merge remote-tracking branch 'origin/master' into opcache/file_cache_read_only

Author: iamacarpet

UPGRADING

@@ -100,6 +100,11 @@ PHP 8.5 UPGRADE NOTES
 9. Other Changes to Extensions
 ========================================
 
+- Readline:
+  . The return types of readline_add_history(), readline_clear_history(), and
+    readline_callback_handler_install() have been changed to true, rather
+    than bool.
+
 ========================================
 10. New Global Constants
 ========================================

Zend/tests/abstract_implicit.phpt

@@ -0,0 +1,19 @@
+--TEST--
+Abstract methods not allowed in classes that are not abstract (GH-16067)
+--FILE--
+<?php
+
+// Still allowed via trait
+trait TraitWithAbstract {
+    abstract public function foo();
+}
+class TraitWorks {
+    use TraitWithAbstract;
+}
+
+class NotAbstract {
+    abstract public function bar();
+}
+?>
+--EXPECTF--
+Fatal error: Class NotAbstract declares abstract method bar() and must therefore be declared abstract in %s on line %d

Zend/tests/anon/gh16067.phpt

@@ -0,0 +1,11 @@
+--TEST--
+Compiler prevents explicit `abstract` methods on anonymous classes
+--FILE--
+<?php
+
+$c = new class {
+    abstract public function f();
+}
+?>
+--EXPECTF--
+Fatal error: Anonymous class method f() must not be abstract in %s on line 4

Zend/tests/enum/no-abstract.phpt

@@ -0,0 +1,12 @@
+--TEST--
+Compiler prevents `abstract` methods on enums classes (GH-16067)
+--FILE--
+<?php
+
+enum Example {
+    abstract public function foo();
+}
+
+?>
+--EXPECTF--
+Fatal error: Enum method Example::foo() must not be abstract in %s on line 4

Zend/tests/errmsg/errmsg_018.phpt

@@ -10,4 +10,4 @@ class test {
 echo "Done\n";
 ?>
 --EXPECTF--
-Fatal error: Class test contains 1 abstract method and must therefore be declared abstract or implement the remaining method (test::foo) in %s on line %d
+Fatal error: Class test declares abstract method foo() and must therefore be declared abstract in %s on line %d

Zend/zend_compile.c

@@ -3709,6 +3709,7 @@ static uint32_t zend_get_arg_num(zend_function *fn, zend_string *arg_name) {
 			}
 		}
 	} else {
+		ZEND_ASSERT(fn->common.num_args == 0 || fn->internal_function.arg_info);
 		for (uint32_t i = 0; i < fn->common.num_args; i++) {
 			zend_internal_arg_info *arg_info = &fn->internal_function.arg_info[i];
 			size_t len = strlen(arg_info->name);
@@ -8067,6 +8068,22 @@ static zend_string *zend_begin_method_decl(zend_op_array *op_array, zend_string
 		zend_error(E_COMPILE_WARNING, "Private methods cannot be final as they are never overridden by other classes");
 	}
 
+	if ((fn_flags & ZEND_ACC_ABSTRACT)
+	 && !(ce->ce_flags & (ZEND_ACC_EXPLICIT_ABSTRACT_CLASS|ZEND_ACC_TRAIT))) {
+		// Don't say that the class should be declared abstract if it is
+		// anonymous or an enum and can't be abstract
+		if (ce->ce_flags & ZEND_ACC_ANON_CLASS) {
+			zend_error_noreturn(E_COMPILE_ERROR, "Anonymous class method %s() must not be abstract",
+				ZSTR_VAL(name));
+		} else if (ce->ce_flags & (ZEND_ACC_ENUM|ZEND_ACC_INTERFACE)) {
+			zend_error_noreturn(E_COMPILE_ERROR, "%s method %s::%s() must not be abstract",
+				zend_get_object_type_case(ce, true), ZSTR_VAL(ce->name), ZSTR_VAL(name));
+		} else {
+			zend_error_noreturn(E_COMPILE_ERROR, "Class %s declares abstract method %s() and must therefore be declared abstract",
+				ZSTR_VAL(ce->name), ZSTR_VAL(name));
+		}
+	}
+
 	if (in_interface) {
 		if (!(fn_flags & ZEND_ACC_PUBLIC)) {
 			zend_error_noreturn(E_COMPILE_ERROR, "Access type for interface method "
@@ -8076,10 +8093,6 @@ static zend_string *zend_begin_method_decl(zend_op_array *op_array, zend_string
 			zend_error_noreturn(E_COMPILE_ERROR, "Interface method "
 				"%s::%s() must not be final", ZSTR_VAL(ce->name), ZSTR_VAL(name));
 		}
-		if (fn_flags & ZEND_ACC_ABSTRACT) {
-			zend_error_noreturn(E_COMPILE_ERROR, "Interface method "
-				"%s::%s() must not be abstract", ZSTR_VAL(ce->name), ZSTR_VAL(name));
-		}
 		op_array->fn_flags |= ZEND_ACC_ABSTRACT;
 	}
 

Zend/zend_execute.c

@@ -5304,6 +5304,7 @@ static zend_always_inline uint32_t zend_get_arg_offset_by_name(
 			}
 		}
 	} else {
+		ZEND_ASSERT(num_args == 0 || fbc->internal_function.arg_info);
 		for (uint32_t i = 0; i < num_args; i++) {
 			zend_internal_arg_info *arg_info = &fbc->internal_function.arg_info[i];
 			size_t len = strlen(arg_info->name);

Zend/zend_max_execution_timer.h

@@ -21,8 +21,10 @@
 
 #include "zend_long.h"
 
+BEGIN_EXTERN_C()
 /* Must be called after calls to fork() */
 ZEND_API void zend_max_execution_timer_init(void);
+END_EXTERN_C()
 void zend_max_execution_timer_settime(zend_long seconds);
 void zend_max_execution_timer_shutdown(void);
 

Zend/zend_vm_def.h

@@ -3634,7 +3634,7 @@ ZEND_VM_HOT_OBJ_HANDLER(112, ZEND_INIT_METHOD_CALL, CONST|TMPVAR|UNUSED|THIS|CV,
 		fbc = obj->handlers->get_method(&obj, Z_STR_P(function_name), ((OP2_TYPE == IS_CONST) ? (RT_CONSTANT(opline, opline->op2) + 1) : NULL));
 		if (UNEXPECTED(fbc == NULL)) {
 			if (EXPECTED(!EG(exception))) {
-				zend_undefined_method(obj->ce, Z_STR_P(function_name));
+				zend_undefined_method(orig_obj->ce, Z_STR_P(function_name));
 			}
 			FREE_OP2();
 			if ((OP1_TYPE & (IS_VAR|IS_TMP_VAR)) && GC_DELREF(orig_obj) == 0) {