Remove FQCN type hints on properties

fabpot · fabpot · commit ff3f9fdbfbfc · 2021-12-08T16:13:44.000+01:00
diff --git a/AbstractExtension.php b/AbstractExtension.php
@@ -36,7 +36,7 @@ abstract class AbstractExtension implements FormExtensionInterface
     /**
      * The type guesser provided by this extension.
      */
-    private ?FormTypeGuesserInterface $typeGuesser = null;
+    private $typeGuesser = null;
 
     /**
      * Whether the type guesser has been loaded.
diff --git a/Button.php b/Button.php
@@ -25,8 +25,8 @@
  */
 class Button implements \IteratorAggregate, FormInterface
 {
-    private ?FormInterface $parent = null;
-    private FormConfigInterface $config;
+    private $parent = null;
+    private $config;
     private bool $submitted = false;
 
     /**
diff --git a/ButtonBuilder.php b/ButtonBuilder.php
@@ -29,7 +29,7 @@ class ButtonBuilder implements \IteratorAggregate, FormBuilderInterface
     protected $locked = false;
 
     private bool $disabled = false;
-    private ResolvedFormTypeInterface $type;
+    private $type;
     private string $name;
     private array $attributes = [];
     private array $options;
diff --git a/ChoiceList/Factory/CachingFactoryDecorator.php b/ChoiceList/Factory/CachingFactoryDecorator.php
@@ -27,7 +27,7 @@
  */
 class CachingFactoryDecorator implements ChoiceListFactoryInterface, ResetInterface
 {
-    private ChoiceListFactoryInterface $decoratedFactory;
+    private $decoratedFactory;
 
     /**
      * @var ChoiceListInterface[]
diff --git a/ChoiceList/Factory/PropertyAccessDecorator.php b/ChoiceList/Factory/PropertyAccessDecorator.php
@@ -38,8 +38,8 @@
  */
 class PropertyAccessDecorator implements ChoiceListFactoryInterface
 {
-    private ChoiceListFactoryInterface $decoratedFactory;
-    private PropertyAccessorInterface $propertyAccessor;
+    private $decoratedFactory;
+    private $propertyAccessor;
 
     public function __construct(ChoiceListFactoryInterface $decoratedFactory, PropertyAccessorInterface $propertyAccessor = null)
     {
diff --git a/ChoiceList/LazyChoiceList.php b/ChoiceList/LazyChoiceList.php
@@ -27,7 +27,7 @@
  */
 class LazyChoiceList implements ChoiceListInterface
 {
-    private ChoiceLoaderInterface $loader;
+    private $loader;
 
     /**
      * The callable creating string values for each choice.
diff --git a/ChoiceList/Loader/AbstractChoiceLoader.php b/ChoiceList/Loader/AbstractChoiceLoader.php
@@ -22,7 +22,7 @@ abstract class AbstractChoiceLoader implements ChoiceLoaderInterface
     /**
      * The loaded choice list.
      */
-    private ArrayChoiceList $choiceList;
+    private $choiceList;
 
     /**
      * @final
diff --git a/ChoiceList/Loader/FilterChoiceLoaderDecorator.php b/ChoiceList/Loader/FilterChoiceLoaderDecorator.php
@@ -18,7 +18,7 @@
  */
 class FilterChoiceLoaderDecorator extends AbstractChoiceLoader
 {
-    private ChoiceLoaderInterface $decoratedLoader;
+    private $decoratedLoader;
     private \Closure $filter;
 
     public function __construct(ChoiceLoaderInterface $loader, callable $filter)
diff --git a/Command/DebugCommand.php b/Command/DebugCommand.php
@@ -35,12 +35,12 @@
 #[AsCommand(name: 'debug:form', description: 'Display form type information')]
 class DebugCommand extends Command
 {
-    private FormRegistryInterface $formRegistry;
+    private $formRegistry;
     private array $namespaces;
     private array $types;
     private array $extensions;
     private array $guessers;
-    private ?FileLinkFormatter $fileLinkFormatter;
+    private $fileLinkFormatter;
 
     public function __construct(FormRegistryInterface $formRegistry, array $namespaces = ['Symfony\Component\Form\Extension\Core\Type'], array $types = [], array $extensions = [], array $guessers = [], FileLinkFormatter $fileLinkFormatter = null)
     {
diff --git a/Console/Descriptor/TextDescriptor.php b/Console/Descriptor/TextDescriptor.php
@@ -24,7 +24,7 @@
  */
 class TextDescriptor extends Descriptor
 {
-    private ?FileLinkFormatter $fileLinkFormatter;
+    private $fileLinkFormatter;
 
     public function __construct(FileLinkFormatter $fileLinkFormatter = null)
     {
diff --git a/Extension/Core/CoreExtension.php b/Extension/Core/CoreExtension.php
@@ -28,9 +28,9 @@
  */
 class CoreExtension extends AbstractExtension
 {
-    private PropertyAccessorInterface $propertyAccessor;
-    private ChoiceListFactoryInterface $choiceListFactory;
-    private ?TranslatorInterface $translator;
+    private $propertyAccessor;
+    private $choiceListFactory;
+    private $translator;
 
     public function __construct(PropertyAccessorInterface $propertyAccessor = null, ChoiceListFactoryInterface $choiceListFactory = null, TranslatorInterface $translator = null)
     {
diff --git a/Extension/Core/DataAccessor/PropertyPathAccessor.php b/Extension/Core/DataAccessor/PropertyPathAccessor.php
@@ -28,7 +28,7 @@
  */
 class PropertyPathAccessor implements DataAccessorInterface
 {
-    private PropertyAccessorInterface $propertyAccessor;
+    private $propertyAccessor;
 
     public function __construct(PropertyAccessorInterface $propertyAccessor = null)
     {
diff --git a/Extension/Core/DataMapper/DataMapper.php b/Extension/Core/DataMapper/DataMapper.php
@@ -25,7 +25,7 @@
  */
 class DataMapper implements DataMapperInterface
 {
-    private DataAccessorInterface $dataAccessor;
+    private $dataAccessor;
 
     public function __construct(DataAccessorInterface $dataAccessor = null)
     {
diff --git a/Extension/Core/DataTransformer/ChoiceToValueTransformer.php b/Extension/Core/DataTransformer/ChoiceToValueTransformer.php
@@ -20,7 +20,7 @@
  */
 class ChoiceToValueTransformer implements DataTransformerInterface
 {
-    private ChoiceListInterface $choiceList;
+    private $choiceList;
 
     public function __construct(ChoiceListInterface $choiceList)
     {
diff --git a/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php b/Extension/Core/DataTransformer/ChoicesToValuesTransformer.php
@@ -20,7 +20,7 @@
  */
 class ChoicesToValuesTransformer implements DataTransformerInterface
 {
-    private ChoiceListInterface $choiceList;
+    private $choiceList;
 
     public function __construct(ChoiceListInterface $choiceList)
     {
diff --git a/Extension/Core/EventListener/TransformationFailureListener.php b/Extension/Core/EventListener/TransformationFailureListener.php
@@ -22,7 +22,7 @@
  */
 class TransformationFailureListener implements EventSubscriberInterface
 {
-    private ?TranslatorInterface $translator;
+    private $translator;
 
     public function __construct(TranslatorInterface $translator = null)
     {
diff --git a/Extension/Core/Type/ChoiceType.php b/Extension/Core/Type/ChoiceType.php
@@ -49,8 +49,8 @@
 
 class ChoiceType extends AbstractType
 {
-    private ChoiceListFactoryInterface $choiceListFactory;
-    private ?TranslatorInterface $translator;
+    private $choiceListFactory;
+    private $translator;
 
     public function __construct(ChoiceListFactoryInterface $choiceListFactory = null, TranslatorInterface $translator = null)
     {
diff --git a/Extension/Core/Type/ColorType.php b/Extension/Core/Type/ColorType.php
@@ -26,7 +26,7 @@ class ColorType extends AbstractType
      */
     private const HTML5_PATTERN = '/^#[0-9a-f]{6}$/i';
 
-    private ?TranslatorInterface $translator;
+    private $translator;
 
     public function __construct(TranslatorInterface $translator = null)
     {
diff --git a/Extension/Core/Type/FileType.php b/Extension/Core/Type/FileType.php
@@ -33,7 +33,7 @@ class FileType extends AbstractType
         self::MIB_BYTES => 'MiB',
     ];
 
-    private ?TranslatorInterface $translator;
+    private $translator;
 
     public function __construct(TranslatorInterface $translator = null)
     {
diff --git a/Extension/Core/Type/FormType.php b/Extension/Core/Type/FormType.php
@@ -28,7 +28,7 @@
 
 class FormType extends BaseType
 {
-    private DataMapper $dataMapper;
+    private $dataMapper;
 
     public function __construct(PropertyAccessorInterface $propertyAccessor = null)
     {
diff --git a/Extension/Core/Type/TransformationFailureExtension.php b/Extension/Core/Type/TransformationFailureExtension.php
@@ -21,7 +21,7 @@
  */
 class TransformationFailureExtension extends AbstractTypeExtension
 {
-    private ?TranslatorInterface $translator;
+    private $translator;
 
     public function __construct(TranslatorInterface $translator = null)
     {
diff --git a/Extension/Csrf/CsrfExtension.php b/Extension/Csrf/CsrfExtension.php
@@ -22,8 +22,8 @@
  */
 class CsrfExtension extends AbstractExtension
 {
-    private CsrfTokenManagerInterface $tokenManager;
-    private ?TranslatorInterface $translator;
+    private $tokenManager;
+    private $translator;
     private ?string $translationDomain;
 
     public function __construct(CsrfTokenManagerInterface $tokenManager, TranslatorInterface $translator = null, string $translationDomain = null)
diff --git a/Extension/Csrf/EventListener/CsrfValidationListener.php b/Extension/Csrf/EventListener/CsrfValidationListener.php
@@ -26,12 +26,12 @@
 class CsrfValidationListener implements EventSubscriberInterface
 {
     private string $fieldName;
-    private CsrfTokenManagerInterface $tokenManager;
+    private $tokenManager;
     private string $tokenId;
     private string $errorMessage;
-    private ?TranslatorInterface $translator;
+    private $translator;
     private ?string $translationDomain;
-    private ServerParams $serverParams;
+    private $serverParams;
 
     public static function getSubscribedEvents(): array
     {
diff --git a/Extension/Csrf/Type/FormTypeCsrfExtension.php b/Extension/Csrf/Type/FormTypeCsrfExtension.php
@@ -28,12 +28,12 @@
  */
 class FormTypeCsrfExtension extends AbstractTypeExtension
 {
-    private CsrfTokenManagerInterface $defaultTokenManager;
+    private $defaultTokenManager;
     private bool $defaultEnabled;
     private string $defaultFieldName;
-    private ?TranslatorInterface $translator;
+    private $translator;
     private ?string $translationDomain;
-    private ?ServerParams $serverParams;
+    private $serverParams;
 
     public function __construct(CsrfTokenManagerInterface $defaultTokenManager, bool $defaultEnabled = true, string $defaultFieldName = '_token', TranslatorInterface $translator = null, string $translationDomain = null, ServerParams $serverParams = null)
     {
diff --git a/Extension/DataCollector/DataCollectorExtension.php b/Extension/DataCollector/DataCollectorExtension.php
@@ -21,7 +21,7 @@
  */
 class DataCollectorExtension extends AbstractExtension
 {
-    private FormDataCollectorInterface $dataCollector;
+    private $dataCollector;
 
     public function __construct(FormDataCollectorInterface $dataCollector)
     {
diff --git a/Extension/DataCollector/EventListener/DataCollectorListener.php b/Extension/DataCollector/EventListener/DataCollectorListener.php
@@ -24,7 +24,7 @@
  */
 class DataCollectorListener implements EventSubscriberInterface
 {
-    private FormDataCollectorInterface $dataCollector;
+    private $dataCollector;
 
     public function __construct(FormDataCollectorInterface $dataCollector)
     {
diff --git a/Extension/DataCollector/FormDataCollector.php b/Extension/DataCollector/FormDataCollector.php
@@ -33,7 +33,7 @@
  */
 class FormDataCollector extends DataCollector implements FormDataCollectorInterface
 {
-    private FormDataExtractorInterface $dataExtractor;
+    private $dataExtractor;
 
     /**
      * Stores the collected data per {@link FormInterface} instance.
diff --git a/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php b/Extension/DataCollector/Proxy/ResolvedTypeDataCollectorProxy.php
@@ -27,8 +27,8 @@
  */
 class ResolvedTypeDataCollectorProxy implements ResolvedFormTypeInterface
 {
-    private ResolvedFormTypeInterface $proxiedType;
-    private FormDataCollectorInterface $dataCollector;
+    private $proxiedType;
+    private $dataCollector;
 
     public function __construct(ResolvedFormTypeInterface $proxiedType, FormDataCollectorInterface $dataCollector)
     {
diff --git a/Extension/DataCollector/Proxy/ResolvedTypeFactoryDataCollectorProxy.php b/Extension/DataCollector/Proxy/ResolvedTypeFactoryDataCollectorProxy.php
@@ -24,8 +24,8 @@
  */
 class ResolvedTypeFactoryDataCollectorProxy implements ResolvedFormTypeFactoryInterface
 {
-    private ResolvedFormTypeFactoryInterface $proxiedFactory;
-    private FormDataCollectorInterface $dataCollector;
+    private $proxiedFactory;
+    private $dataCollector;
 
     public function __construct(ResolvedFormTypeFactoryInterface $proxiedFactory, FormDataCollectorInterface $dataCollector)
     {
diff --git a/Extension/DataCollector/Type/DataCollectorTypeExtension.php b/Extension/DataCollector/Type/DataCollectorTypeExtension.php
@@ -25,7 +25,7 @@
  */
 class DataCollectorTypeExtension extends AbstractTypeExtension
 {
-    private DataCollectorListener $listener;
+    private $listener;
 
     public function __construct(FormDataCollectorInterface $dataCollector)
     {
diff --git a/Extension/DependencyInjection/DependencyInjectionExtension.php b/Extension/DependencyInjection/DependencyInjectionExtension.php
@@ -20,9 +20,9 @@
 
 class DependencyInjectionExtension implements FormExtensionInterface
 {
-    private ?FormTypeGuesserChain $guesser = null;
+    private $guesser = null;
     private bool $guesserLoaded = false;
-    private ContainerInterface $typeContainer;
+    private $typeContainer;
     private array $typeExtensionServices;
     private iterable $guesserServices;
 
diff --git a/Extension/HttpFoundation/HttpFoundationRequestHandler.php b/Extension/HttpFoundation/HttpFoundationRequestHandler.php
@@ -28,7 +28,7 @@
  */
 class HttpFoundationRequestHandler implements RequestHandlerInterface
 {
-    private ServerParams $serverParams;
+    private $serverParams;
 
     public function __construct(ServerParams $serverParams = null)
     {
diff --git a/Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php b/Extension/HttpFoundation/Type/FormTypeHttpFoundationExtension.php
@@ -22,7 +22,7 @@
  */
 class FormTypeHttpFoundationExtension extends AbstractTypeExtension
 {
-    private RequestHandlerInterface $requestHandler;
+    private $requestHandler;
 
     public function __construct(RequestHandlerInterface $requestHandler = null)
     {
diff --git a/Extension/Validator/EventListener/ValidationListener.php b/Extension/Validator/EventListener/ValidationListener.php
@@ -23,8 +23,8 @@
  */
 class ValidationListener implements EventSubscriberInterface
 {
-    private ValidatorInterface $validator;
-    private ViolationMapperInterface $violationMapper;
+    private $validator;
+    private $violationMapper;
 
     /**
      * {@inheritdoc}
diff --git a/Extension/Validator/Type/FormTypeValidatorExtension.php b/Extension/Validator/Type/FormTypeValidatorExtension.php
@@ -27,8 +27,8 @@
  */
 class FormTypeValidatorExtension extends BaseValidatorExtension
 {
-    private ValidatorInterface $validator;
-    private ViolationMapper $violationMapper;
+    private $validator;
+    private $violationMapper;
     private bool $legacyErrorMessages;
 
     public function __construct(ValidatorInterface $validator, bool $legacyErrorMessages = true, FormRendererInterface $formRenderer = null, TranslatorInterface $translator = null)
diff --git a/Extension/Validator/Type/UploadValidatorExtension.php b/Extension/Validator/Type/UploadValidatorExtension.php
@@ -23,7 +23,7 @@
  */
 class UploadValidatorExtension extends AbstractTypeExtension
 {
-    private TranslatorInterface $translator;
+    private $translator;
     private ?string $translationDomain;
 
     public function __construct(TranslatorInterface $translator, string $translationDomain = null)
diff --git a/Extension/Validator/ValidatorExtension.php b/Extension/Validator/ValidatorExtension.php
@@ -27,9 +27,9 @@
  */
 class ValidatorExtension extends AbstractExtension
 {
-    private ValidatorInterface $validator;
-    private ?FormRendererInterface $formRenderer;
-    private ?TranslatorInterface $translator;
+    private $validator;
+    private $formRenderer;
+    private $translator;
     private bool $legacyErrorMessages;
 
     public function __construct(ValidatorInterface $validator, bool $legacyErrorMessages = true, FormRendererInterface $formRenderer = null, TranslatorInterface $translator = null)
diff --git a/Extension/Validator/ValidatorTypeGuesser.php b/Extension/Validator/ValidatorTypeGuesser.php
@@ -21,7 +21,7 @@
 
 class ValidatorTypeGuesser implements FormTypeGuesserInterface
 {
-    private MetadataFactoryInterface $metadataFactory;
+    private $metadataFactory;
 
     public function __construct(MetadataFactoryInterface $metadataFactory)
     {
diff --git a/Extension/Validator/ViolationMapper/MappingRule.php b/Extension/Validator/ViolationMapper/MappingRule.php
@@ -19,7 +19,7 @@
  */
 class MappingRule
 {
-    private FormInterface $origin;
+    private $origin;
     private string $propertyPath;
     private string $targetPath;
 
diff --git a/Extension/Validator/ViolationMapper/RelativePath.php b/Extension/Validator/ViolationMapper/RelativePath.php
diff --git a/Extension/Validator/ViolationMapper/ViolationMapper.php b/Extension/Validator/ViolationMapper/ViolationMapper.php
diff --git a/Form.php b/Form.php
diff --git a/FormConfigBuilder.php b/FormConfigBuilder.php
diff --git a/FormError.php b/FormError.php
diff --git a/FormErrorIterator.php b/FormErrorIterator.php
diff --git a/FormEvent.php b/FormEvent.php
diff --git a/FormFactory.php b/FormFactory.php
diff --git a/FormFactoryBuilder.php b/FormFactoryBuilder.php
diff --git a/FormRegistry.php b/FormRegistry.php
diff --git a/FormRenderer.php b/FormRenderer.php
diff --git a/NativeRequestHandler.php b/NativeRequestHandler.php
diff --git a/PreloadedExtension.php b/PreloadedExtension.php
diff --git a/ResolvedFormType.php b/ResolvedFormType.php
diff --git a/Util/ServerParams.php b/Util/ServerParams.php

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`*/`
`28`	`28`	`class CachingFactoryDecorator implements ChoiceListFactoryInterface, ResetInterface`
`29`	`29`	`{`
`30`		`- private ChoiceListFactoryInterface $decoratedFactory;`
	`30`	`+ private $decoratedFactory;`
`31`	`31`
`32`	`32`	`/**`
`33`	`33`	`* @var ChoiceListInterface[]`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@`
`38`	`38`	`*/`
`39`	`39`	`class PropertyAccessDecorator implements ChoiceListFactoryInterface`
`40`	`40`	`{`
`41`		`- private ChoiceListFactoryInterface $decoratedFactory;`
`42`		`- private PropertyAccessorInterface $propertyAccessor;`
	`41`	`+ private $decoratedFactory;`
	`42`	`+ private $propertyAccessor;`
`43`	`43`
`44`	`44`	`public function __construct(ChoiceListFactoryInterface $decoratedFactory, PropertyAccessorInterface $propertyAccessor = null)`
`45`	`45`	`{`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`*/`
`19`	`19`	`class FilterChoiceLoaderDecorator extends AbstractChoiceLoader`
`20`	`20`	`{`
`21`		`- private ChoiceLoaderInterface $decoratedLoader;`
	`21`	`+ private $decoratedLoader;`
`22`	`22`	`private \Closure $filter;`
`23`	`23`
`24`	`24`	`public function __construct(ChoiceLoaderInterface $loader, callable $filter)`
Original file line number	Diff line number	Diff line change
`@@ -35,12 +35,12 @@`
`35`	`35`	`#[AsCommand(name: 'debug:form', description: 'Display form type information')]`
`36`	`36`	`class DebugCommand extends Command`
`37`	`37`	`{`
`38`		`- private FormRegistryInterface $formRegistry;`
	`38`	`+ private $formRegistry;`
`39`	`39`	`private array $namespaces;`
`40`	`40`	`private array $types;`
`41`	`41`	`private array $extensions;`
`42`	`42`	`private array $guessers;`
`43`		`- private ?FileLinkFormatter $fileLinkFormatter;`
	`43`	`+ private $fileLinkFormatter;`
`44`	`44`
`45`	`45`	`public function __construct(FormRegistryInterface $formRegistry, array $namespaces = ['Symfony\Component\Form\Extension\Core\Type'], array $types = [], array $extensions = [], array $guessers = [], FileLinkFormatter $fileLinkFormatter = null)`
`46`	`46`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`*/`
`25`	`25`	`class TextDescriptor extends Descriptor`
`26`	`26`	`{`
`27`		`- private ?FileLinkFormatter $fileLinkFormatter;`
	`27`	`+ private $fileLinkFormatter;`
`28`	`28`
`29`	`29`	`public function __construct(FileLinkFormatter $fileLinkFormatter = null)`
`30`	`30`	`{`