Fix null title/description configuration (#1563 followup)

api-platform · Dec 20, 2017 · c1568e1 · c1568e1
1 parent 26be83a
commit c1568e1
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 2 deletions.
diff --git a/src/Bridge/Symfony/Bundle/DependencyInjection/Configuration.php b/src/Bridge/Symfony/Bundle/DependencyInjection/Configuration.php
@@ -42,13 +42,19 @@ public function getConfigTreeBuilder()
             ->children()
                 ->scalarNode('title')
                     ->info('The title of the API.')
-                    ->cannotBeEmpty()
                     ->defaultValue('')
+                    ->beforeNormalization()
+                        ->ifNull()
+                        ->then(function ($v) { return ''; })
+                    ->end()
                 ->end()
                 ->scalarNode('description')
                     ->info('The description of the API.')
-                    ->cannotBeEmpty()
                     ->defaultValue('')
+                    ->beforeNormalization()
+                        ->ifNull()
+                        ->then(function ($v) { return ''; })
+                    ->end()
                 ->end()
                 ->scalarNode('version')
                     ->info('The version of the API.')

diff --git a/tests/Bridge/Symfony/Bundle/DependencyInjection/ConfigurationTest.php b/tests/Bridge/Symfony/Bundle/DependencyInjection/ConfigurationTest.php
@@ -234,4 +234,40 @@ public function testApiKeysConfig()
         $this->assertTrue(isset($config['swagger']['api_keys']));
         $this->assertSame($exampleConfig, $config['swagger']['api_keys'][0]);
     }
+
+    /**
+     * Test config for empty title and description.
+     */
+    public function testEmptyTitleDescriptionConfig()
+    {
+        $testConfig = [
+            'title' => '',
+            'description' => '',
+        ];
+
+        $config = $this->processor->processConfiguration($this->configuration, [
+            'api_platform' => $testConfig,
+        ]);
+
+        $this->assertSame($config['title'], '');
+        $this->assertSame($config['description'], '');
+    }
+
+    /**
+     * Test config for null title and description.
+     */
+    public function testNullTitleDescriptionConfig()
+    {
+        $testConfig = [
+            'title' => null,
+            'description' => null,
+        ];
+
+        $config = $this->processor->processConfiguration($this->configuration, [
+            'api_platform' => $testConfig,
+        ]);
+
+        $this->assertSame($config['title'], '');
+        $this->assertSame($config['description'], '');
+    }
 }