Bump to symfony ^6.4 || ^7.0

nucleos · Dec 21, 2023 · fa21e69 · fa21e69
1 parent 869eab3
commit fa21e69
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -14,5 +14,6 @@ jobs:
     with:
       PHP_EXTENSIONS: "mbstring"
       SYMFONY_KERNEL: "Nucleos\\MapsBundle\\Tests\\App\\AppKernel"
+      SYMFONY_VERSIONS: "6.4,7.0"
     secrets:
       CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}"
diff --git a/composer.json b/composer.json
@@ -48,15 +48,15 @@
         "psr/log": "^1.0 || ^2.0 || ^3.0",
         "sonata-project/block-bundle": "^4.21 || ^5.0",
         "sonata-project/form-extensions": "^1.4 || ^2.0",
-        "symfony/config": "^5.4 || ^6.2",
-        "symfony/dependency-injection": "^5.4 || ^6.2",
-        "symfony/expression-language": "^5.4 || ^6.2",
-        "symfony/form": "^5.4 || ^6.2",
-        "symfony/framework-bundle": "^5.4.19 || ^6.2.5",
-        "symfony/http-foundation": "^5.4 || ^6.2",
-        "symfony/http-kernel": "^5.4 || ^6.2",
-        "symfony/options-resolver": "^5.4 || ^6.2",
-        "symfony/twig-bridge": "^5.4 || ^6.2",
+        "symfony/config": "^6.4 || ^7.0",
+        "symfony/dependency-injection": "^6.4 || ^7.0",
+        "symfony/expression-language": "^6.4 || ^7.0",
+        "symfony/form": "^6.4 || ^7.0",
+        "symfony/framework-bundle": "^6.4 || ^7.0",
+        "symfony/http-foundation": "^6.4 || ^7.0",
+        "symfony/http-kernel": "^6.4 || ^7.0",
+        "symfony/options-resolver": "^6.4 || ^7.0",
+        "symfony/twig-bridge": "^6.4 || ^7.0",
         "twig/twig": "^2.4 || ^3.0",
         "willdurand/geocoder": "^4.2",
         "willdurand/geocoder-bundle": "^5.11"
@@ -67,10 +67,10 @@
         "nyholm/psr7": "^1.0",
         "php-http/mock-client": "^1.3",
         "psr/simple-cache": "^2.0 || ^3.0",
-        "symfony/browser-kit": "^5.4 || ^6.2",
+        "symfony/browser-kit": "^6.4 || ^7.0",
         "symfony/cache": "^6.2",
-        "symfony/console": "^5.4 || ^6.2",
-        "symfony/yaml": "^5.4 || ^6.2"
+        "symfony/console": "^6.4 || ^7.0",
+        "symfony/yaml": "^6.4 || ^7.0"
     },
     "suggest": {
         "geocoder-php/bing-maps-provider": "For bing geocoder",

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -7,9 +7,6 @@
     </MixedAssignment>
   </file>
   <file src="src/DependencyInjection/Configuration.php">
-    <PossiblyNullReference>
-      <code>end</code>
-    </PossiblyNullReference>
     <UndefinedInterfaceMethod>
       <code>end</code>
     </UndefinedInterfaceMethod>
@@ -42,6 +39,7 @@
     </MixedMethodCall>
     <PropertyNotSetInConstructor>
       <code>AppKernel</code>
+      <code>AppKernel</code>
     </PropertyNotSetInConstructor>
   </file>
   <file src="tests/Block/BundleIntegrationTest.php">

diff --git a/tests/App/AppKernel.php b/tests/App/AppKernel.php
@@ -26,12 +26,8 @@ final class AppKernel extends Kernel
 {
     use MicroKernelTrait;
 
-    private string $baseDir;
-
     public function __construct()
     {
-        $this->baseDir = sprintf('%s/%s/app-bundle/var/', sys_get_temp_dir(), uniqid('', true));
-
         parent::__construct('test', false);
     }
 
@@ -50,12 +46,12 @@ public function registerBundles(): iterable
 
     public function getCacheDir(): string
     {
-        return $this->baseDir.'cache';
+        return $this->getBaseDir().'cache';
     }
 
     public function getLogDir(): string
     {
-        return $this->baseDir.'log';
+        return $this->getBaseDir().'log';
     }
 
     public function getProjectDir(): string
@@ -87,4 +83,9 @@ protected function configureContainer($container, $loader): void
 
         $loader->load(__DIR__.'/config/config.yaml');
     }
+
+    private function getBaseDir(): string
+    {
+        return sys_get_temp_dir().'/app-bundle/var/';
+    }
 }