Merge pull request #497 from stof/clean_dead_code

Remove dead code for the registration of menu builders

Author: stof

src/DependencyInjection/Compiler/MenuBuilderPass.php

@@ -22,9 +22,6 @@ public function process(ContainerBuilder $container): void
             return;
         }
 
-        // Remove the old way of handling this feature.
-        $container->removeDefinition('knp_menu.menu_provider.builder_service');
-
         $menuBuilders = [];
         foreach ($container->findTaggedServiceIds('knp_menu.menu_builder', true) as $id => $tags) {
             foreach ($tags as $attributes) {

src/DependencyInjection/Compiler/RegisterMenusPass.php

@@ -6,7 +6,6 @@
 use Knp\Bundle\MenuBundle\DependencyInjection\Compiler\AddProvidersPass;
 use Knp\Bundle\MenuBundle\DependencyInjection\Compiler\AddRenderersPass;
 use Knp\Bundle\MenuBundle\DependencyInjection\Compiler\AddVotersPass;
-use Knp\Bundle\MenuBundle\DependencyInjection\Compiler\MenuBuilderPass;
 use Knp\Bundle\MenuBundle\DependencyInjection\Compiler\RegisterMenusPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
@@ -18,7 +17,6 @@ public function build(ContainerBuilder $container): void
         parent::build($container);
 
         $container->addCompilerPass(new RegisterMenusPass());
-        $container->addCompilerPass(new MenuBuilderPass());
         $container->addCompilerPass(new AddExtensionsPass());
         $container->addCompilerPass(new AddProvidersPass());
         $container->addCompilerPass(new AddRenderersPass());

src/KnpMenuBundle.php

@@ -22,7 +22,6 @@ protected function setUp(): void
 
         $this->containerBuilder->register('knp_menu.menu_provider.lazy', LazyProvider::class)
             ->setArgument(0, null);
-        $this->containerBuilder->register('knp_menu.menu_provider.builder_service', \stdClass::class);
         $this->containerBuilder->register('id', \stdClass::class)
             ->addTag('knp_menu.menu_builder', ['alias' => 'foo', 'method' => 'fooMenu'])
             ->addTag('knp_menu.menu_builder', ['alias' => 'bar', 'method' => 'bar'])
@@ -40,7 +39,7 @@ public function testNoopWithoutProvider(): void
 
         $this->pass->process($this->containerBuilder);
 
-        $this->assertTrue($this->containerBuilder->hasDefinition('knp_menu.menu_provider.builder_service'));
+        $this->expectNotToPerformAssertions(); // We just want to test that it does not break in such case.
     }
 
     public function testFailsWhenBuilderAliasIsMissing(): void
@@ -89,7 +88,6 @@ public function testRegisterMenuBuilderAndMenu(): void
         $menuBuilders = $this->containerBuilder->getDefinition('knp_menu.menu_provider.lazy')->getArgument(0);
 
         $this->assertEquals($expectedMenuBuilders, $menuBuilders);
-        $this->assertFalse($this->containerBuilder->hasDefinition('knp_menu.menu_provider.builder_service'));
     }
 
     public function testMenuWinsOverBuilder(): void