Add tests for and refactor publication field type validation rules

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

@@ -4,6 +4,7 @@
 
 namespace Hyde\Framework\Features\Publications\Models;
 
+use function collect;
 use Hyde\Framework\Features\Publications\Concerns\PublicationFieldTypes;
 use Hyde\Framework\Features\Publications\PublicationService;
 use Hyde\Support\Concerns\Serializable;
@@ -64,25 +65,26 @@ public function toArray(): array
         ];
     }
 
+    /** @see \Hyde\Framework\Testing\Unit\PublicationFieldTypeValidationRulesTest */
     public function getValidationRules(bool $reload = true): Collection
     {
         $defaultRules = Collection::create(PublicationFieldTypes::values());
         $fieldRules = Collection::create($defaultRules->get($this->type->value));
 
-        $doBetween = true;
+        $useRange = true;
         // The trim command used to process the min/max input results in a string, so
         // we need to test both int and string values to determine required status.
         if (($this->min && ! $this->max) || ($this->min == '0' && $this->max == '0')) {
             $fieldRules->forget($fieldRules->search('required'));
-            $doBetween = false;
+            $useRange = false;
         }
 
         switch ($this->type->value) {
             case 'array':
-                $fieldRules->add('array');
+                $fieldRules->add('array'); // FIXME do we do range validation too?
                 break;
             case 'datetime':
-                if ($doBetween) {
+                if ($useRange) {
                     $fieldRules->add("after:$this->min");
                     $fieldRules->add("before:$this->max");
                 }
@@ -91,26 +93,26 @@ public function getValidationRules(bool $reload = true): Collection
             case 'integer':
             case 'string':
             case 'text':
-                if ($doBetween) {
+                if ($useRange) {
                     $fieldRules->add("between:$this->min,$this->max");
                 }
                 break;
             case 'image':
                 $mediaFiles = PublicationService::getMediaForPubType($this->publicationType, $reload);
                 $valueList = $mediaFiles->implode(',');
-                $fieldRules->add("in:$valueList");
+                $fieldRules->add("in:$valueList"); // FIXME What if the list is empty?
+                                                   // FIXME: Now the items look like 'in:_media/foo/bar.jpg', but do we really need the directory information?
+                                                   //   Wouldn't it suffice with just 'in:bar.jpg' since we already know what directory it is in?
+                                                   //   We could then easily qualify it within the template and/or via a helper method.
                 break;
             case 'tag':
-                $tagValues = PublicationService::getValuesForTagName($this->tagGroup, $reload);
+                $tagValues = PublicationService::getValuesForTagName($this->tagGroup, $reload) ?? collect([]);
                 $valueList = $tagValues->implode(',');
                 $fieldRules->add("in:$valueList");
                 break;
             case 'url':
+                // FIXME Shouldn't we add a 'url' rule here?
                 break;
-            default:
-                throw new \InvalidArgumentException(
-                    "Unhandled field type [{$this->type->value}]. Possible field types are: ".implode(', ', PublicationFieldTypes::values())
-                );
         }
 
         return $fieldRules;

packages/framework/tests/Unit/PublicationFieldTypeValidationRulesTest.php

@@ -0,0 +1,72 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Hyde\Framework\Testing\Unit;
+
+use Hyde\Framework\Features\Publications\Models\PublicationFieldType;
+use Hyde\Framework\Features\Publications\Models\PublicationType;
+use Hyde\Testing\TestCase;
+
+/**
+ * @covers \Hyde\Framework\Features\Publications\Models\PublicationFieldType
+ */
+class PublicationFieldTypeValidationRulesTest extends TestCase
+{
+    public function testWithArray()
+    {
+        $rules = (new PublicationFieldType('array', 'myArray', '4', '8'))->getValidationRules();
+        $this->assertSame(['array'], $rules->toArray());
+    }
+
+    public function testWithDatetime()
+    {
+        $rules = (new PublicationFieldType('datetime', 'myDatetime', '4', '8'))->getValidationRules();
+        $this->assertSame(['after:4', 'before:8'], $rules->toArray());
+    }
+
+    public function testWithFloat()
+    {
+        $rules = (new PublicationFieldType('float', 'myFloat', '4', '8'))->getValidationRules();
+        $this->assertSame(['between:4,8'], $rules->toArray());
+    }
+
+    public function testWithInteger()
+    {
+        $rules = (new PublicationFieldType('integer', 'myInteger', '4', '8'))->getValidationRules();
+        $this->assertSame(['between:4,8'], $rules->toArray());
+    }
+
+    public function testWithString()
+    {
+        $rules = (new PublicationFieldType('string', 'myString', '4', '8'))->getValidationRules();
+        $this->assertSame(['between:4,8'], $rules->toArray());
+    }
+
+    public function testWithText()
+    {
+        $rules = (new PublicationFieldType('text', 'myText', '4', '8'))->getValidationRules();
+        $this->assertSame(['between:4,8'], $rules->toArray());
+    }
+
+    public function testWithImage()
+    {
+        $this->directory('_media/foo');
+        $this->file('_media/foo/bar.jpg');
+        $this->file('_media/foo/baz.png');
+        $rules = (new PublicationFieldType('image', 'myImage', '4', '8', publicationType: new PublicationType('foo')))->getValidationRules();
+        $this->assertSame(['in:_media/foo/bar.jpg,_media/foo/baz.png'], $rules->toArray());
+    }
+
+    public function testWithTag()
+    {
+        $rules = (new PublicationFieldType('tag', 'myTag', '4', '8', 'foo'))->getValidationRules();
+        $this->assertSame(['in:'], $rules->toArray());
+    }
+
+    public function testWithUrl()
+    {
+        $rules = (new PublicationFieldType('url', 'myUrl', '4', '8'))->getValidationRules();
+        $this->assertSame([], $rules->toArray());
+    }
+}