Update based on feedback

* Remove special messages for `never` parameters with default values or on
property hooks
* Reword error message for method with a body
* Simplify some tests
* Reduplicate registration of backed enum methods

Author: DanielEScherzer

Zend/tests/never-parameters/backed_enum.phpt

@@ -15,9 +15,7 @@ function enumMethod(string $class, string $name) {
 
     $type = $param->getType();
 
-    if (!($type instanceof ReflectionNamedType)) {
-        throw new Exception("Should be named...");
-    }
+    assert($type instanceof ReflectionNamedType);
     echo "Name: " . $type->getName() . "\n";
     echo "isBuiltin: " . $type->isBuiltIn() . "\n";
     echo "allowsNull: " . (int)$type->allowsNull() . "\n";

Zend/tests/never-parameters/no_implementation.phpt renamed to Zend/tests/never-parameters/no_body.phpt

@@ -1,5 +1,5 @@
 --TEST--
-`never` parameter types - cannot be used for parameters on methods with implementations
+`never` parameter types - cannot be used for parameters on methods with bodies
 --FILE--
 <?php
 
@@ -11,4 +11,4 @@ abstract class Demo {
 
 ?>
 --EXPECTF--
-Fatal error: never cannot be used as a parameter type for methods with implementations in %s on line %d
+Fatal error: Function Demo::example() containing a body cannot use never as a parameter type in %s on line %d

Zend/tests/never-parameters/no_defaults.phpt

@@ -9,4 +9,4 @@ interface Demo {
 
 ?>
 --EXPECTF--
-Fatal error: never cannot be used as a parameter type for parameters with defaults in %s on line %d
+Fatal error: Cannot use int as default value for parameter $v of type never in %s on line %d

Zend/tests/never-parameters/no_hooks.phpt

@@ -10,4 +10,4 @@ interface I
 
 ?>
 --EXPECTF--
-Fatal error: never cannot be used as a parameter type for property hooks in %s on line %d
+Fatal error: Type of parameter $value of hook I::$both::set must be compatible with property type in %s on line %d

Zend/tests/never-parameters/reflection.phpt

@@ -13,9 +13,7 @@ echo $ref . "\n";
 
 $type = $ref->getType();
 
-if (!($type instanceof ReflectionNamedType)) {
-    throw new Exception("Should be named...");
-}
+assert($type instanceof ReflectionNamedType);
 echo "Name: " . $type->getName() . "\n";
 echo "isBuiltin: " . $type->isBuiltIn() . "\n";
 echo "allowsNull: " . (int)$type->allowsNull() . "\n";

Zend/zend_compile.c

@@ -7716,21 +7716,18 @@ static void zend_compile_params(zend_ast_decl *decl, uint32_t fallback_return_ty
 				if (decl->child[2] != NULL) {
 					zend_error_noreturn(
 						E_COMPILE_ERROR,
-						"never cannot be used as a parameter type for methods with implementations"
-					);
-				}
-				if (*default_ast_ptr) {
-					zend_error_noreturn(
-						E_COMPILE_ERROR,
-						"never cannot be used as a parameter type for parameters with defaults"
-					);
-				}
-				if (decl->kind == ZEND_AST_PROPERTY_HOOK) {
-					zend_error_noreturn(
-						E_COMPILE_ERROR,
-						"never cannot be used as a parameter type for property hooks"
+						"Function %s::%s() containing a body cannot use never as a parameter type",
+						ZSTR_VAL(op_array->scope->name),
+						ZSTR_VAL(op_array->function_name)
 					);
 				}
+				/* The restriction on not using `never` parameters for
+				 * parameters with defaults is implemented by the validation of
+				 * default values (since no value is valid for a `never` type).
+				 * The restriction on not using `never` parameters for property
+				 * hooks is implemented by the validation that the type of
+				 * parameters accepted by the `set` hook is wider than that of
+				 * the property itself. */
 			}
 
 			if (default_type != IS_UNDEF && default_type != IS_CONSTANT_AST && !force_nullable

Zend/zend_enum.c

@@ -564,13 +564,11 @@ ZEND_API zend_class_entry *zend_register_internal_enum(
 			ce, unit_enum_methods, &ce->function_table, EG(current_module)->type);
 		zend_class_implements(ce, 1, zend_ce_unit_enum);
 	} else {
-		if (type == IS_LONG) {
-			zend_register_functions(
-				ce, int_backed_enum_methods, &ce->function_table, EG(current_module)->type);
-		} else {
-			zend_register_functions(
-				ce, string_backed_enum_methods, &ce->function_table, EG(current_module)->type);
-		}
+		zend_function_entry *backed_enum_methods = type == IS_LONG
+			? int_backed_enum_methods
+			: string_backed_enum_methods;
+		zend_register_functions(
+			ce, backed_enum_methods, &ce->function_table, EG(current_module)->type);
 		zend_class_implements(ce, 1, zend_ce_backed_enum);
 	}