Merge pull request #67 from 1ed/symfony-7.0

Symfony 7.0 support

Author: mnapoli

.github/workflows/ci.yml

@@ -10,8 +10,13 @@ jobs:
       max-parallel: 10
       fail-fast: false
       matrix:
-        php: ['8.0', '8.1', '8.2']
-        sf_version: ['5.2.*', '5.4.*', '6.0.*']
+        php: ['8.2', '8.3']
+        sf_version: ['7.0.*']
+        include:
+            - php: '8.0'
+              sf_version: '5.4.*'
+            - php: '8.1'
+              sf_version: '6.4.*'
 
     steps:
       - name: Set up PHP

composer.json

@@ -24,20 +24,20 @@
     "require": {
         "php": ">=8.0",
         "bref/bref": "^1.2|^2.0",
-        "symfony/filesystem": "^5.2|^6.0",
-        "symfony/http-kernel": "^5.2|^6.0",
-        "symfony/psr-http-message-bridge": "^2.1",
-        "symfony/runtime": "^5.2|^6.0"
+        "symfony/filesystem": "^5.4|^6.0|^7.0",
+        "symfony/http-kernel": "^5.4|^6.0|^7.0",
+        "symfony/psr-http-message-bridge": "^2.1|^6.4|^7.0",
+        "symfony/runtime": "^5.4|^6.0|^7.0"
     },
     "require-dev": {
         "mnapoli/hard-mode": "^0.3.0",
         "phpstan/phpstan": "^1.3",
         "phpunit/phpunit": "^8.5.22",
-        "symfony/config": "^5.2|^6.0",
-        "symfony/dependency-injection": "^5.2|^6.0",
-        "symfony/framework-bundle": "^5.2|^6.0",
-        "symfony/phpunit-bridge": "^6.0",
-        "symfony/process": "^5.2|^6.0"
+        "symfony/config": "^5.4|^6.0|^7.0",
+        "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+        "symfony/framework-bundle": "^5.4|^6.0|^7.0",
+        "symfony/phpunit-bridge": "^6.0|^7.0",
+        "symfony/process": "^5.4|^6.0|^7.0"
     },
     "config": {
         "sort-packages": true,

src/BrefKernel.php

@@ -41,7 +41,7 @@ public function getLogDir(): string
      *
      * @see https://github.com/brefphp/symfony-bridge/pull/37
      */
-    public function handle($request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true): Response
+    public function handle($request, $type = HttpKernelInterface::MAIN_REQUEST, $catch = true): Response
     {
         $this->prepareCacheDir(parent::getCacheDir(), $this->getCacheDir());
 

tests/Functional/App/src/Command/PingCommand.php

@@ -2,15 +2,15 @@
 
 namespace App\Command;
 
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
+#[AsCommand('app:ping')]
 class PingCommand extends Command
 {
-    protected static $defaultName = 'app:ping';
-
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $output->writeln('Ok');
 

tests/Functional/App/src/Command/WriteToCacheCommand.php

@@ -2,6 +2,7 @@
 
 namespace App\Command;
 
+use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -10,10 +11,9 @@
 /**
  * This command tests writing to the system cache.
  */
+#[AsCommand('write-to-cache')]
 class WriteToCacheCommand extends Command
 {
-    protected static $defaultName = 'write-to-cache';
-
     /** @var CacheInterface */
     private $systemCache;
 

tests/Functional/App/src/Kernel.php

@@ -57,7 +57,7 @@ protected function configureRoutes($routes): void
      *
      * It lets us detect whenever the compiled container is being rebuilt.
      */
-    protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container, $class, $baseClass)
+    protected function dumpContainer(ConfigCache $cache, ContainerBuilder $container, $class, $baseClass): void
     {
         echo "Symfony is compiling the container\n";