Merge pull request #396 from formapro-forks/configuration-is-not-arra…

…y-given [config] correctly process resolvers\loaders section if not array or null
liip · Apr 14, 2014 · 2be6f95 · 2be6f95
2 parents d975668 + 1df30d1
commit 2be6f95
Show file tree

Hide file tree

Showing 2 changed files with 92 additions and 4 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -59,24 +59,32 @@ public function getConfigTreeBuilder()
                 ->ifTrue(function ($v) {
                     return
                         empty($v['loaders']) ||
-                        !array_key_exists('default', $v['loaders']) ||
+                        empty($v['loaders']['default']) ||
                         empty($v['resolvers']) ||
-                        !array_key_exists('default', $v['resolvers'])
+                        empty($v['resolvers']['default'])
                     ;
                 })
                 ->then(function ($v) {
-                    if (false == array_key_exists('loaders', $v)) {
+                    if (empty($v['loaders'])) {
                         $v['loaders'] = array();
                     }
 
+                    if (false == is_array($v['loaders'])) {
+                        throw new \LogicException('Loaders has to be array');
+                    }
+
                     if (false == array_key_exists('default', $v['loaders'])) {
                         $v['loaders']['default'] = array('filesystem' => null);
                     }
 
-                    if (false == array_key_exists('resolvers', $v)) {
+                    if (empty($v['resolvers'])) {
                         $v['resolvers'] = array();
                     }
 
+                    if (false == is_array($v['resolvers'])) {
+                        throw new \LogicException('Resolvers has to be array');
+                    }
+
                     if (false == array_key_exists('default', $v['resolvers'])) {
                         $v['resolvers']['default'] = array('web_path' => null);
                     }

diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
@@ -112,6 +112,45 @@ public function testSetFilesystemLoaderAsDefaultLoaderIfNotDefined()
         $this->assertArrayHasKey('filesystem', $config['loaders']['default']);
     }
 
+    public function testSetFilesystemLoaderAsDefaultLoaderIfNull()
+    {
+        $config = $this->processConfiguration(
+            new Configuration(
+                array(
+                    new WebPathResolverFactory
+                ),
+                array(
+                    new FileSystemLoaderFactory
+                )
+            ),
+            array(array(
+                'loaders' => null,
+            ))
+        );
+
+        $this->assertArrayHasKey('loaders', $config);
+        $this->assertArrayHasKey('default', $config['loaders']);
+        $this->assertArrayHasKey('filesystem', $config['loaders']['default']);
+    }
+
+    public function testThrowIfLoadersNotArray()
+    {
+        $this->setExpectedException('LogicException', 'Loaders has to be array');
+        $this->processConfiguration(
+            new Configuration(
+                array(
+                    new WebPathResolverFactory
+                ),
+                array(
+                    new FileSystemLoaderFactory
+                )
+            ),
+            array(array(
+                'loaders' => 'not_array',
+            ))
+        );
+    }
+
     public function testSetFilesystemLoaderAsDefaultIfLoadersSectionNotDefined()
     {
         $config = $this->processConfiguration(
@@ -264,6 +303,47 @@ public function testSetWebPathAsDefaultResolverIfNotDefined()
         $this->assertArrayHasKey('web_path', $config['resolvers']['default']);
     }
 
+    public function testSetWebPathAsDefaultResolverIfNull()
+    {
+        $config = $this->processConfiguration(
+            new Configuration(
+                array(
+                    new WebPathResolverFactory
+                ), array(
+                    new FileSystemLoaderFactory
+                )
+            ),
+            array(array(
+                'resolvers' => null,
+            ))
+        );
+
+        $this->assertArrayHasKey('resolvers', $config);
+        $this->assertArrayHasKey('default', $config['resolvers']);
+        $this->assertArrayHasKey('web_path', $config['resolvers']['default']);
+    }
+
+    public function testThrowsIfResolversNotArray()
+    {
+        $this->setExpectedException('LogicException', 'Resolvers has to be array');
+        $config = $this->processConfiguration(
+            new Configuration(
+                array(
+                    new WebPathResolverFactory
+                ), array(
+                    new FileSystemLoaderFactory
+                )
+            ),
+            array(array(
+                'resolvers' => 'not_array',
+            ))
+        );
+
+        $this->assertArrayHasKey('resolvers', $config);
+        $this->assertArrayHasKey('default', $config['resolvers']);
+        $this->assertArrayHasKey('web_path', $config['resolvers']['default']);
+    }
+
     public function testShouldNotOverwriteDefaultResolverIfDefined()
     {
         $config = $this->processConfiguration(