Remove FQCN type hints on properties

fabpot · fabpot · commit acb019ca678c · 2021-12-08T16:13:44.000+01:00
diff --git a/CacheWarmer/ExpressionCacheWarmer.php b/CacheWarmer/ExpressionCacheWarmer.php
@@ -18,7 +18,7 @@
 class ExpressionCacheWarmer implements CacheWarmerInterface
 {
     private iterable $expressions;
-    private ExpressionLanguage $expressionLanguage;
+    private $expressionLanguage;
 
     /**
      * @param iterable<mixed, Expression|string> $expressions
diff --git a/Command/DebugFirewallCommand.php b/Command/DebugFirewallCommand.php
@@ -33,8 +33,8 @@
 final class DebugFirewallCommand extends Command
 {
     private array $firewallNames;
-    private ContainerInterface $contexts;
-    private ContainerInterface $eventDispatchers;
+    private $contexts;
+    private $eventDispatchers;
     private array $authenticators;
 
     /**
diff --git a/DataCollector/SecurityDataCollector.php b/DataCollector/SecurityDataCollector.php
@@ -36,12 +36,12 @@
  */
 class SecurityDataCollector extends DataCollector implements LateDataCollectorInterface
 {
-    private ?TokenStorageInterface $tokenStorage;
-    private ?RoleHierarchyInterface $roleHierarchy;
-    private ?LogoutUrlGenerator $logoutUrlGenerator;
-    private ?AccessDecisionManagerInterface $accessDecisionManager;
-    private ?FirewallMapInterface $firewallMap;
-    private ?TraceableFirewallListener $firewall;
+    private $tokenStorage;
+    private $roleHierarchy;
+    private $logoutUrlGenerator;
+    private $accessDecisionManager;
+    private $firewallMap;
+    private $firewall;
     private bool $hasVarDumper;
 
     public function __construct(TokenStorageInterface $tokenStorage = null, RoleHierarchyInterface $roleHierarchy = null, LogoutUrlGenerator $logoutUrlGenerator = null, AccessDecisionManagerInterface $accessDecisionManager = null, FirewallMapInterface $firewallMap = null, TraceableFirewallListener $firewall = null)
diff --git a/Debug/TraceableListenerTrait.php b/Debug/TraceableListenerTrait.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Bundle\SecurityBundle\Debug;
 
-use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Http\Authenticator\Debug\TraceableAuthenticatorManagerListener;
 use Symfony\Component\VarDumper\Caster\ClassStub;
 
@@ -22,7 +21,7 @@
  */
 trait TraceableListenerTrait
 {
-    private ?Response $response = null;
+    private $response = null;
     private mixed $listener;
     private ?float $time = null;
     private object $stub;
diff --git a/EventListener/FirewallListener.php b/EventListener/FirewallListener.php
@@ -25,8 +25,8 @@
  */
 class FirewallListener extends Firewall
 {
-    private FirewallMapInterface $map;
-    private LogoutUrlGenerator $logoutUrlGenerator;
+    private $map;
+    private $logoutUrlGenerator;
 
     public function __construct(FirewallMapInterface $map, EventDispatcherInterface $dispatcher, LogoutUrlGenerator $logoutUrlGenerator)
     {
diff --git a/EventListener/VoteListener.php b/EventListener/VoteListener.php
@@ -24,7 +24,7 @@
  */
 class VoteListener implements EventSubscriberInterface
 {
-    private TraceableAccessDecisionManager $traceableAccessDecisionManager;
+    private $traceableAccessDecisionManager;
 
     public function __construct(TraceableAccessDecisionManager $traceableAccessDecisionManager)
     {
diff --git a/RememberMe/DecoratedRememberMeHandler.php b/RememberMe/DecoratedRememberMeHandler.php
@@ -24,7 +24,7 @@
  */
 final class DecoratedRememberMeHandler implements RememberMeHandlerInterface
 {
-    private RememberMeHandlerInterface $handler;
+    private $handler;
 
     public function __construct(RememberMeHandlerInterface $handler)
     {
diff --git a/Security/FirewallAwareTrait.php b/Security/FirewallAwareTrait.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Bundle\SecurityBundle\Security;
 
-use Psr\Container\ContainerInterface;
-use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
  * Provides basic functionality for services mapped by the firewall name
@@ -24,9 +22,9 @@
  */
 trait FirewallAwareTrait
 {
-    private ContainerInterface $locator;
-    private RequestStack $requestStack;
-    private FirewallMap $firewallMap;
+    private $locator;
+    private $requestStack;
+    private $firewallMap;
 
     private function getForFirewall(): object
     {
diff --git a/Security/FirewallContext.php b/Security/FirewallContext.php
@@ -23,9 +23,9 @@
 class FirewallContext
 {
     private iterable $listeners;
-    private ?ExceptionListener $exceptionListener;
-    private ?LogoutListener $logoutListener;
-    private ?FirewallConfig $config;
+    private $exceptionListener;
+    private $logoutListener;
+    private $config;
 
     /**
      * @param iterable<mixed, callable> $listeners
diff --git a/Security/FirewallMap.php b/Security/FirewallMap.php
@@ -24,7 +24,7 @@
  */
 class FirewallMap implements FirewallMapInterface
 {
-    private ContainerInterface $container;
+    private $container;
     private iterable $map;
 
     public function __construct(ContainerInterface $container, iterable $map)
diff --git a/Security/LazyFirewallContext.php b/Security/LazyFirewallContext.php
@@ -25,7 +25,7 @@
  */
 class LazyFirewallContext extends FirewallContext
 {
-    private TokenStorage $tokenStorage;
+    private $tokenStorage;
 
     public function __construct(iterable $listeners, ?ExceptionListener $exceptionListener, ?LogoutListener $logoutListener, ?FirewallConfig $config, TokenStorage $tokenStorage)
     {
diff --git a/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php b/Tests/DependencyInjection/Security/Factory/AbstractFactoryTest.php
@@ -17,7 +17,7 @@
 
 class AbstractFactoryTest extends TestCase
 {
-    private ContainerBuilder $container;
+    private $container;
 
     protected function setUp(): void
     {
diff --git a/Tests/Functional/Bundle/RequestTrackerBundle/EventSubscriber/RequestTrackerSubscriber.php b/Tests/Functional/Bundle/RequestTrackerBundle/EventSubscriber/RequestTrackerSubscriber.php
@@ -17,7 +17,7 @@
 
 final class RequestTrackerSubscriber implements EventSubscriberInterface
 {
-    private ?Request $lastRequest;
+    private $lastRequest;
 
     public static function getSubscribedEvents(): array
     {

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`class ExpressionCacheWarmer implements CacheWarmerInterface`
`19`	`19`	`{`
`20`	`20`	`private iterable $expressions;`
`21`		`- private ExpressionLanguage $expressionLanguage;`
	`21`	`+ private $expressionLanguage;`
`22`	`22`
`23`	`23`	`/**`
`24`	`24`	`* @param iterable<mixed, Expression\|string> $expressions`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@`
`25`	`25`	`*/`
`26`	`26`	`class FirewallListener extends Firewall`
`27`	`27`	`{`
`28`		`- private FirewallMapInterface $map;`
`29`		`- private LogoutUrlGenerator $logoutUrlGenerator;`
	`28`	`+ private $map;`
	`29`	`+ private $logoutUrlGenerator;`
`30`	`30`
`31`	`31`	`public function __construct(FirewallMapInterface $map, EventDispatcherInterface $dispatcher, LogoutUrlGenerator $logoutUrlGenerator)`
`32`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`*/`
`25`	`25`	`class VoteListener implements EventSubscriberInterface`
`26`	`26`	`{`
`27`		`- private TraceableAccessDecisionManager $traceableAccessDecisionManager;`
	`27`	`+ private $traceableAccessDecisionManager;`
`28`	`28`
`29`	`29`	`public function __construct(TraceableAccessDecisionManager $traceableAccessDecisionManager)`
`30`	`30`	`{`