Merge pull request #602 from phpDocumentor/bugfix/output-formats

jaapio · web-flow · commit 52d9f5d41703 · 2023-09-26T13:52:00.000+02:00
[BUGFIX] Treat single output formats as array
diff --git a/guides.xml b/guides.xml
@@ -11,8 +11,6 @@
         log-path="php://stder"
 >
     <project title="phpDocumentor Guides"/>
-    <output-format>html</output-format>
-    <output-format>intersphinx</output-format>
 
     <extension class="phpDocumentor\Guides\Bootstrap"/>
 </guides>
diff --git a/packages/guides/src/DependencyInjection/GuidesExtension.php b/packages/guides/src/DependencyInjection/GuidesExtension.php
@@ -56,7 +56,13 @@ public function getConfigTreeBuilder(): TreeBuilder
                 ->scalarNode('output')->end()
                 ->scalarNode('input_format')->end()
                 ->arrayNode('output_format')
-                    ->defaultValue([])
+                    ->defaultValue(['html', 'intersphinx'])
+                    ->beforeNormalization()
+                    ->ifString()
+                    ->then(static function ($value) {
+                        return [$value];
+                    })
+                    ->end()
                     ->scalarPrototype()->end()
                 ->end()
                 ->scalarNode('log_path')->end()
diff --git a/tests/Integration/tests/index-html-only/expected/index.html b/tests/Integration/tests/index-html-only/expected/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<title>Document Title</title>
+</head>
+<body>
+    <div class="section" id="document-title">
+    <h1>Document Title</h1>
+        <p>Lorem Ipsum Dolor.</p>
+    </div>
+</body>
+</html>
diff --git a/tests/Integration/tests/index-html-only/input/guides.xml b/tests/Integration/tests/index-html-only/input/guides.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<guides xmlns="https://www.phpdoc.org/guides"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://www.phpdoc.org/guides packages/guides-cli/resources/schema/guides.xsd">
+    <output-format>html</output-format>
+
+    <extension class="phpDocumentor\Guides\Bootstrap"/>
+</guides>
diff --git a/tests/Integration/tests/index-html-only/input/index.rst b/tests/Integration/tests/index-html-only/input/index.rst
@@ -0,0 +1,5 @@
+==============
+Document Title
+==============
+
+Lorem Ipsum Dolor.

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@`
`11`	`11`	`log-path="php://stder"`
`12`	`12`	`>`
`13`	`13`	`<project title="phpDocumentor Guides"/>`
`14`		`- <output-format>html</output-format>`
`15`		`- <output-format>intersphinx</output-format>`
`16`	`14`
`17`	`15`	`<extension class="phpDocumentor\Guides\Bootstrap"/>`
`18`	`16`	`</guides>`