Move Font Awesome config to .disco-devbar.yaml file for simpler configuration

Author: MarcinOrlowski

README.md

@@ -115,18 +115,24 @@ DiscoDevBar supports Font Awesome icons for widgets. You have two options for in
 
 #### Option 1: Automatic Inclusion (Recommended for Quick Setup)
 
-Enable automatic Font Awesome inclusion from CDN by creating `config/packages/disco_dev_bar.yaml`:
+Enable automatic Font Awesome inclusion from CDN in your `.disco-devbar.yaml` configuration file:
 
 ```yaml
-disco_dev_bar:
-    font_awesome:
-        enabled: true           # Enable auto-include from CDN (default: false)
-        version: '6.5.1'        # Font Awesome version to use (default: '6.5.1')
+font_awesome:
+    enabled: true           # Enable auto-include from CDN (default: false)
+    version: '6.5.1'        # Font Awesome version to use (optional, default: 6.5.1)
+
+widgets:
+    left:
+        - icon: "fa-flag-checkered"
+          text: "1.0"
+          url: "https://github.com/user/repo"
 ```
 
 **Benefits:**
 - Works out of the box - no additional setup needed
 - Icons display immediately
+- Configuration kept in one place with your widgets
 
 **Note:** Only enable this if your application doesn't already include Font Awesome. If you have Font Awesome in your project, use Option 2 instead to avoid version conflicts.
 

Resources/config/services.yaml

@@ -10,8 +10,6 @@ services:
     MarcinOrlowski\DiscoDevBar\Service\DiscoDevBarService:
         arguments:
             $projectDir: '%kernel.project_dir%'
-            $fontAwesomeEnabled: '%disco_dev_bar.font_awesome.enabled%'
-            $fontAwesomeVersion: '%disco_dev_bar.font_awesome.version%'
 
     MarcinOrlowski\DiscoDevBar\Twig\DiscoDevBarExtension:
         tags: ['twig.extension']

src/DependencyInjection/Configuration.php

@@ -34,18 +34,11 @@ class DiscoDevBarExtension extends Extension
 {
     public function load(array $configs, ContainerBuilder $container): void
     {
-        $configuration = new Configuration();
-        $config = $this->processConfiguration($configuration, $configs);
-
         $loader = new YamlFileLoader(
             $container,
             new FileLocator(\dirname(__DIR__) . '/../Resources/config')
         );
 
         $loader->load('services.yaml');
-
-        // Store Font Awesome configuration as parameters for use in Twig
-        $container->setParameter('disco_dev_bar.font_awesome.enabled', $config['font_awesome']['enabled']);
-        $container->setParameter('disco_dev_bar.font_awesome.version', $config['font_awesome']['version']);
     }
 }

src/DependencyInjection/DiscoDevBarExtension.php

@@ -36,10 +36,13 @@ class DiscoDevBarService
         '.debug-banner.yaml',  // Legacy, kept for backward compatibility
     ];
 
+    /**
+     * Default Font Awesome version
+     */
+    private const DEFAULT_FONT_AWESOME_VERSION = '6.5.1';
+
     public function __construct(
-        private readonly string $projectDir,
-        private readonly bool $fontAwesomeEnabled = false,
-        private readonly string $fontAwesomeVersion = '6.5.1'
+        private readonly string $projectDir
     ) {
     }
 
@@ -59,8 +62,8 @@ public function getDiscoDevBarData(): DiscoDevBarData
                 hasError:            true,
                 errorMessage:        $errorMessage,
                 version:             $version,
-                fontAwesomeEnabled:  $this->fontAwesomeEnabled,
-                fontAwesomeVersion:  $this->fontAwesomeVersion
+                fontAwesomeEnabled:  false,
+                fontAwesomeVersion:  self::DEFAULT_FONT_AWESOME_VERSION
             );
         }
 
@@ -71,6 +74,20 @@ public function getDiscoDevBarData(): DiscoDevBarData
             $config = [];
         }
 
+        // Extract Font Awesome configuration from YAML
+        $fontAwesomeConfig = $config['font_awesome'] ?? [];
+        $fontAwesomeEnabled = false;
+        $fontAwesomeVersion = self::DEFAULT_FONT_AWESOME_VERSION;
+
+        if (\is_array($fontAwesomeConfig)) {
+            $fontAwesomeEnabled = $fontAwesomeConfig['enabled'] ?? false;
+            // Use user's version if provided and not null, otherwise use default
+            $userVersion = $fontAwesomeConfig['version'] ?? null;
+            if ($userVersion !== null && \is_string($userVersion)) {
+                $fontAwesomeVersion = $userVersion;
+            }
+        }
+
         $widgets = $config['widgets'] ?? [];
         if (!\is_array($widgets)) {
             $widgets = [];
@@ -90,8 +107,8 @@ public function getDiscoDevBarData(): DiscoDevBarData
             hasError:            false,
             errorMessage:        '',
             version:             $version,
-            fontAwesomeEnabled:  $this->fontAwesomeEnabled,
-            fontAwesomeVersion:  $this->fontAwesomeVersion
+            fontAwesomeEnabled:  \is_bool($fontAwesomeEnabled) ? $fontAwesomeEnabled : false,
+            fontAwesomeVersion:  $fontAwesomeVersion
         );
     }