Update FontAwesome services.

Author: laurentmuller

src/Controller/LogController.php

@@ -25,7 +25,7 @@
 use App\Model\TranslatableFlashMessage;
 use App\Report\LogsReport;
 use App\Resolver\DataQueryValueResolver;
-use App\Service\FontAwesomeService;
+use App\Service\FontAwesomeCellService;
 use App\Service\LogService;
 use App\Spreadsheet\LogsDocument;
 use App\Table\DataQuery;
@@ -146,7 +146,7 @@ public function index(
      * Export to PDF the content of the log file.
      */
     #[PdfRoute]
-    public function pdf(FontAwesomeService $service): Response
+    public function pdf(FontAwesomeCellService $service): Response
     {
         $logFile = $this->getLogFile();
         if (!$logFile instanceof LogFile) {

src/Controller/TestExportController.php

@@ -29,8 +29,8 @@
 use App\Repository\CustomerRepository;
 use App\Response\PdfResponse;
 use App\Response\WordResponse;
+use App\Service\FontAwesomeCellService;
 use App\Service\FontAwesomeImageService;
-use App\Service\FontAwesomeService;
 use App\Service\PdfLabelService;
 use App\Traits\RenderPdfDocumentTrait;
 use App\Traits\RenderWordDocumentTrait;
@@ -116,7 +116,7 @@ public function exportMemoryImage(
         string $iconFile,
         #[Autowire('%kernel.project_dir%/public/images/screenshots/home_light.png')]
         string $screenshotFile,
-        FontAwesomeService $service
+        FontAwesomeCellService $service
     ): PdfResponse {
         $report = new MemoryImageReport(
             helper: $this,

src/Controller/UserController.php

@@ -41,7 +41,7 @@
 use App\Response\PdfResponse;
 use App\Response\SpreadsheetResponse;
 use App\Service\ApplicationService;
-use App\Service\FontAwesomeService;
+use App\Service\FontAwesomeCellService;
 use App\Service\MailerService;
 use App\Service\PasswordTooltipService;
 use App\Service\ResetPasswordService;
@@ -208,7 +208,7 @@ public function password(Request $request, User $item, PasswordTooltipService $s
     public function pdf(
         StorageInterface $storage,
         RoleService $roleService,
-        FontAwesomeService $fontService,
+        FontAwesomeCellService $fontService,
     ): PdfResponse {
         $entities = $this->getEntitiesByUserName();
         $report = new UsersReport($this, $entities, $storage, $roleService, $fontService);
@@ -365,7 +365,7 @@ public function rightsExcel(RoleService $roleService, RoleBuilderService $roleBu
     public function rightsPdf(
         RoleService $roleService,
         RoleBuilderService $roleBuilderService,
-        FontAwesomeService $fontAwesomeService
+        FontAwesomeCellService $fontAwesomeService
     ): PdfResponse {
         $entities = $this->getEntitiesByUserName();
         $parameters = $this->getApplicationParameters();

src/Pdf/Interfaces/PdfColorInterface.php

@@ -44,6 +44,15 @@ public function applyFillColor(PdfDocument $doc): void;
      */
     public function applyTextColor(PdfDocument $doc): void;
 
+    /**
+     * Gets the hexadecimal representation of these values.
+     *
+     * @param string $prefix the optional prefix to prepend
+     *
+     * @return string the hexadecimal value as six lower case characters (like <code>'ff8040'</code>)
+     */
+    public function asHex(string $prefix = ''): string;
+
     /**
      * Gets this value converted to RGB.
      *

src/Pdf/Traits/PdfColorTrait.php

@@ -41,6 +41,11 @@ public function applyTextColor(PdfDocument $doc): void
         $this->getTextColor()->updateDocument($doc);
     }
 
+    public function asHex(string $prefix = ''): string
+    {
+        return $this->getTextColor()->asHex($prefix);
+    }
+
     public function asRGB(): array
     {
         return [

src/Report/FontAwesomeReport.php

@@ -78,7 +78,7 @@ private function createTable(): PdfTable
 
     private function renderImage(PdfTable $table, int $index, FontAwesomeIcon $icon): void
     {
-        $image = $this->service->getFontAwesomeImage($icon) ?? throw PdfException::format('Unable to get image: "%s".', $icon->getKey());
+        $image = $this->service->getImage($icon) ?? throw PdfException::format('Unable to get image: "%s".', $icon->getKey());
         if (0 === $index % self::COLUMNS) {
             $table->startRow();
         }

src/Report/LogsReport.php

@@ -20,15 +20,13 @@
 use App\Model\LogFile;
 use App\Model\LogLevel;
 use App\Pdf\Colors\PdfTextColor;
-use App\Pdf\Html\HtmlBootstrapColor;
 use App\Pdf\PdfCell;
 use App\Pdf\PdfColumn;
 use App\Pdf\PdfFontAwesomeCell;
 use App\Pdf\PdfStyle;
 use App\Pdf\PdfTable;
 use App\Pdf\Traits\PdfMemoryImageTrait;
-use App\Service\FontAwesomeImageService;
-use App\Service\FontAwesomeService;
+use App\Service\FontAwesomeCellService;
 use App\Utils\FormatUtils;
 use App\Utils\StringUtils;
 use fpdf\Enums\PdfMove;
@@ -57,7 +55,7 @@ public function __construct(
         DocumentHelperInterface $helper,
         private readonly LogFile $logFile,
         string $relativePath,
-        private readonly FontAwesomeService $service
+        private readonly FontAwesomeCellService $service
     ) {
         parent::__construct($helper, PdfOrientation::LANDSCAPE);
         $this->setTranslatedTitle('log.title')
@@ -111,7 +109,7 @@ private function getCell(string $text, FontAwesomeIcon $icon, ?string $color = n
         if (isset($this->cells[$key])) {
             return $this->cells[$key];
         }
-        $cell = $this->service->getFontAwesomeCell(icon: $icon, color: $color, text: $text) ?? $text;
+        $cell = $this->service->getCell(icon: $icon, color: $color, text: $text) ?? $text;
 
         return $this->cells[$key] = $cell;
     }
@@ -144,7 +142,7 @@ private function getImageIcon(LogLevel|LogChannel $value, string $text): PdfCell
         }
 
         $alignment = PdfTextAlignment::CENTER;
-        $cell = $this->service->getFontAwesomeCell(
+        $cell = $this->service->getCell(
             icon: $icon,
             color: $color,
             text: $text,
@@ -162,9 +160,9 @@ private function getLevelColor(string $level): string
         if (\array_key_exists($level, $this->colors)) {
             return $this->colors[$level];
         }
-
-        $levelColor = LogLevel::instance($level)->getLevelColor();
-        $color = HtmlBootstrapColor::parseTextColor($levelColor)?->asHex('#') ?? FontAwesomeImageService::BLACK_COLOR;
+        $color = LogLevel::instance($level)
+            ->getLevelBootstrapColor()
+            ->asHex('#');
 
         return $this->colors[$level] = $color;
     }