Merge pull request #1055 from FriendsOfSymfony/version_regexp

fix regression in handling for version_regex

Author: lsmith77

DependencyInjection/Configuration.php

@@ -251,6 +251,10 @@ private function addFormatListenerSection(ArrayNodeDefinition $rootNode)
                         })
                     ->end()                    
                     ->canBeEnabled()
+                    ->validate()
+                        ->ifTrue(function ($v) { return empty($v['rules']) && !empty($v['media_type']['enabled']); })
+                        ->thenInvalid('To enable the "media_type" setting, a "rules" setting must also needs to be defined for the "format_listener"')
+                    ->end()
                     ->children()
                         ->scalarNode('service')->defaultNull()->end()
                         ->arrayNode('rules')
@@ -273,18 +277,13 @@ private function addFormatListenerSection(ArrayNodeDefinition $rootNode)
                             ->end()
                         ->end()
                         ->arrayNode('media_type')
-                            ->children()
-                                ->arrayNode('version_regex')
-                                    ->canBeEnabled()
-                                    ->beforeNormalization()
-                                        ->ifString()->then(function($v) { return array('enabled' => true, 'regex' => $v); })
-                                    ->end()
-                                    ->children()
-                                        ->scalarNode('service')->defaultNull()->end()
-                                        ->scalarNode('regex')->defaultValue('/(v|version)=(?P<version>[0-9\.]+)/')->end()
-                                    ->end()
-                                ->end()
-                            ->end()
+                            ->canBeEnabled()
+                            ->beforeNormalization()
+                            ->ifString()->then(function($v) { return array('enabled' => true, 'version_regex' => $v); })
+                        ->end()
+                        ->children()
+                            ->scalarNode('service')->defaultNull()->end()
+                            ->scalarNode('version_regex')->defaultValue('/(v|version)=(?P<version>[0-9\.]+)/')->end()
                         ->end()
                     ->end()
                 ->end()

Tests/DependencyInjection/FOSRestExtensionTest.php

@@ -171,7 +171,7 @@ public function testLoadFormatListenerWithSingleRule()
     {
         $config = array(
             'fos_rest' => array('format_listener' => array(
-                'rules' => array('path' => '/')
+                'rules' => array('path' => '/'),
             )),
         );
         $this->extension->load($config, $this->container);
@@ -207,7 +207,7 @@ public function testLoadFormatListenerWithMultipleRule()
             'fos_rest' => array('format_listener' => array(
                 'rules' => array(
                     array('path' => '/foo'),
-                    array('path' => '/')
+                    array('path' => '/'),
                 )
             )),
         );
@@ -216,6 +216,32 @@ public function testLoadFormatListenerWithMultipleRule()
         $this->assertTrue($this->container->hasDefinition('fos_rest.format_listener'));
     }
 
+    public function testLoadFormatListenerMediaType()
+    {
+        $config = array(
+            'fos_rest' => array('format_listener' => array(
+                'rules' => array('path' => '/'),
+                'media_type' => true,
+            )),
+        );
+        $this->extension->load($config, $this->container);
+
+        $this->assertTrue($this->container->hasDefinition('fos_rest.version_listener'));
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
+     */
+    public function testLoadFormatListenerMediaTypeNoRules()
+    {
+        $config = array(
+            'fos_rest' => array('format_listener' => array(
+                'media_type' => true,
+            )),
+        );
+        $this->extension->load($config, $this->container);
+    }
+
     public function testLoadServicesWithDefaults()
     {
         $this->extension->load(array(), $this->container);