Add Symfony 7 support (#172)

--------- Co-authored-by: Alexander Schranz <[email protected]>
sulu · Jul 24, 2024 · 17e2867 · 17e2867
1 parent d95bfd8
commit 17e2867
Show file tree

Hide file tree

Showing 7 changed files with 86 additions and 162 deletions.
diff --git a/Command/InitCommand.php b/Command/InitCommand.php
@@ -72,7 +72,7 @@ public function configure(): void
             ->addArgument('webspace', null, 'A specific webspace key.');
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         /** @var string|null $webspaceKey */
         $webspaceKey = $input->getArgument('webspace');

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -91,7 +91,7 @@ class Configuration implements ConfigurationInterface
     public const LAST_LOGIN = 'last_login';
     public const REFRESH_INTERVAL = 'refresh_interval';
 
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('sulu_community');
         $rootNode = $treeBuilder->getRootNode();

diff --git a/Validator/Constraints/Blocked.php b/Validator/Constraints/Blocked.php
@@ -23,7 +23,7 @@ class Blocked extends Constraint
      */
     public $message = 'The email "%email%" is blocked.';
 
-    public function validatedBy()
+    public function validatedBy(): string
     {
         return 'blocked_validator';
     }

diff --git a/Validator/Constraints/Exist.php b/Validator/Constraints/Exist.php
@@ -33,7 +33,7 @@ class Exist extends Constraint
      */
     public $entity = '';
 
-    public function validatedBy()
+    public function validatedBy(): string
     {
         return 'exist_validator';
     }

diff --git a/composer.json b/composer.json
@@ -10,43 +10,43 @@
         "doctrine/orm": "^2.5.3",
         "doctrine/persistence": "^1.3 || ^2.0 || ^3.0",
         "doctrine/phpcr-bundle": "^2 || ^3.0",
-        "jms/serializer-bundle": "^3.3 || ^4.0",
+        "jms/serializer-bundle": "^3.3 || ^4.0|| ^5.4",
         "massive/build-bundle": "^0.3 || ^0.4 || ^0.5",
         "sulu/sulu": "^2.4.0 || ^2.6@dev",
-        "symfony/config": "^5.4 || ^6.2",
-        "symfony/console": "^5.4 || ^6.2",
-        "symfony/dependency-injection": "^5.4 || ^6.2",
-        "symfony/event-dispatcher": "^5.4 || ^6.2",
-        "symfony/form": "^5.4 || ^6.2",
-        "symfony/framework-bundle": "^5.4 || ^6.2",
-        "symfony/http-foundation": "^5.4 || ^6.2",
-        "symfony/http-kernel": "^5.4 || ^6.2",
-        "symfony/intl": "^5.4 || ^6.2",
-        "symfony/mailer": "^5.4 || ^6.2",
-        "symfony/routing": "^5.4 || ^6.2",
-        "symfony/security-bundle": "^5.4 || ^6.2"
+        "symfony/config": "^5.4 || ^6.2 || ^7.0",
+        "symfony/console": "^5.4 || ^6.2 || ^7.0",
+        "symfony/dependency-injection": "^5.4 || ^6.2 || ^7.0",
+        "symfony/event-dispatcher": "^5.4 || ^6.2 || ^7.0",
+        "symfony/form": "^5.4 || ^6.2 || ^7.0",
+        "symfony/framework-bundle": "^5.4 || ^6.2 || ^7.0",
+        "symfony/http-foundation": "^5.4 || ^6.2 || ^7.0",
+        "symfony/http-kernel": "^5.4 || ^6.2 || ^7.0",
+        "symfony/intl": "^5.4 || ^6.2 || ^7.0",
+        "symfony/mailer": "^5.4 || ^6.2 || ^7.0",
+        "symfony/routing": "^5.4 || ^6.2 || ^7.0",
+        "symfony/security-bundle": "^5.4 || ^6.2 || ^7.0"
     },
     "require-dev": {
         "doctrine/data-fixtures": "^1.3.3",
         "friendsofsymfony/jsrouting-bundle": "^2.6 || ^3.0",
         "handcraftedinthealps/zendsearch": "^2.0",
-        "jackalope/jackalope-doctrine-dbal": "^1.3.4",
+        "jackalope/jackalope-doctrine-dbal": "^1.3.4 || ^2.0",
         "jangregor/phpstan-prophecy": "^1.0",
         "massive/search-bundle": "^2.0",
         "php-cs-fixer/shim": "^3.9",
         "phpspec/prophecy": "^1.16",
-        "phpstan/phpstan": "1.0",
+        "phpstan/phpstan": "^1.0",
         "phpstan/phpstan-doctrine": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpstan/phpstan-symfony": "^1.0",
         "phpunit/phpunit": "^8.2",
-        "symfony/browser-kit": "^5.4 || ^6.2",
-        "symfony/css-selector": "^5.4 || ^6.2",
-        "symfony/dotenv": "^5.4 || ^6.2",
+        "symfony/browser-kit": "^5.4 || ^6.2 || ^7.0",
+        "symfony/css-selector": "^5.4 || ^6.2 || ^7.0",
+        "symfony/dotenv": "^5.4 || ^6.2 || ^7.0",
         "symfony/monolog-bundle": "^3.1",
-        "symfony/phpunit-bridge": "^5.4 || ^6.2",
-        "symfony/stopwatch": "^5.4 || ^6.2",
-        "symfony/var-dumper": "^5.4 || ^6.2",
+        "symfony/phpunit-bridge": "^5.4 || ^6.2 || ^7.0",
+        "symfony/stopwatch": "^5.4 || ^6.2 || ^7.0",
+        "symfony/var-dumper": "^5.4 || ^6.2 || ^7.0",
         "thecodingmachine/phpstan-strict-rules": "^1.0"
     },
     "conflict": {