4565: Cleaned up enum use

Author: tuj

src/Command/ScreenLayout/ScreenLayoutsListCommand.php

@@ -47,16 +47,16 @@ final protected function execute(InputInterface $input, OutputInterface $output)
 
             if ($status) {
                 $numberOfScreenLayouts = count($screenLayouts);
-                $numberOfInstallledScreenLayouts = count(array_filter($screenLayouts, fn ($entry): bool => $entry->installed));
-                $text = $numberOfInstallledScreenLayouts.' / '.$numberOfScreenLayouts.' templates installed.';
+                $numberOfInstalledScreenLayouts = count(array_filter($screenLayouts, fn ($entry): bool => $entry->installed));
+                $text = $numberOfInstalledScreenLayouts.' / '.$numberOfScreenLayouts.' templates installed.';
 
                 $io->success($text);
             } else {
                 $io->table(['ID', 'Title', 'Status', 'Type'], array_map(fn (ScreenLayoutData $screenLayout) => [
                     $screenLayout->id,
                     $screenLayout->title,
                     $screenLayout->installed ? 'Installed' : 'Not Installed',
-                    $screenLayout->type,
+                    $screenLayout->type->value,
                 ], $screenLayouts));
             }
 

src/Command/Template/TemplatesListCommand.php

@@ -40,7 +40,7 @@ final protected function execute(InputInterface $input, OutputInterface $output)
         try {
             $templates = $this->templateService->getTemplates();
 
-            $coreTemplateCount = count(array_filter($templates, fn (TemplateData $template) => $template->type === ResourceTypeEnum::CORE->value));
+            $coreTemplateCount = count(array_filter($templates, fn (TemplateData $template) => $template->type === ResourceTypeEnum::CORE));
 
             if (0 === $coreTemplateCount) {
                 $io->error('No core templates found.');
@@ -50,16 +50,16 @@ final protected function execute(InputInterface $input, OutputInterface $output)
 
             if ($status) {
                 $numberOfTemplates = count($templates);
-                $numberOfInstallledTemplates = count(array_filter($templates, fn ($entry): bool => $entry->installed));
-                $text = $numberOfInstallledTemplates.' / '.$numberOfTemplates.' templates installed.';
+                $numberOfInstalledTemplates = count(array_filter($templates, fn ($entry): bool => $entry->installed));
+                $text = $numberOfInstalledTemplates.' / '.$numberOfTemplates.' templates installed.';
 
                 $io->success($text);
             } else {
                 $io->table(['ID', 'Title', 'Status', 'Type'], array_map(fn (TemplateData $templateData) => [
                     $templateData->id,
                     $templateData->title,
                     $templateData->installed ? 'Installed' : 'Not Installed',
-                    $templateData->type,
+                    $templateData->type->value,
                 ], $templates));
             }
 

src/Model/ScreenLayoutData.php

@@ -5,13 +5,14 @@
 namespace App\Model;
 
 use App\Entity\ScreenLayout;
+use App\Enum\ResourceTypeEnum;
 
 class ScreenLayoutData
 {
     public function __construct(
         public readonly string $id,
         public readonly string $title,
-        public readonly string $type,
+        public readonly ResourceTypeEnum $type,
         public readonly int $gridRows,
         public readonly int $gridColumns,
         public readonly ?ScreenLayout $screenLayoutEntity,

src/Model/TemplateData.php

@@ -5,6 +5,7 @@
 namespace App\Model;
 
 use App\Entity\Template;
+use App\Enum\ResourceTypeEnum;
 
 class TemplateData
 {
@@ -15,6 +16,6 @@ public function __construct(
         public readonly object $options,
         public readonly ?Template $templateEntity,
         public readonly bool $installed,
-        public readonly string $type,
+        public readonly ResourceTypeEnum $type,
     ) {}
 }

src/Service/ScreenLayoutService.php

@@ -106,6 +106,7 @@ public function installScreenLayout(ScreenLayoutData $screenLayoutData, bool $up
 
     public function updateScreenLayout(ScreenLayoutData $screenLayoutToUpdate): void
     {
+        // This only handles screen layouts that have an entity in the database.
         if (null !== $screenLayoutToUpdate->screenLayoutEntity) {
             $this->installScreenLayout($screenLayoutToUpdate, true);
         }

src/Utils/ResourceLoader.php

@@ -17,10 +17,10 @@
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Uid\Ulid;
 
-class ResourceLoader
+readonly class ResourceLoader
 {
     public function __construct(
-        private readonly EntityManagerInterface $entityManager,
+        private EntityManagerInterface $entityManager,
     ) {}
 
     public function getResourceJsonInDirectory(string $path, string $resourceType, ResourceTypeEnum $type): array
@@ -45,7 +45,7 @@ public function getResourceJsonInDirectory(string $path, string $resourceType, R
         return [];
     }
 
-    public function getTemplateData(iterable $finder, ResourceTypeEnum $type): array
+    private function getTemplateData(iterable $finder, ResourceTypeEnum $type): array
     {
         $templates = [];
 
@@ -82,7 +82,7 @@ public function getTemplateData(iterable $finder, ResourceTypeEnum $type): array
                 $content->options,
                 $template,
                 null !== $template,
-                $type->value,
+                $type,
             );
         }
 
@@ -122,7 +122,7 @@ private function getScreenLayoutData(iterable $finder, ResourceTypeEnum $type):
             $screenLayouts[] = new ScreenLayoutData(
                 $content->id,
                 $content->title,
-                $type->value,
+                $type,
                 $content->grid->rows,
                 $content->grid->columns,
                 $screenLayout,
@@ -189,7 +189,7 @@ private function getScreenLayoutJsonSchema(): object
           "$schema": "https://json-schema.org/draft/2020-12/schema",
           "$id": "https://os2display.dk/config-schema.json",
           "title": "Config file schema",
-          "description": "Schema for defining config files for templates",
+          "description": "Schema for defining config files for screen layouts",
           "type": "object",
           "properties": {
             "id": {