Remove FQCN type hints on properties

fabpot · fabpot · commit 9c9c39041c23 · 2021-12-08T16:13:44.000+01:00
diff --git a/Config/FileLocator.php b/Config/FileLocator.php
@@ -21,7 +21,7 @@
  */
 class FileLocator extends BaseFileLocator
 {
-    private KernelInterface $kernel;
+    private $kernel;
 
     public function __construct(KernelInterface $kernel)
     {
diff --git a/Controller/ArgumentResolver.php b/Controller/ArgumentResolver.php
@@ -27,7 +27,7 @@
  */
 final class ArgumentResolver implements ArgumentResolverInterface
 {
-    private ArgumentMetadataFactoryInterface $argumentMetadataFactory;
+    private $argumentMetadataFactory;
     private iterable $argumentValueResolvers;
 
     /**
diff --git a/Controller/ArgumentResolver/NotTaggedControllerValueResolver.php b/Controller/ArgumentResolver/NotTaggedControllerValueResolver.php
@@ -24,7 +24,7 @@
  */
 final class NotTaggedControllerValueResolver implements ArgumentValueResolverInterface
 {
-    private ContainerInterface $container;
+    private $container;
 
     public function __construct(ContainerInterface $container)
     {
diff --git a/Controller/ArgumentResolver/ServiceValueResolver.php b/Controller/ArgumentResolver/ServiceValueResolver.php
@@ -24,7 +24,7 @@
  */
 final class ServiceValueResolver implements ArgumentValueResolverInterface
 {
-    private ContainerInterface $container;
+    private $container;
 
     public function __construct(ContainerInterface $container)
     {
diff --git a/Controller/ArgumentResolver/TraceableValueResolver.php b/Controller/ArgumentResolver/TraceableValueResolver.php
@@ -23,8 +23,8 @@
  */
 final class TraceableValueResolver implements ArgumentValueResolverInterface
 {
-    private ArgumentValueResolverInterface $inner;
-    private Stopwatch $stopwatch;
+    private $inner;
+    private $stopwatch;
 
     public function __construct(ArgumentValueResolverInterface $inner, Stopwatch $stopwatch)
     {
diff --git a/Controller/ControllerResolver.php b/Controller/ControllerResolver.php
@@ -23,7 +23,7 @@
  */
 class ControllerResolver implements ControllerResolverInterface
 {
-    private ?LoggerInterface $logger;
+    private $logger;
 
     public function __construct(LoggerInterface $logger = null)
     {
diff --git a/Controller/ErrorController.php b/Controller/ErrorController.php
@@ -25,9 +25,9 @@
  */
 class ErrorController
 {
-    private HttpKernelInterface $kernel;
+    private $kernel;
     private string|object|array|null $controller;
-    private ErrorRendererInterface $errorRenderer;
+    private $errorRenderer;
 
     public function __construct(HttpKernelInterface $kernel, string|object|array|null $controller, ErrorRendererInterface $errorRenderer)
     {
diff --git a/Controller/TraceableArgumentResolver.php b/Controller/TraceableArgumentResolver.php
@@ -19,8 +19,8 @@
  */
 class TraceableArgumentResolver implements ArgumentResolverInterface
 {
-    private ArgumentResolverInterface $resolver;
-    private Stopwatch $stopwatch;
+    private $resolver;
+    private $stopwatch;
 
     public function __construct(ArgumentResolverInterface $resolver, Stopwatch $stopwatch)
     {
diff --git a/Controller/TraceableControllerResolver.php b/Controller/TraceableControllerResolver.php
@@ -19,8 +19,8 @@
  */
 class TraceableControllerResolver implements ControllerResolverInterface
 {
-    private ControllerResolverInterface $resolver;
-    private Stopwatch $stopwatch;
+    private $resolver;
+    private $stopwatch;
 
     public function __construct(ControllerResolverInterface $resolver, Stopwatch $stopwatch)
     {
diff --git a/DataCollector/ConfigDataCollector.php b/DataCollector/ConfigDataCollector.php
@@ -24,7 +24,7 @@
  */
 class ConfigDataCollector extends DataCollector implements LateDataCollectorInterface
 {
-    private KernelInterface $kernel;
+    private $kernel;
 
     /**
      * Sets the Kernel associated with this Request.
diff --git a/DataCollector/DataCollector.php b/DataCollector/DataCollector.php
@@ -13,7 +13,6 @@
 
 use Symfony\Component\VarDumper\Caster\CutStub;
 use Symfony\Component\VarDumper\Caster\ReflectionCaster;
-use Symfony\Component\VarDumper\Cloner\ClonerInterface;
 use Symfony\Component\VarDumper\Cloner\Data;
 use Symfony\Component\VarDumper\Cloner\Stub;
 use Symfony\Component\VarDumper\Cloner\VarCloner;
@@ -33,7 +32,7 @@ abstract class DataCollector implements DataCollectorInterface
      */
     protected $data = [];
 
-    private ClonerInterface $cloner;
+    private $cloner;
 
     /**
      * Converts the variable into a serializable Data instance.
diff --git a/DataCollector/DumpDataCollector.php b/DataCollector/DumpDataCollector.php
@@ -31,16 +31,16 @@
  */
 class DumpDataCollector extends DataCollector implements DataDumperInterface
 {
-    private ?Stopwatch $stopwatch = null;
+    private $stopwatch = null;
     private string|FileLinkFormatter|false $fileLinkFormat;
     private int $dataCount = 0;
     private bool $isCollected = true;
     private int $clonesCount = 0;
     private int $clonesIndex = 0;
     private array $rootRefs;
     private string $charset;
-    private ?RequestStack $requestStack;
-    private DataDumperInterface|Connection|null $dumper;
+    private $requestStack;
+    private $dumper;
     private mixed $sourceContextProvider;
 
     public function __construct(Stopwatch $stopwatch = null, string|FileLinkFormatter $fileLinkFormat = null, string $charset = null, RequestStack $requestStack = null, DataDumperInterface|Connection $dumper = null)
diff --git a/DataCollector/EventDataCollector.php b/DataCollector/EventDataCollector.php
@@ -28,9 +28,9 @@
  */
 class EventDataCollector extends DataCollector implements LateDataCollectorInterface
 {
-    private ?EventDispatcherInterface $dispatcher;
-    private ?RequestStack $requestStack;
-    private ?Request $currentRequest = null;
+    private $dispatcher;
+    private $requestStack;
+    private $currentRequest = null;
 
     public function __construct(EventDispatcherInterface $dispatcher = null, RequestStack $requestStack = null)
     {
diff --git a/DataCollector/LoggerDataCollector.php b/DataCollector/LoggerDataCollector.php
@@ -24,10 +24,10 @@
  */
 class LoggerDataCollector extends DataCollector implements LateDataCollectorInterface
 {
-    private DebugLoggerInterface $logger;
+    private $logger;
     private ?string $containerPathPrefix;
-    private ?Request $currentRequest = null;
-    private ?RequestStack $requestStack;
+    private $currentRequest = null;
+    private $requestStack;
     private ?array $processedLogs = null;
 
     public function __construct(object $logger = null, string $containerPathPrefix = null, RequestStack $requestStack = null)
diff --git a/DataCollector/RequestDataCollector.php b/DataCollector/RequestDataCollector.php
@@ -36,7 +36,7 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter
      */
     private \SplObjectStorage $controllers;
     private array $sessionUsages = [];
-    private ?RequestStack $requestStack;
+    private $requestStack;
 
     public function __construct(RequestStack $requestStack = null)
     {
diff --git a/DataCollector/TimeDataCollector.php b/DataCollector/TimeDataCollector.php
@@ -24,8 +24,8 @@
  */
 class TimeDataCollector extends DataCollector implements LateDataCollectorInterface
 {
-    private ?KernelInterface $kernel;
-    private ?Stopwatch $stopwatch;
+    private $kernel;
+    private $stopwatch;
 
     public function __construct(KernelInterface $kernel = null, Stopwatch $stopwatch = null)
     {
diff --git a/Debug/FileLinkFormatter.php b/Debug/FileLinkFormatter.php
@@ -35,7 +35,7 @@ class FileLinkFormatter
     ];
 
     private array|false $fileLinkFormat;
-    private ?RequestStack $requestStack = null;
+    private $requestStack = null;
     private ?string $baseDir = null;
     private \Closure|string|null $urlFormat;
 
diff --git a/DependencyInjection/AddAnnotatedClassesToCachePass.php b/DependencyInjection/AddAnnotatedClassesToCachePass.php
@@ -25,7 +25,7 @@
  */
 class AddAnnotatedClassesToCachePass implements CompilerPassInterface
 {
-    private Kernel $kernel;
+    private $kernel;
 
     public function __construct(Kernel $kernel)
     {
diff --git a/DependencyInjection/LazyLoadingFragmentHandler.php b/DependencyInjection/LazyLoadingFragmentHandler.php
@@ -23,7 +23,7 @@
  */
 class LazyLoadingFragmentHandler extends FragmentHandler
 {
-    private ContainerInterface $container;
+    private $container;
 
     /**
      * @var array<string, bool>
diff --git a/Event/KernelEvent.php b/Event/KernelEvent.php
@@ -22,8 +22,8 @@
  */
 class KernelEvent extends Event
 {
-    private HttpKernelInterface $kernel;
-    private Request $request;
+    private $kernel;
+    private $request;
     private ?int $requestType;
 
     /**
diff --git a/Event/RequestEvent.php b/Event/RequestEvent.php
@@ -24,7 +24,7 @@
  */
 class RequestEvent extends KernelEvent
 {
-    private ?Response $response = null;
+    private $response = null;
 
     /**
      * Returns the response object.
diff --git a/Event/ResponseEvent.php b/Event/ResponseEvent.php
@@ -26,7 +26,7 @@
  */
 final class ResponseEvent extends KernelEvent
 {
-    private Response $response;
+    private $response;
 
     public function __construct(HttpKernelInterface $kernel, Request $request, int $requestType, Response $response)
     {
diff --git a/Event/TerminateEvent.php b/Event/TerminateEvent.php
@@ -25,7 +25,7 @@
  */
 final class TerminateEvent extends KernelEvent
 {
-    private Response $response;
+    private $response;
 
     public function __construct(HttpKernelInterface $kernel, Request $request, Response $response)
     {
diff --git a/EventListener/DebugHandlersListener.php b/EventListener/DebugHandlersListener.php
@@ -33,8 +33,8 @@ class DebugHandlersListener implements EventSubscriberInterface
 {
     private string|object|null $earlyHandler;
     private ?\Closure $exceptionHandler;
-    private ?LoggerInterface $logger;
-    private ?LoggerInterface $deprecationLogger;
+    private $logger;
+    private $deprecationLogger;
     private array|int|null $levels;
     private ?int $throwAt;
     private bool $scream;
diff --git a/EventListener/DumpListener.php b/EventListener/DumpListener.php
@@ -25,9 +25,9 @@
  */
 class DumpListener implements EventSubscriberInterface
 {
-    private ClonerInterface $cloner;
-    private DataDumperInterface $dumper;
-    private ?Connection $connection;
+    private $cloner;
+    private $dumper;
+    private $connection;
 
     public function __construct(ClonerInterface $cloner, DataDumperInterface $dumper, Connection $connection = null)
     {
diff --git a/EventListener/FragmentListener.php b/EventListener/FragmentListener.php
@@ -33,7 +33,7 @@
  */
 class FragmentListener implements EventSubscriberInterface
 {
-    private UriSigner $signer;
+    private $signer;
     private string $fragmentPath;
 
     /**
diff --git a/EventListener/LocaleAwareListener.php b/EventListener/LocaleAwareListener.php
@@ -26,7 +26,7 @@
 class LocaleAwareListener implements EventSubscriberInterface
 {
     private iterable $localeAwareServices;
-    private RequestStack $requestStack;
+    private $requestStack;
 
     /**
      * @param iterable<mixed, LocaleAwareInterface> $localeAwareServices
diff --git a/EventListener/LocaleListener.php b/EventListener/LocaleListener.php
@@ -29,9 +29,9 @@
  */
 class LocaleListener implements EventSubscriberInterface
 {
-    private ?RequestContextAwareInterface $router;
+    private $router;
     private string $defaultLocale;
-    private RequestStack $requestStack;
+    private $requestStack;
     private bool $useAcceptLanguageHeader;
     private array $enabledLocales;
 
diff --git a/EventListener/ProfilerListener.php b/EventListener/ProfilerListener.php
@@ -31,14 +31,14 @@
  */
 class ProfilerListener implements EventSubscriberInterface
 {
-    private Profiler $profiler;
-    private ?RequestMatcherInterface $matcher;
+    private $profiler;
+    private $matcher;
     private bool $onlyException;
     private bool $onlyMainRequests;
     private ?\Throwable $exception = null;
     /** @var \SplObjectStorage<Request, Profile> */
     private \SplObjectStorage $profiles;
-    private RequestStack $requestStack;
+    private $requestStack;
     private ?string $collectParameter;
     /** @var \SplObjectStorage<Request, Request|null> */
     private \SplObjectStorage $parents;
diff --git a/EventListener/RouterListener.php b/EventListener/RouterListener.php
@@ -42,10 +42,10 @@
  */
 class RouterListener implements EventSubscriberInterface
 {
-    private RequestMatcherInterface|UrlMatcherInterface $matcher;
-    private RequestContext $context;
-    private ?LoggerInterface $logger;
-    private RequestStack $requestStack;
+    private $matcher;
+    private $context;
+    private $logger;
+    private $requestStack;
     private ?string $projectDir;
     private bool $debug;
 
diff --git a/EventListener/SessionListener.php b/EventListener/SessionListener.php
@@ -12,8 +12,6 @@
 namespace Symfony\Component\HttpKernel\EventListener;
 
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
-use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
-use Symfony\Component\HttpKernel\Event\RequestEvent;
 
 /**
  * Sets the session in the request.
diff --git a/EventListener/SurrogateListener.php b/EventListener/SurrogateListener.php
@@ -26,7 +26,7 @@
  */
 class SurrogateListener implements EventSubscriberInterface
 {
-    private ?SurrogateInterface $surrogate;
+    private $surrogate;
 
     public function __construct(SurrogateInterface $surrogate = null)
     {
diff --git a/Fragment/AbstractSurrogateFragmentRenderer.php b/Fragment/AbstractSurrogateFragmentRenderer.php
@@ -24,9 +24,9 @@
  */
 abstract class AbstractSurrogateFragmentRenderer extends RoutableFragmentRenderer
 {
-    private ?SurrogateInterface $surrogate;
-    private FragmentRendererInterface $inlineStrategy;
-    private ?UriSigner $signer;
+    private $surrogate;
+    private $inlineStrategy;
+    private $signer;
 
     /**
      * The "fallback" strategy when surrogate is not available should always be an
diff --git a/Fragment/FragmentHandler.php b/Fragment/FragmentHandler.php
@@ -31,7 +31,7 @@ class FragmentHandler
 {
     private bool $debug;
     private array $renderers = [];
-    private RequestStack $requestStack;
+    private $requestStack;
 
     /**
      * @param FragmentRendererInterface[] $renderers An array of FragmentRendererInterface instances
diff --git a/Fragment/FragmentUriGenerator.php b/Fragment/FragmentUriGenerator.php
@@ -25,8 +25,8 @@
 final class FragmentUriGenerator implements FragmentUriGeneratorInterface
 {
     private string $fragmentPath;
-    private ?UriSigner $signer;
-    private ?RequestStack $requestStack;
+    private $signer;
+    private $requestStack;
 
     public function __construct(string $fragmentPath, UriSigner $signer = null, RequestStack $requestStack = null)
     {
diff --git a/Fragment/HIncludeFragmentRenderer.php b/Fragment/HIncludeFragmentRenderer.php
@@ -25,8 +25,8 @@
 class HIncludeFragmentRenderer extends RoutableFragmentRenderer
 {
     private ?string $globalDefaultTemplate;
-    private ?UriSigner $signer;
-    private ?Environment $twig;
+    private $signer;
+    private $twig;
     private string $charset;
 
     /**
diff --git a/Fragment/InlineFragmentRenderer.php b/Fragment/InlineFragmentRenderer.php
diff --git a/HttpCache/HttpCache.php b/HttpCache/HttpCache.php
diff --git a/HttpClientKernel.php b/HttpClientKernel.php
diff --git a/HttpKernel.php b/HttpKernel.php
diff --git a/Profiler/Profiler.php b/Profiler/Profiler.php
diff --git a/Tests/EventListener/SessionListenerTest.php b/Tests/EventListener/SessionListenerTest.php

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`*/`
`22`	`22`	`class FileLocator extends BaseFileLocator`
`23`	`23`	`{`
`24`		`- private KernelInterface $kernel;`
	`24`	`+ private $kernel;`
`25`	`25`
`26`	`26`	`public function __construct(KernelInterface $kernel)`
`27`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`*/`
`28`	`28`	`final class ArgumentResolver implements ArgumentResolverInterface`
`29`	`29`	`{`
`30`		`- private ArgumentMetadataFactoryInterface $argumentMetadataFactory;`
	`30`	`+ private $argumentMetadataFactory;`
`31`	`31`	`private iterable $argumentValueResolvers;`
`32`	`32`
`33`	`33`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`*/`
`25`	`25`	`final class NotTaggedControllerValueResolver implements ArgumentValueResolverInterface`
`26`	`26`	`{`
`27`		`- private ContainerInterface $container;`
	`27`	`+ private $container;`
`28`	`28`
`29`	`29`	`public function __construct(ContainerInterface $container)`
`30`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@`
`23`	`23`	`*/`
`24`	`24`	`final class TraceableValueResolver implements ArgumentValueResolverInterface`
`25`	`25`	`{`
`26`		`- private ArgumentValueResolverInterface $inner;`
`27`		`- private Stopwatch $stopwatch;`
	`26`	`+ private $inner;`
	`27`	`+ private $stopwatch;`
`28`	`28`
`29`	`29`	`public function __construct(ArgumentValueResolverInterface $inner, Stopwatch $stopwatch)`
`30`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`*/`
`24`	`24`	`class ControllerResolver implements ControllerResolverInterface`
`25`	`25`	`{`
`26`		`- private ?LoggerInterface $logger;`
	`26`	`+ private $logger;`
`27`	`27`
`28`	`28`	`public function __construct(LoggerInterface $logger = null)`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,9 @@`
`25`	`25`	`*/`
`26`	`26`	`class ErrorController`
`27`	`27`	`{`
`28`		`- private HttpKernelInterface $kernel;`
	`28`	`+ private $kernel;`
`29`	`29`	`private string\|object\|array\|null $controller;`
`30`		`- private ErrorRendererInterface $errorRenderer;`
	`30`	`+ private $errorRenderer;`
`31`	`31`
`32`	`32`	`public function __construct(HttpKernelInterface $kernel, string\|object\|array\|null $controller, ErrorRendererInterface $errorRenderer)`
`33`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@`
`19`	`19`	`*/`
`20`	`20`	`class TraceableArgumentResolver implements ArgumentResolverInterface`
`21`	`21`	`{`
`22`		`- private ArgumentResolverInterface $resolver;`
`23`		`- private Stopwatch $stopwatch;`
	`22`	`+ private $resolver;`
	`23`	`+ private $stopwatch;`
`24`	`24`
`25`	`25`	`public function __construct(ArgumentResolverInterface $resolver, Stopwatch $stopwatch)`
`26`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,9 @@`
`28`	`28`	`*/`
`29`	`29`	`class EventDataCollector extends DataCollector implements LateDataCollectorInterface`
`30`	`30`	`{`
`31`		`- private ?EventDispatcherInterface $dispatcher;`
`32`		`- private ?RequestStack $requestStack;`
`33`		`- private ?Request $currentRequest = null;`
	`31`	`+ private $dispatcher;`
	`32`	`+ private $requestStack;`
	`33`	`+ private $currentRequest = null;`
`34`	`34`
`35`	`35`	`public function __construct(EventDispatcherInterface $dispatcher = null, RequestStack $requestStack = null)`
`36`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class RequestDataCollector extends DataCollector implements EventSubscriberInter`
`36`	`36`	`*/`
`37`	`37`	`private \SplObjectStorage $controllers;`
`38`	`38`	`private array $sessionUsages = [];`
`39`		`- private ?RequestStack $requestStack;`
	`39`	`+ private $requestStack;`
`40`	`40`
`41`	`41`	`public function __construct(RequestStack $requestStack = null)`
`42`	`42`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@`
`24`	`24`	`*/`
`25`	`25`	`class TimeDataCollector extends DataCollector implements LateDataCollectorInterface`
`26`	`26`	`{`
`27`		`- private ?KernelInterface $kernel;`
`28`		`- private ?Stopwatch $stopwatch;`
	`27`	`+ private $kernel;`
	`28`	`+ private $stopwatch;`
`29`	`29`
`30`	`30`	`public function __construct(KernelInterface $kernel = null, Stopwatch $stopwatch = null)`
`31`	`31`	`{`