Remove FQCN type hints on properties

fabpot · fabpot · commit 401f794b3425 · 2021-12-08T16:13:44.000+01:00
diff --git a/Argument/ServiceLocatorArgument.php b/Argument/ServiceLocatorArgument.php
@@ -22,7 +22,7 @@ class ServiceLocatorArgument implements ArgumentInterface
 {
     use ReferenceSetArgumentTrait;
 
-    private ?TaggedIteratorArgument $taggedIteratorArgument = null;
+    private $taggedIteratorArgument = null;
 
     /**
      * @param Reference[]|TaggedIteratorArgument $values
diff --git a/Compiler/AbstractRecursivePass.php b/Compiler/AbstractRecursivePass.php
@@ -32,7 +32,7 @@ abstract class AbstractRecursivePass implements CompilerPassInterface
     protected $currentId;
 
     private bool $processExpressions = false;
-    private ExpressionLanguage $expressionLanguage;
+    private $expressionLanguage;
     private bool $inExpression = false;
 
     /**
diff --git a/Compiler/AnalyzeServiceReferencesPass.php b/Compiler/AnalyzeServiceReferencesPass.php
@@ -30,8 +30,8 @@
  */
 class AnalyzeServiceReferencesPass extends AbstractRecursivePass
 {
-    private ServiceReferenceGraph $graph;
-    private ?Definition $currentDefinition = null;
+    private $graph;
+    private $currentDefinition = null;
     private bool $onlyConstructorArguments;
     private bool $hasProxyDumper;
     private bool $lazy;
diff --git a/Compiler/CheckTypeDeclarationsPass.php b/Compiler/CheckTypeDeclarationsPass.php
@@ -62,7 +62,7 @@ final class CheckTypeDeclarationsPass extends AbstractRecursivePass
     private bool $autoload;
     private array $skippedIds;
 
-    private ExpressionLanguage $expressionLanguage;
+    private $expressionLanguage;
 
     /**
      * @param bool  $autoload   Whether services who's class in not loaded should be checked or not.
diff --git a/Compiler/Compiler.php b/Compiler/Compiler.php
@@ -21,9 +21,9 @@
  */
 class Compiler
 {
-    private PassConfig $passConfig;
+    private $passConfig;
     private array $log = [];
-    private ServiceReferenceGraph $serviceReferenceGraph;
+    private $serviceReferenceGraph;
 
     public function __construct()
     {
diff --git a/Compiler/InlineServiceDefinitionsPass.php b/Compiler/InlineServiceDefinitionsPass.php
@@ -24,13 +24,13 @@
  */
 class InlineServiceDefinitionsPass extends AbstractRecursivePass
 {
-    private ?AnalyzeServiceReferencesPass $analyzingPass;
+    private $analyzingPass;
     private array $cloningIds = [];
     private array $connectedIds = [];
     private array $notInlinedIds = [];
     private array $inlinedIds = [];
     private array $notInlinableIds = [];
-    private ?ServiceReferenceGraph $graph = null;
+    private $graph = null;
 
     public function __construct(AnalyzeServiceReferencesPass $analyzingPass = null)
     {
diff --git a/Compiler/PassConfig.php b/Compiler/PassConfig.php
@@ -28,7 +28,7 @@ class PassConfig
     public const TYPE_OPTIMIZE = 'optimization';
     public const TYPE_REMOVE = 'removing';
 
-    private MergeExtensionConfigurationPass $mergePass;
+    private $mergePass;
     private array $afterRemovingPasses;
     private array $beforeOptimizationPasses;
     private array $beforeRemovingPasses = [];
diff --git a/Compiler/ResolveInvalidReferencesPass.php b/Compiler/ResolveInvalidReferencesPass.php
@@ -29,8 +29,8 @@
  */
 class ResolveInvalidReferencesPass implements CompilerPassInterface
 {
-    private ContainerBuilder $container;
-    private RuntimeException $signalingException;
+    private $container;
+    private $signalingException;
     private string $currentId;
 
     /**
diff --git a/Compiler/ResolveParameterPlaceHoldersPass.php b/Compiler/ResolveParameterPlaceHoldersPass.php
@@ -14,7 +14,6 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Exception\ParameterNotFoundException;
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 
 /**
  * Resolves all parameter placeholders "%somevalue%" to their real values.
@@ -23,7 +22,7 @@
  */
 class ResolveParameterPlaceHoldersPass extends AbstractRecursivePass
 {
-    private ParameterBagInterface $bag;
+    private $bag;
 
     public function __construct(
         private bool $resolveArrays = true,
diff --git a/Compiler/ServiceReferenceGraphEdge.php b/Compiler/ServiceReferenceGraphEdge.php
@@ -20,8 +20,8 @@
  */
 class ServiceReferenceGraphEdge
 {
-    private ServiceReferenceGraphNode $sourceNode;
-    private ServiceReferenceGraphNode $destNode;
+    private $sourceNode;
+    private $destNode;
     private mixed $value;
     private bool $lazy;
     private bool $weak;
diff --git a/Config/ContainerParametersResourceChecker.php b/Config/ContainerParametersResourceChecker.php
@@ -20,7 +20,7 @@
  */
 class ContainerParametersResourceChecker implements ResourceCheckerInterface
 {
-    private ContainerInterface $container;
+    private $container;
 
     public function __construct(ContainerInterface $container)
     {
diff --git a/ContainerBuilder.php b/ContainerBuilder.php
@@ -83,10 +83,10 @@ class ContainerBuilder extends Container implements TaggedContainerInterface
      */
     private array $extensionConfigs = [];
 
-    private Compiler $compiler;
+    private $compiler;
     private bool $trackResources;
-    private ?InstantiatorInterface $proxyInstantiator = null;
-    private ExpressionLanguage $expressionLanguage;
+    private $proxyInstantiator = null;
+    private $expressionLanguage;
 
     /**
      * @var ExpressionFunctionProviderInterface[]
diff --git a/Dumper/PhpDumper.php b/Dumper/PhpDumper.php
@@ -69,7 +69,7 @@ class PhpDumper extends Dumper
     private ?\SplObjectStorage $inlinedDefinitions = null;
     private ?array $serviceCalls = null;
     private array $reservedVariables = ['instance', 'class', 'this', 'container'];
-    private ExpressionLanguage $expressionLanguage;
+    private $expressionLanguage;
     private ?string $targetDirRegex = null;
     private int $targetDirMaxMatches;
     private string $docStar;
@@ -90,7 +90,7 @@ class PhpDumper extends Dumper
     private string $serviceLocatorTag;
     private array $exportedVariables = [];
     private string $baseClass;
-    private ProxyDumper $proxyDumper;
+    private $proxyDumper;
 
     /**
      * {@inheritdoc}
diff --git a/Dumper/YamlDumper.php b/Dumper/YamlDumper.php
@@ -37,7 +37,7 @@
  */
 class YamlDumper extends Dumper
 {
-    private YmlDumper $dumper;
+    private $dumper;
 
     /**
      * Dumps the service container as an YAML string.
diff --git a/EnvVarProcessor.php b/EnvVarProcessor.php
@@ -20,7 +20,7 @@
  */
 class EnvVarProcessor implements EnvVarProcessorInterface
 {
-    private ContainerInterface $container;
+    private $container;
     private \Traversable $loaders;
     private array $loadedVars = [];
 
diff --git a/Loader/ClosureLoader.php b/Loader/ClosureLoader.php
@@ -23,7 +23,7 @@
  */
 class ClosureLoader extends Loader
 {
-    private ContainerBuilder $container;
+    private $container;
 
     public function __construct(ContainerBuilder $container, string $env = null)
     {
diff --git a/Loader/Configurator/AbstractConfigurator.php b/Loader/Configurator/AbstractConfigurator.php
@@ -12,7 +12,6 @@
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use Symfony\Component\Config\Loader\ParamConfigurator;
-use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\Argument\AbstractArgument;
 use Symfony\Component\DependencyInjection\Argument\ArgumentInterface;
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
@@ -32,7 +31,7 @@ abstract class AbstractConfigurator
     public static $valuePreProcessor;
 
     /** @internal */
-    protected Definition|Alias|null $definition = null;
+    protected $definition = null;
 
     public function __call(string $method, array $args)
     {
diff --git a/Loader/Configurator/ContainerConfigurator.php b/Loader/Configurator/ContainerConfigurator.php
@@ -30,8 +30,8 @@ class ContainerConfigurator extends AbstractConfigurator
 {
     public const FACTORY = 'container';
 
-    private ContainerBuilder $container;
-    private PhpFileLoader $loader;
+    private $container;
+    private $loader;
     private array $instanceof;
     private string $path;
     private string $file;
diff --git a/Loader/Configurator/ParametersConfigurator.php b/Loader/Configurator/ParametersConfigurator.php
@@ -20,7 +20,7 @@ class ParametersConfigurator extends AbstractConfigurator
 {
     public const FACTORY = 'parameters';
 
-    private ContainerBuilder $container;
+    private $container;
 
     public function __construct(ContainerBuilder $container)
     {
diff --git a/Loader/Configurator/PrototypeConfigurator.php b/Loader/Configurator/PrototypeConfigurator.php
@@ -37,7 +37,7 @@ class PrototypeConfigurator extends AbstractServiceConfigurator
 
     public const FACTORY = 'load';
 
-    private PhpFileLoader $loader;
+    private $loader;
     private string $resource;
     private ?array $excludes = null;
     private bool $allowParent;
diff --git a/Loader/Configurator/ServiceConfigurator.php b/Loader/Configurator/ServiceConfigurator.php
@@ -41,7 +41,7 @@ class ServiceConfigurator extends AbstractServiceConfigurator
 
     public const FACTORY = 'services';
 
-    private ContainerBuilder $container;
+    private $container;
     private array $instanceof;
     private bool $allowParent;
     private ?string $path;
diff --git a/Loader/Configurator/ServicesConfigurator.php b/Loader/Configurator/ServicesConfigurator.php
@@ -26,9 +26,9 @@ class ServicesConfigurator extends AbstractConfigurator
 {
     public const FACTORY = 'services';
 
-    private Definition $defaults;
-    private ContainerBuilder $container;
-    private PhpFileLoader $loader;
+    private $defaults;
+    private $container;
+    private $loader;
     private array $instanceof;
     private ?string $path;
     private string $anonymousHash;
diff --git a/Loader/PhpFileLoader.php b/Loader/PhpFileLoader.php
@@ -34,7 +34,7 @@
 class PhpFileLoader extends FileLoader
 {
     protected $autoRegisterAliasesForSinglyImplementedInterfaces = false;
-    private ?ConfigBuilderGeneratorInterface $generator;
+    private $generator;
 
     public function __construct(ContainerBuilder $container, FileLocatorInterface $locator, string $env = null, ConfigBuilderGeneratorInterface $generator = null)
     {
diff --git a/Loader/YamlFileLoader.php b/Loader/YamlFileLoader.php
@@ -106,7 +106,7 @@ class YamlFileLoader extends FileLoader
         'bind' => 'bind',
     ];
 
-    private YamlParser $yamlParser;
+    private $yamlParser;
 
     private int $anonymousServicesCount;
     private string $anonymousServicesSuffix;
diff --git a/ParameterBag/ContainerBag.php b/ParameterBag/ContainerBag.php
@@ -18,7 +18,7 @@
  */
 class ContainerBag extends FrozenParameterBag implements ContainerBagInterface
 {
-    private Container $container;
+    private $container;
 
     public function __construct(Container $container)
     {
diff --git a/ReverseContainer.php b/ReverseContainer.php
@@ -21,8 +21,8 @@
  */
 final class ReverseContainer
 {
-    private Container $serviceContainer;
-    private ContainerInterface $reversibleLocator;
+    private $serviceContainer;
+    private $reversibleLocator;
     private string $tagName;
     private \Closure $getServiceId;
 
diff --git a/ServiceLocator.php b/ServiceLocator.php
@@ -31,7 +31,7 @@ class ServiceLocator implements ServiceProviderInterface
     }
 
     private ?string $externalId = null;
-    private ?Container $container = null;
+    private $container = null;
 
     /**
      * {@inheritdoc}
diff --git a/Tests/Fixtures/FooClassWithEnumAttribute.php b/Tests/Fixtures/FooClassWithEnumAttribute.php
@@ -4,7 +4,7 @@
 
 class FooClassWithEnumAttribute
 {
-    private FooUnitEnum $bar;
+    private $bar;
 
     public function __construct(FooUnitEnum $bar)
     {
diff --git a/Tests/Fixtures/LocatorConsumer.php b/Tests/Fixtures/LocatorConsumer.php
@@ -18,7 +18,7 @@ final class LocatorConsumer
 {
     public function __construct(
         #[TaggedLocator('foo_bar', indexAttribute: 'foo')]
-        private ContainerInterface $locator,
+        private $locator,
     ) {
     }
 
diff --git a/Tests/Fixtures/LocatorConsumerConsumer.php b/Tests/Fixtures/LocatorConsumerConsumer.php
@@ -14,7 +14,7 @@
 final class LocatorConsumerConsumer
 {
     public function __construct(
-        private LocatorConsumer $locatorConsumer
+        private $locatorConsumer
     ) {
     }
 
diff --git a/Tests/Fixtures/LocatorConsumerWithDefaultIndexMethod.php b/Tests/Fixtures/LocatorConsumerWithDefaultIndexMethod.php
@@ -9,7 +9,7 @@ final class LocatorConsumerWithDefaultIndexMethod
 {
     public function __construct(
         #[TaggedLocator(tag: 'foo_bar', defaultIndexMethod: 'getDefaultFooName')]
-        private ContainerInterface $locator,
+        private $locator,
     ) {
     }
 
diff --git a/Tests/Fixtures/LocatorConsumerWithDefaultIndexMethodAndWithDefaultPriorityMethod.php b/Tests/Fixtures/LocatorConsumerWithDefaultIndexMethodAndWithDefaultPriorityMethod.php
@@ -9,7 +9,7 @@ final class LocatorConsumerWithDefaultIndexMethodAndWithDefaultPriorityMethod
 {
     public function __construct(
         #[TaggedLocator(tag: 'foo_bar', defaultIndexMethod: 'getDefaultFooName', defaultPriorityMethod: 'getPriority')]
-        private ContainerInterface $locator,
+        private $locator,
     ) {
     }
 
diff --git a/Tests/Fixtures/LocatorConsumerWithDefaultPriorityMethod.php b/Tests/Fixtures/LocatorConsumerWithDefaultPriorityMethod.php
@@ -9,7 +9,7 @@ final class LocatorConsumerWithDefaultPriorityMethod
 {
     public function __construct(
         #[TaggedLocator(tag: 'foo_bar', defaultPriorityMethod: 'getPriority')]
-        private ContainerInterface $locator,
+        private $locator,
     ) {
     }
 
diff --git a/Tests/Fixtures/LocatorConsumerWithoutIndex.php b/Tests/Fixtures/LocatorConsumerWithoutIndex.php
@@ -18,7 +18,7 @@ final class LocatorConsumerWithoutIndex
 {
     public function __construct(
         #[TaggedLocator('foo_bar')]
-        private ContainerInterface $locator,
+        private $locator,
     ) {
     }
 

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class ServiceLocatorArgument implements ArgumentInterface`
`22`	`22`	`{`
`23`	`23`	`use ReferenceSetArgumentTrait;`
`24`	`24`
`25`		`- private ?TaggedIteratorArgument $taggedIteratorArgument = null;`
	`25`	`+ private $taggedIteratorArgument = null;`
`26`	`26`
`27`	`27`	`/**`
`28`	`28`	`* @param Reference[]\|TaggedIteratorArgument $values`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@`
`21`	`21`	`*/`
`22`	`22`	`class Compiler`
`23`	`23`	`{`
`24`		`- private PassConfig $passConfig;`
	`24`	`+ private $passConfig;`
`25`	`25`	`private array $log = [];`
`26`		`- private ServiceReferenceGraph $serviceReferenceGraph;`
	`26`	`+ private $serviceReferenceGraph;`
`27`	`27`
`28`	`28`	`public function __construct()`
`29`	`29`	`{`