Refactor publication validation helpers to single class

packages/framework/src/Console/Commands/MakePublicationCommand.php

@@ -178,7 +178,7 @@ protected function captureTagFieldInput(PublicationFieldDefinition $field): ?Pub
 
     protected function captureOtherFieldInput(PublicationFieldDefinition $field): ?PublicationFieldValue
     {
-        $selection = $this->askForFieldData($field->name, $field->getValidationRules()->toArray());
+        $selection = $this->askForFieldData($field->name, $field->getRules());
         if (empty($selection)) {
             return null;
         }

packages/framework/src/Console/Commands/ValidatePublicationsCommand.php

@@ -8,13 +8,16 @@
 use Hyde\Console\Concerns\ValidatingCommand;
 use Hyde\Framework\Features\Publications\Models\PublicationFieldDefinition;
 use Hyde\Framework\Features\Publications\PublicationService;
+use Hyde\Framework\Features\Publications\ValidatesPublicationField;
 use InvalidArgumentException;
 use LaravelZero\Framework\Commands\Command;
+use function str_repeat;
+use function strlen;
 
 /**
  * Hyde Command to validate one or all publications.
  *
- * @see \Hyde\Framework\Testing\Feature\Commands\ValidatePublicationTypeCommandTest
+ * @see \Hyde\Framework\Testing\Feature\Commands\ValidatePublicationsCommandTest
  *
  * @todo Add JSON output option?
  */
@@ -57,7 +60,6 @@ public function safeHandle(): int
             $countPubTypes++;
             $publications = PublicationService::getPublicationsForPubType($pubType);
             $this->output->write("<fg=yellow>Validating publication type [$name]</>");
-            $publicationFieldRules = $pubType->getFieldRules(false);
 
             /** @var \Hyde\Pages\PublicationPage $publication */
             foreach ($publications as $publication) {
@@ -79,11 +81,7 @@ public function safeHandle(): int
                             throw new Exception("Field [$fieldName] is missing from publication");
                         }
 
-                        $pubTypeField->validate(
-                            $publication->matter->get($fieldName),
-                            $publicationFieldRules->get($fieldName),
-                            $pubType
-                        );
+                        (new ValidatesPublicationField($pubType, $pubTypeField))->validate($publication->matter->get($fieldName));
                         $this->output->writeln(" <fg=green>$checkmark</>");
                     } catch (Exception $e) {
                         $countErrors++;
@@ -102,7 +100,7 @@ public function safeHandle(): int
 
         $warnColor = $countWarnings ? 'yellow' : 'green';
         $errorColor = $countErrors ? 'red' : 'green';
-        $this->title('Summary:');
+        $this->subtitle('Summary:');
         $this->output->writeln("<fg=green>Validated $countPubTypes Publication Types, $countPubs Publications, $countFields Fields</>");
         $this->output->writeln("<fg=$warnColor>Found $countWarnings Warnings</>");
         $this->output->writeln("<fg=$errorColor>Found $countErrors Errors</>");
@@ -112,4 +110,19 @@ public function safeHandle(): int
 
         return Command::SUCCESS;
     }
+
+    /*
+     * Displays the given string as subtitle.
+     */
+    public function subtitle(string $title): Command
+    {
+        $size = strlen($title);
+        $spaces = str_repeat(' ', $size);
+
+        $this->output->newLine();
+        $this->output->writeln("<bg=blue;fg=white>$spaces$title$spaces</>");
+        $this->output->newLine();
+
+        return $this;
+    }
 }

packages/framework/src/Framework/Features/Publications/Models/PublicationFieldDefinition.php

@@ -5,14 +5,10 @@
 namespace Hyde\Framework\Features\Publications\Models;
 
 use function array_filter;
-use function collect;
-use function Hyde\evaluate_arrayable;
-use Hyde\Framework\Features\Publications\PublicationFieldService;
+use function array_merge;
 use Hyde\Framework\Features\Publications\PublicationFieldTypes;
 use Hyde\Support\Concerns\Serializable;
 use Hyde\Support\Contracts\SerializableContract;
-use Illuminate\Contracts\Support\Arrayable;
-use Illuminate\Support\Collection;
 use Illuminate\Support\Str;
 use function str_starts_with;
 use function strtolower;
@@ -53,18 +49,12 @@ public function toArray(): array
     }
 
     /**
-     * @param  \Hyde\Framework\Features\Publications\Models\PublicationType|null  $publicationType  Required only when using the 'image' type.
+     * Get the validation rules for this field.
+     *
+     * @return array<string> The type default rules merged with any custom rules.
      */
-    public function getValidationRules(?PublicationType $publicationType = null): Collection
+    public function getRules(): array
     {
-        return collect(PublicationFieldService::getValidationRulesForPublicationFieldDefinition($publicationType, $this));
-    }
-
-    /** @param \Hyde\Framework\Features\Publications\Models\PublicationType|null $publicationType Required only when using the 'image' type. */
-    public function validate(mixed $input = null, Arrayable|array|null $fieldRules = null, ?PublicationType $publicationType = null): array
-    {
-        $rules = evaluate_arrayable($fieldRules ?? $this->getValidationRules($publicationType));
-
-        return validator([$this->name => $input], [$this->name => $rules])->validate();
+        return array_merge($this->type->rules(), $this->rules);
     }
 }

packages/framework/src/Framework/Features/Publications/Models/PublicationType.php

@@ -106,16 +106,6 @@ public function getFields(): Collection
         return Collection::make($result);
     }
 
-    /** @return \Illuminate\Support\Collection<string, \Illuminate\Support\Collection> */
-    public function getFieldRules(): Collection
-    {
-        return Collection::make(
-            $this->getFields()->mapWithKeys(function (PublicationFieldDefinition $field) {
-                return [$field->name => $field->getValidationRules($this)];
-            })
-        );
-    }
-
     public function getFieldDefinition(string $fieldName): PublicationFieldDefinition
     {
         return $this->getFields()->filter(fn (PublicationFieldDefinition $field): bool => $field->name === $fieldName)->firstOrFail();

packages/framework/src/Framework/Features/Publications/PublicationFieldService.php

@@ -4,60 +4,10 @@
 
 namespace Hyde\Framework\Features\Publications;
 
-use function array_merge;
-use function collect;
-use Hyde\Framework\Features\Publications\Models\PublicationFieldDefinition;
-use Hyde\Framework\Features\Publications\Models\PublicationType;
-
 /**
  * @see \Hyde\Framework\Testing\Feature\PublicationFieldServiceTest
  */
 class PublicationFieldService
 {
-    public static function getValidationRulesForPublicationFieldDefinition(?PublicationType $publicationType, PublicationFieldDefinition $fieldDefinition): array
-    {
-        return array_merge(
-            self::getDefaultRulesForFieldType($fieldDefinition->type),
-            self::makeDynamicValidationRulesForPublicationFieldEntry($fieldDefinition, $publicationType),
-            self::getCustomRulesFromPublicationTypeSchema($fieldDefinition)
-        );
-    }
-
-    protected static function makeDynamicValidationRulesForPublicationFieldEntry(
-        Models\PublicationFieldDefinition $fieldDefinition, ?PublicationType $publicationType
-    ): array {
-        if ($fieldDefinition->type == PublicationFieldTypes::Image) {
-            if ($publicationType !== null) {
-                $mediaFiles = PublicationService::getMediaForPubType($publicationType);
-                $valueList = $mediaFiles->implode(',');
-            } else {
-                $valueList = '';
-            }
-
-            return ["in:$valueList"];
-        }
-
-        if ($fieldDefinition->type == PublicationFieldTypes::Tag) {
-            if ($publicationType !== null) {
-                $tagValues = PublicationService::getValuesForTagName($publicationType->getIdentifier()) ?? collect([]);
-                $valueList = $tagValues->implode(',');
-            } else {
-                $valueList = '';
-            }
-
-            return ["in:$valueList"];
-        }
-
-        return [];
-    }
-
-    protected static function getDefaultRulesForFieldType(PublicationFieldTypes $type): array
-    {
-        return $type->rules();
-    }
-
-    protected static function getCustomRulesFromPublicationTypeSchema(PublicationFieldDefinition $fieldDefinition): array
-    {
-        return $fieldDefinition->rules;
-    }
+    //
 }

packages/framework/src/Framework/Features/Publications/ValidatesPublicationField.php

@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Features\Publications;
+
+use function array_merge;
+use function collect;
+use Hyde\Framework\Features\Publications\Models\PublicationFieldDefinition;
+use Hyde\Framework\Features\Publications\Models\PublicationType;
+use Illuminate\Contracts\Validation\Validator;
+use function validator;
+
+/**
+ * @see \Hyde\Framework\Testing\Feature\ValidatesPublicationsTest
+ */
+class ValidatesPublicationField
+{
+    protected PublicationType $publicationType;
+    protected PublicationFieldDefinition $fieldDefinition;
+
+    public function __construct(PublicationType $publicationType, PublicationFieldDefinition $fieldDefinition)
+    {
+        $this->publicationType = $publicationType;
+        $this->fieldDefinition = $fieldDefinition;
+    }
+
+    public function getValidationRules(): array
+    {
+        return array_merge(
+            $this->fieldDefinition->getRules(),
+            $this->makeDynamicRules()
+        );
+    }
+
+    public function validate(mixed $input = null): array
+    {
+        return $this->makeValidator($input, $this->getValidationRules())->validate();
+    }
+
+    protected function makeDynamicRules(): array
+    {
+        if ($this->fieldDefinition->type == PublicationFieldTypes::Image) {
+            $mediaFiles = PublicationService::getMediaForPubType($this->publicationType);
+            $valueList = $mediaFiles->implode(',');
+
+            return ["in:$valueList"];
+        }
+
+        if ($this->fieldDefinition->type == PublicationFieldTypes::Tag) {
+            $tagValues = PublicationService::getValuesForTagName($this->publicationType->getIdentifier()) ?? collect([]);
+            $valueList = $tagValues->implode(',');
+
+            return ["in:$valueList"];
+        }
+
+        return [];
+    }
+
+    protected function makeValidator(mixed $input, array $rules): Validator
+    {
+        return validator(
+            [$this->fieldDefinition->name => $input],
+            [$this->fieldDefinition->name => $rules]
+        );
+    }
+}