Merge pull request #1035 from FriendsOfSymfony/phramz-patch-2

includes #1020 as well as a test

Author: lsmith77

DependencyInjection/Configuration.php

@@ -201,6 +201,18 @@ private function addFormatListenerSection(ArrayNodeDefinition $rootNode)
                     ->fixXmlConfig('rule', 'rules')
                     ->addDefaultsIfNotSet()
                     ->canBeUnset()
+                    ->beforeNormalization()
+                        ->ifTrue(function ($v) {
+                            // check if we got an assoc array in rules
+                            return isset($v['rules'])
+                                && is_array($v['rules'])
+                                && array_keys($v['rules']) !== range(0, count($v['rules']) - 1);
+                        })
+                        ->then(function($v) {
+                            $v['rules'] = array($v['rules']);
+                            return $v;
+                        })
+                    ->end()                    
                     ->children()
                         ->arrayNode('rules')
                             ->cannotBeOverwritten()

Tests/DependencyInjection/FOSRestExtensionTest.php

@@ -167,6 +167,33 @@ public function testLoadFormatListenerWithDefaults()
         $this->assertFalse($this->container->hasDefinition('fos_rest.format_listener'));
     }
 
+    public function testLoadFormatListenerWithSingleRule()
+    {
+        $config = array(
+            'fos_rest' => array('format_listener' => array(
+                'rules' => array('path' => '/')
+            )),
+        );
+        $this->extension->load($config, $this->container);
+
+        $this->assertTrue($this->container->hasDefinition('fos_rest.format_listener'));
+    }
+
+    public function testLoadFormatListenerWithMultipleRule()
+    {
+        $config = array(
+            'fos_rest' => array('format_listener' => array(
+                'rules' => array(
+                    array('path' => '/foo'),
+                    array('path' => '/')
+                )
+            )),
+        );
+        $this->extension->load($config, $this->container);
+
+        $this->assertTrue($this->container->hasDefinition('fos_rest.format_listener'));
+    }
+
     public function testLoadServicesWithDefaults()
     {
         $this->extension->load(array(), $this->container);