Add support for symfony 5

.github/settings.yml

@@ -18,8 +18,12 @@ branches:
           - "Static Code Analysis (8)"
           - "Test (PHP 7.4, symfony 4.4, lowest)"
           - "Test (PHP 7.4, symfony 4.4, highest)"
+          - "Test (PHP 7.4, symfony 5.3, lowest)"
+          - "Test (PHP 7.4, symfony 5.3, highest)"
           - "Test (PHP 8, symfony 4.4, lowest)"
           - "Test (PHP 8, symfony 4.4, highest)"
+          - "Test (PHP 8, symfony 5.3, lowest)"
+          - "Test (PHP 8, symfony 5.3, highest)"
           - "Code Coverage (8)"
           - "Mutation Tests (8)"
         strict: true

.github/workflows/continuous-integration.yml

@@ -121,6 +121,7 @@ jobs:
 
         symfony:
           - 4.4
+          - 5.3
 
     steps:
       - name: "Checkout"

composer.json

@@ -21,27 +21,27 @@
         "php": "^7.4 || ^8.0",
         "ext-json": "*",
         "nucleos/user-bundle": "^1.9",
-        "psr/log": "^1.0",
+        "psr/log": "^1.0 || ^2.0 || ^3.0",
         "sonata-project/admin-bundle": "^3.90 || ^4.0",
         "sonata-project/doctrine-extensions": "^1.5.1",
-        "symfony/config": "^4.4",
-        "symfony/dependency-injection": "^4.4",
-        "symfony/event-dispatcher": "^4.4",
+        "symfony/config": "^4.4 || ^5.3",
+        "symfony/dependency-injection": "^4.4 || ^5.3",
+        "symfony/event-dispatcher": "^4.4 || ^5.3",
         "symfony/event-dispatcher-contracts": "^1.0 || ^2.0",
-        "symfony/form": "^4.4",
-        "symfony/framework-bundle": "^4.4",
-        "symfony/http-foundation": "^4.4",
-        "symfony/http-kernel": "^4.4",
-        "symfony/options-resolver": "^4.4",
-        "symfony/routing": "^4.4",
+        "symfony/form": "^4.4 || ^5.3",
+        "symfony/framework-bundle": "^4.4 || ^5.3",
+        "symfony/http-foundation": "^4.4 || ^5.3",
+        "symfony/http-kernel": "^4.4 || ^5.3",
+        "symfony/options-resolver": "^4.4 || ^5.3",
+        "symfony/routing": "^4.4 || ^5.3",
         "symfony/security-acl": "^3.0",
-        "symfony/security-core": "^4.4",
-        "symfony/security-csrf": "^4.4",
-        "symfony/security-http": "^4.4",
-        "symfony/translation": "^4.4",
+        "symfony/security-core": "^4.4 || ^5.3",
+        "symfony/security-csrf": "^4.4 || ^5.3",
+        "symfony/security-http": "^4.4 || ^5.3",
+        "symfony/translation": "^4.4 || ^5.3",
         "symfony/translation-contracts": "^1.0 || ^2.0",
-        "symfony/twig-bridge": "^4.4",
-        "symfony/twig-bundle": "^4.4",
+        "symfony/twig-bridge": "^4.4 || ^5.3",
+        "symfony/twig-bundle": "^4.4 || ^5.3",
         "twig/extra-bundle": "^3.0",
         "twig/twig": "^2.14 || ^3.1"
     },
@@ -57,10 +57,9 @@
         "ergebnis/composer-normalize": "^2.0.1",
         "knplabs/knp-menu": "^2.3 || ^3.0",
         "sonata-project/doctrine-orm-admin-bundle": "^3.13 || ^4.0",
-        "symfony/asset": "^4.4",
-        "symfony/browser-kit": "^4.4",
-        "symfony/doctrine-bridge": "^4.4",
-        "twig/extensions": "^1.5"
+        "symfony/asset": "^4.4 || ^5.3",
+        "symfony/browser-kit": "^4.4 || ^5.3",
+        "symfony/doctrine-bridge": "^4.4 || ^5.3"
     },
     "config": {
         "sort-packages": true

psalm-baseline.xml

@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <files psalm-version="4.10.0@916b098b008f6de4543892b1e0651c1c3b92cbfa">
-  <file src="src/Action/LoginAction.php">
-    <TooManyArguments occurrences="1">
-      <code>dispatch</code>
-    </TooManyArguments>
-  </file>
-  <file src="src/Controller/UserCRUDController.php">
-    <TooManyArguments occurrences="1">
-      <code>dispatch</code>
-    </TooManyArguments>
+  <file src="src/Action/CheckEmailAction.php">
+    <InvalidArgument occurrences="1">
+      <code>$username</code>
+    </InvalidArgument>
   </file>
   <file src="src/DependencyInjection/Configuration.php">
     <UndefinedMethod occurrences="4">

src/Admin/Model/GroupAdmin.php

@@ -26,13 +26,6 @@
  */
 abstract class GroupAdmin extends AbstractAdmin
 {
-    /**
-     * @var string[]
-     */
-    protected $formOptions = [
-        'validation_groups' => 'Registration',
-    ];
-
     private GroupManagerInterface $groupManager;
 
     /**
@@ -50,6 +43,11 @@ protected function createNewInstance(): object
         return $this->groupManager->createGroup('');
     }
 
+    protected function configureFormOptions(array &$formOptions): void
+    {
+        $formOptions['validation_groups'] = $this->isNewInstance() ? 'Registration' : 'Profile';
+    }
+
     protected function configureListFields(ListMapper $list): void
     {
         $list
@@ -85,4 +83,9 @@ protected function configureFormFields(FormMapper $form): void
             ->end()
         ;
     }
+
+    private function isNewInstance(): bool
+    {
+        return !$this->hasSubject() || null === $this->id($this->getSubject());
+    }
 }