Merge 58f081d into 81770d5

api-platform · Dec 20, 2017 · 37a9db4 · 37a9db4
2 parents 81770d5 + 58f081d
commit 37a9db4
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -33,7 +33,7 @@
         "behat/symfony2-extension": "^2.1.1",
         "behatch/contexts": "dev-master",
         "doctrine/doctrine-bundle": "^1.6.3",
-        "doctrine/orm": "^2.5.2",
+        "doctrine/orm": ">=2.5.2 <2.5.14",
         "doctrine/annotations": "^1.2",
         "friendsofsymfony/user-bundle": "^2.0",
         "guzzlehttp/guzzle": "^6.0",

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'], '');
+    }
 }