Merge pull request #84 from kbond/sf7

Symfony 7 Support
zenstruck · Nov 16, 2023 · bb1a432 · bb1a432
2 parents 8df2a99 + eaeac48
commit bb1a432
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 24 deletions.
diff --git a/composer.json b/composer.json
@@ -14,25 +14,25 @@
     "require": {
         "php": ">=8.0",
         "dragonmantank/cron-expression": "^2.3|^3.0",
-        "symfony/console": "^4.4|^5.4|^6.0",
-        "symfony/dependency-injection": "^4.4|^5.4|^6.0",
-        "symfony/event-dispatcher": "^4.4|^5.4|^6.0",
-        "symfony/http-kernel": "^4.4|^5.4|^6.0"
+        "symfony/console": "^5.4|^6.0|^7.0",
+        "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+        "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+        "symfony/http-kernel": "^5.4|^6.0|^7.0"
     },
     "require-dev": {
         "lorisleiva/cron-translator": "^0.1.0|^0.3.1|^0.4.0",
-        "matthiasnoback/symfony-dependency-injection-test": "^4.1",
+        "matthiasnoback/symfony-dependency-injection-test": "^4.1|^5.0",
         "phpstan/phpstan": "^1.4",
         "phpunit/phpunit": "^9.5",
         "psr/log": "^1.1",
-        "symfony/framework-bundle": "^4.4|^5.4|^6.0",
-        "symfony/http-client": "^4.4|^5.4|^6.0",
-        "symfony/lock": "^4.4|^5.4|^6.0",
-        "symfony/mailer": "^4.4|^5.4|^6.0",
-        "symfony/messenger": "^4.4|^5.4|^6.0",
-        "symfony/notifier": "^5.4|^6.0",
-        "symfony/phpunit-bridge": "^6.2",
-        "symfony/process": "^4.4|^5.4|^6.0"
+        "symfony/framework-bundle": "^5.4|^6.0|^7.0",
+        "symfony/http-client": "^5.4|^6.0|^7.0",
+        "symfony/lock": "^5.4|^6.0|^7.0",
+        "symfony/mailer": "^5.4|^6.0|^7.0",
+        "symfony/messenger": "^5.4|^6.0|^7.0",
+        "symfony/notifier": "^5.4|^6.0|^7.0",
+        "symfony/phpunit-bridge": "^6.2|^7.0",
+        "symfony/process": "^5.4|^6.0|^7.0"
     },
     "suggest": {
         "lorisleiva/cron-translator": "Displays human readable cron expression in schedule:list",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -2,16 +2,15 @@
 
 <!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.1/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
+         colors="true"
          failOnRisky="true"
          failOnWarning="true"
 >
     <php>
         <ini name="error_reporting" value="-1" />
-        <server name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0&amp;max[direct]=0"/>
+        <server name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0&amp;max[direct]=0&amp;quiet[]=indirect&amp;quiet[]=other"/>
         <server name="KERNEL_CLASS" value="Zenstruck\ScheduleBundle\Tests\Fixture\Kernel" />
         <server name="SHELL_VERBOSITY" value="-1" />
     </php>
@@ -22,9 +21,9 @@
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
-            <directory>./src/</directory>
-        </whitelist>
-    </filter>
+    <coverage>
+        <include>
+            <directory>src</directory>
+        </include>
+    </coverage>
 </phpunit>
diff --git a/tests/Schedule/Task/Runner/CommandTaskRunnerTest.php b/tests/Schedule/Task/Runner/CommandTaskRunnerTest.php
@@ -115,15 +115,15 @@ public static function getDefaultName(): string
                 return 'my:command';
             }
 
-            protected function configure()
+            protected function configure(): void
             {
                 $this
                     ->addOption('fail')
                     ->addOption('exception')
                 ;
             }
 
-            protected function execute(InputInterface $input, OutputInterface $output)
+            protected function execute(InputInterface $input, OutputInterface $output): int
             {
                 $output->write('some output...');