Merge pull request #158 from jmsche/allow-symfony-7

Allow Symfony 7 & drop support for unmaintained Symfony versions

.github/workflows/static.yml

@@ -7,7 +7,7 @@ jobs:
     steps:
       - uses: actions/checkout@master
       - name: PHPStan
-        uses: docker://jakzal/phpqa:php8.0
+        uses: docker://jakzal/phpqa:php8.2
         with:
           args: phpstan analyze --no-progress
 
@@ -17,6 +17,6 @@ jobs:
     steps:
       - uses: actions/checkout@master
       - name: PHP-CS-Fixer
-        uses: docker://jakzal/phpqa:php8.0
+        uses: docker://jakzal/phpqa:php8.2
         with:
           args: php-cs-fixer fix --config=.php_cs.dist.php --dry-run --diff

.github/workflows/tests.yml

@@ -13,19 +13,19 @@ jobs:
     strategy:
       matrix:
         include:
-          - php: '7.4'
-            symfony-require: 4.4.*
           - php: '8.0'
-            symfony-require: 5.3.*
+            symfony-require: 5.4.*
           - php: '8.0'
-            symfony-require: 6.0.*
+            symfony-require: 6.3.*
+          - php: '8.2'
+            symfony-require: 7.0.*
             stability: dev
           - php: '8.1'
       fail-fast: false
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+- Remove support of Symfony 4.x, 5.3 & < 6.3
+- Add support for Symfony 7
+
 ## [3.9.3] - 2023-11-29
 
 ### Added

composer.json

@@ -14,20 +14,20 @@
     "require": {
         "php": ">=7.4",
         "giggsey/libphonenumber-for-php": "^8.0",
-        "symfony/framework-bundle": "^4.4|^5.3|^6.0",
-        "symfony/intl": "^4.4|^5.3|^6.0",
+        "symfony/framework-bundle": "^5.4 || ^6.3 || ^7.0",
+        "symfony/intl": "^5.4 || ^6.3 || ^7.0",
         "symfony/polyfill-mbstring": "^1.28"
     },
     "require-dev": {
         "doctrine/doctrine-bundle": "^1.12|^2.0",
         "phpspec/prophecy-phpunit": "^2.0",
         "phpunit/phpunit": "^9.5",
-        "symfony/form": "^4.4|^5.3|^6.0",
-        "symfony/phpunit-bridge": "^6.2",
-        "symfony/property-access": "^4.4|^5.3|^6.0",
-        "symfony/serializer": "^4.4|^5.3|^6.0.1",
-        "symfony/twig-bundle": "^4.4|^5.3|^6.0",
-        "symfony/validator": "^4.4|^5.3|^6.0"
+        "symfony/form": "^5.4 || ^6.3 || ^7.0",
+        "symfony/phpunit-bridge": "^6.3 || ^7.0",
+        "symfony/property-access": "^5.4 || ^6.3 || ^7.0",
+        "symfony/serializer": "^5.4 || ^6.3 || ^7.0",
+        "symfony/twig-bundle": "^5.4 || ^6.3 || ^7.0",
+        "symfony/validator": "^5.4 || ^6.3 || ^7.0"
     },
     "suggest": {
         "doctrine/doctrine-bundle": "Add a DBAL mapping type",
@@ -54,8 +54,5 @@
         "branch-alias": {
             "dev-master": "3.9.x-dev"
         }
-    },
-    "conflict": {
-        "symfony/serializer": "6.0.0"
     }
 }

phpstan.neon.dist

@@ -4,8 +4,3 @@ parameters:
       - src
       - tests
     inferPrivatePropertyTypeFromConstructor: true
-    ignoreErrors:
-        -
-            message: "#^Attribute class Symfony\\\\Component\\\\Validator\\\\Attribute\\\\HasNamedArguments does not exist\\.$#"
-            count: 1
-            path: src/Validator/Constraints/PhoneNumber.php

src/Doctrine/DBAL/Types/PhoneNumberType.php

@@ -13,6 +13,7 @@
 
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\ConversionException;
+use Doctrine\DBAL\Types\Exception\InvalidType;
 use Doctrine\DBAL\Types\Type;
 use libphonenumber\NumberParseException;
 use libphonenumber\PhoneNumber;
@@ -36,7 +37,13 @@ public function getName(): string
 
     public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform): string
     {
-        return $platform->getVarcharTypeDeclarationSQL(['length' => $fieldDeclaration['length'] ?? 35]);
+        // DBAL < 4
+        if (method_exists(AbstractPlatform::class, 'getVarcharTypeDeclarationSQL')) {
+            return $platform->getVarcharTypeDeclarationSQL(['length' => $fieldDeclaration['length'] ?? 35]);
+        }
+
+        // DBAL 4
+        return $platform->getStringTypeDeclarationSQL(['length' => $fieldDeclaration['length'] ?? 35]);
     }
 
     public function convertToDatabaseValue($value, AbstractPlatform $platform): ?string
@@ -65,7 +72,14 @@ public function convertToPHPValue($value, AbstractPlatform $platform): ?PhoneNum
         try {
             return $util->parse($value, PhoneNumberUtil::UNKNOWN_REGION);
         } catch (NumberParseException $e) {
-            throw ConversionException::conversionFailed($value, self::NAME);
+            if (method_exists(ConversionException::class, 'conversionFailed')) {
+                // DBAL < 4
+                throw ConversionException::conversionFailed($value, self::NAME);
+            }
+
+            // DBAL 4
+            // @phpstan-ignore-next-line
+            throw InvalidType::new($value, self::NAME, ['null', 'string']);
         }
     }
 

tests/Doctrine/DBAL/Types/PhoneNumberTypeTest.php

@@ -50,7 +50,13 @@ public static function setUpBeforeClass(): void
     protected function setUp(): void
     {
         $this->platform = $this->prophesize(AbstractPlatform::class);
-        $this->platform->getVarcharTypeDeclarationSQL()->willReturn('DUMMYVARCHAR()');
+        if (method_exists(AbstractPlatform::class, 'getVarcharTypeDeclarationSQL')) {
+            // DBAL < 4
+            $this->platform->getVarcharTypeDeclarationSQL()->willReturn('DUMMYVARCHAR()');
+        } else {
+            // DBAL 4
+            $this->platform->getStringTypeDeclarationSQL()->willReturn('DUMMYVARCHAR()');
+        }
 
         $this->type = Type::getType('phone_number');
         $this->phoneNumberUtil = PhoneNumberUtil::getInstance();
@@ -68,7 +74,13 @@ public function testGetName()
 
     public function testGetSQLDeclaration()
     {
-        $this->platform->getVarcharTypeDeclarationSQL(['length' => 35])->willReturn('DUMMYVARCHAR()');
+        if (method_exists(AbstractPlatform::class, 'getVarcharTypeDeclarationSQL')) {
+            // DBAL < 4
+            $this->platform->getVarcharTypeDeclarationSQL(['length' => 35])->willReturn('DUMMYVARCHAR()');
+        } else {
+            // DBAL 4
+            $this->platform->getStringTypeDeclarationSQL(['length' => 35])->willReturn('DUMMYVARCHAR()');
+        }
         $this->assertSame('DUMMYVARCHAR()', $this->type->getSQLDeclaration([], $this->platform->reveal()));
     }
 

tests/Validator/Constraints/PhoneNumberTest.php

@@ -24,10 +24,10 @@ public function testProperties()
     {
         $phoneNumber = new PhoneNumber();
 
-        $this->assertObjectHasAttribute('message', $phoneNumber);
-        $this->assertObjectHasAttribute('type', $phoneNumber);
-        $this->assertObjectHasAttribute('defaultRegion', $phoneNumber);
-        $this->assertObjectHasAttribute('regionPath', $phoneNumber);
+        $this->assertObjectHasProperty('message', $phoneNumber);
+        $this->assertObjectHasProperty('type', $phoneNumber);
+        $this->assertObjectHasProperty('defaultRegion', $phoneNumber);
+        $this->assertObjectHasProperty('regionPath', $phoneNumber);
     }
 
     /**

tests/Validator/Constraints/PhoneNumberValidatorTest.php

@@ -21,6 +21,7 @@
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Mapping\Loader\AnnotationLoader;
+use Symfony\Component\Validator\Mapping\Loader\AttributeLoader;
 use Symfony\Component\Validator\Violation\ConstraintViolationBuilderInterface;
 
 /**
@@ -67,9 +68,6 @@ public function testValidate($value, $violates, $type = null, $defaultRegion = n
                 ->method('setCode')
                 ->with($this->isType('string'))
                 ->willReturn($constraintViolationBuilder);
-            $constraintViolationBuilder
-                ->method('addViolation')
-                ->willReturn($constraintViolationBuilder);
 
             $this->context
                 ->expects($this->once())
@@ -89,7 +87,11 @@ public function testValidate($value, $violates, $type = null, $defaultRegion = n
     public function testValidateFromAttribute()
     {
         $classMetadata = new ClassMetadata(PhoneNumberDummy::class);
-        (new AnnotationLoader())->loadClassMetadata($classMetadata);
+        if (class_exists(AnnotationLoader::class)) {
+            (new AnnotationLoader())->loadClassMetadata($classMetadata);
+        } else {
+            (new AttributeLoader())->loadClassMetadata($classMetadata);
+        }
 
         [$constraint1] = $classMetadata->properties['phoneNumber1']->constraints;
         [$constraint2] = $classMetadata->properties['phoneNumber2']->constraints;