Commit32443e4

committed

Address deprecation of ReflectionType::getClass().

1 parent5ec5bfb commit32443e4Copy full SHA for 32443e4

File tree

+46

-3

lines changed

+46

-3

lines changed

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -525,7 +525,16 @@ private static function getResourceMetadataForMethod(\ReflectionMethod $method)`
`525`	`525`	`$methodArgumentsMetadata = [];`
`526`	`526`	`foreach ($method->getParameters()as$parameter) {`
`527`	`527`	`try {`
`528`		`-$class =$parameter->getClass();`
	`528`	`+if (method_exists($parameter,'getType')) {`
	`529`	`+$type =$parameter->getType();`
	`530`	`+if ($type && !$type->isBuiltin()) {`
	`531`	`+$class =new \ReflectionClass(method_exists($type,'getName') ?$type->getName() : (string)$type);`
	`532`	`+ }else {`
	`533`	`+$class =null;`
	`534`	`+ }`
	`535`	`+ }else {`
	`536`	`+$class =$parameter->getClass();`
	`537`	`+ }`
`529`	`538`	`}catch (\ReflectionException$e) {`
`530`	`539`	`// type-hint is against a non-existent class`
`531`	`540`	`$class =false;`

Lines changed: 19 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ protected function doGetArguments(Request $request, $controller, array $paramete`
`136`	`136`	`}else {`
`137`	`137`	`$arguments[] =$attributes[$param->name];`
`138`	`138`	`}`
`139`		`- }elseif ($param->getClass() &&$param->getClass()->isInstance($request)) {`
	`139`	`+ }elseif ($this->typeMatchesRequestClass($param,$request)) {`
`140`	`140`	`$arguments[] =$request;`
`141`	`141`	`}elseif ($param->isDefaultValueAvailable()) {`
`142`	`142`	`$arguments[] =$param->getDefaultValue();`
`@@ -260,4 +260,22 @@ private function getControllerError($callable)`
`260`	`260`
`261`	`261`	`return$message;`
`262`	`262`	`}`
	`263`	`+`
	`264`	`+/**`
	`265`	`+ * @return bool`
	`266`	`+ */`
	`267`	`+privatefunctiontypeMatchesRequestClass(\ReflectionParameter$param,Request$request)`
	`268`	`+ {`
	`269`	`+if (!method_exists($param,'getType')) {`
	`270`	`+return$param->getClass() &&$param->getClass()->isInstance($request);`
	`271`	`+ }`
	`272`	`+`
	`273`	`+if (!($type =$param->getType()) \|\|$type->isBuiltin()) {`
	`274`	`+returnfalse;`
	`275`	`+ }`
	`276`	`+`
	`277`	`+$class =new \ReflectionClass(method_exists($type,'getName') ?$type->getName() : (string)$type);`
	`278`	`+`
	`279`	`+return$class &&$class->isInstance($request);`
	`280`	`+ }`
`263`	`281`	`}`

Lines changed: 17 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ public function setDefault($option, $value)`
`146`	`146`	`$reflClosure =new \ReflectionFunction($value);`
`147`	`147`	`$params =$reflClosure->getParameters();`
`148`	`148`
`149`		`-if (isset($params[0]) &&null !== ($class =$params[0]->getClass()) &&Options::class ===$class->name) {`
	`149`	`+if (isset($params[0]) && Options::class ===$this->getParameterClassName($params[0])) {`
`150`	`150`	`// Initialize the option if no previous value exists`
`151`	`151`	`if (!isset($this->defaults[$option])) {`
`152`	`152`	`$this->defaults[$option] =null;`
`@@ -1066,4 +1066,20 @@ private static function isValueValidType($type, $value)`
`1066`	`1066`	`{`
`1067`	`1067`	`return (\function_exists($isFunction ='is_'.$type) &&$isFunction($value)) \|\|$valueinstanceof$type;`
`1068`	`1068`	`}`
	`1069`	`+`
	`1070`	`+/**`
	`1071`	`+ * @return string\|null`
	`1072`	`+ */`
	`1073`	`+privatefunctiongetParameterClassName(\ReflectionParameter$parameter)`
	`1074`	`+ {`
	`1075`	`+if (!method_exists($parameter,'getType')) {`
	`1076`	`+return ($class =$parameter->getClass()) ?null :$class->name;`
	`1077`	`+ }`
	`1078`	`+`
	`1079`	`+if (!($type =$parameter->getType()) \|\|$type->isBuiltin()) {`
	`1080`	`+returnnull;`
	`1081`	`+ }`
	`1082`	`+`
	`1083`	`+returnmethod_exists($type,'getName') ?$type->getName() : (string)$type;`
	`1084`	`+ }`
`1069`	`1085`	`}`

Comments

(0)