Remove tags, images, and files methods inconsistencies

getformwork · Feb 22, 2025 · fb154eb · fb154eb
1 parent e5f96a0
commit fb154eb
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 9 deletions.
diff --git a/formwork/fields/files.php b/formwork/fields/files.php
@@ -50,7 +50,7 @@
                 $value = array_filter($value, static fn($item): bool => Constraint::matchesRegex($item, $field->get('pattern')));
             }
 
-            if ($field->has('limit') && count($value) > $field->get('limit')) {
+            if ($field->limit() !== null && count($value) > $field->limit()) {
                 throw new ValidationException(sprintf('Field "%s" of type "%s" has a limit of %d items', $field->name(), $field->type(), $field->get('limit')));
             }
 
@@ -75,5 +75,9 @@
         'limit' => function (Field $field): ?int {
             return $field->get('limit', null);
         },
+
+        'isOrderable' => function ($field): bool {
+            return $field->is('orderable', true);
+        },
     ];
 };
diff --git a/formwork/fields/images.php b/formwork/fields/images.php
@@ -52,7 +52,7 @@
                 $value = array_filter($value, static fn($item): bool => Constraint::matchesRegex($item, $field->get('pattern')));
             }
 
-            if ($field->has('limit') && count($value) > $field->get('limit')) {
+            if ($field->limit() !== null && count($value) > $field->limit()) {
                 throw new ValidationException(sprintf('Field "%s" of type "%s" has a limit of %d items', $field->name(), $field->type(), $field->get('limit')));
             }
 
@@ -71,5 +71,9 @@
         'limit' => function (Field $field): ?int {
             return $field->get('limit', null);
         },
+
+        'isOrderable' => function ($field): bool {
+            return $field->is('orderable', true);
+        },
     ];
 };
diff --git a/formwork/fields/tags.php b/formwork/fields/tags.php
@@ -34,7 +34,7 @@
                 $value = array_filter($value, static fn($item): bool => Constraint::matchesRegex($item, $field->get('pattern')));
             }
 
-            if ($field->has('limit') && count($value) > $field->get('limit')) {
+            if ($field->limit() !== null && count($value) > $field->limit()) {
                 throw new ValidationException(sprintf('Field "%s" of type "%s" has a limit of %d items', $field->name(), $field->type(), $field->get('limit')));
             }
 
@@ -47,8 +47,16 @@
             return $options !== null ? Arr::from($options) : null;
         },
 
+        'accept' => function ($field): string {
+            return $field->get('accept', 'options');
+        },
+
         'limit' => function ($field): ?int {
             return $field->get('limit', null);
         },
+
+        'isOrderable' => function ($field): bool {
+            return $field->is('orderable', true);
+        },
     ];
 };
diff --git a/panel/views/fields/files.php b/panel/views/fields/files.php
@@ -14,6 +14,6 @@
                 'data-limit'     => $field->limit(),
                 'data-options'   => Formwork\Parsers\Json::encode($field->options()),
                 'data-accept'    => 'options',
-                'data-orderable' => $field->is('orderable', true),
+                'data-orderable' => $field->isOrderable(),
             ]) ?>>
 </div>
diff --git a/panel/views/fields/images.php b/panel/views/fields/images.php
@@ -14,6 +14,6 @@
                 'data-limit'     => $field->limit(),
                 'data-options'   => Formwork\Parsers\Json::encode($field->options()),
                 'data-accept'    => 'options',
-                'data-orderable' => $field->is('orderable', true),
+                'data-orderable' => $field->isOrderable(),
             ]) ?>>
 </div>
diff --git a/panel/views/fields/tags.php b/panel/views/fields/tags.php
@@ -11,9 +11,9 @@
                 'required'       => $field->isRequired(),
                 'disabled'       => $field->isDisabled(),
                 'hidden'         => $field->isHidden(),
-                'data-limit'     => $field->get('limit'),
-                'data-options'   => $field->has('options') ? Formwork\Parsers\Json::encode($field->options()) : null,
-                'data-accept'    => $field->get('accept', 'options'),
-                'data-orderable' => $field->is('orderable', true),
+                'data-limit'     => $field->limit(),
+                'data-options'   => $field->options() ? Formwork\Parsers\Json::encode($field->options()) : null,
+                'data-accept'    => $field->accept(),
+                'data-orderable' => $field->isOrderable(),
             ]) ?>>
 </div>