Merge pull request #260 from symfony-cmf/backport-bugfixes

Backport bugfixes

Author: wouterj

CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+unreleased
+----------
+
+* **2016-05-25** Use "auto" for publish workflow enabled flag. If auto and
+  CmfCoreBundle is not instantiated, publish workflow integration is not enabled.
+
 2.0.0
 -----
 

DependencyInjection/CmfMenuExtension.php

@@ -44,7 +44,9 @@ public function load(array $configs, ContainerBuilder $container)
             $this->loadExtensions($config, $loader, $container);
         }
 
-        if ($config['publish_workflow']['enabled']) {
+        if (true === $config['publish_workflow']['enabled']
+            || 'auto' === $config['publish_workflow']['enabled'] && isset($bundles['CmfCoreBundle'])
+        ) {
             $loader->load('publish-workflow.xml');
         }
     }

DependencyInjection/Configuration.php

@@ -81,7 +81,12 @@ public function getConfigTreeBuilder()
 
                 ->arrayNode('publish_workflow')
                     ->addDefaultsIfNotSet()
-                    ->canBeDisabled()
+                    ->children()
+                        ->enumNode('enabled')
+                            ->values(array(true, false, 'auto'))
+                            ->defaultValue('auto')
+                        ->end()
+                    ->end()
                 ->end()
             ->end()
         ;

QuietFactory.php

@@ -11,7 +11,9 @@
 
 namespace Symfony\Cmf\Bundle\MenuBundle;
 
+use Knp\Menu\Factory\ExtensionInterface;
 use Knp\Menu\FactoryInterface;
+use LogicException;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Routing\Exception\RouteNotFoundException;
 
@@ -69,10 +71,28 @@ public function createItem($name, array $options = array())
             }
 
             // remove route and content options
-            unset($options['route']);
-            unset($options['content']);
+            unset($options['route'], $options['content']);
 
             return $this->innerFactory->createItem($name, $options);
         }
     }
+
+    /**
+     * Forward adding extensions to the wrapped factory.
+     *
+     * @param ExtensionInterface $extension
+     * @param int                $priority
+     *
+     * @throws \Exception if the inner factory does not implement the addExtension method.
+     */
+    public function addExtension(ExtensionInterface $extension, $priority = 0)
+    {
+        if (!method_exists($this->innerFactory, 'addExtension')) {
+            throw new LogicException(sprintf(
+                'Wrapped factory "%s" does not have the method "addExtension".',
+                get_class($this->innerFactory)
+            ));
+        }
+        $this->innerFactory->addExtension($extension, $priority);
+    }
 }

Resources/config/schema/menu-1.0.xsd

@@ -51,7 +51,7 @@
     </xsd:complexType>
 
     <xsd:complexType name="publish-workflow">
-        <xsd:attribute name="enabled" type="xsd:boolean" />
+        <xsd:attribute name="enabled" type="enable_auto" />
     </xsd:complexType>
 
     <xsd:simpleType name="enable_auto">