Allow Symfony 7, dropped support for 4.4 and bumped minimal version t…

…o 5.4 (#324)

* Allow Symfony 7, dropped Symfony 4.4 and bumped to Syfmony 5.4

* Fix testsuite

* CI update for Symfony 7

* Dropped symfony/framework-extra-bundle usage

* Fix PHPUnit tests

* Reverted completely switching from annotation routes

.github/workflows/tests.yml

@@ -18,16 +18,14 @@ jobs:
     strategy:
       matrix:
         include:
-          - php-version: 7.1
-            symfony-version: 4.4.*
-          - php-version: 8.1
-            symfony-version: 4.4.*
           - php-version: 7.2
             symfony-version: 5.4.*
           - php-version: 8.1
             symfony-version: 5.4.*
           - php-version: 8.1
             symfony-version: 6.3.*
+          - php-version: 8.2
+            symfony-version: 7.0.*
 
     steps:
       - name: "Checkout"

composer.json

@@ -14,21 +14,20 @@
         "issues": "https://github.com/prestaconcept/PrestaSitemapBundle/issues"
     },
     "require": {
-        "php": ">=7.1.3",
+        "php": ">=7.2.5|>=8.0.2",
         "ext-simplexml": "*",
-        "symfony/console": "^4.4|^5.0|^6.0",
-        "symfony/framework-bundle": "^4.4|^5.0|^6.0"
+        "symfony/console": "^5.4|^6.0|^7.0",
+        "symfony/framework-bundle": "^5.4|^6.0|^7.0"
     },
     "require-dev": {
         "doctrine/annotations": "^1.0",
         "phpstan/phpstan": "^1.4",
         "phpunit/phpunit": "^7.5|^8.0",
-        "sensio/framework-extra-bundle": "^5.5|^6.1",
         "squizlabs/php_codesniffer": "^3.5",
-        "symfony/messenger": "^4.4|^5.0|^6.0",
-        "symfony/browser-kit": "^4.4|^5.0|^6.0",
-        "symfony/phpunit-bridge": "^4.4|^5.0|^6.0",
-        "symfony/yaml": "^4.4|^5.0|^6.0"
+        "symfony/messenger": "^5.4|^6.0|^7.0",
+        "symfony/browser-kit": "^5.4|^6.0|^7.0",
+        "symfony/phpunit-bridge": "^5.4|^6.0|^7.0",
+        "symfony/yaml": "^5.4|^6.0|^7.0"
     },
     "autoload": {
         "psr-4": {

src/Messenger/DumpSitemapMessageHandler.php

@@ -13,11 +13,13 @@
 
 use Presta\SitemapBundle\Service\DumperInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 use Symfony\Component\Routing\RouterInterface;
 
 /**
  * Message handler to handle DumpSitemapMessage asynchronously or synchronously in background
  */
+#[AsMessageHandler]
 class DumpSitemapMessageHandler
 {
     /**

tests/Integration/config/5.4/special/annotations.yaml

@@ -1,6 +1,2 @@
 framework:
     annotations: true
-
-sensio_framework_extra:
-    router:
-        annotations: true

tests/Integration/config/6.4/framework.yaml

@@ -0,0 +1,15 @@
+framework:
+    test: true
+    secret: '%env(APP_SECRET)%'
+    http_method_override: false
+    handle_all_throwables: true
+    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

tests/Integration/config/4.4/presta_sitemap.yaml → tests/Integration/config/6.4/presta_sitemap.yaml

@@ -2,3 +2,8 @@ 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

tests/Integration/config/6.3/routes/annotations.yaml → tests/Integration/config/6.4/routes/controllers.yaml

@@ -1,3 +1,3 @@
 controllers:
     resource: ../../../src/Controller/
-    type: annotation
+    type: attribute

tests/Integration/config/6.4/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

tests/Integration/config/7.0/framework.yaml

@@ -0,0 +1,15 @@
+framework:
+    test: true
+    secret: '%env(APP_SECRET)%'
+    http_method_override: false
+    handle_all_throwables: true
+    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

tests/Integration/config/7.0/messenger.yaml

@@ -0,0 +1,6 @@
+framework:
+    messenger:
+        transports:
+            async: 'in-memory://'
+        routing:
+            'Presta\SitemapBundle\Messenger\DumpSitemapMessage': async

tests/Integration/config/7.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

tests/Integration/config/7.0/routes/controllers.yaml

@@ -0,0 +1,3 @@
+controllers:
+    resource: ../../../src/Controller/
+    type: attribute

tests/Integration/config/7.0/routes/presta_sitemap.yaml

@@ -0,0 +1,2 @@
+presta_sitemap:
+    resource: "@PrestaSitemapBundle/config/routing.yml"

tests/Integration/config/7.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

tests/Integration/config/7.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>

tests/Integration/config/7.0/routes/yaml.yaml

@@ -0,0 +1,6 @@
+yaml:
+  path: /contact
+  defaults: { _controller: \Presta\SitemapBundle\Tests\Integration\Controller\StaticController::contact }
+  options:
+    sitemap:
+      section: static

tests/Integration/src/Kernel.php

@@ -63,12 +63,9 @@ public function registerBundles(): iterable
         {
             yield new \Symfony\Bundle\FrameworkBundle\FrameworkBundle();
             yield new \Presta\SitemapBundle\PrestaSitemapBundle();
-            if (\PHP_VERSION_ID < 80000) {
-                yield new \Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle();
-            }
         }
 
-        public function boot()
+        public function boot(): void
         {
             /* force "var" dir to be removed the first time this kernel boot */
             static $cleanVarDirectory = true;
@@ -123,12 +120,9 @@ public function registerBundles(): iterable
         {
             yield new \Symfony\Bundle\FrameworkBundle\FrameworkBundle();
             yield new \Presta\SitemapBundle\PrestaSitemapBundle();
-            if (\PHP_VERSION_ID < 80000) {
-                yield new \Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle();
-            }
         }
 
-        public function boot()
+        public function boot(): void
         {
             /* force "var" dir to be removed the first time this kernel boot */
             static $cleanVarDirectory = true;