Merge pull request #3047 from stof/symfony_6

Add support for Symfony 6
FriendsOfSymfony · Oct 26, 2022 · cba15a7 · cba15a7
2 parents 1cbe2a0 + 4bcde71
commit cba15a7
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 17 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -22,6 +22,9 @@ jobs:
                     -   description: 'Symfony 4.*'
                         php: '7.4'
                         symfony-versions: '^4.4'
+                    -   description: 'Symfony 5.*'
+                        php: '8.1'
+                        symfony-versions: '^5.4'
         name: PHP ${{ matrix.php }} ${{ matrix.description }}
         steps:
             - name: Checkout

diff --git a/Command/ActivateUserCommand.php b/Command/ActivateUserCommand.php
@@ -12,6 +12,7 @@
 namespace FOS\UserBundle\Command;
 
 use FOS\UserBundle\Util\UserManipulator;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -25,8 +26,10 @@
  *
  * @final
  */
+#[AsCommand(name: 'fos:user:activate', description: 'Activate a user')]
 class ActivateUserCommand extends Command
 {
+    // BC with Symfony <5.3
     protected static $defaultName = 'fos:user:activate';
 
     private $userManipulator;
@@ -44,6 +47,7 @@ public function __construct(UserManipulator $userManipulator)
     protected function configure()
     {
         $this
+            // BC with Symfony <5.3
             ->setName('fos:user:activate')
             ->setDescription('Activate a user')
             ->setDefinition([

diff --git a/Command/ChangePasswordCommand.php b/Command/ChangePasswordCommand.php
@@ -12,6 +12,7 @@
 namespace FOS\UserBundle\Command;
 
 use FOS\UserBundle\Util\UserManipulator;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -23,8 +24,10 @@
  *
  * @final
  */
+#[AsCommand(name: 'fos:user:change-password', description: 'Change the password of a user.')]
 class ChangePasswordCommand extends Command
 {
+    // BC with Symfony <5.3
     protected static $defaultName = 'fos:user:change-password';
 
     private $userManipulator;
@@ -42,6 +45,7 @@ public function __construct(UserManipulator $userManipulator)
     protected function configure()
     {
         $this
+            // BC with Symfony <5.3
             ->setName('fos:user:change-password')
             ->setDescription('Change the password of a user.')
             ->setDefinition([

diff --git a/Command/CreateUserCommand.php b/Command/CreateUserCommand.php
@@ -12,6 +12,7 @@
 namespace FOS\UserBundle\Command;
 
 use FOS\UserBundle\Util\UserManipulator;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -28,8 +29,10 @@
  *
  * @final
  */
+#[AsCommand(name: 'fos:user:create', description: 'Create a user.')]
 class CreateUserCommand extends Command
 {
+    // BC with Symfony <5.3
     protected static $defaultName = 'fos:user:create';
 
     private $userManipulator;
@@ -47,6 +50,7 @@ public function __construct(UserManipulator $userManipulator)
     protected function configure()
     {
         $this
+            // BC with Symfony <5.3
             ->setName('fos:user:create')
             ->setDescription('Create a user.')
             ->setDefinition([

diff --git a/Command/DeactivateUserCommand.php b/Command/DeactivateUserCommand.php
@@ -12,6 +12,7 @@
 namespace FOS\UserBundle\Command;
 
 use FOS\UserBundle\Util\UserManipulator;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -25,8 +26,10 @@
  *
  * @final
  */
+#[AsCommand(name: 'fos:user:deactivate', description: 'Deactivate a user')]
 class DeactivateUserCommand extends Command
 {
+    // BC with Symfony <5.3
     protected static $defaultName = 'fos:user:deactivate';
 
     private $userManipulator;
@@ -44,6 +47,7 @@ public function __construct(UserManipulator $userManipulator)
     protected function configure()
     {
         $this
+            // BC with Symfony <5.3
             ->setName('fos:user:deactivate')
             ->setDescription('Deactivate a user')
             ->setDefinition([

diff --git a/Command/DemoteUserCommand.php b/Command/DemoteUserCommand.php
@@ -12,6 +12,7 @@
 namespace FOS\UserBundle\Command;
 
 use FOS\UserBundle\Util\UserManipulator;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
@@ -22,8 +23,10 @@
  *
  * @final
  */
+#[AsCommand(name: 'fos:user:demote', description: 'Demote a user by removing a role')]
 class DemoteUserCommand extends RoleCommand
 {
+    // BC with Symfony <5.3
     protected static $defaultName = 'fos:user:demote';
 
     /**
@@ -34,6 +37,7 @@ protected function configure()
         parent::configure();
 
         $this
+            // BC with Symfony <5.3
             ->setName('fos:user:demote')
             ->setDescription('Demote a user by removing a role')
             ->setHelp(<<<'EOT'

diff --git a/Command/PromoteUserCommand.php b/Command/PromoteUserCommand.php
@@ -12,6 +12,7 @@
 namespace FOS\UserBundle\Command;
 
 use FOS\UserBundle\Util\UserManipulator;
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
@@ -24,8 +25,10 @@
  *
  * @final
  */
+#[AsCommand(name: 'fos:user:promote', description: 'Promotes a user by adding a role')]
 class PromoteUserCommand extends RoleCommand
 {
+    // BC with Symfony <5.3
     protected static $defaultName = 'fos:user:promote';
 
     /**
@@ -36,6 +39,7 @@ protected function configure()
         parent::configure();
 
         $this
+            // BC with Symfony <5.3
             ->setName('fos:user:promote')
             ->setDescription('Promotes a user by adding a role')
             ->setHelp(<<<'EOT'

diff --git a/composer.json b/composer.json
@@ -24,21 +24,21 @@
         "php": "^7.4 || ^8.0",
         "ext-dom": "*",
         "ext-json": "*",
-        "symfony/config": "^4.4 || ^5.0",
-        "symfony/dependency-injection": "^4.4 || ^5.0",
-        "symfony/event-dispatcher": "^4.4 || ^5.0",
-        "symfony/event-dispatcher-contracts": "^1.1 || ^2.0",
-        "symfony/form": "^4.4 || ^5.0",
-        "symfony/framework-bundle": "^4.4 || ^5.0",
-        "symfony/http-foundation": "^4.4 || ^5.0",
-        "symfony/http-kernel": "^4.4 || ^5.0",
-        "symfony/options-resolver": "^4.4 || ^5.0",
-        "symfony/routing": "^4.4 || ^5.0",
-        "symfony/security-bundle": "^4.4 || ^5.0",
-        "symfony/security-core": "^4.4 || ^5.0",
-        "symfony/translation": "^4.4 || ^5.0",
-        "symfony/twig-bundle": "^4.4 || ^5.0",
-        "symfony/validator": "^4.4 || ^5.0",
+        "symfony/config": "^4.4 || ^5.0 || ^6.0",
+        "symfony/dependency-injection": "^4.4 || ^5.0 || ^6.0",
+        "symfony/event-dispatcher": "^4.4 || ^5.0 || ^6.0",
+        "symfony/event-dispatcher-contracts": "^1.1 || ^2.0 || ^3.0",
+        "symfony/form": "^4.4 || ^5.0 || ^6.0",
+        "symfony/framework-bundle": "^4.4 || ^5.0 || ^6.0",
+        "symfony/http-foundation": "^4.4 || ^5.0 || ^6.0",
+        "symfony/http-kernel": "^4.4 || ^5.0 || ^6.0",
+        "symfony/options-resolver": "^4.4 || ^5.0 || ^6.0",
+        "symfony/routing": "^4.4 || ^5.0 || ^6.0",
+        "symfony/security-bundle": "^4.4 || ^5.0 || ^6.0",
+        "symfony/security-core": "^4.4 || ^5.0 || ^6.0",
+        "symfony/translation": "^4.4 || ^5.0 || ^6.0",
+        "symfony/twig-bundle": "^4.4 || ^5.0 || ^6.0",
+        "symfony/validator": "^4.4 || ^5.0 || ^6.0",
         "twig/twig": "^1.34 || ^2.4 || ^3.0"
     },
     "conflict": {
@@ -50,9 +50,9 @@
         "doctrine/doctrine-bundle": "^1.3 || ^2",
         "friendsofphp/php-cs-fixer": "^3.0.2, !=3.5.0",
         "swiftmailer/swiftmailer": "^4.3 || ^5.0 || ^6.0",
-        "symfony/console": "^4.4 || ^5.0",
+        "symfony/console": "^4.4 || ^5.0 || ^6.0",
         "symfony/phpunit-bridge": "^6.1",
-        "symfony/yaml": "^4.4 || ^5.0"
+        "symfony/yaml": "^4.4 || ^5.0 || ^6.0"
     },
     "config": {
         "sort-packages": true