Merge pull request #906 from WouterJ/patch-2

[DX] Improved error message on wrong error

Author: lsmith77

DependencyInjection/Configuration.php

@@ -235,6 +235,10 @@ private function addExceptionSection(ArrayNodeDefinition $rootNode)
                         ->scalarNode('exception_controller')->defaultNull()->end()
                         ->arrayNode('codes')
                             ->useAttributeAsKey('name')
+                            ->validate()
+                                ->ifTrue(function ($v) { return 0 !== count(array_filter($v, function ($i) { return !defined('FOS\RestBundle\Util\Codes::'.$i) && !is_int($i); })); })
+                                ->thenInvalid('Invalid HTTP code in fos_rest.exception.codes, see FOS\RestBundle\Util\Codes for all valid codes.')
+                            ->end()
                             ->prototype('scalar')->end()
                         ->end()
                         ->arrayNode('messages')

Tests/DependencyInjection/FOSRestExtensionTest.php

@@ -370,6 +370,7 @@ public function testLoadBadClassThrowsException()
 
     /**
      * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Could not load class 'UnknownException' or the class does not extend from '\Exception'
      */
     public function testLoadBadMessagesClassThrowsException()
     {
@@ -398,6 +399,39 @@ public function testLoadOkMessagesClass()
         $this->assertFalse($this->container->hasDefinition('fos_rest.exception.codes'));
     }
 
+    /**
+     * @dataProvider getLoadBadCodeValueThrowsExceptionData
+     *
+     * @expectedException Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
+     * @expectedExceptionMessage Invalid HTTP code in fos_rest.exception.codes
+     */
+    public function testLoadBadCodeValueThrowsException($value)
+    {
+        $this->extension->load(array(
+            'fos_rest' => array(
+                'exception' => array(
+                    'codes' => array(
+                        'Exception' => $value,
+                    ),
+                ),
+            ),
+        ), $this->container);
+    }
+
+    public function getLoadBadCodeValueThrowsExceptionData()
+    {
+        $data = array(
+            null,
+            'HTTP_NOT_EXISTS',
+            'some random string',
+            true,
+        );
+
+        return array_map(function ($i) {
+            return array($i);
+        }, $data);
+    }
+
     /**
      * Assert that loader definition described properly.
      *