allow Symfony 8, drop Symfony 5

.github/workflows/build.yaml

@@ -41,9 +41,9 @@ jobs:
                     - description: 'Lowest deps'
                       php: '8.1'
                       composer_option: '--prefer-lowest'
-                    - description: 'Symfony 5.4'
+                    - description: 'Symfony 6.4'
                       php: '8.1'
-                      symfony: 5.4.*
+                      symfony: 6.4.*
                     - description: 'Symfony 7'
                       php: '8.2'
                       symfony: ^7.2

.php-cs-fixer.php

@@ -15,7 +15,7 @@
         '@PHPUnit75Migration:risky' => true,
         'ordered_imports' => true,
         'declare_strict_types' => false,
-        'native_function_invocation' => ['include' => ['@all']],
+        'native_function_invocation' => ['include' => ['@internal']],
     ])
     ->setFinder($finder)
 ;

composer.json

@@ -21,16 +21,16 @@
     "require": {
         "php": "^8.1",
         "knplabs/knp-menu": "^3.8",
-        "symfony/config": "^5.4 | ^6.0 | ^7.0",
-        "symfony/dependency-injection": "^5.4 | ^6.0 | ^7.0",
+        "symfony/config": "^6.4 | ^7.0 | ^8.0",
+        "symfony/dependency-injection": "^6.4 | ^7.0 | ^8.0",
         "symfony/deprecation-contracts": "^2.5 | ^3.3",
-        "symfony/http-kernel": "^5.4 | ^6.0 | ^7.0"
+        "symfony/http-kernel": "^6.4 | ^7.0 | ^8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^10.5 | ^11.5 | ^12.1",
-        "symfony/expression-language": "^5.4 | ^6.0 | ^7.0",
-        "symfony/phpunit-bridge": "^6.0 | ^7.0",
-        "symfony/templating": "^5.4 | ^6.0 | ^7.0"
+        "phpunit/phpunit": "^10.5 | ^11.5 | ^12.4",
+        "symfony/expression-language": "^6.4 | ^7.0 | ^8.0",
+        "symfony/phpunit-bridge": "^7.0 | ^8.0",
+        "symfony/templating": "^6.4 | ^7.0 | ^8.0"
     },
     "autoload": {
         "psr-4": { "Knp\\Bundle\\MenuBundle\\": "src" }

config/menu.php

@@ -0,0 +1,113 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Knp\Bundle\MenuBundle\Provider\BuilderAliasProvider;
+use Knp\Menu\FactoryInterface;
+use Knp\Menu\Integration\Symfony\RoutingExtension;
+use Knp\Menu\Matcher\Matcher;
+use Knp\Menu\Matcher\MatcherInterface;
+use Knp\Menu\Matcher\Voter\CallbackVoter;
+use Knp\Menu\Matcher\Voter\RouteVoter;
+use Knp\Menu\MenuFactory;
+use Knp\Menu\Provider\ChainProvider;
+use Knp\Menu\Provider\LazyProvider;
+use Knp\Menu\Provider\MenuProviderInterface;
+use Knp\Menu\Renderer\ListRenderer;
+use Knp\Menu\Renderer\PsrProvider;
+use Knp\Menu\Twig\Helper;
+use Knp\Menu\Util\MenuManipulator;
+use Symfony\Component\DependencyInjection\Argument\ServiceLocatorArgument;
+use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
+
+return static function (ContainerConfigurator $configurator): void {
+    $configurator->parameters()->set('knp_menu.renderer.list.options', []);
+
+    $services = $configurator->services();
+
+    $services
+        ->set('knp_menu.factory', MenuFactory::class)
+        ->public()
+    ;
+
+    $services
+        ->set('knp_menu.factory_extension.routing', RoutingExtension::class)
+        ->arg(0, service('router'))
+        ->tag('knp_menu.factory_extension')
+    ;
+
+    $services
+        ->set('knp_menu.helper', Helper::class)
+        ->args([
+            service('knp_menu.renderer_provider'),
+            service('knp_menu.menu_provider'),
+            service('knp_menu.manipulator'),
+            service('knp_menu.matcher'),
+        ])
+    ;
+
+    $services
+        ->set('knp_menu.matcher', Matcher::class)
+        ->public()
+        ->arg(0, new TaggedIteratorArgument('knp_menu.voter'))
+        ->tag('kernel.reset', ['method' => 'clear'])
+    ;
+
+    $services
+        ->alias(MenuProviderInterface::class, 'knp_menu.menu_provider')
+    ;
+
+    $services
+        ->set('knp_menu.menu_provider.chain', ChainProvider::class)
+        ->arg(0, new TaggedIteratorArgument('knp_menu.provider'))
+    ;
+
+    $services
+        ->set('knp_menu.menu_provider.lazy', LazyProvider::class)
+        ->arg(0, [])
+        ->tag('knp_menu.provider')
+    ;
+
+    $services
+        ->set('knp_menu.menu_provider.builder_alias', BuilderAliasProvider::class)
+        ->args([
+            service('kernel'),
+            service('service_container'),
+            service('knp_menu.factory'),
+        ])
+    ;
+
+    $services
+        ->set('knp_menu.renderer_provider', PsrProvider::class)
+        ->args([
+            new ServiceLocatorArgument(new TaggedIteratorArgument('knp_menu.renderer', 'alias')),
+            '%knp_menu.default_renderer%',
+        ]);
+
+    $services
+        ->set('knp_menu.renderer.list', ListRenderer::class)
+        ->tag('knp_menu.renderer', ['alias' => 'list'])
+        ->args([
+            service('knp_menu.matcher'),
+            '%knp_menu.renderer.list.options%',
+            '%kernel.charset%',
+        ]);
+
+    $services
+        ->set('knp_menu.voter.callback', CallbackVoter::class)
+        ->tag('knp_menu.voter');
+
+    $services
+        ->set('knp_menu.voter.router', RouteVoter::class)
+        ->arg(0, service('request_stack'))
+        ->tag('knp_menu.voter');
+
+    $services
+        ->set('knp_menu.manipulator', MenuManipulator::class)
+    ;
+
+    // Autowiring aliases
+    $services->alias(FactoryInterface::class, 'knp_menu.factory');
+    $services->alias(MatcherInterface::class, 'knp_menu.matcher');
+    $services->alias(MenuManipulator::class, 'knp_menu.manipulator');
+};

config/templating.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Knp\Bundle\MenuBundle\Templating\Helper\MenuHelper;
+
+return static function (ContainerConfigurator $configurator): void {
+    $configurator->parameters()->set('knp_menu.templating.helper.class', MenuHelper::class);
+
+    $configurator
+        ->services()
+        ->set('knp_menu.templating.helper', '%knp_menu.templating.helper.class%')
+        ->tag('templating.helper', ['alias' => 'knp_menu'])
+        ->args([
+            service('knp_menu.helper'),
+            service('knp_menu.matcher'),
+            service('knp_menu.manipulator'),
+        ])
+    ;
+};

config/twig.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Knp\Menu\Renderer\TwigRenderer;
+use Knp\Menu\Twig\MenuExtension;
+use Knp\Menu\Twig\MenuRuntimeExtension;
+
+return static function (ContainerConfigurator $configurator): void {
+    $configurator->parameters()->set('knp_menu.renderer.twig.options', []);
+
+    $services = $configurator->services();
+
+    $services
+        ->set('knp_menu.twig.extension', MenuExtension::class)
+        ->tag('twig.extension')
+    ;
+
+    $services
+        ->set('knp_menu.twig.runtime', MenuRuntimeExtension::class)
+        ->tag('twig.runtime')
+        ->args([
+            service('knp_menu.helper'),
+            service('knp_menu.matcher'),
+            service('knp_menu.manipulator'),
+        ])
+    ;
+
+    $services
+        ->set('knp_menu.renderer.twig', TwigRenderer::class)
+        ->tag('knp_menu.renderer', ['alias' => 'twig'])
+        ->args([
+            service('twig'),
+            '%knp_menu.renderer.twig.template%',
+            service('knp_menu.matcher'),
+            '%knp_menu.renderer.twig.options%',
+        ])
+    ;
+};

src/DependencyInjection/KnpMenuExtension.php

@@ -11,14 +11,14 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 
 class KnpMenuExtension extends Extension implements PrependExtensionInterface
 {
     public function load(array $configs, ContainerBuilder $container): void
     {
-        $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../../config'));
-        $loader->load('menu.xml');
+        $loader = new PhpFileLoader($container, new FileLocator(__DIR__.'/../../config'));
+        $loader->load('menu.php');
 
         $configuration = new Configuration();
         $config = $this->processConfiguration($configuration, $configs);
@@ -30,12 +30,12 @@ public function load(array $configs, ContainerBuilder $container): void
         }
 
         if (isset($config['twig'])) {
-            $loader->load('twig.xml');
+            $loader->load('twig.php');
             $container->setParameter('knp_menu.renderer.twig.template', $config['twig']['template']);
         }
         if ($config['templating']) {
-            \trigger_deprecation('knplabs/knp-menu-bundle', '3.3', 'Using the templating component is deprecated since version 3.3, this option will be removed in version 4.');
-            $loader->load('templating.xml');
+            trigger_deprecation('knplabs/knp-menu-bundle', '3.3', 'Using the templating component is deprecated since version 3.3, this option will be removed in version 4.');
+            $loader->load('templating.php');
         }
 
         $container->setParameter('knp_menu.default_renderer', $config['default_renderer']);