Remove FQCN type hints on properties

fabpot · fabpot · commit 981c9baef0f1 · 2021-12-08T16:13:44.000+01:00
diff --git a/Command/DebugCommand.php b/Command/DebugCommand.php
@@ -34,7 +34,7 @@
 #[AsCommand(name: 'debug:validator', description: 'Display validation constraints for classes')]
 class DebugCommand extends Command
 {
-    private MetadataFactoryInterface $validator;
+    private $validator;
 
     public function __construct(MetadataFactoryInterface $validator)
     {
diff --git a/ConstraintViolation.php b/ConstraintViolation.php
@@ -25,7 +25,7 @@ class ConstraintViolation implements ConstraintViolationInterface
     private mixed $root;
     private ?string $propertyPath;
     private mixed $invalidValue;
-    private ?Constraint $constraint;
+    private $constraint;
     private ?string $code;
     private mixed $cause;
 
diff --git a/Constraints/AbstractComparisonValidator.php b/Constraints/AbstractComparisonValidator.php
@@ -27,7 +27,7 @@
  */
 abstract class AbstractComparisonValidator extends ConstraintValidator
 {
-    private ?PropertyAccessorInterface $propertyAccessor;
+    private $propertyAccessor;
 
     public function __construct(PropertyAccessorInterface $propertyAccessor = null)
     {
diff --git a/Constraints/BicValidator.php b/Constraints/BicValidator.php
@@ -48,7 +48,7 @@ class BicValidator extends ConstraintValidator
         'VG' => 'GB', // British Virgin Islands
     ];
 
-    private ?PropertyAccessor $propertyAccessor;
+    private $propertyAccessor;
 
     public function __construct(PropertyAccessor $propertyAccessor = null)
     {
diff --git a/Constraints/ExpressionLanguageSyntaxValidator.php b/Constraints/ExpressionLanguageSyntaxValidator.php
@@ -23,7 +23,7 @@
  */
 class ExpressionLanguageSyntaxValidator extends ConstraintValidator
 {
-    private ?ExpressionLanguage $expressionLanguage;
+    private $expressionLanguage;
 
     public function __construct(ExpressionLanguage $expressionLanguage = null)
     {
diff --git a/Constraints/ExpressionValidator.php b/Constraints/ExpressionValidator.php
@@ -22,7 +22,7 @@
  */
 class ExpressionValidator extends ConstraintValidator
 {
-    private ?ExpressionLanguage $expressionLanguage;
+    private $expressionLanguage;
 
     public function __construct(ExpressionLanguage $expressionLanguage = null)
     {
diff --git a/Constraints/NotCompromisedPasswordValidator.php b/Constraints/NotCompromisedPasswordValidator.php
@@ -31,7 +31,7 @@ class NotCompromisedPasswordValidator extends ConstraintValidator
 {
     private const DEFAULT_API_ENDPOINT = 'https://api.pwnedpasswords.com/range/%s';
 
-    private HttpClientInterface $httpClient;
+    private $httpClient;
     private string $charset;
     private bool $enabled;
     private string $endpoint;
diff --git a/Constraints/RangeValidator.php b/Constraints/RangeValidator.php
@@ -24,7 +24,7 @@
  */
 class RangeValidator extends ConstraintValidator
 {
-    private ?PropertyAccessorInterface $propertyAccessor;
+    private $propertyAccessor;
 
     public function __construct(PropertyAccessorInterface $propertyAccessor = null)
     {
diff --git a/ContainerConstraintValidatorFactory.php b/ContainerConstraintValidatorFactory.php
@@ -22,7 +22,7 @@
  */
 class ContainerConstraintValidatorFactory implements ConstraintValidatorFactoryInterface
 {
-    private ContainerInterface $container;
+    private $container;
     private array $validators;
 
     public function __construct(ContainerInterface $container)
diff --git a/Context/ExecutionContext.php b/Context/ExecutionContext.php
@@ -37,20 +37,20 @@
  */
 class ExecutionContext implements ExecutionContextInterface
 {
-    private ValidatorInterface $validator;
+    private $validator;
 
     /**
      * The root value of the validated object graph.
      */
     private mixed $root;
 
-    private TranslatorInterface $translator;
+    private $translator;
     private ?string $translationDomain;
 
     /**
      * The violations generated in the current context.
      */
-    private ConstraintViolationList $violations;
+    private $violations;
 
     /**
      * The currently validated value.
@@ -70,7 +70,7 @@ class ExecutionContext implements ExecutionContextInterface
     /**
      * The current validation metadata.
      */
-    private ?MetadataInterface $metadata = null;
+    private $metadata = null;
 
     /**
      * The currently validated group.
@@ -80,7 +80,7 @@ class ExecutionContext implements ExecutionContextInterface
     /**
      * The currently validated constraint.
      */
-    private ?Constraint $constraint = null;
+    private $constraint = null;
 
     /**
      * Stores which objects have been validated in which group.
diff --git a/Context/ExecutionContextFactory.php b/Context/ExecutionContextFactory.php
@@ -23,7 +23,7 @@
  */
 class ExecutionContextFactory implements ExecutionContextFactoryInterface
 {
-    private TranslatorInterface $translator;
+    private $translator;
     private ?string $translationDomain;
 
     public function __construct(TranslatorInterface $translator, string $translationDomain = null)
diff --git a/DataCollector/ValidatorDataCollector.php b/DataCollector/ValidatorDataCollector.php
@@ -29,7 +29,7 @@
  */
 class ValidatorDataCollector extends DataCollector implements LateDataCollectorInterface
 {
-    private TraceableValidator $validator;
+    private $validator;
 
     public function __construct(TraceableValidator $validator)
     {
diff --git a/Exception/ValidationFailedException.php b/Exception/ValidationFailedException.php
@@ -18,7 +18,7 @@
  */
 class ValidationFailedException extends RuntimeException
 {
-    private ConstraintViolationListInterface $violations;
+    private $violations;
     private mixed $value;
 
     public function __construct(mixed $value, ConstraintViolationListInterface $violations)
diff --git a/Mapping/Loader/PropertyInfoLoader.php b/Mapping/Loader/PropertyInfoLoader.php
@@ -31,9 +31,9 @@ final class PropertyInfoLoader implements LoaderInterface
 {
     use AutoMappingTrait;
 
-    private PropertyListExtractorInterface $listExtractor;
-    private PropertyTypeExtractorInterface $typeExtractor;
-    private PropertyAccessExtractorInterface $accessExtractor;
+    private $listExtractor;
+    private $typeExtractor;
+    private $accessExtractor;
     private ?string $classValidatorRegexp;
 
     public function __construct(PropertyListExtractorInterface $listExtractor, PropertyTypeExtractorInterface $typeExtractor, PropertyAccessExtractorInterface $accessExtractor, string $classValidatorRegexp = null)
diff --git a/Mapping/Loader/YamlFileLoader.php b/Mapping/Loader/YamlFileLoader.php
@@ -34,7 +34,7 @@ class YamlFileLoader extends FileLoader
     /**
      * Caches the used YAML parser.
      */
-    private YamlParser $yamlParser;
+    private $yamlParser;
 
     /**
      * {@inheritdoc}
diff --git a/Test/ConstraintValidatorTestCase.php b/Test/ConstraintValidatorTestCase.php
@@ -294,7 +294,7 @@ abstract protected function createValidator();
 
 final class ConstraintViolationAssertion
 {
-    private ExecutionContextInterface $context;
+    private $context;
 
     /**
      * @var ConstraintViolationAssertion[]
@@ -307,7 +307,7 @@ final class ConstraintViolationAssertion
     private string $propertyPath = 'property.path';
     private ?int $plural = null;
     private ?string $code = null;
-    private ?Constraint $constraint;
+    private $constraint;
     private mixed $cause = null;
 
     /**
@@ -451,7 +451,7 @@ private function getViolation(): ConstraintViolation
  */
 class AssertingContextualValidator implements ContextualValidatorInterface
 {
-    private ExecutionContextInterface $context;
+    private $context;
     private bool $expectNoValidate = false;
     private int $atPathCalls = -1;
     private array $expectedAtPath = [];
diff --git a/Validator/RecursiveContextualValidator.php b/Validator/RecursiveContextualValidator.php
@@ -44,11 +44,11 @@
  */
 class RecursiveContextualValidator implements ContextualValidatorInterface
 {
-    private ExecutionContextInterface $context;
+    private $context;
     private string $defaultPropertyPath;
     private array $defaultGroups;
-    private MetadataFactoryInterface $metadataFactory;
-    private ConstraintValidatorFactoryInterface $validatorFactory;
+    private $metadataFactory;
+    private $validatorFactory;
     private array $objectInitializers;
 
     /**
diff --git a/Validator/TraceableValidator.php b/Validator/TraceableValidator.php
@@ -25,7 +25,7 @@
  */
 class TraceableValidator implements ValidatorInterface, ResetInterface
 {
-    private ValidatorInterface $validator;
+    private $validator;
     private array $collectedData = [];
 
     public function __construct(ValidatorInterface $validator)
diff --git a/ValidatorBuilder.php b/ValidatorBuilder.php
@@ -48,12 +48,12 @@ class ValidatorBuilder
     private array $xmlMappings = [];
     private array $yamlMappings = [];
     private array $methodMappings = [];
-    private ?Reader $annotationReader = null;
+    private $annotationReader = null;
     private bool $enableAnnotationMapping = false;
-    private ?MetadataFactoryInterface $metadataFactory = null;
-    private ConstraintValidatorFactoryInterface $validatorFactory;
-    private ?CacheItemPoolInterface $mappingCache = null;
-    private ?TranslatorInterface $translator = null;
+    private $metadataFactory = null;
+    private $validatorFactory;
+    private $mappingCache = null;
+    private $translator = null;
     private ?string $translationDomain = null;
 
     /**
diff --git a/Violation/ConstraintViolationBuilder.php b/Violation/ConstraintViolationBuilder.php
@@ -26,16 +26,16 @@
  */
 class ConstraintViolationBuilder implements ConstraintViolationBuilderInterface
 {
-    private ConstraintViolationList $violations;
+    private $violations;
     private string|\Stringable $message;
     private array $parameters;
     private mixed $root;
     private mixed $invalidValue;
     private string $propertyPath;
-    private TranslatorInterface $translator;
+    private $translator;
     private ?string $translationDomain;
     private ?int $plural = null;
-    private ?Constraint $constraint;
+    private $constraint;
     private ?string $code = null;
     private mixed $cause = null;
 

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`#[AsCommand(name: 'debug:validator', description: 'Display validation constraints for classes')]`
`35`	`35`	`class DebugCommand extends Command`
`36`	`36`	`{`
`37`		`- private MetadataFactoryInterface $validator;`
	`37`	`+ private $validator;`
`38`	`38`
`39`	`39`	`public function __construct(MetadataFactoryInterface $validator)`
`40`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`*/`
`28`	`28`	`abstract class AbstractComparisonValidator extends ConstraintValidator`
`29`	`29`	`{`
`30`		`- private ?PropertyAccessorInterface $propertyAccessor;`
	`30`	`+ private $propertyAccessor;`
`31`	`31`
`32`	`32`	`public function __construct(PropertyAccessorInterface $propertyAccessor = null)`
`33`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class BicValidator extends ConstraintValidator`
`48`	`48`	`'VG' => 'GB', // British Virgin Islands`
`49`	`49`	`];`
`50`	`50`
`51`		`- private ?PropertyAccessor $propertyAccessor;`
	`51`	`+ private $propertyAccessor;`
`52`	`52`
`53`	`53`	`public function __construct(PropertyAccessor $propertyAccessor = null)`
`54`	`54`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`*/`
`24`	`24`	`class ExpressionLanguageSyntaxValidator extends ConstraintValidator`
`25`	`25`	`{`
`26`		`- private ?ExpressionLanguage $expressionLanguage;`
	`26`	`+ private $expressionLanguage;`
`27`	`27`
`28`	`28`	`public function __construct(ExpressionLanguage $expressionLanguage = null)`
`29`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`*/`
`23`	`23`	`class ExpressionValidator extends ConstraintValidator`
`24`	`24`	`{`
`25`		`- private ?ExpressionLanguage $expressionLanguage;`
	`25`	`+ private $expressionLanguage;`
`26`	`26`
`27`	`27`	`public function __construct(ExpressionLanguage $expressionLanguage = null)`
`28`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class NotCompromisedPasswordValidator extends ConstraintValidator`
`31`	`31`	`{`
`32`	`32`	`private const DEFAULT_API_ENDPOINT = 'https://api.pwnedpasswords.com/range/%s';`
`33`	`33`
`34`		`- private HttpClientInterface $httpClient;`
	`34`	`+ private $httpClient;`
`35`	`35`	`private string $charset;`
`36`	`36`	`private bool $enabled;`
`37`	`37`	`private string $endpoint;`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`*/`
`25`	`25`	`class RangeValidator extends ConstraintValidator`
`26`	`26`	`{`
`27`		`- private ?PropertyAccessorInterface $propertyAccessor;`
	`27`	`+ private $propertyAccessor;`
`28`	`28`
`29`	`29`	`public function __construct(PropertyAccessorInterface $propertyAccessor = null)`
`30`	`30`	`{`