Bump to symfony ^6.4 || ^7.0

nucleos · Feb 4, 2024 · a4b31d9 · a4b31d9
1 parent 452cb88
commit a4b31d9
Show file tree

Hide file tree

Showing 13 changed files with 674 additions and 818 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -14,5 +14,6 @@ jobs:
     with:
       PHP_EXTENSIONS: "mbstring, json, mongodb"
       SYMFONY_KERNEL: "Nucleos\\UserAdminBundle\\Tests\\App\\AppKernel"
+      SYMFONY_VERSIONS: "6.4,7.0"
     secrets:
       CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"
diff --git a/composer.json b/composer.json
@@ -43,25 +43,25 @@
         "psr/log": "^1.0 || ^2.0 || ^3.0",
         "sonata-project/admin-bundle": "^4.8.1",
         "sonata-project/doctrine-extensions": "^1.5.1 || ^2.0.0",
-        "symfony/asset": "^5.4 || ^6.0",
-        "symfony/config": "^5.4 || ^6.0",
-        "symfony/dependency-injection": "^5.4 || ^6.0",
-        "symfony/event-dispatcher": "^5.4 || ^6.0",
+        "symfony/asset": "^6.4 || ^7.0",
+        "symfony/config": "^6.4 || ^7.0",
+        "symfony/dependency-injection": "^6.4 || ^7.0",
+        "symfony/event-dispatcher": "^6.4 || ^7.0",
         "symfony/event-dispatcher-contracts": "^1.0 || ^2.0 || ^3.0",
-        "symfony/form": "^5.4 || ^6.0",
-        "symfony/framework-bundle": "^5.4.19 || ^6.2.5",
-        "symfony/http-foundation": "^5.4 || ^6.0",
-        "symfony/http-kernel": "^5.4 || ^6.0",
-        "symfony/options-resolver": "^5.4 || ^6.0",
-        "symfony/routing": "^5.4 || ^6.0",
+        "symfony/form": "^6.4 || ^7.0",
+        "symfony/framework-bundle": "^6.4 || ^7.0",
+        "symfony/http-foundation": "^6.4 || ^7.0",
+        "symfony/http-kernel": "^6.4 || ^7.0",
+        "symfony/options-resolver": "^6.4 || ^7.0",
+        "symfony/routing": "^6.4 || ^7.0",
         "symfony/security-acl": "^3.0",
-        "symfony/security-core": "^5.4 || ^6.0",
-        "symfony/security-csrf": "^5.4 || ^6.0",
-        "symfony/security-http": "^5.4 || ^6.0",
-        "symfony/translation": "^5.4 || ^6.0",
+        "symfony/security-core": "^6.4 || ^7.0",
+        "symfony/security-csrf": "^6.4 || ^7.0",
+        "symfony/security-http": "^6.4 || ^7.0",
+        "symfony/translation": "^6.4 || ^7.0",
         "symfony/translation-contracts": "^1.0 || ^2.0 || ^3.0",
-        "symfony/twig-bridge": "^5.4 || ^6.0",
-        "symfony/twig-bundle": "^5.4 || ^6.0",
+        "symfony/twig-bridge": "^6.4 || ^7.0",
+        "symfony/twig-bundle": "^6.4 || ^7.0",
         "twig/extra-bundle": "^3.0",
         "twig/twig": "^2.14 || ^3.1"
     },
@@ -73,10 +73,10 @@
         "knplabs/knp-menu-bundle": "^3.2",
         "sonata-project/doctrine-orm-admin-bundle": "^4.0",
         "sonata-project/form-extensions": "^1.20 || ^2.0",
-        "symfony/browser-kit": "^5.4 || ^6.0",
-        "symfony/doctrine-bridge": "^5.4 || ^6.0",
-        "symfony/intl": "^5.4 || ^6.0",
-        "symfony/yaml": "^5.4 || ^6.0"
+        "symfony/browser-kit": "^6.4 || ^7.0",
+        "symfony/doctrine-bridge": "^6.4 || ^7.0",
+        "symfony/intl": "^6.4 || ^7.0",
+        "symfony/yaml": "^6.4 || ^7.0"
     },
     "conflict": {
         "doctrine/doctrine-bundle": "<2.5",

diff --git a/src/Admin/Document/GroupAdmin.php b/src/Admin/Document/GroupAdmin.php
@@ -15,6 +15,4 @@
 
 use Nucleos\UserAdminBundle\Admin\Model\GroupAdmin as BaseGroupAdmin;
 
-final class GroupAdmin extends BaseGroupAdmin
-{
-}
+final class GroupAdmin extends BaseGroupAdmin {}
diff --git a/src/Admin/Document/UserAdmin.php b/src/Admin/Document/UserAdmin.php
@@ -15,6 +15,4 @@
 
 use Nucleos\UserAdminBundle\Admin\Model\UserAdmin as BaseUserAdmin;
 
-final class UserAdmin extends BaseUserAdmin
-{
-}
+final class UserAdmin extends BaseUserAdmin {}
diff --git a/src/Admin/Entity/GroupAdmin.php b/src/Admin/Entity/GroupAdmin.php
@@ -15,6 +15,4 @@
 
 use Nucleos\UserAdminBundle\Admin\Model\GroupAdmin as BaseGroupAdmin;
 
-final class GroupAdmin extends BaseGroupAdmin
-{
-}
+final class GroupAdmin extends BaseGroupAdmin {}
diff --git a/src/Admin/Entity/UserAdmin.php b/src/Admin/Entity/UserAdmin.php
@@ -15,6 +15,4 @@
 
 use Nucleos\UserAdminBundle\Admin\Model\UserAdmin as BaseUserAdmin;
 
-final class UserAdmin extends BaseUserAdmin
-{
-}
+final class UserAdmin extends BaseUserAdmin {}
diff --git a/src/Security/RolesBuilder/AdminRolesBuilderInterface.php b/src/Security/RolesBuilder/AdminRolesBuilderInterface.php
@@ -13,6 +13,4 @@
 
 namespace Nucleos\UserAdminBundle\Security\RolesBuilder;
 
-interface AdminRolesBuilderInterface extends RolesBuilderInterface, PermissionLabelsBuilderInterface
-{
-}
+interface AdminRolesBuilderInterface extends RolesBuilderInterface, PermissionLabelsBuilderInterface {}
diff --git a/src/Security/RolesBuilder/MatrixRolesBuilderInterface.php b/src/Security/RolesBuilder/MatrixRolesBuilderInterface.php
@@ -13,6 +13,4 @@
 
 namespace Nucleos\UserAdminBundle\Security\RolesBuilder;
 
-interface MatrixRolesBuilderInterface extends ExpandableRolesBuilderInterface, PermissionLabelsBuilderInterface
-{
-}
+interface MatrixRolesBuilderInterface extends ExpandableRolesBuilderInterface, PermissionLabelsBuilderInterface {}
diff --git a/tests/Action/LoginActionTest.php b/tests/Action/LoginActionTest.php
@@ -153,7 +153,7 @@ static function (string $message): string {
     }
 
     /**
-     * @dataProvider userGrantedAdminProvider
+     * @dataProvider provideUserGrantedAdminCases
      */
     public function testUserGrantedAdmin(string $referer, string $expectedRedirectUrl): void
     {
@@ -189,7 +189,7 @@ public function testUserGrantedAdmin(string $referer, string $expectedRedirectUr
     /**
      * @return string[][]
      */
-    public static function userGrantedAdminProvider(): array
+    public static function provideUserGrantedAdminCases(): iterable
     {
         return [
             ['', '/foo'],
@@ -199,7 +199,7 @@ public static function userGrantedAdminProvider(): array
     }
 
     /**
-     * @dataProvider unauthenticatedProvider
+     * @dataProvider provideUnauthenticatedCases
      *
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -311,7 +311,7 @@ static function (string $key) use ($sessionParameters): bool {
         self::assertSame('template content', $result->getContent());
     }
 
-    public static function unauthenticatedProvider(): array
+    public static function provideUnauthenticatedCases(): iterable
     {
         $error = new AuthenticationException('An error');
 

diff --git a/tests/App/config/config.php b/tests/App/config/config.php
@@ -16,6 +16,7 @@
 use Nucleos\UserAdminBundle\Tests\App\Entity\Group;
 use Nucleos\UserAdminBundle\Tests\App\Entity\User;
 use Nucleos\UserBundle\Model\UserInterface;
+use Symfony\Component\Security\Http\Attribute\IsGranted;
 
 return static function (ContainerConfigurator $containerConfigurator): void {
     $containerConfigurator->extension('framework', ['secret' => 'MySecret']);
@@ -62,7 +63,14 @@
         ],
     ]);
 
-    $containerConfigurator->extension('security', ['enable_authenticator_manager' => true]);
+    $securityConfig = [];
+
+    // TODO: Remove if when dropping support of Symfony 5.4
+    if (!class_exists(IsGranted::class)) {
+        $securityConfig['enable_authenticator_manager'] = true;
+    }
+
+    $containerConfigurator->extension('security', $securityConfig);
 
     $containerConfigurator->extension('security', ['access_control' => [['path' => '^/.*', 'role' => 'PUBLIC_ACCESS']]]);
 

diff --git a/tests/Resources/XliffTest.php b/tests/Resources/XliffTest.php
@@ -32,7 +32,7 @@ protected function setUp(): void
     }
 
     /**
-     * @dataProvider getXliffPaths
+     * @dataProvider provideXliffCases
      */
     public function testXliff(string $path): void
     {
@@ -45,7 +45,7 @@ public function testXliff(string $path): void
     /**
      * @return string[][]
      */
-    public static function getXliffPaths(): array
+    public static function provideXliffCases(): iterable
     {
         return [[__DIR__.'/../../src/Resources/translations']];
     }

diff --git a/vendor-bin/tools/composer.json b/vendor-bin/tools/composer.json
@@ -15,7 +15,7 @@
         "phpunit/phpunit": "^10.1.2",
         "psalm/plugin-phpunit": "^0.18.4",
         "psalm/plugin-symfony": "^5.0.3",
-        "symfony/phpunit-bridge": "^6.2.7",
+        "symfony/phpunit-bridge": "^7.0",
         "vimeo/psalm": "^5.9"
     },
     "config": {