SUPPORT-86537 - added support of symfony 6 (#6)

* SUPPORT-86537 - added support of symfony 6 * SUPPORT-86537 - fixed PR comments * SUPPORT-86537 - fixed PR comments --------- Co-authored-by: Yuri Gaidoba <[email protected]>
paysera · Nov 24, 2023 · fe2d593 · fe2d593
1 parent 87fc1be
commit fe2d593
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,5 @@ vendor/
 composer.lock
 bin/
 phpunit.xml
+
+.phpunit.result.cache
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).
 
+## 1.3.0
+### Added
+- Support for Symfony 6
+
 ## 1.2.0
 ### Added
 - Support for Symfony 5.4

diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
     "require": {
         "php": "^7.0 || ^8.0",
         "paysera/lib-normalization": "^1.2",
-        "symfony/framework-bundle": "^3.4.26|^4.2.7|^5.4",
+        "symfony/framework-bundle": "^3.4.26|^4.2.7|^5.4|^6.0",
         "paysera/lib-dependency-injection": "^1.3.0"
     },
     "require-dev": {

diff --git a/tests/Functional/Fixtures/TestKernel.php b/tests/Functional/Fixtures/TestKernel.php
@@ -20,7 +20,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
@@ -6,6 +6,7 @@
 use Paysera\Bundle\NormalizationBundle\Tests\Functional\Fixtures\TestKernel;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\ResettableContainerInterface;
+use Symfony\Contracts\Service\ResetInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Yoast\PHPUnitPolyfills\TestCases\TestCase;
 
@@ -28,11 +29,11 @@ protected function tear_down()
     {
         $container = $this->kernel->getContainer();
         $this->kernel->shutdown();
-        if ($container instanceof ResettableContainerInterface) {
+        if ($container instanceof ResettableContainerInterface || $container instanceof ResetInterface) {
             $container->reset();
         }
 
         $filesystem = new Filesystem();
-        $filesystem->remove($this->kernel->getRootDir() . '/cache');
+        $filesystem->remove($this->kernel->getCacheDir());
     }
 }