Remove FQCN type hints on properties

fabpot · fabpot · commit a871a08baaf2 · 2021-12-08T16:13:44.000+01:00
diff --git a/CacheWarmer/AnnotationsCacheWarmer.php b/CacheWarmer/AnnotationsCacheWarmer.php
@@ -25,7 +25,7 @@
  */
 class AnnotationsCacheWarmer extends AbstractPhpFileCacheWarmer
 {
-    private Reader $annotationReader;
+    private $annotationReader;
     private ?string $excludeRegexp;
     private bool $debug;
 
diff --git a/CacheWarmer/CachePoolClearerCacheWarmer.php b/CacheWarmer/CachePoolClearerCacheWarmer.php
@@ -25,7 +25,7 @@
  */
 final class CachePoolClearerCacheWarmer implements CacheWarmerInterface
 {
-    private Psr6CacheClearer $poolClearer;
+    private $poolClearer;
     private array $pools;
 
     /**
diff --git a/CacheWarmer/ConfigBuilderCacheWarmer.php b/CacheWarmer/ConfigBuilderCacheWarmer.php
@@ -28,8 +28,8 @@
  */
 class ConfigBuilderCacheWarmer implements CacheWarmerInterface
 {
-    private KernelInterface $kernel;
-    private ?LoggerInterface $logger;
+    private $kernel;
+    private $logger;
 
     public function __construct(KernelInterface $kernel, LoggerInterface $logger = null)
     {
diff --git a/CacheWarmer/RouterCacheWarmer.php b/CacheWarmer/RouterCacheWarmer.php
@@ -26,7 +26,7 @@
  */
 class RouterCacheWarmer implements CacheWarmerInterface, ServiceSubscriberInterface
 {
-    private ContainerInterface $container;
+    private $container;
 
     public function __construct(ContainerInterface $container)
     {
diff --git a/CacheWarmer/TranslationsCacheWarmer.php b/CacheWarmer/TranslationsCacheWarmer.php
@@ -24,8 +24,8 @@
  */
 class TranslationsCacheWarmer implements CacheWarmerInterface, ServiceSubscriberInterface
 {
-    private ContainerInterface $container;
-    private TranslatorInterface $translator;
+    private $container;
+    private $translator;
 
     public function __construct(ContainerInterface $container)
     {
diff --git a/CacheWarmer/ValidatorCacheWarmer.php b/CacheWarmer/ValidatorCacheWarmer.php
@@ -28,7 +28,7 @@
  */
 class ValidatorCacheWarmer extends AbstractPhpFileCacheWarmer
 {
-    private ValidatorBuilder $validatorBuilder;
+    private $validatorBuilder;
 
     /**
      * @param string $phpArrayFile The PHP file where metadata are cached
diff --git a/Command/AssetsInstallCommand.php b/Command/AssetsInstallCommand.php
@@ -41,7 +41,7 @@ class AssetsInstallCommand extends Command
     public const METHOD_ABSOLUTE_SYMLINK = 'absolute symlink';
     public const METHOD_RELATIVE_SYMLINK = 'relative symlink';
 
-    private Filesystem $filesystem;
+    private $filesystem;
     private string $projectDir;
 
     public function __construct(Filesystem $filesystem, string $projectDir)
diff --git a/Command/CacheClearCommand.php b/Command/CacheClearCommand.php
@@ -37,8 +37,8 @@
 #[AsCommand(name: 'cache:clear', description: 'Clear the cache')]
 class CacheClearCommand extends Command
 {
-    private CacheClearerInterface $cacheClearer;
-    private Filesystem $filesystem;
+    private $cacheClearer;
+    private $filesystem;
 
     public function __construct(CacheClearerInterface $cacheClearer, Filesystem $filesystem = null)
     {
diff --git a/Command/CachePoolClearCommand.php b/Command/CachePoolClearCommand.php
@@ -31,7 +31,7 @@
 #[AsCommand(name: 'cache:pool:clear', description: 'Clear cache pools')]
 final class CachePoolClearCommand extends Command
 {
-    private Psr6CacheClearer $poolClearer;
+    private $poolClearer;
     private ?array $poolNames;
 
     /**
diff --git a/Command/CachePoolDeleteCommand.php b/Command/CachePoolDeleteCommand.php
@@ -29,7 +29,7 @@
 #[AsCommand(name: 'cache:pool:delete', description: 'Delete an item from a cache pool')]
 final class CachePoolDeleteCommand extends Command
 {
-    private Psr6CacheClearer $poolClearer;
+    private $poolClearer;
     private ?array $poolNames;
 
     /**
diff --git a/Command/CacheWarmupCommand.php b/Command/CacheWarmupCommand.php
@@ -30,7 +30,7 @@
 #[AsCommand(name: 'cache:warmup', description: 'Warm up an empty cache')]
 class CacheWarmupCommand extends Command
 {
-    private CacheWarmerAggregate $cacheWarmer;
+    private $cacheWarmer;
 
     public function __construct(CacheWarmerAggregate $cacheWarmer)
     {
diff --git a/Command/ContainerLintCommand.php b/Command/ContainerLintCommand.php
@@ -31,7 +31,7 @@
 #[AsCommand(name: 'lint:container', description: 'Ensure that arguments injected into services match type declarations')]
 final class ContainerLintCommand extends Command
 {
-    private ContainerBuilder $containerBuilder;
+    private $containerBuilder;
 
     /**
      * {@inheritdoc}
diff --git a/Command/DebugAutowiringCommand.php b/Command/DebugAutowiringCommand.php
@@ -34,7 +34,7 @@
 class DebugAutowiringCommand extends ContainerDebugCommand
 {
     private bool $supportsHref;
-    private ?FileLinkFormatter $fileLinkFormatter;
+    private $fileLinkFormatter;
 
     public function __construct(string $name = null, FileLinkFormatter $fileLinkFormatter = null)
     {
diff --git a/Command/EventDispatcherDebugCommand.php b/Command/EventDispatcherDebugCommand.php
@@ -37,7 +37,7 @@ class EventDispatcherDebugCommand extends Command
 {
     private const DEFAULT_DISPATCHER = 'event_dispatcher';
 
-    private ContainerInterface $dispatchers;
+    private $dispatchers;
 
     public function __construct(ContainerInterface $dispatchers)
     {
diff --git a/Command/RouterDebugCommand.php b/Command/RouterDebugCommand.php
@@ -39,8 +39,8 @@ class RouterDebugCommand extends Command
 {
     use BuildDebugContainerTrait;
 
-    private RouterInterface $router;
-    private ?FileLinkFormatter $fileLinkFormatter;
+    private $router;
+    private $fileLinkFormatter;
 
     public function __construct(RouterInterface $router, FileLinkFormatter $fileLinkFormatter = null)
     {
diff --git a/Command/RouterMatchCommand.php b/Command/RouterMatchCommand.php
@@ -33,7 +33,7 @@
 #[AsCommand(name: 'router:match', description: 'Help debug routes by simulating a path info match')]
 class RouterMatchCommand extends Command
 {
-    private RouterInterface $router;
+    private $router;
     private iterable $expressionLanguageProviders;
 
     /**
diff --git a/Command/SecretsDecryptToLocalCommand.php b/Command/SecretsDecryptToLocalCommand.php
@@ -28,8 +28,8 @@
 #[AsCommand(name: 'secrets:decrypt-to-local', description: 'Decrypt all secrets and stores them in the local vault')]
 final class SecretsDecryptToLocalCommand extends Command
 {
-    private AbstractVault $vault;
-    private ?AbstractVault $localVault;
+    private $vault;
+    private $localVault;
 
     public function __construct(AbstractVault $vault, AbstractVault $localVault = null)
     {
diff --git a/Command/SecretsEncryptFromLocalCommand.php b/Command/SecretsEncryptFromLocalCommand.php
@@ -27,8 +27,8 @@
 #[AsCommand(name: 'secrets:encrypt-from-local', description: 'Encrypt all local secrets to the vault')]
 final class SecretsEncryptFromLocalCommand extends Command
 {
-    private AbstractVault $vault;
-    private ?AbstractVault $localVault;
+    private $vault;
+    private $localVault;
 
     public function __construct(AbstractVault $vault, AbstractVault $localVault = null)
     {
diff --git a/Command/SecretsGenerateKeysCommand.php b/Command/SecretsGenerateKeysCommand.php
@@ -30,8 +30,8 @@
 #[AsCommand(name: 'secrets:generate-keys', description: 'Generate new encryption keys')]
 final class SecretsGenerateKeysCommand extends Command
 {
-    private AbstractVault $vault;
-    private ?AbstractVault $localVault;
+    private $vault;
+    private $localVault;
 
     public function __construct(AbstractVault $vault, AbstractVault $localVault = null)
     {
diff --git a/Command/SecretsListCommand.php b/Command/SecretsListCommand.php
@@ -31,8 +31,8 @@
 #[AsCommand(name: 'secrets:list', description: 'List all secrets')]
 final class SecretsListCommand extends Command
 {
-    private AbstractVault $vault;
-    private ?AbstractVault $localVault;
+    private $vault;
+    private $localVault;
 
     public function __construct(AbstractVault $vault, AbstractVault $localVault = null)
     {
diff --git a/Command/SecretsRemoveCommand.php b/Command/SecretsRemoveCommand.php
@@ -32,8 +32,8 @@
 #[AsCommand(name: 'secrets:remove', description: 'Remove a secret from the vault')]
 final class SecretsRemoveCommand extends Command
 {
-    private AbstractVault $vault;
-    private ?AbstractVault $localVault;
+    private $vault;
+    private $localVault;
 
     public function __construct(AbstractVault $vault, AbstractVault $localVault = null)
     {
diff --git a/Command/SecretsSetCommand.php b/Command/SecretsSetCommand.php
@@ -33,8 +33,8 @@
 #[AsCommand(name: 'secrets:set', description: 'Set a secret in the vault')]
 final class SecretsSetCommand extends Command
 {
-    private AbstractVault $vault;
-    private ?AbstractVault $localVault;
+    private $vault;
+    private $localVault;
 
     public function __construct(AbstractVault $vault, AbstractVault $localVault = null)
     {
diff --git a/Command/TranslationDebugCommand.php b/Command/TranslationDebugCommand.php
@@ -50,9 +50,9 @@ class TranslationDebugCommand extends Command
     public const MESSAGE_UNUSED = 1;
     public const MESSAGE_EQUALS_FALLBACK = 2;
 
-    private TranslatorInterface $translator;
-    private TranslationReaderInterface $reader;
-    private ExtractorInterface $extractor;
+    private $translator;
+    private $reader;
+    private $extractor;
     private ?string $defaultTransPath;
     private ?string $defaultViewsPath;
     private array $transPaths;
diff --git a/Command/TranslationUpdateCommand.php b/Command/TranslationUpdateCommand.php
@@ -50,9 +50,9 @@ class TranslationUpdateCommand extends Command
         'xlf20' => ['xlf', '2.0'],
     ];
 
-    private TranslationWriterInterface $writer;
-    private TranslationReaderInterface $reader;
-    private ExtractorInterface $extractor;
+    private $writer;
+    private $reader;
+    private $extractor;
     private string $defaultLocale;
     private ?string $defaultTransPath;
     private ?string $defaultViewsPath;
diff --git a/Console/Application.php b/Console/Application.php
@@ -29,7 +29,7 @@
  */
 class Application extends BaseApplication
 {
-    private KernelInterface $kernel;
+    private $kernel;
     private bool $commandsRegistered = false;
     private array $registrationErrors = [];
 
diff --git a/Console/Descriptor/TextDescriptor.php b/Console/Descriptor/TextDescriptor.php
@@ -37,7 +37,7 @@
  */
 class TextDescriptor extends Descriptor
 {
-    private ?FileLinkFormatter $fileLinkFormatter;
+    private $fileLinkFormatter;
 
     public function __construct(FileLinkFormatter $fileLinkFormatter = null)
     {
diff --git a/Controller/RedirectController.php b/Controller/RedirectController.php
@@ -27,7 +27,7 @@
  */
 class RedirectController
 {
-    private ?UrlGeneratorInterface $router;
+    private $router;
     private ?int $httpPort;
     private ?int $httpsPort;
 
diff --git a/Controller/TemplateController.php b/Controller/TemplateController.php
@@ -23,7 +23,7 @@
  */
 class TemplateController
 {
-    private ?Environment $twig;
+    private $twig;
 
     public function __construct(Environment $twig = null)
     {
diff --git a/HttpCache/HttpCache.php b/HttpCache/HttpCache.php
@@ -30,8 +30,8 @@ class HttpCache extends BaseHttpCache
     protected $cacheDir;
     protected $kernel;
 
-    private ?StoreInterface $store = null;
-    private ?SurrogateInterface $surrogate;
+    private $store = null;
+    private $surrogate;
     private array $options;
 
     /**
diff --git a/Resources/config/mailer_debug.php b/Resources/config/mailer_debug.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use Symfony\Component\Mailer\DataCollector\MessageDataCollector;
-use Symfony\Component\Mailer\EventListener\MessageLoggerListener;
 
 return static function (ContainerConfigurator $container) {
     $container->services()
diff --git a/Routing/Router.php b/Routing/Router.php
@@ -33,7 +33,7 @@
  */
 class Router extends BaseRouter implements WarmableInterface, ServiceSubscriberInterface
 {
-    private ContainerInterface $container;
+    private $container;
     private array $collectedParameters = [];
     private \Closure $paramFetcher;
 
diff --git a/Test/TestContainer.php b/Test/TestContainer.php
@@ -28,7 +28,7 @@
  */
 class TestContainer extends Container
 {
-    private KernelInterface $kernel;
+    private $kernel;
     private string $privateServicesLocatorId;
 
     public function __construct(KernelInterface $kernel, string $privateServicesLocatorId)
diff --git a/Tests/DependencyInjection/FrameworkExtensionTest.php b/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -14,7 +14,6 @@
 use Doctrine\Common\Annotations\Annotation;
 use Psr\Cache\CacheItemPoolInterface;
 use Psr\Log\LoggerAwareInterface;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\AddAnnotationsCachedReaderPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\FrameworkExtension;
 use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\Messenger\DummyMessage;

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`*/`
`26`	`26`	`class AnnotationsCacheWarmer extends AbstractPhpFileCacheWarmer`
`27`	`27`	`{`
`28`		`- private Reader $annotationReader;`
	`28`	`+ private $annotationReader;`
`29`	`29`	`private ?string $excludeRegexp;`
`30`	`30`	`private bool $debug;`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@`
`28`	`28`	`*/`
`29`	`29`	`class ConfigBuilderCacheWarmer implements CacheWarmerInterface`
`30`	`30`	`{`
`31`		`- private KernelInterface $kernel;`
`32`		`- private ?LoggerInterface $logger;`
	`31`	`+ private $kernel;`
	`32`	`+ private $logger;`
`33`	`33`
`34`	`34`	`public function __construct(KernelInterface $kernel, LoggerInterface $logger = null)`
`35`	`35`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`*/`
`27`	`27`	`class RouterCacheWarmer implements CacheWarmerInterface, ServiceSubscriberInterface`
`28`	`28`	`{`
`29`		`- private ContainerInterface $container;`
	`29`	`+ private $container;`
`30`	`30`
`31`	`31`	`public function __construct(ContainerInterface $container)`
`32`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@`
`24`	`24`	`*/`
`25`	`25`	`class TranslationsCacheWarmer implements CacheWarmerInterface, ServiceSubscriberInterface`
`26`	`26`	`{`
`27`		`- private ContainerInterface $container;`
`28`		`- private TranslatorInterface $translator;`
	`27`	`+ private $container;`
	`28`	`+ private $translator;`
`29`	`29`
`30`	`30`	`public function __construct(ContainerInterface $container)`
`31`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`*/`
`29`	`29`	`class ValidatorCacheWarmer extends AbstractPhpFileCacheWarmer`
`30`	`30`	`{`
`31`		`- private ValidatorBuilder $validatorBuilder;`
	`31`	`+ private $validatorBuilder;`
`32`	`32`
`33`	`33`	`/**`
`34`	`34`	`* @param string $phpArrayFile The PHP file where metadata are cached`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@`
`37`	`37`	`#[AsCommand(name: 'cache:clear', description: 'Clear the cache')]`
`38`	`38`	`class CacheClearCommand extends Command`
`39`	`39`	`{`
`40`		`- private CacheClearerInterface $cacheClearer;`
`41`		`- private Filesystem $filesystem;`
	`40`	`+ private $cacheClearer;`
	`41`	`+ private $filesystem;`
`42`	`42`
`43`	`43`	`public function __construct(CacheClearerInterface $cacheClearer, Filesystem $filesystem = null)`
`44`	`44`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`#[AsCommand(name: 'cache:pool:clear', description: 'Clear cache pools')]`
`32`	`32`	`final class CachePoolClearCommand extends Command`
`33`	`33`	`{`
`34`		`- private Psr6CacheClearer $poolClearer;`
	`34`	`+ private $poolClearer;`
`35`	`35`	`private ?array $poolNames;`
`36`	`36`
`37`	`37`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`#[AsCommand(name: 'cache:pool:delete', description: 'Delete an item from a cache pool')]`
`30`	`30`	`final class CachePoolDeleteCommand extends Command`
`31`	`31`	`{`
`32`		`- private Psr6CacheClearer $poolClearer;`
	`32`	`+ private $poolClearer;`
`33`	`33`	`private ?array $poolNames;`
`34`	`34`
`35`	`35`	`/**`