Merge pull request #13 from janlam7/sf6

Add symfony 6 support
hostnet · Jun 6, 2024 · db22b98 · db22b98
2 parents 2b546ca + 1fe091d
commit db22b98
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -8,7 +8,7 @@ jobs:
 
         strategy:
             matrix:
-                php-versions: ['7.3', '7.4', '8.0']
+                php-versions: ['8.1', '8.2', '8.3']
         name: PHP ${{ matrix.php-versions }}
         steps:
             -   uses: actions/checkout@v2

diff --git a/composer.json b/composer.json
@@ -4,17 +4,17 @@
     "description": "A simple Symfony Bundle that contains twig extensions for displaying financial information.",
     "license":     "MIT",
     "require": {
-        "php":                    "^7.3||^8.0",
+        "php":                    "^8.1",
         "ronanguilloux/isocodes": "^2.1",
-        "symfony/http-kernel":    "^4.4||^5.0"
+        "symfony/http-kernel":    "^5.4||^6.0"
     },
     "require-dev": {
         "hostnet/phpcs-tool":       "^9.1.0",
         "phpunit/phpunit":          "^9.5.6",
-        "symfony/framework-bundle": "^4.4||^5.0",
-        "symfony/twig-bundle":      "^4.4||^5.0",
-        "symfony/yaml":             "^4.4||^5.0",
-        "twig/twig":                "^2.7.2||^3.0"
+        "symfony/framework-bundle": "^5.4||^6.0",
+        "symfony/twig-bundle":      "^5.4||^6.0",
+        "symfony/yaml":             "^5.4||^6.0",
+        "twig/twig":                "^3.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/test/Functional/ConfigurationTest.php b/test/Functional/ConfigurationTest.php
@@ -7,6 +7,7 @@
 namespace Hostnet\Bundle\FinancialTwigExtensionBundle\Functional;
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Twig\Environment;
 
 /**
  * @coversNothing
@@ -23,8 +24,9 @@ protected function setUp(): void
      */
     public function testFormatIban(string $unformatted_iban, string $expected): void
     {
-        $container = static::$kernel->getContainer();
-        $twig      = $container->get('twig');
+        static::bootKernel();
+        $container = self::getContainer();
+        $twig      = $container->get(Environment::class);
 
         self::assertSame(
             $expected,

diff --git a/test/Functional/Fixtures/TestKernel.php b/test/Functional/Fixtures/TestKernel.php
@@ -14,7 +14,7 @@ class TestKernel extends Kernel
     /**
      * {@inheritdoc}
      */
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         return [
             new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),

diff --git a/test/Functional/Fixtures/config/config.yml b/test/Functional/Fixtures/config/config.yml
@@ -1,5 +1,6 @@
 framework:
     secret: test
+    test: true
 
 twig:
     paths: