Merge branch 'PHP-7.4'

Author: nikic

Zend/tests/object_types/return_type_reflection.phpt

@@ -14,13 +14,13 @@ class Two implements One {
 function a() : object {}
 
 $returnTypeOne = (new ReflectionClass(One::class))->getMethod('a')->getReturnType();
-var_dump($returnTypeOne->isBuiltin(), (string)$returnTypeOne);
+var_dump($returnTypeOne->isBuiltin(), $returnTypeOne->getName());
 
 $returnTypeTwo = (new ReflectionClass(Two::class))->getMethod('a')->getReturnType();
-var_dump($returnTypeTwo->isBuiltin(), (string)$returnTypeTwo);
+var_dump($returnTypeTwo->isBuiltin(), $returnTypeTwo->getName());
 
 $returnTypea = (new ReflectionFunction('a'))->getReturnType();
-var_dump($returnTypea->isBuiltin(), (string)$returnTypea);
+var_dump($returnTypea->isBuiltin(), $returnTypea->getName());
 --EXPECT--
 bool(true)
 string(6) "object"

Zend/tests/object_types/type_hint_reflection.phpt

@@ -14,13 +14,13 @@ class Two implements One {
 function a(object $obj) {}
 
 $typeHintOne = (new ReflectionClass(One::class))->getMethod('a')->getParameters()[0]->getType();
-var_dump($typeHintOne->isBuiltin(), (string)$typeHintOne);
+var_dump($typeHintOne->isBuiltin(), $typeHintOne->getName());
 
 $typeHintTwo = (new ReflectionClass(Two::class))->getMethod('a')->getParameters()[0]->getType();
-var_dump($typeHintTwo->isBuiltin(), (string)$typeHintTwo);
+var_dump($typeHintTwo->isBuiltin(), $typeHintTwo->getName());
 
 $typeHinta = (new ReflectionFunction('a'))->getParameters()[0]->getType();
-var_dump($typeHinta->isBuiltin(), (string)$typeHinta);
+var_dump($typeHinta->isBuiltin(), $typeHinta->getName());
 --EXPECT--
 bool(true)
 string(6) "object"

Zend/tests/type_declarations/typed_properties_018.phpt

@@ -11,7 +11,7 @@ $reflector = new ReflectionClass(Foo::class);
 
 $prop = $reflector->getProperty("qux");
 
-var_dump((string) $prop->getType());
+var_dump($prop->getType()->getName());
 ?>
 --EXPECT--
 string(3) "int"

ext/reflection/php_reflection.c

@@ -6657,10 +6657,7 @@ static const zend_function_entry reflection_type_functions[] = {
 	ZEND_ME(reflection, __clone, arginfo_reflection__void, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
 	ZEND_ME(reflection_type, allowsNull, arginfo_reflection__void, 0)
 	ZEND_ME(reflection_type, isBuiltin, arginfo_reflection__void, 0)
-	/* ReflectionType::__toString() is deprecated, but we currently do not mark it as such
-	 * due to bad interaction with the PHPUnit error handler and exceptions in __toString().
-	 * See PR2137. */
-	ZEND_ME(reflection_type, __toString, arginfo_reflection__void, 0)
+	ZEND_ME(reflection_type, __toString, arginfo_reflection__void, ZEND_ACC_DEPRECATED)
 	PHP_FE_END
 };
 

ext/reflection/tests/ReflectionNamedType.phpt

@@ -30,12 +30,20 @@ var_dump($return->getName());
 var_dump((string) $return);
 
 ?>
---EXPECT--
+--EXPECTF--
 string(11) "Traversable"
+
+Deprecated: Function ReflectionType::__toString() is deprecated in %s on line %d
 string(11) "Traversable"
 string(6) "string"
+
+Deprecated: Function ReflectionType::__toString() is deprecated in %s on line %d
 string(6) "string"
 string(4) "Test"
+
+Deprecated: Function ReflectionType::__toString() is deprecated in %s on line %d
 string(4) "Test"
 string(4) "Test"
+
+Deprecated: Function ReflectionType::__toString() is deprecated in %s on line %d
 string(4) "Test"

ext/reflection/tests/ReflectionType_001.phpt

@@ -91,7 +91,7 @@ $reflector = new ReflectionClass(PropTypeTest::class);
 foreach ($reflector->getProperties() as $name => $property) {
 	if ($property->hasType()) {
 		printf("public %s $%s;\n",
-			$property->getType(), $property->getName());
+			$property->getType()->getName(), $property->getName());
 	} else printf("public $%s;\n", $property->getName());
 }
 

ext/reflection/tests/bug72661.phpt

@@ -6,5 +6,6 @@ function test(iterable $arg) { }
 
 var_dump((string)(new ReflectionParameter("test", 0))->getType());
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function ReflectionType::__toString() is deprecated in %s on line %d
 string(8) "iterable"