Merge pull request #171 from WouterJ/fix_xml_whitespace

Improved whitespace handling by Extension

Author: lsmith77

DependencyInjection/CmfRoutingExtension.php

@@ -37,7 +37,7 @@ public function load(array $configs, ContainerBuilder $container)
         // add the routers defined in the configuration mapping
         $router = $container->getDefinition($this->getAlias() . '.router');
         foreach ($config['chain']['routers_by_id'] as $id => $priority) {
-            $router->addMethodCall('add', array(new Reference($id), $priority));
+            $router->addMethodCall('add', array(new Reference($id), trim($priority)));
         }
 
         $this->setupFormTypes($config, $container, $loader);
@@ -65,6 +65,13 @@ public function setupFormTypes(array $config, ContainerBuilder $container, Loade
      */
     private function setupDynamicRouter(array $config, ContainerBuilder $container, LoaderInterface $loader)
     {
+        // strip whitespace (XML support)
+        foreach (array('controllers_by_type', 'controllers_by_class', 'templates_by_class', 'route_filters_by_id') as $option) {
+            $config[$option] = array_map(function ($value) {
+                return trim($value);
+            }, $config[$option]);
+        }
+
         $container->setParameter($this->getAlias() . '.generic_controller', $config['generic_controller']);
         $container->setParameter($this->getAlias() . '.controllers_by_type', $config['controllers_by_type']);
         $container->setParameter($this->getAlias() . '.controllers_by_class', $config['controllers_by_class']);

Tests/Unit/DependencyInjection/CmfRoutingExtensionTest.php

@@ -135,4 +135,46 @@ function ($call) {
         $this->assertEquals($providedRouters, $routersAdded);
     }
 
+    public function testWhitespaceInPriorities()
+    {
+        $config = array(
+            array(
+                'dynamic' => array(
+                    'route_provider_service_id' => 'test_route_provider_service',
+                    'enabled' => true,
+                    'controllers_by_type' => array(
+                        'Acme\Foo' => '
+                            acme_main.controller:indexAction
+                        '
+                    ),
+                ),
+                'chain' => array(
+                    'routers_by_id' => array(
+                        'acme_test.router' => '
+                            100
+                        ',
+                    ),
+                ),
+            )
+        );
+
+        $builder = $this->getBuilder($config);
+
+        $methodCalls = $builder->getDefinition('cmf_routing.router')->getMethodCalls();
+        $addMethodCalls = array_filter(
+            $methodCalls,
+            function ($call) {
+                return 'add' == $call[0];
+            }
+        );
+
+        $this->assertCount(1, $addMethodCalls);
+
+        $methodCall = current($addMethodCalls);
+
+        $this->assertSame('100', $methodCall[1][1]);
+
+        $controllers = $builder->getParameter('cmf_routing.controllers_by_type');
+        $this->assertSame('acme_main.controller:indexAction', $controllers['Acme\Foo']);
+    }
 }