Allow Symfony v7 (#78)

crunzphp · Feb 12, 2024 · 7bb3228 · 7bb3228
1 parent 0193dc3
commit 7bb3228
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 17 deletions.
diff --git a/.github/workflows/php.yaml b/.github/workflows/php.yaml
@@ -32,6 +32,7 @@ jobs:
                 symfony_version:
                     - '~5.4.9'
                     - '~6.4.0'
+                    - '~7.0.0'
                 include:
                     - os: 'windows-2022'
                       php: '8.1'
@@ -46,6 +47,22 @@ jobs:
                       php: '8.0'
                       dependencies: 'highest'
                       symfony_version: '~6.4.0'
+                    - os: 'ubuntu-22.04'
+                      php: '8.0'
+                      dependencies: 'lowest'
+                      symfony_version: '~7.0.0'
+                    - os: 'ubuntu-22.04'
+                      php: '8.0'
+                      dependencies: 'highest'
+                      symfony_version: '~7.0.0'
+                    - os: 'ubuntu-22.04'
+                      php: '8.1'
+                      dependencies: 'lowest'
+                      symfony_version: '~7.0.0'
+                    - os: 'ubuntu-22.04'
+                      php: '8.1'
+                      dependencies: 'highest'
+                      symfony_version: '~7.0.0'
         runs-on: ${{ matrix.os }}
 
         steps:

diff --git a/composer.json b/composer.json
@@ -39,14 +39,14 @@
         "composer-runtime-api": "^2.0",
         "dragonmantank/cron-expression": "^3.3.2",
         "laravel/serializable-closure": "^1.2.2",
-        "symfony/config": "^5.4.9 || ^6.4.0",
-        "symfony/console": "^5.4.9 || ^6.4.0",
-        "symfony/dependency-injection": "^5.4.9 || ^6.4.0",
-        "symfony/filesystem": "^5.4.9 || ^6.4.0",
-        "symfony/lock": "^5.4.9 || ^6.4.0",
-        "symfony/mailer": "^5.4.9 || ^6.4.0",
-        "symfony/process": "^5.4.9 || ^6.4.0",
-        "symfony/yaml": "^5.4.9 || ^6.4.0"
+        "symfony/config": "^5.4.9 || ^6.4.0 || ^7.0.0",
+        "symfony/console": "^5.4.9 || ^6.4.0 || ^7.0.0",
+        "symfony/dependency-injection": "^5.4.9 || ^6.4.0 || ^7.0.0",
+        "symfony/filesystem": "^5.4.9 || ^6.4.0 || ^7.0.0",
+        "symfony/lock": "^5.4.9 || ^6.4.0 || ^7.0.0",
+        "symfony/mailer": "^5.4.9 || ^6.4.0 || ^7.0.0",
+        "symfony/process": "^5.4.9 || ^6.4.0 || ^7.0.0",
+        "symfony/yaml": "^5.4.9 || ^6.4.0 || ^7.0.0"
     },
     "require-dev": {
         "ext-json": "*",
@@ -57,8 +57,8 @@
         "phpstan/phpstan-phpunit": "1.1.1",
         "phpstan/phpstan-strict-rules": "1.4.4",
         "phpunit/phpunit": "9.5.25",
-        "symfony/error-handler": "^5.4.9 || ^6.4.0",
-        "symfony/phpunit-bridge": "^5.4.9 || ^6.4.0"
+        "symfony/error-handler": "^5.4.9 || ^6.4.0 || ^7.0.0",
+        "symfony/phpunit-bridge": "^5.4.9 || ^6.4.0 || ^7.0.0"
     },
     "minimum-stability": "beta",
     "prefer-stable": true,

diff --git a/src/Console/Command/TaskGeneratorCommand.php b/src/Console/Command/TaskGeneratorCommand.php
@@ -104,12 +104,7 @@ protected function configure(): void
             ->setHelp('This command makes a task file skeleton.');
     }
 
-    /**
-     * Executes the current command.
-     *
-     * @return int|null null or 0 if everything went fine, or an error code
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->input = $input;
         $this->output = $output;

diff --git a/src/UserInterface/Cli/ClosureRunCommand.php b/src/UserInterface/Cli/ClosureRunCommand.php
@@ -39,7 +39,7 @@ protected function configure(): void
         ;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output): ?int
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $args = [];
         /** @var string $closure */