Rewrite test config structure & adapt for symfony 5.4 & 6.0 (#291)

* Rewrite test config structure & adapt for symfony 5.4 & 6.0 * Run coverage with newest PHP & Symfony * Run github actions with newest PHP & Symfony
prestaconcept · Dec 15, 2021 · d8e9d6c · d8e9d6c
1 parent 505d5a7
commit d8e9d6c
Show file tree

Hide file tree

Showing 35 changed files with 252 additions and 163 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -16,12 +16,16 @@ jobs:
         include:
           - php-version: 7.1
             symfony-version: 4.4.*
-          - php-version: 8.0
+          - php-version: 8.1
             symfony-version: 4.4.*
           - php-version: 7.2
-            symfony-version: 5.3.*
+            symfony-version: 5.4.*
+          - php-version: 8.1
+            symfony-version: 5.4.*
           - php-version: 8.0
-            symfony-version: 5.3.*
+            symfony-version: 6.0.*
+          - php-version: 8.1
+            symfony-version: 6.0.*
 
     steps:
       - name: "Checkout"
@@ -53,8 +57,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - php-version: 8.0
-            symfony-version: 5.3.*
+          - php-version: 8.1
+            symfony-version: 6.0.*
 
     steps:
       - name: "Checkout"
@@ -92,8 +96,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - php-version: 8.0
-            symfony-version: 5.3.*
+          - php-version: 8.1
+            symfony-version: 6.0.*
 
     steps:
       - name: "Checkout"
@@ -125,8 +129,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - php-version: 8.0
-            symfony-version: 5.3.*
+          - php-version: 8.1
+            symfony-version: 6.0.*
 
     steps:
       - name: "Checkout"

diff --git a/...ntegration/config/packages/framework.yaml → tests/Integration/config/4.4/framework.yaml b/...ntegration/config/packages/framework.yaml → tests/Integration/config/4.4/framework.yaml
@@ -6,3 +6,6 @@ framework:
         storage_id: session.storage.mock_file
     php_errors:
         log: true
+    router:
+        utf8: true
+    cache: null
diff --git a/tests/Integration/config/messenger.yaml → tests/Integration/config/4.4/messenger.yaml b/tests/Integration/config/messenger.yaml → tests/Integration/config/4.4/messenger.yaml
@@ -4,7 +4,3 @@ framework:
             async: 'in-memory://'
         routing:
             'Presta\SitemapBundle\Messenger\DumpSitemapMessage': async
-
-services:
-    Presta\SitemapBundle\Tests\Integration\Controller\MessengerController:
-        tags: ['controller.service_arguments']
diff --git a/...ation/config/packages/presta_sitemap.yaml → ...ntegration/config/4.4/presta_sitemap.yaml b/...ation/config/packages/presta_sitemap.yaml → ...ntegration/config/4.4/presta_sitemap.yaml
diff --git a/tests/Integration/config/4.4/routes/annotations.yaml b/tests/Integration/config/4.4/routes/annotations.yaml
@@ -0,0 +1,3 @@
+controllers:
+    resource: ../../../src/Controller/
+    type: annotation
diff --git a/...gration/config/routes/presta_sitemap.yaml → ...ion/config/4.4/routes/presta_sitemap.yaml b/...gration/config/routes/presta_sitemap.yaml → ...ion/config/4.4/routes/presta_sitemap.yaml
diff --git a/tests/Integration/config/routes/xml.xml → tests/Integration/config/4.4/routes/xml.xml b/tests/Integration/config/routes/xml.xml → tests/Integration/config/4.4/routes/xml.xml
diff --git a/tests/Integration/config/routes/yaml.yaml → ...s/Integration/config/4.4/routes/yaml.yaml b/tests/Integration/config/routes/yaml.yaml → ...s/Integration/config/4.4/routes/yaml.yaml
diff --git a/...ration/config/packages/5.3/framework.yaml → tests/Integration/config/5.4/framework.yaml b/...ration/config/packages/5.3/framework.yaml → tests/Integration/config/5.4/framework.yaml
@@ -1,4 +1,5 @@
 framework:
+    test: true
     secret: '%env(APP_SECRET)%'
     http_method_override: false
     session:
@@ -8,3 +9,6 @@ framework:
         storage_factory_id: session.storage.factory.mock_file
     php_errors:
         log: true
+    router:
+        utf8: true
+    cache: null
diff --git a/tests/Integration/config/5.4/messenger.yaml b/tests/Integration/config/5.4/messenger.yaml
@@ -0,0 +1,6 @@
+framework:
+    messenger:
+        transports:
+            async: 'in-memory://'
+        routing:
+            'Presta\SitemapBundle\Messenger\DumpSitemapMessage': async
diff --git a/...n/config/packages/5.x/presta_sitemap.yaml → ...ntegration/config/5.4/presta_sitemap.yaml b/...n/config/packages/5.x/presta_sitemap.yaml → ...ntegration/config/5.4/presta_sitemap.yaml
@@ -1,4 +1,7 @@
 presta_sitemap:
+    default_section: static
+    dump_directory: "%kernel.project_dir%/public"
+    items_by_set: 10
     alternate:
         enabled: true
         default_locale: en

diff --git a/tests/Integration/config/5.4/routes/annotations.yaml b/tests/Integration/config/5.4/routes/annotations.yaml
@@ -0,0 +1,3 @@
+controllers:
+    resource: ../../../src/Controller/
+    type: annotation
diff --git a/tests/Integration/config/5.4/routes/presta_sitemap.yaml b/tests/Integration/config/5.4/routes/presta_sitemap.yaml
@@ -0,0 +1,2 @@
+presta_sitemap:
+    resource: "@PrestaSitemapBundle/config/routing.yml"
diff --git a/...gration/config/routes/5.x/translated.yaml → ...gration/config/5.4/routes/translated.yaml b/...gration/config/routes/5.x/translated.yaml → ...gration/config/5.4/routes/translated.yaml
diff --git a/tests/Integration/config/5.4/routes/xml.xml b/tests/Integration/config/5.4/routes/xml.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="xml" path="/company">
+        <default key="_controller">Presta\SitemapBundle\Tests\Integration\Controller\StaticController::company</default>
+        <option key="sitemap">
+            {"priority":"0.7", "changefreq":"weekly", "section":"static"}
+        </option>
+    </route>
+
+</routes>
diff --git a/tests/Integration/config/5.4/routes/yaml.yaml b/tests/Integration/config/5.4/routes/yaml.yaml
@@ -0,0 +1,6 @@
+yaml:
+  path: /contact
+  defaults: { _controller: \Presta\SitemapBundle\Tests\Integration\Controller\StaticController::contact }
+  options:
+    sitemap:
+      section: static
diff --git a/...tion/config/packages/5.3/annotations.yaml → ...ation/config/5.4/special/annotations.yaml b/...tion/config/packages/5.3/annotations.yaml → ...ation/config/5.4/special/annotations.yaml
diff --git a/tests/Integration/config/6.0/framework.yaml b/tests/Integration/config/6.0/framework.yaml
@@ -0,0 +1,14 @@
+framework:
+    test: true
+    secret: '%env(APP_SECRET)%'
+    http_method_override: false
+    session:
+        handler_id: null
+        cookie_secure: auto
+        cookie_samesite: lax
+        storage_factory_id: session.storage.factory.mock_file
+    php_errors:
+        log: true
+    router:
+        utf8: true
+    cache: null
diff --git a/tests/Integration/config/6.0/messenger.yaml b/tests/Integration/config/6.0/messenger.yaml
@@ -0,0 +1,6 @@
+framework:
+    messenger:
+        transports:
+            async: 'in-memory://'
+        routing:
+            'Presta\SitemapBundle\Messenger\DumpSitemapMessage': async
diff --git a/tests/Integration/config/6.0/presta_sitemap.yaml b/tests/Integration/config/6.0/presta_sitemap.yaml
@@ -0,0 +1,9 @@
+presta_sitemap:
+    default_section: static
+    dump_directory: "%kernel.project_dir%/public"
+    items_by_set: 10
+    alternate:
+        enabled: true
+        default_locale: en
+        locales: [en, fr]
+        i18n: symfony
diff --git a/tests/Integration/config/6.0/routes/annotations.yaml b/tests/Integration/config/6.0/routes/annotations.yaml
@@ -0,0 +1,3 @@
+controllers:
+    resource: ../../../src/Controller/
+    type: annotation
diff --git a/tests/Integration/config/6.0/routes/presta_sitemap.yaml b/tests/Integration/config/6.0/routes/presta_sitemap.yaml
@@ -0,0 +1,2 @@
+presta_sitemap:
+    resource: "@PrestaSitemapBundle/config/routing.yml"
diff --git a/tests/Integration/config/6.0/routes/translated.yaml b/tests/Integration/config/6.0/routes/translated.yaml
@@ -0,0 +1,7 @@
+about:
+  path:
+    en: /about
+    fr: /a-propos
+  defaults: { _controller: \Presta\SitemapBundle\Tests\Integration\Controller\StaticController::about }
+  options:
+    sitemap: true
diff --git a/tests/Integration/config/6.0/routes/xml.xml b/tests/Integration/config/6.0/routes/xml.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<routes xmlns="http://symfony.com/schema/routing"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
+
+    <route id="xml" path="/company">
+        <default key="_controller">Presta\SitemapBundle\Tests\Integration\Controller\StaticController::company</default>
+        <option key="sitemap">
+            {"priority":"0.7", "changefreq":"weekly", "section":"static"}
+        </option>
+    </route>
+
+</routes>
diff --git a/tests/Integration/config/6.0/routes/yaml.yaml b/tests/Integration/config/6.0/routes/yaml.yaml
@@ -0,0 +1,6 @@
+yaml:
+  path: /contact
+  defaults: { _controller: \Presta\SitemapBundle\Tests\Integration\Controller\StaticController::contact }
+  options:
+    sitemap:
+      section: static
diff --git a/tests/Integration/config/packages/cache.yaml b/tests/Integration/config/packages/cache.yaml
diff --git a/tests/Integration/config/packages/routing.yaml b/tests/Integration/config/packages/routing.yaml
diff --git a/tests/Integration/config/routes/annotations.yaml b/tests/Integration/config/routes/annotations.yaml
diff --git a/tests/Integration/config/services.yaml b/tests/Integration/config/services.yaml
@@ -10,5 +10,4 @@ services:
 
   Presta\SitemapBundle\Tests\Integration\Controller\:
     resource: '../src/Controller/*'
-    exclude: '../src/Controller/MessengerController.php'
     tags: ['controller.service_arguments']
diff --git a/tests/Integration/src/ContainerConfiguratorTrait.php b/tests/Integration/src/ContainerConfiguratorTrait.php