Fixed support for config properties on URL fields (#1439)

Co-authored-by: Luke Towers <git@luketowers.ca>

Author: mjauvin

modules/backend/classes/FormField.php

@@ -91,9 +91,9 @@ class FormField
     public $span = 'full';
 
     /**
-     * @var string Specifies a size. Possible values: tiny, small, large, huge, giant.
+     * @var string|int Specifies a size. Possible values for textarea: tiny, small, large, huge, giant.
      */
-    public $size = 'large';
+    public $size;
 
     /**
      * @var string Specifies contextual visibility of this form field.
@@ -211,7 +211,7 @@ public function span($value = 'full')
     }
 
     /**
-     * Sets a side of the field on a form.
+     * Sets the size of the field on a form.
      * @param string $value Specifies a size. Possible values: tiny, small, large, huge, giant
      */
     public function size($value = 'large')
@@ -259,6 +259,11 @@ public function options($value = null)
      */
     public function displayAs($type, $config = [])
     {
+        if (in_array($type, ['textarea', 'widget'])) {
+            // defaults to 'large'
+            $this->size = 'large';
+        }
+
         $this->type = strtolower($type) ?: $this->type;
         $this->config = $this->evalConfig($config);
 
@@ -281,18 +286,18 @@ protected function evalConfig($config)
          */
         $applyConfigValues = [
             'commentHtml',
-            'placeholder',
+            'context',
+            'cssClass',
             'dependsOn',
-            'required',
-            'readOnly',
             'disabled',
-            'cssClass',
-            'stretch',
-            'context',
             'hidden',
-            'trigger',
-            'preset',
             'path',
+            'placeholder',
+            'preset',
+            'readOnly',
+            'required',
+            'stretch',
+            'trigger',
         ];
 
         foreach ($applyConfigValues as $value) {
@@ -729,4 +734,31 @@ protected function getFieldNameFromData($fieldName, $data, $default = null)
 
         return $result;
     }
+
+    /**
+      * Implements the getter functionality.
+      * @param  string  $name
+      */
+    public function __get($name)
+    {
+        if (is_array($this->config) && array_key_exists($name, $this->config)) {
+            return array_get($this->config, $name);
+        }
+        if (property_exists($this, $name)) {
+            return $this->{$name};
+        }
+        return null;
+    }
+
+    /**
+      * Determine if an attribute exists on the object.
+      * @param  string  $name
+      */
+    public function __isset($name)
+    {
+        if (is_array($this->config) && array_key_exists($name, $this->config)) {
+            return true;
+        }
+        return property_exists($this, $name) && !is_null($this->{$name});
+    }
 }

modules/backend/widgets/form/partials/_field_tel.php

@@ -32,7 +32,7 @@ class="form-control"
             <?= isset($field->maxlength) && is_numeric($field->maxlength) ? 'maxlength="' . e($field->maxlength) . '"' : '' ?>
             <?= isset($field->minlength) && is_numeric($field->minlength) ? 'minlength="' . e($field->minlength) . '"' : '' ?>
             <?= isset($field->pattern) && is_string($field->pattern) ? 'pattern="' . e($field->pattern) . '"' : '' ?>
-            <?= isset($field->placeholder) && is_string($field->placeholder) ? 'placeholder="' . e($field->placeholder) . '"' : '' ?>
+            <?= isset($field->placeholder) && is_string($field->placeholder) ? 'placeholder="' . e(trans($field->placeholder)) . '"' : '' ?>
             <?= isset($field->size) && is_numeric($field->size) ? 'size="' . e($field->size) . '"' : '' ?>
             <?= $field->getAttributes() ?>
             <?= $listId ? 'list="' . e($listId) . '"' : '' ?>

modules/backend/widgets/form/partials/_field_url.php

@@ -27,18 +27,15 @@ class="form-control"
             name="<?= $field->getName() ?>"
             id="<?= $field->getId() ?>"
             value="<?= e($field->value) ?>"
-            placeholder="<?= e(trans($field->placeholder)) ?>"
             class="form-control"
+            <?= isset($field->autocomplete) && is_string($field->autocomplete) ? 'autocomplete="' . e($field->autocomplete) . '"' : '' ?>
+            <?= isset($field->maxlength) && is_numeric($field->maxlength) ? 'maxlength="' . e($field->maxlength) . '"' : '' ?>
+            <?= isset($field->minlength) && is_numeric($field->minlength) ? 'minlength="' . e($field->minlength) . '"' : '' ?>
+            <?= isset($field->pattern) && is_string($field->pattern) ? 'pattern="' . e($field->pattern) . '"' : '' ?>
+            <?= isset($field->placeholder) && is_string($field->placeholder) ? 'placeholder="' . e(trans($field->placeholder)) . '"' : '' ?>
+            <?= isset($field->size) && is_numeric($field->size) ? 'size="' . e($field->size) . '"' : '' ?>
             <?= $field->getAttributes() ?>
-            <?= isset($field->maxlength) ? 'maxlength="' . e($field->maxlength) . '"' : '' ?>
-            <?= isset($field->minlength) ? 'minlength="' . e($field->minlength) . '"' : '' ?>
-            <?= isset($field->pattern) ? 'pattern="' . e($field->pattern) . '"' : '' ?>
-            <?= isset($field->size) ? 'size="' . e($field->size) . '"' : '' ?>
             <?= $listId ? 'list="' . e($listId) . '"' : '' ?>
-            <?= isset($field->autocomplete) ? 'autocomplete="' . e($field->autocomplete) . '"' : '' ?>
-            <?= isset($field->required) && $field->required ? 'required' : '' ?>
-            <?= isset($field->readonly) && $field->readonly ? 'readonly' : '' ?>
-            <?= isset($field->disabled) && $field->disabled ? 'disabled' : '' ?>
         />
         <?php if ($hasOptions): ?>
             <datalist id="<?= e($listId) ?>">