Merge branch '2.3'

Author: dunglas

features/hydra/docs.feature

@@ -32,7 +32,8 @@ Feature: Documentation support
     # Root properties
     And the JSON node "@id" should be equal to "/docs.jsonld"
     And the JSON node "hydra:title" should be equal to "My Dummy API"
-    And the JSON node "hydra:description" should be equal to "This is a test API."
+    And the JSON node "hydra:description" should contain "This is a test API."
+    And the JSON node "hydra:description" should contain "Made with love"
     And the JSON node "hydra:entrypoint" should be equal to "/"
     # Supported classes
     And the Hydra class "The API entrypoint" exists

features/swagger/docs.feature

@@ -13,7 +13,8 @@ Feature: Documentation support
     And the JSON node "swagger" should be equal to "2.0"
     # Root properties
     And the JSON node "info.title" should be equal to "My Dummy API"
-    And the JSON node "info.description" should be equal to "This is a test API."
+    And the JSON node "info.description" should contain "This is a test API."
+    And the JSON node "info.description" should contain "Made with love"
     # Supported classes
     And the Swagger class "AbstractDummy" exists
     And the Swagger class "CircularReference" exists

src/Bridge/Symfony/Bundle/Command/SwaggerCommand.php

@@ -80,7 +80,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $documentation = new Documentation($this->resourceNameCollectionFactory->create(), $this->apiTitle, $this->apiDescription, $this->apiVersion, $this->apiFormats);
         $data = $this->normalizer->normalize($documentation, DocumentationNormalizer::FORMAT, ['spec_version' => (int) $version]);
-        $content = $input->getOption('yaml') ? Yaml::dump($data, 10, 2, Yaml::DUMP_OBJECT_AS_MAP | Yaml::DUMP_EMPTY_ARRAY_AS_SEQUENCE) : (json_encode($data, JSON_PRETTY_PRINT) ?: '');
+        $content = $input->getOption('yaml') ? Yaml::dump($data, 10, 2, Yaml::DUMP_OBJECT_AS_MAP | Yaml::DUMP_EMPTY_ARRAY_AS_SEQUENCE | Yaml::DUMP_MULTI_LINE_LITERAL_BLOCK) : (json_encode($data, JSON_PRETTY_PRINT) ?: '');
 
         if (!empty($filename = $input->getOption('output')) && \is_string($filename)) {
             file_put_contents($filename, $content);

tests/Bridge/Symfony/Bundle/Command/SwaggerCommandTest.php

@@ -81,6 +81,16 @@ public function testExecuteWithYamlVersion3()
 
         $this->assertContains($expected, $result, 'arrays should be correctly formatted.');
         $this->assertContains('openapi: 3.0.2', $result);
+
+        $expected = <<<YAML
+info:
+    title: 'My Dummy API'
+    version: 0.0.0
+    description: |
+        This is a test API.
+        Made with love
+YAML;
+        $this->assertContains($expected, $result, 'multiline formatting must be preserved (using literal style).');
     }
 
     public function testExecuteOpenApiVersion2WithYaml()

tests/Fixtures/app/config/config_common.yml

@@ -41,7 +41,9 @@ mercure:
 
 api_platform:
     title:                             'My Dummy API'
-    description:                       'This is a test API.'
+    description: |
+        This is a test API.
+        Made with love
     allow_plain_identifiers:           true
     formats:
         jsonld:                        ['application/ld+json']