Reflection fixes

nikic · Feb 5, 2019 · Feb 19, 2019 · Feb 19, 2019 · Feb 19, 2019 · Mar 5, 2019
commit 73de76ca2bd97d696cc3f2eea6f06c0f2f166037
@@ -4,7 +4,7 @@ ReflectionClass::__constructor() - bad arguments
 <?php
 try {
 	var_dump(new ReflectionClass());
-} catch (Exception $e) {
+} catch (TypeError $e) {
 	echo $e->getMessage() . "\n";
 }
 
@@ -34,7 +34,7 @@ try {
 
 try {
 	var_dump(new ReflectionClass("stdClass", 1));
-} catch (Exception $e) {
+} catch (TypeError $e) {
 	echo $e->getMessage() . "\n";
 }
 
@@ -46,21 +46,12 @@ try {
 
 ?>
 --EXPECTF--
-Warning: ReflectionClass::__construct() expects exactly 1 parameter, 0 given in %s on line 3
-object(ReflectionClass)#%d (1) {
-  ["name"]=>
-  string(0) ""
-}
+ReflectionClass::__construct() expects exactly 1 parameter, 0 given
 Class  does not exist
 Class 1 does not exist
 Class 1 does not exist
 
 Notice: Array to string conversion in %s on line 27
 Class Array does not exist
-
-Warning: ReflectionClass::__construct() expects exactly 1 parameter, 2 given in %s on line 33
-object(ReflectionClass)#%d (1) {
-  ["name"]=>
-  string(0) ""
-}
+ReflectionClass::__construct() expects exactly 1 parameter, 2 given
 Class X does not exist
@@ -8,30 +8,14 @@ class C {
 
 $rc = new ReflectionClass("C");
 echo "Check invalid params:\n";
-var_dump($rc->getConstant());
-var_dump($rc->getConstant("myConst", "myConst"));
 var_dump($rc->getConstant(null));
 var_dump($rc->getConstant(1));
 var_dump($rc->getConstant(1.5));
 var_dump($rc->getConstant(true));
-var_dump($rc->getConstant(array(1,2,3)));
-var_dump($rc->getConstant(new C));
 ?>
---EXPECTF--
+--EXPECT--
 Check invalid params:
-
-Warning: ReflectionClass::getConstant() expects exactly 1 parameter, 0 given in %s on line 8
-NULL
-
-Warning: ReflectionClass::getConstant() expects exactly 1 parameter, 2 given in %s on line 9
-NULL
 bool(false)
 bool(false)
 bool(false)
 bool(false)
-
-Warning: ReflectionClass::getConstant() expects parameter 1 to be string, array given in %s on line 14
-NULL
-
-Warning: ReflectionClass::getConstant() expects parameter 1 to be string, object given in %s on line 15
-NULL
@@ -13,12 +13,12 @@ $rc = new ReflectionClass("C");
 echo "Check invalid params:\n";
 try {
 	var_dump($rc->getMethod());
-} catch (Exception $e) {
+} catch (TypeError $e) {
 	echo $e->getMessage() . "\n";
 }
 try {
 	var_dump($rc->getMethod("f", "f"));
-} catch (Exception $e) {
+} catch (TypeError $e) {
 	echo $e->getMessage() . "\n";
 }
 try {
@@ -43,32 +43,24 @@ try {
 }
 try {
 	var_dump($rc->getMethod(array(1,2,3)));
-} catch (Exception $e) {
+} catch (TypeError $e) {
 	echo $e->getMessage() . "\n";
 }
 try {
 	var_dump($rc->getMethod(new C));
-} catch (Exception $e) {
+} catch (TypeError $e) {
 	echo $e->getMessage() . "\n";
 }
 
 
 ?>
---EXPECTF--
+--EXPECT--
 Check invalid params:
-
-Warning: ReflectionClass::getMethod() expects exactly 1 parameter, 0 given in %s on line 9
-NULL
-
-Warning: ReflectionClass::getMethod() expects exactly 1 parameter, 2 given in %s on line 14
-NULL
+ReflectionClass::getMethod() expects exactly 1 parameter, 0 given
+ReflectionClass::getMethod() expects exactly 1 parameter, 2 given
 Method  does not exist
 Method 1 does not exist
 Method 1.5 does not exist
 Method 1 does not exist
-
-Warning: ReflectionClass::getMethod() expects parameter 1 to be string, array given in %s on line 39
-NULL
-
-Warning: ReflectionClass::getMethod() expects parameter 1 to be string, object given in %s on line 44
-NULL
+ReflectionClass::getMethod() expects parameter 1 to be string, array given
+ReflectionClass::getMethod() expects parameter 1 to be string, object given
@@ -10,11 +10,14 @@ class Foo {}
 
 class Bar extends Foo {}
 
-$rc1 = new ReflectionClass("Bar");
-var_dump($rc1->getParentClass());
+$rc = new ReflectionClass("Bar");
+$parent = $rc->getParentClass();
+$grandParent = $parent->getParentClass();
+var_dump($parent, $grandParent);
 ?>
 --EXPECTF--
 object(ReflectionClass)#%d (1) {
   ["name"]=>
   string(3) "Foo"
 }
+bool(false)
@@ -13,12 +13,12 @@ $rc = new ReflectionClass("C");
 echo "Check invalid params:\n";
 try {
 	var_dump($rc->getProperty());
-} catch (exception $e) {
+} catch (TypeError $e) {
 	echo $e->getMessage() . "\n";
 }
 try {
 	var_dump($rc->getProperty("a", "a"));
-} catch (exception $e) {
+} catch (TypeError $e) {
 	echo $e->getMessage() . "\n";
 }
 try {
@@ -43,30 +43,22 @@ try {
 }
 try {
 	var_dump($rc->getProperty(array(1,2,3)));
-} catch (exception $e) {
+} catch (TypeError $e) {
 	echo $e->getMessage() . "\n";
 }
 try {
 	var_dump($rc->getProperty(new C));
-} catch (exception $e) {
+} catch (TypeError $e) {
 	echo $e->getMessage() . "\n";
 }
 ?>
---EXPECTF--
+--EXPECT--
 Check invalid params:
-
-Warning: ReflectionClass::getProperty() expects exactly 1 parameter, 0 given in %s on line 9
-NULL
-
-Warning: ReflectionClass::getProperty() expects exactly 1 parameter, 2 given in %s on line 14
-NULL
+ReflectionClass::getProperty() expects exactly 1 parameter, 0 given
+ReflectionClass::getProperty() expects exactly 1 parameter, 2 given
 Property  does not exist
 Property 1 does not exist
 Property 1.5 does not exist
 Property 1 does not exist
-
-Warning: ReflectionClass::getProperty() expects parameter 1 to be string, array given in %s on line 39
-NULL
-
-Warning: ReflectionClass::getProperty() expects parameter 1 to be string, object given in %s on line 44
-NULL
+ReflectionClass::getProperty() expects parameter 1 to be string, array given
+ReflectionClass::getProperty() expects parameter 1 to be string, object given
@@ -12,12 +12,12 @@ class C {
 $rc = new ReflectionClass('C');
 try {
 	var_dump($rc->getStaticPropertyValue("x", "default value", 'blah'));
-} catch (Exception $e) {
+} catch (TypeError $e) {
 	echo $e->getMessage() . "\n";
 }
 try {
 	var_dump($rc->getStaticPropertyValue());
-} catch (Exception $e) {
+} catch (TypeError $e) {
 	echo $e->getMessage() . "\n";
 }
 try {
@@ -32,20 +32,15 @@ try {
 }
 try {
 	var_dump($rc->getStaticPropertyValue(array(1,2,3)));
-} catch (Exception $e) {
+} catch (TypeError $e) {
 	echo $e->getMessage() . "\n";
 }
 
 
 ?>
---EXPECTF--
-Warning: ReflectionClass::getStaticPropertyValue() expects at most 2 parameters, 3 given in %s on line 8
-NULL
-
-Warning: ReflectionClass::getStaticPropertyValue() expects at least 1 parameter, 0 given in %s on line 13
-NULL
+--EXPECT--
+ReflectionClass::getStaticPropertyValue() expects at most 2 parameters, 3 given
+ReflectionClass::getStaticPropertyValue() expects at least 1 parameter, 0 given
 Class C does not have a property named 
 string(3) "def"
-
-Warning: ReflectionClass::getStaticPropertyValue() expects parameter 1 to be string, array given in %s on line 28
-NULL
+ReflectionClass::getStaticPropertyValue() expects parameter 1 to be string, array given
@@ -11,30 +11,14 @@ class C {
 
 $rc = new ReflectionClass("C");
 echo "Check invalid params:\n";
-var_dump($rc->hasConstant());
-var_dump($rc->hasConstant("myConst", "myConst"));
 var_dump($rc->hasConstant(null));
 var_dump($rc->hasConstant(1));
 var_dump($rc->hasConstant(1.5));
 var_dump($rc->hasConstant(true));
-var_dump($rc->hasConstant(array(1,2,3)));
-var_dump($rc->hasConstant(new C));
 ?>
---EXPECTF--
+--EXPECT--
 Check invalid params:
-
-Warning: ReflectionClass::hasConstant() expects exactly 1 parameter, 0 given in %s on line 8
-NULL
-
-Warning: ReflectionClass::hasConstant() expects exactly 1 parameter, 2 given in %s on line 9
-NULL
 bool(false)
 bool(false)
 bool(false)
 bool(false)
-
-Warning: ReflectionClass::hasConstant() expects parameter 1 to be string, array given in %s on line 14
-NULL
-
-Warning: ReflectionClass::hasConstant() expects parameter 1 to be string, object given in %s on line 15
-NULL
@@ -11,30 +11,14 @@ class C {
 
 $rc = new ReflectionClass("C");
 echo "Check invalid params:\n";
-var_dump($rc->hasMethod());
-var_dump($rc->hasMethod("f", "f"));
 var_dump($rc->hasMethod(null));
 var_dump($rc->hasMethod(1));
 var_dump($rc->hasMethod(1.5));
 var_dump($rc->hasMethod(true));
-var_dump($rc->hasMethod(array(1,2,3)));
-var_dump($rc->hasMethod(new C));
 ?>
---EXPECTF--
+--EXPECT--
 Check invalid params:
-
-Warning: ReflectionClass::hasMethod() expects exactly 1 parameter, 0 given in %s on line 8
-NULL
-
-Warning: ReflectionClass::hasMethod() expects exactly 1 parameter, 2 given in %s on line 9
-NULL
 bool(false)
 bool(false)
 bool(false)
 bool(false)
-
-Warning: ReflectionClass::hasMethod() expects parameter 1 to be string, array given in %s on line 14
-NULL
-
-Warning: ReflectionClass::hasMethod() expects parameter 1 to be string, object given in %s on line 15
-NULL
@@ -11,30 +11,14 @@ class C {
 
 $rc = new ReflectionClass("C");
 echo "Check invalid params:\n";
-var_dump($rc->hasProperty());
-var_dump($rc->hasProperty("a", "a"));
 var_dump($rc->hasProperty(null));
 var_dump($rc->hasProperty(1));
 var_dump($rc->hasProperty(1.5));
 var_dump($rc->hasProperty(true));
-var_dump($rc->hasProperty(array(1,2,3)));
-var_dump($rc->hasProperty(new C));
 ?>
 --EXPECTF--
 Check invalid params:
-
-Warning: ReflectionClass::hasProperty() expects exactly 1 parameter, 0 given in %s on line 8
-NULL
-
-Warning: ReflectionClass::hasProperty() expects exactly 1 parameter, 2 given in %s on line 9
-NULL
 bool(false)
 bool(false)
 bool(false)
 bool(false)
-
-Warning: ReflectionClass::hasProperty() expects parameter 1 to be string, array given in %s on line 14
-NULL
-
-Warning: ReflectionClass::hasProperty() expects parameter 1 to be string, object given in %s on line 15
-NULL