Update CI versions (#339)

willdurand · Sep 11, 2022 · ffb1acb · ffb1acb
1 parent 44877e6
commit ffb1acb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 37 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -20,37 +20,27 @@ jobs:
 
         strategy:
             matrix:
-                php-version: ['7.2.5', '7.3', '7.4', '8.0']
+                php-version: ['7.2.5', '7.4', '8.0', '8.1']
                 variant: [normal]
                 dependencies: [highest]
                 allowed-to-fail: [true]
                 symfony-version: [latest]
                 include:
-                  - php-version: 7.2.5
+                  - php-version: '7.4'
                     dependencies: highest
                     variant: normal
                     allowed-to-fail: false
                     symfony-version: latest
                   - php-version: '8.0'
                     dependencies: highest
                     variant: normal
-                    allowed-to-fail: true
-                    symfony-version: latest
-                  - php-version: '7.4'
-                    dependencies: highest
-                    variant: 'symfony/symfony:"4.4.*"'
                     allowed-to-fail: false
-                    symfony-version: 4.4
-                  - php-version: '7.4'
-                    dependencies: highest
-                    variant: 'symfony/symfony:"5.1"'
-                    allowed-to-fail: false
-                    symfony-version: 5.1
-                  - php-version: '8.0'
+                    symfony-version: latest
+                  - php-version: '8.1'
                     dependencies: highest
-                    variant: 'symfony/symfony:"6.0.*"'
+                    variant: normal
                     allowed-to-fail: false
-                    symfony-version: 6.0
+                    symfony-version: latest
         steps:
             - name: "Checkout code"
               uses: actions/[email protected]

diff --git a/Tests/Fixtures/app/AppKernel.php b/Tests/Fixtures/app/AppKernel.php
@@ -67,17 +67,9 @@ public function getLogDir(): string
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
         $loader->load(__DIR__.'/config/'.$this->environment.'.yml');
+        $loader->load(__DIR__.'/config/base_config.yml');
+        $loader->load(__DIR__.'/config/disable_annotations.yml');
 
-        if (self::VERSION_ID >= 40400) {
-            $loader->load(__DIR__.'/config/base_config_44.yml');
-        } else {
-            $loader->load(__DIR__.'/config/base_config.yml');
-        }
-
-        if (self::VERSION_ID > 30200) {
-            $loader->load(__DIR__.'/config/disable_annotations.yml');
-        }
-
         if (self::VERSION_ID < 40200 && file_exists(__DIR__.'/Resources/translations') === false) {
             self::recurseCopy(__DIR__.'/../translations', __DIR__.'/Resources/translations');
         }

diff --git a/Tests/Fixtures/app/config/base_config.yml b/Tests/Fixtures/app/config/base_config.yml
@@ -1,9 +1,10 @@
 framework:
     secret:        test
-    router:        { resource: "%kernel.project_dir%/app/config/routing.yml" }
+    router:        { resource: "%kernel.project_dir%/app/config/routing.yml", utf8: true }
     test:          ~
     translator:    { enabled: true }
     validation:    { enabled: false }
+    http_method_override: false
 
 # Twig Configuration
 twig:

diff --git a/Tests/Fixtures/app/config/base_config_44.yml b/Tests/Fixtures/app/config/base_config_44.yml