Merge pull request #224 from kamilmusial/3.x

Symfony 6 support

Author: goetas

.github/workflows/ci.yaml

@@ -15,12 +15,11 @@ jobs:
       fail-fast: false
       matrix:
         symfony-version:
-          - '^4.4'
           - '^5.4'
+          - '^6.0'
         php-version:
-          - "7.4"
-          - "8.0"
-          - "8.1"
+          - '8.1'
+          - '8.2'
         dependencies:
           - "lowest"
           - "highest"

composer.json

@@ -15,19 +15,19 @@
         }
     ],
     "require": {
-        "php": "^7.4 || ^8.0",
-        "symfony/framework-bundle": "^4.4 || ^5.4 ",
-        "symfony/intl": "^4.4 || ^5.4",
-        "symfony/templating": "^4.4 || ^5.4 ",
-        "symfony/validator": "^4.4 || ^5.4 ",
-        "symfony/yaml": "^4.4 || ^5.4 ",
+        "php": "^8.1",
+        "symfony/framework-bundle": "^5.4 || ^6.0 ",
+        "symfony/intl": "^5.4 || ^6.0",
+        "symfony/templating": "^5.4  || ^6.0",
+        "symfony/validator": "^5.4  || ^6.0",
+        "symfony/yaml": "^5.4  || ^6.0",
         "psr/log": "^1.0 || ^2.0 || ^3.0"
     },
     "require-dev": {
         "symfony/phpunit-bridge": ">=5.4",
         "ext-intl": "*",
         "twig/twig": "^1.41 || ^2.0 || ^3.0",
-        "symfony/form": "^4.4 || ^5.4",
+        "symfony/form": "^5.4 || ^6.0",
         "symfony/flex": "^1.0 || ^2.0",
         "dg/bypass-finals": "^1.4"
     },
@@ -50,5 +50,11 @@
             "allow-contrib": true,
             "require": "^5.4"
         }
+    },
+    "scripts": {
+        "auto-scripts": {
+            "cache:clear": "symfony-cmd",
+            "assets:install %PUBLIC_DIR%": "symfony-cmd"
+        }
     }
 }

src/Form/Extension/ChoiceList/LocaleChoiceList.php

@@ -21,8 +21,8 @@
  */
 class LocaleChoiceList extends ArrayChoiceList
 {
-    private $localeChoices;
-    private $preferredChoices;
+    private $localeChoices = [];
+    private $preferredChoices = [];
 
     /**
      * Construct the LocaleChoiceList
@@ -33,7 +33,6 @@ class LocaleChoiceList extends ArrayChoiceList
      */
     public function __construct(LocaleInformation $information, $languagesOnly = true, $strictMode = false)
     {
-        $this->localeChoices = array();
         $allowedLocales = $strictMode
             ? $information->getAllowedLocalesFromConfiguration()
             : $information->getAllAllowedLanguages();

tests/Form/Extension/Type/LocaleTypeTest.php

@@ -27,7 +27,7 @@ public function testConfigureOptions()
         $resolver
             ->expects($this->once())
             ->method('setDefaults')
-            ->with(array('choices' => null, 'preferred_choices' => null));
+            ->with(array('choices' => [], 'preferred_choices' => null));
 
         $type = new LocaleType($choiceList);
         $type->configureOptions($resolver);
@@ -49,7 +49,10 @@ public function testGetName()
 
     protected function getMockLocaleChoiceList()
     {
-        return $this->createMock(LocaleChoiceList::class);
+        $mockLocaleChoiceList = $this->createMock(LocaleChoiceList::class);
+        $mockLocaleChoiceList->method('getOriginalKeys')->willReturn([]);
+
+        return $mockLocaleChoiceList;
     }
 
     protected function getMockOptionsResolverInterface()

tests/Validator/BaseMetaValidator.php

@@ -16,6 +16,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\FileLocator;
+use Symfony\Component\Validator\ConstraintValidatorInterface;
 use Symfony\Component\Validator\Validation;
 use Symfony\Component\Yaml\Parser as YamlParser;
 
@@ -121,7 +122,7 @@ public function __construct(LocaleValidator $localeValidator, LocaleAllowedValid
     /**
      * {@inheritDoc}
      */
-    public function getInstance(Constraint $constraint)
+    public function getInstance(Constraint $constraint): ConstraintValidatorInterface
     {
         $className = $constraint->validatedBy();