Don't use decorates to keep Sf 2.3 support

Author: wouterj

CmfMenuBundle.php

@@ -13,8 +13,7 @@
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-use Symfony\Cmf\Bundle\MenuBundle\DependencyInjection\Compiler\AddVotersPass;
+use Symfony\Cmf\Bundle\MenuBundle\DependencyInjection\Compiler\DecorateMenuFactoryPass;
 use Doctrine\Bundle\PHPCRBundle\DependencyInjection\Compiler\DoctrinePhpcrMappingsPass;
 
 class CmfMenuBundle extends Bundle
@@ -23,6 +22,8 @@ public function build(ContainerBuilder $container)
     {
         parent::build($container);
 
+        $container->addCompilerPass(new DecorateMenuFactoryPass());
+
         if (class_exists('Doctrine\Bundle\PHPCRBundle\DependencyInjection\Compiler\DoctrinePhpcrMappingsPass')) {
             $container->addCompilerPass(
                 DoctrinePhpcrMappingsPass::createXmlMappingDriver(

DependencyInjection/Compiler/DecorateMenuFactoryPass.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Symfony\Cmf\Bundle\MenuBundle\DependencyInjection\Compiler;
+
+use Symfony\Component\DependencyInjection\Alias;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+
+class DecorateMenuFactoryPass implements CompilerPassInterface
+{
+    /**
+     * {@inheritdoc}
+     *
+     * @todo Add `decorates="knp_menu.factory"` to the service definition
+     *       instead if Symfony 2.3 support is dropped.
+     */
+    public function process(ContainerBuilder $container)
+    {
+        if (!$container->hasDefinition('knp_menu.factory')) {
+            return;
+        }
+
+        $knpFactory = $container->getDefinition('knp_menu.factory');
+        $knpFactory->setPublic(false);
+
+        // rename old service
+        $container->setDefinition('cmf_menu.factory.quiet.inner', $knpFactory);
+
+        $container->setAlias('knp_menu.factory', new Alias('cmf_menu.factory.quiet'));
+    }
+}

Resources/config/menu.xml

@@ -8,8 +8,7 @@
 
         <service id="cmf_menu.content_router" alias="router"/>
 
-        <service id="cmf_menu.factory.quiet" class="Symfony\Cmf\Bundle\MenuBundle\QuietFactory"
-                 decorates="knp_menu.factory" public="false">
+        <service id="cmf_menu.factory.quiet" class="Symfony\Cmf\Bundle\MenuBundle\QuietFactory" public="false">
             <argument type="service" id="cmf_menu.factory.quiet.inner" />
             <argument type="service" id="logger"/>
             <argument>%cmf_menu.allow_empty_items%</argument>