Merge pull request #1528 from mbabker/php-7.4

Require PHP 7.4 and Symfony 5.4

.github/workflows/benchmark.yaml

@@ -14,9 +14,8 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.2"
-          - "8.0"
-          - "8.1"
+          - "7.4"
+          - "8.2"
 
     steps:
       - name: Checkout code
@@ -29,7 +28,7 @@ jobs:
 
       - name: "Install dependencies with Composer"
         uses: "ramsey/composer-install@v1"
-        
+
       - name: Run performance benchmarks
         run: |
           vendor/bin/phpbench run tests/Benchmark/Performance --report=aggregate

.github/workflows/ci.yaml

@@ -15,8 +15,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "7.2"
-          - "7.3"
           - "7.4"
           - "8.0"
           - "8.1"

.github/workflows/coding-standards.yaml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.2"
+          - "7.4"
 
     steps:
       - name: "Checkout"

composer.json

@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": "^7.2 || ^8.0",
+        "php": "^7.4 || ^8.0",
         "doctrine/annotations": "^1.14 || ^2.0",
         "doctrine/instantiator": "^1.3.1 || ^2.0",
         "doctrine/lexer": "^2.0 || ^3.0",
@@ -39,16 +39,16 @@
         "ocramius/proxy-manager": "^1.0 || ^2.0",
         "phpbench/phpbench": "^1.0",
         "phpstan/phpstan": "^1.0.2",
-        "phpunit/phpunit": "^8.5.21 || ^9.0 || ^10.0",
+        "phpunit/phpunit": "^9.0 || ^10.0",
         "psr/container": "^1.0 || ^2.0",
-        "symfony/dependency-injection": "^3.4 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
-        "symfony/expression-language": "^3.2 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
-        "symfony/filesystem": "^4.2 || ^5.0 || ^6.0 || ^7.0",
-        "symfony/form": "^3.4 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
-        "symfony/translation": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
-        "symfony/uid": "^5.1 || ^6.0 || ^7.0",
-        "symfony/validator": "^3.1.9 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
-        "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
+        "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
+        "symfony/expression-language": "^5.4 || ^6.0 || ^7.0",
+        "symfony/filesystem": "^5.4 || ^6.0 || ^7.0",
+        "symfony/form": "^5.4 || ^6.0 || ^7.0",
+        "symfony/translation": "^5.4 || ^6.0 || ^7.0",
+        "symfony/uid": "^5.4 || ^6.0 || ^7.0",
+        "symfony/validator": "^5.4 || ^6.0 || ^7.0",
+        "symfony/yaml": "^5.4 || ^6.0 || ^7.0",
         "twig/twig": "^1.34 || ^2.4 || ^3.0"
     },
     "autoload": {

phpcs.xml.dist

@@ -10,7 +10,7 @@
     <arg name="colors"/>
     <arg value="nps"/>
 
-    <config name="php_version" value="70200"/>
+    <config name="php_version" value="70400"/>
 
     <file>src/</file>
     <file>tests/</file>

src/Annotation/Type.php

@@ -23,7 +23,7 @@ public function __construct($values = [], $name = null)
     {
         if ((null !== $name) && !is_string($name) && !(is_object($name) && method_exists($name, '__toString'))) {
             throw new \RuntimeException(
-                'Type must be either string, null or object implements __toString() method.'
+                'Type must be either string, null or object implements __toString() method.',
             );
         }
 
@@ -34,7 +34,7 @@ public function __construct($values = [], $name = null)
         if (is_object($values)) {
             if (false === method_exists($values, '__toString')) {
                 throw new \RuntimeException(
-                    'Type must be either string or object implements __toString() method.'
+                    'Type must be either string or object implements __toString() method.',
                 );
             }
 

src/Builder/DefaultDriverFactory.php

@@ -84,9 +84,7 @@ public function createDriver(array $metadataDirs, Reader $annotationReader): Dri
             $driver = new EnumPropertiesDriver($driver);
         }
 
-        if (PHP_VERSION_ID >= 70400) {
-            $driver = new TypedPropertiesDriver($driver, $this->typeParser);
-        }
+        $driver = new TypedPropertiesDriver($driver, $this->typeParser);
 
         if (PHP_VERSION_ID >= 80000) {
             $driver = new DefaultValuePropertyDriver($driver);

src/Exception/NonCastableTypeException.php

@@ -22,8 +22,8 @@ public function __construct(string $expectedType, $value)
             sprintf(
                 'Cannot convert value of type "%s" to %s',
                 gettype($value),
-                $expectedType
-            )
+                $expectedType,
+            ),
         );
     }
 

src/Exception/NonVisitableTypeException.php

@@ -20,7 +20,7 @@ public static function fromDataAndType($data, array $type, ?RuntimeException $pr
         return new self(
             sprintf('Type %s cannot be visited as %s', get_debug_type($data), $type['name']),
             0,
-            $previous
+            $previous,
         );
     }
 }

src/Exception/RuntimeException.php

@@ -16,7 +16,7 @@ public static function noMetadataForProperty(string $class, string $prop): self
         return new RuntimeException(sprintf(
             'You must define a type for %s::$%s.',
             $class,
-            $prop
+            $prop,
         ));
     }
 }

src/GraphNavigator/DeserializationGraphNavigator.php

@@ -243,7 +243,7 @@ private function resolveMetadata($data, ClassMetadata $metadata): ?ClassMetadata
                 'The type value "%s" does not exist in the discriminator map of class "%s". Available types: %s',
                 $typeValue,
                 $metadata->name,
-                implode(', ', array_keys($metadata->discriminatorMap))
+                implode(', ', array_keys($metadata->discriminatorMap)),
             ));
         }
 

src/Handler/DateHandler.php

@@ -256,7 +256,7 @@ private function parseDateTime($data, array $type, bool $immutable = false): \Da
         throw new RuntimeException(sprintf(
             'Invalid datetime "%s", expected one of the format %s.',
             $data,
-            '"' . implode('", "', $formatTried) . '"'
+            '"' . implode('", "', $formatTried) . '"',
         ));
     }
 

src/Handler/FormErrorHandler.php

@@ -63,7 +63,7 @@ public function __construct(?object $translator = null, string $translationDomai
                 self::class,
                 TranslatorInterface::class,
                 TranslatorContract::class,
-                get_class($translator)
+                get_class($translator),
             ));
         }
 

src/JsonDeserializationVisitor.php

@@ -142,7 +142,7 @@ public function visitDiscriminatorMapProperty($data, ClassMetadata $metadata): s
         throw new LogicException(sprintf(
             'The discriminator field name "%s" for base-class "%s" was not found in input data.',
             $metadata->discriminatorFieldName,
-            $metadata->name
+            $metadata->name,
         ));
     }
 

src/Metadata/ClassMetadata.php

@@ -240,7 +240,7 @@ public function merge(MergeableInterface $object): void
                 'The discriminator of class "%s" would overwrite the discriminator of the parent class "%s". Please define all possible sub-classes in the discriminator of %s.',
                 $object->name,
                 $this->discriminatorBaseClass,
-                $this->discriminatorBaseClass
+                $this->discriminatorBaseClass,
             ));
         } elseif (!$this->discriminatorFieldName && $object->discriminatorFieldName) {
             $this->discriminatorFieldName = $object->discriminatorFieldName;
@@ -359,7 +359,7 @@ private function handleDiscriminatorProperty(): void
                 throw new InvalidMetadataException(sprintf(
                     'The sub-class "%s" is not listed in the discriminator of the base class "%s".',
                     $this->name,
-                    $this->discriminatorBaseClass
+                    $this->discriminatorBaseClass,
                 ));
             }
 
@@ -373,15 +373,15 @@ private function handleDiscriminatorProperty(): void
                     'The discriminator field name "%s" of the base-class "%s" conflicts with a regular property of the sub-class "%s".',
                     $this->discriminatorFieldName,
                     $this->discriminatorBaseClass,
-                    $this->name
+                    $this->name,
                 ));
             }
 
             $discriminatorProperty = new StaticPropertyMetadata(
                 $this->name,
                 $this->discriminatorFieldName,
                 $typeValue,
-                $this->discriminatorGroups
+                $this->discriminatorGroups,
             );
             $discriminatorProperty->serializedName = $this->discriminatorFieldName;
             $discriminatorProperty->xmlAttribute = $this->xmlDiscriminatorAttribute;

src/Metadata/Driver/AnnotationOrAttributeDriver.php

@@ -132,7 +132,7 @@ public function loadMetadataForClass(\ReflectionClass $class): ?BaseClassMetadat
                 $virtualPropertyMetadata = new ExpressionPropertyMetadata(
                     $name,
                     $annot->name,
-                    $this->parseExpression($annot->exp)
+                    $this->parseExpression($annot->exp),
                 );
                 $propertiesMetadata[] = $virtualPropertyMetadata;
                 $propertiesAnnotations[] = $annot->options;
@@ -248,7 +248,7 @@ public function loadMetadataForClass(\ReflectionClass $class): ?BaseClassMetadat
                                 throw new InvalidMetadataException(sprintf(
                                     'Invalid group name "%s" on "%s", did you mean to create multiple groups?',
                                     implode(', ', $propertyMetadata->groups),
-                                    $propertyMetadata->class . '->' . $propertyMetadata->name
+                                    $propertyMetadata->class . '->' . $propertyMetadata->name,
                                 ));
                             }
                         }
@@ -310,7 +310,7 @@ protected function getClassAnnotations(\ReflectionClass $class): array
                 static function (\ReflectionAttribute $attribute): object {
                     return $attribute->newInstance();
                 },
-                $class->getAttributes(SerializerAttribute::class, \ReflectionAttribute::IS_INSTANCEOF)
+                $class->getAttributes(SerializerAttribute::class, \ReflectionAttribute::IS_INSTANCEOF),
             );
         }
 
@@ -333,7 +333,7 @@ protected function getMethodAnnotations(\ReflectionMethod $method): array
                 static function (\ReflectionAttribute $attribute): object {
                     return $attribute->newInstance();
                 },
-                $method->getAttributes(SerializerAttribute::class, \ReflectionAttribute::IS_INSTANCEOF)
+                $method->getAttributes(SerializerAttribute::class, \ReflectionAttribute::IS_INSTANCEOF),
             );
         }
 
@@ -356,7 +356,7 @@ protected function getPropertyAnnotations(\ReflectionProperty $property): array
                 static function (\ReflectionAttribute $attribute): object {
                     return $attribute->newInstance();
                 },
-                $property->getAttributes(SerializerAttribute::class, \ReflectionAttribute::IS_INSTANCEOF)
+                $property->getAttributes(SerializerAttribute::class, \ReflectionAttribute::IS_INSTANCEOF),
             );
         }
 

src/Metadata/Driver/AttributeDriver.php

@@ -17,7 +17,7 @@ protected function getClassAnnotations(\ReflectionClass $class): array
             static function (\ReflectionAttribute $attribute): object {
                 return $attribute->newInstance();
             },
-            $class->getAttributes(SerializerAttribute::class, \ReflectionAttribute::IS_INSTANCEOF)
+            $class->getAttributes(SerializerAttribute::class, \ReflectionAttribute::IS_INSTANCEOF),
         );
     }
 
@@ -30,7 +30,7 @@ protected function getMethodAnnotations(\ReflectionMethod $method): array
             static function (\ReflectionAttribute $attribute): object {
                 return $attribute->newInstance();
             },
-            $method->getAttributes(SerializerAttribute::class, \ReflectionAttribute::IS_INSTANCEOF)
+            $method->getAttributes(SerializerAttribute::class, \ReflectionAttribute::IS_INSTANCEOF),
         );
     }
 
@@ -43,7 +43,7 @@ protected function getPropertyAnnotations(\ReflectionProperty $property): array
             static function (\ReflectionAttribute $attribute): object {
                 return $attribute->newInstance();
             },
-            $property->getAttributes(SerializerAttribute::class, \ReflectionAttribute::IS_INSTANCEOF)
+            $property->getAttributes(SerializerAttribute::class, \ReflectionAttribute::IS_INSTANCEOF),
         );
     }
 }

src/Metadata/Driver/AttributeDriver/AttributeReader.php

@@ -67,7 +67,10 @@ public function getPropertyAnnotation(ReflectionProperty $property, $annotationN
         return $this->reader->getClassAnnotation($property, $annotationName) ?? $this->buildAnnotation($attributes);
     }
 
-    private function buildAnnotation(array $attributes): ?object
+    /**
+     * @param list<\ReflectionAttribute<SerializerAttribute>> $attributes
+     */
+    private function buildAnnotation(array $attributes): ?SerializerAttribute
     {
         if (!isset($attributes[0])) {
             return null;
@@ -85,7 +88,7 @@ private function buildAnnotations(array $attributes): array
             static function (\ReflectionAttribute $attribute): object {
                 return $attribute->newInstance();
             },
-            $attributes
+            $attributes,
         );
     }
 }

src/Metadata/Driver/DocBlockDriver.php

@@ -70,11 +70,11 @@ public function loadMetadataForClass(ReflectionClass $class): ?ClassMetadata
             try {
                 if ($propertyMetadata instanceof VirtualPropertyMetadata) {
                     $type = $this->docBlockTypeResolver->getMethodDocblockTypeHint(
-                        new ReflectionMethod($propertyMetadata->class, $propertyMetadata->getter)
+                        new ReflectionMethod($propertyMetadata->class, $propertyMetadata->getter),
                     );
                 } else {
                     $type = $this->docBlockTypeResolver->getPropertyDocblockTypeHint(
-                        new ReflectionProperty($propertyMetadata->class, $propertyMetadata->name)
+                        new ReflectionProperty($propertyMetadata->class, $propertyMetadata->name),
                     );
                 }
 

src/Metadata/Driver/DocBlockDriver/DocBlockTypeResolver.php

@@ -429,7 +429,7 @@ private function getPhpstanType(\ReflectionClass $declaringClass, string $typeHi
                         ',',
                         array_map(static function (string $type) use ($reflector, $self) {
                             return $self->resolveType(trim($type), $reflector);
-                        }, $types)
+                        }, $types),
                     ));
                 }
             }

src/Metadata/Driver/DoctrineTypeDriver.php

@@ -27,7 +27,7 @@ protected function setDiscriminator(DoctrineClassMetadata $doctrineMetadata, Cla
         ) {
             $classMetadata->setDiscriminator(
                 $doctrineMetadata->discriminatorColumn['name'],
-                $doctrineMetadata->discriminatorMap
+                $doctrineMetadata->discriminatorMap,
             );
         }
     }

src/Metadata/Driver/TypedPropertiesDriver.php

@@ -74,10 +74,6 @@ public function loadMetadataForClass(ReflectionClass $class): ?ClassMetadata
 
         \assert($classMetadata instanceof SerializerClassMetadata);
 
-        if (PHP_VERSION_ID <= 70400) {
-            return $classMetadata;
-        }
-
         // We base our scan on the internal driver's property list so that we
         // respect any internal allow/blocklist like in the AnnotationDriver
         foreach ($classMetadata->propertyMetadata as $propertyMetadata) {

src/Metadata/Driver/XmlDriver.php

@@ -155,7 +155,7 @@ protected function loadMetadataFromFile(\ReflectionClass $class, string $path):
                 $virtualPropertyMetadata = new ExpressionPropertyMetadata(
                     $name,
                     (string) $method->attributes()->name,
-                    $this->parseExpression((string) $method->attributes()->expression)
+                    $this->parseExpression((string) $method->attributes()->expression),
                 );
             } else {
                 if (!isset($method->attributes()->method)) {
@@ -326,7 +326,7 @@ protected function loadMetadataFromFile(\ReflectionClass $class, string $path):
                     $pMetadata->setAccessor(
                         (string) ($pElem->attributes()->{'access-type'} ?: $classAccessType),
                         $getter ? (string) $getter : null,
-                        $setter ? (string) $setter : null
+                        $setter ? (string) $setter : null,
                     );
 
                     if (null !== $inline = $pElem->attributes()->inline) {