SUPPORT-86543 - add symfony 6 support (#11)

* SUPPORT-86543 - add symfony 6 support * SUPPORT-86543 - fixed PR comments * SUPPORT-86543 - fixed PR comments --------- Co-authored-by: Yuri Gaidoba <[email protected]>
paysera · Nov 24, 2023 · 7a27e88 · 7a27e88
1 parent 56ded27
commit 7a27e88
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 2.2.0
+### Added
+- Added Symfony ^6 support.
+
 ## 2.1.1 - 2023-04-13
 ### Fixed
 - Fix support for Symfony 5.x

diff --git a/composer.json b/composer.json
@@ -22,19 +22,19 @@
         "sentry/sdk": "^3.1",
         "sentry/sentry": "^3.1",
         "sentry/sentry-symfony": "^4.0",
-        "symfony/config": "^3.4|^4.0|^5.0",
-        "symfony/dependency-injection": "^3.4|^4.0|^5.0",
-        "symfony/expression-language": "^3.0 || ^4.0 || ^5.0",
-        "symfony/framework-bundle": "^3.4.26|^4.2.7|^5.0",
-        "symfony/http-kernel": "^3.4|^4.0|^5.0",
+        "symfony/config": "^3.4|^4.0|^5.0|^6.0",
+        "symfony/dependency-injection": "^3.4|^4.0|^5.0|^6.0",
+        "symfony/expression-language": "^3.0 || ^4.0 || ^5.0 || ^6.0",
+        "symfony/framework-bundle": "^3.4.26|^4.2.7|^5.0|^6.0",
+        "symfony/http-kernel": "^3.4|^4.0|^5.0|^6.0",
         "symfony/monolog-bundle": "^3.4|^5.0"
     },
     "require-dev": {
         "doctrine/annotations": "^1.14",
         "doctrine/doctrine-bundle": "~2.6.0",
         "doctrine/orm": "^2.10",
         "phpunit/phpunit": "^8.5",
-        "symfony/yaml": "^4.3"
+        "symfony/yaml": "^4.3|^5.0|^6.0"
     },
     "config": {
         "bin-dir": "bin",

diff --git a/example/TestKernel.php b/example/TestKernel.php
@@ -16,7 +16,7 @@ public function __construct()
         parent::__construct('dev', true);
     }
 
-    public function registerBundles()
+    public function registerBundles(): array
     {
         return [
             new FrameworkBundle(),

diff --git a/tests/Functional/Fixtures/Logger/TestDbalLogger.php b/tests/Functional/Fixtures/Logger/TestDbalLogger.php
@@ -13,7 +13,7 @@ class TestDbalLogger extends DbalLogger
 {
     private $queryCount = 0;
 
-    public function startQuery($sql, array $params = null, array $types = null)
+    public function startQuery($sql, array $params = null, array $types = null): void
     {
         parent::startQuery($sql, $params, $types);
         $this->queryCount++;

diff --git a/tests/Functional/Fixtures/TestKernel.php b/tests/Functional/Fixtures/TestKernel.php
@@ -24,7 +24,7 @@ public function __construct(string $testCaseFile, string $commonFile = 'common.y
         $this->commonFile = $commonFile;
     }
 
-    public function registerBundles()
+    public function registerBundles(): array
     {
         return [
             new FrameworkBundle(),

diff --git a/tests/Functional/FunctionalTestCase.php b/tests/Functional/FunctionalTestCase.php
@@ -10,6 +10,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\ResettableContainerInterface;
+use Symfony\Contracts\Service\ResetInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -38,7 +39,7 @@ protected function tearDown(): void
     {
         $container = $this->kernel->getContainer();
         $this->kernel->shutdown();
-        if ($container instanceof ResettableContainerInterface) {
+        if ($container instanceof ResettableContainerInterface || $container instanceof ResetInterface) {
             $container->reset();
         }
         $filesystem = new Filesystem();