Merge pull request #592 from phpDocumentor/bugfix/html-theme

[BUGFIX] Make setting theme in guides.xml work

Author: linawolf

guides.xml

@@ -3,6 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="https://www.phpdoc.org/guides packages/guides-cli/resources/schema/guides.xsd">
     <project title="phpDocumentor Guides"/>
+    <theme>bootstrap</theme>
 
     <extension class="phpDocumentor\Guides\Bootstrap"/>
 </guides>

packages/guides-cli/resources/schema/guides.xsd

@@ -14,7 +14,7 @@
             <xsd:element name="extension" type="extension" minOccurs="0" maxOccurs="unbounded"/>
         </xsd:choice>
 
-        <xsd:attribute name="html-theme" type="xsd:string"/>
+        <xsd:attribute name="theme" type="xsd:string"/>
     </xsd:complexType>
 
     <xsd:complexType name="extension">

packages/guides-cli/src/Command/Run.php

@@ -97,7 +97,6 @@ public function __construct(
             null,
             InputOption::VALUE_REQUIRED,
             'The theme used for rendering.',
-            'default',
         );
 
         $this->addOption(
@@ -154,9 +153,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $theme = $input->getOption('theme');
         if ($theme) {
-            $this->themeManager->useTheme($theme);
+            $settings->setTheme($theme);
         }
 
+        $this->themeManager->useTheme($settings->getTheme());
+
         $documents = $this->commandBus->handle(new CompileDocumentsCommand($documents, new CompilerContext($projectNode)));
 
         $destinationFileSystem = new Filesystem(new Local($outputDir));

packages/guides/src/DependencyInjection/GuidesExtension.php

@@ -51,7 +51,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                         ->end()
                     ->end()
                 ->end()
-                ->scalarNode('html_theme')->end()
+                ->scalarNode('theme')->end()
                 ->arrayNode('base_template_paths')
                     ->defaultValue([])
                     ->scalarPrototype()->end()
@@ -104,16 +104,15 @@ public function load(array $configs, ContainerBuilder $container): void
             $projectSettings['inventories'] = $config['inventories']['inventory'];
         }
 
+        if (isset($config['theme'])) {
+            $projectSettings['theme'] = (string) $config['theme'];
+        }
+
         if ($projectSettings) {
             $container->getDefinition(SettingsManager::class)
                 ->addMethodCall('setProjectSettings', [new ProjectSettings($projectSettings)]);
         }
 
-        if (isset($config['html_theme'])) {
-            $container->getDefinition(ThemeManager::class)
-                ->addMethodCall('useTheme', [$config['html_theme']]);
-        }
-
         $config['base_template_paths'][] = dirname(__DIR__, 2) . '/resources/template/html';
         $container->setParameter('phpdoc.guides.base_template_paths', $config['base_template_paths']);
 

packages/guides/src/Settings/ProjectSettings.php

@@ -10,16 +10,18 @@
 class ProjectSettings
 {
     /** @var array<string, string> */
-    private readonly array $inventories;
-    private readonly string $title;
-    private readonly string $version;
+    private array $inventories;
+    private string $title;
+    private string $version;
+    private string $theme;
 
     /** @param array<string, string|array<string, string>> $settingsArray */
     public function __construct(array $settingsArray)
     {
         $this->title = isset($settingsArray['title']) && is_string($settingsArray['title']) ? $settingsArray['title'] : '';
         $this->version = isset($settingsArray['version']) && is_string($settingsArray['version']) ? $settingsArray['version'] : '';
         $this->inventories = isset($settingsArray['inventories']) && is_array($settingsArray['inventories']) ? $settingsArray['inventories'] : [];
+        $this->theme = isset($settingsArray['theme']) && is_string($settingsArray['theme']) ? $settingsArray['theme'] : 'default';
     }
 
     public function getTitle(): string
@@ -37,4 +39,30 @@ public function getInventories(): array
     {
         return $this->inventories;
     }
+
+    public function getTheme(): string
+    {
+        return $this->theme;
+    }
+
+    /** @param array<string, string> $inventories*/
+    public function setInventories(array $inventories): void
+    {
+        $this->inventories = $inventories;
+    }
+
+    public function setTitle(string $title): void
+    {
+        $this->title = $title;
+    }
+
+    public function setVersion(string $version): void
+    {
+        $this->version = $version;
+    }
+
+    public function setTheme(string $theme): void
+    {
+        $this->theme = $theme;
+    }
 }

tests/Integration/IntegrationBootstrapTest.php

@@ -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">
+    <theme>bootstrap</theme>
+
+    <extension class="phpDocumentor\Guides\Bootstrap"/>
+</guides>