Fix PHP 8 deprecations

nicolas-grekas · nicolas-grekas · commit 3db068403769 · 2020-07-08T19:07:26.000+02:00
diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -520,7 +520,7 @@ private function createContextListener($container, $contextKey, $logoutUserOnCha
         return $this->contextListeners[$contextKey] = $listenerId;
     }
 
-    private function createAuthenticationListeners($container, $id, $firewall, &$authenticationProviders, $defaultProvider = null, array $providerIds, $defaultEntryPoint, $contextListenerId = null)
+    private function createAuthenticationListeners($container, $id, $firewall, &$authenticationProviders, $defaultProvider, array $providerIds, $defaultEntryPoint, $contextListenerId = null)
     {
         $listeners = [];
         $hasListeners = false;
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -528,7 +528,7 @@ private static function getResourceMetadataForMethod(\ReflectionMethod $method)
                 if (method_exists($parameter, 'getType')) {
                     $type = $parameter->getType();
                     if ($type && !$type->isBuiltin()) {
-                        $class = new \ReflectionClass(method_exists($type, 'getName') ? $type->getName() : (string) $type);
+                        $class = new \ReflectionClass($type instanceof \ReflectionNamedType ? $type->getName() : (string) $type);
                     } else {
                         $class = null;
                     }
diff --git a/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php b/src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
@@ -274,7 +274,7 @@ private function typeMatchesRequestClass(\ReflectionParameter $param, Request $r
             return false;
         }
 
-        $class = new \ReflectionClass(method_exists($type, 'getName') ? $type->getName() : (string) $type);
+        $class = new \ReflectionClass($type instanceof \ReflectionNamedType ? $type->getName() : (string) $type);
 
         return $class && $class->isInstance($request);
     }
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -1080,6 +1080,6 @@ private function getParameterClassName(\ReflectionParameter $parameter)
             return null;
         }
 
-        return method_exists($type, 'getName') ? $type->getName() : (string) $type;
+        return $type instanceof \ReflectionNamedType ? $type->getName() : (string) $type;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -520,7 +520,7 @@ private function createContextListener($container, $contextKey, $logoutUserOnCha`
`520`	`520`	`return $this->contextListeners[$contextKey] = $listenerId;`
`521`	`521`	`}`
`522`	`522`
`523`		`- private function createAuthenticationListeners($container, $id, $firewall, &$authenticationProviders, $defaultProvider = null, array $providerIds, $defaultEntryPoint, $contextListenerId = null)`
	`523`	`+ private function createAuthenticationListeners($container, $id, $firewall, &$authenticationProviders, $defaultProvider, array $providerIds, $defaultEntryPoint, $contextListenerId = null)`
`524`	`524`	`{`
`525`	`525`	`$listeners = [];`
`526`	`526`	`$hasListeners = false;`
Original file line number	Diff line number	Diff line change
`@@ -528,7 +528,7 @@ private static function getResourceMetadataForMethod(\ReflectionMethod $method)`
`528`	`528`	`if (method_exists($parameter, 'getType')) {`
`529`	`529`	`$type = $parameter->getType();`
`530`	`530`	`if ($type && !$type->isBuiltin()) {`
`531`		`- $class = new \ReflectionClass(method_exists($type, 'getName') ? $type->getName() : (string) $type);`
	`531`	`+ $class = new \ReflectionClass($type instanceof \ReflectionNamedType ? $type->getName() : (string) $type);`
`532`	`532`	`} else {`
`533`	`533`	`$class = null;`
`534`	`534`	`}`
Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ private function typeMatchesRequestClass(\ReflectionParameter $param, Request $r`
`274`	`274`	`return false;`
`275`	`275`	`}`
`276`	`276`
`277`		`- $class = new \ReflectionClass(method_exists($type, 'getName') ? $type->getName() : (string) $type);`
	`277`	`+ $class = new \ReflectionClass($type instanceof \ReflectionNamedType ? $type->getName() : (string) $type);`
`278`	`278`
`279`	`279`	`return $class && $class->isInstance($request);`
`280`	`280`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1080,6 +1080,6 @@ private function getParameterClassName(\ReflectionParameter $parameter)`
`1080`	`1080`	`return null;`
`1081`	`1081`	`}`
`1082`	`1082`
`1083`		`- return method_exists($type, 'getName') ? $type->getName() : (string) $type;`
	`1083`	`+ return $type instanceof \ReflectionNamedType ? $type->getName() : (string) $type;`
`1084`	`1084`	`}`
`1085`	`1085`	`}`