Browse Source

Merge pull request #17522 from nextcloud/fix/noid/reflection-toString-deprecated

Fix ReflectionType::__toString() is deprecated
Roeland Jago Douma 4 years ago
parent
commit
61661036fc
1 changed files with 4 additions and 7 deletions
  1. 4 7
      lib/private/AppFramework/Utility/ControllerMethodReflector.php

+ 4 - 7
lib/private/AppFramework/Utility/ControllerMethodReflector.php

@@ -72,13 +72,10 @@ class ControllerMethodReflector implements IControllerMethodReflector {
 		}
 
 		foreach ($reflection->getParameters() as $param) {
-			// extract type information from PHP 7 scalar types and prefer them
-			// over phpdoc annotations
-			if (method_exists($param, 'getType')) {
-				$type = $param->getType();
-				if ($type !== null) {
-					$this->types[$param->getName()] = (string) $type;
-				}
+			// extract type information from PHP 7 scalar types and prefer them over phpdoc annotations
+			$type = $param->getType();
+			if ($type instanceof \ReflectionNamedType) {
+				$this->types[$param->getName()] = $type->getName();
 			}
 
 			$default = null;