4565: Cleaned up code

Author: tuj

composer.json

@@ -121,7 +121,7 @@
             "cache:clear": "symfony-cmd",
             "assets:install %PUBLIC_DIR%": "symfony-cmd"
         },
-        "code-analysis": "vendor/bin/psalm",
+        "code-analysis": "vendor/bin/psalm --no-cache",
         "coding-standards-apply": [
             "vendor/bin/php-cs-fixer fix"
         ],

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));
+            $coreTemplateCount = count(array_filter($templates, fn (TemplateData $template) => ResourceTypeEnum::CORE === $template->type));
 
             if (0 === $coreTemplateCount) {
                 $io->error('No core templates found.');

src/Utils/ResourceLoader.php

@@ -4,12 +4,13 @@
 
 namespace App\Utils;
 
-use App\Entity\ScreenLayout;
 use App\Entity\Template;
 use App\Enum\ResourceTypeEnum;
 use App\Exceptions\NotImplementedException;
 use App\Model\ScreenLayoutData;
 use App\Model\TemplateData;
+use App\Repository\ScreenLayoutRepository;
+use App\Repository\TemplateRepository;
 use Doctrine\ORM\EntityManagerInterface;
 use JsonSchema\Constraints\Factory;
 use JsonSchema\SchemaStorage;
@@ -20,7 +21,9 @@
 readonly class ResourceLoader
 {
     public function __construct(
-        private EntityManagerInterface $entityManager,
+        private readonly EntityManagerInterface $entityManager,
+        private readonly ScreenLayoutRepository $screenLayoutRepository,
+        private readonly TemplateRepository $templateRepository,
     ) {}
 
     public function getResourceJsonInDirectory(string $path, string $resourceType, ResourceTypeEnum $type): array
@@ -48,11 +51,9 @@ private function getResourceData(iterable $finder, string $resourceType, Resourc
 
         switch ($resourceType) {
             case ScreenLayoutData::class:
-                $repository = $this->entityManager->getRepository(ScreenLayout::class);
                 $jsonSchemaObject = $this->getScreenLayoutJsonSchema();
                 break;
             case TemplateData::class:
-                $repository = $this->entityManager->getRepository(Template::class);
                 $jsonSchemaObject = $this->getTemplateJsonSchema();
                 break;
             default:
@@ -81,10 +82,10 @@ private function getResourceData(iterable $finder, string $resourceType, Resourc
                 throw new \Exception('The Ulid is not valid');
             }
 
-            $entity = $repository->findOneBy(['id' => Ulid::fromString($content->id)]);
-
             switch ($resourceType) {
                 case ScreenLayoutData::class:
+                    $entity = $this->screenLayoutRepository->find(Ulid::fromString($content->id));
+
                     $results[] = new ScreenLayoutData(
                         $content->id,
                         $content->title,
@@ -98,6 +99,8 @@ private function getResourceData(iterable $finder, string $resourceType, Resourc
 
                     break;
                 case TemplateData::class:
+                    $entity = $this->templateRepository->find(Ulid::fromString($content->id));
+
                     $results[] = new TemplateData(
                         $content->id,
                         $content->title,