use array casting and arguments spread (#950)

atk4 · Feb 17, 2020 · 12351d6 · 12351d6
1 parent f5c4caa
commit 12351d6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/src/Form.php b/src/Form.php
@@ -363,11 +363,7 @@ public function addField($name, $decorator = null, $field = null)
     public function addFields($fields)
     {
         foreach ($fields as $field) {
-            if (is_array($field)) {
-                $this->addField(...$field);
-            } else {
-                $this->addField($field);
-            }
+            $this->addField(...(array) $field);
         }
 
         return $this;
@@ -474,8 +470,8 @@ public function decoratorFactory(\atk4\data\Field $f, $seed = [])
 
         $seed = $this->mergeSeeds(
             $seed,
-            isset($f->ui['form']) ? $f->ui['form'] : null,
-            isset($this->typeToDecorator[$f->type]) ? $this->typeToDecorator[$f->type] : null,
+            $f->ui['form'] ?? null,
+            $this->typeToDecorator[$f->type] ?? null,
             $fallback_seed
         );
 
@@ -517,10 +513,10 @@ public function loadPOST()
 
         foreach ($this->fields as $key => $field) {
             try {
-                $value = isset($post[$key]) ? $post[$key] : null;
-
                 // save field value only if field was editable in form at all
                 if (!$field->readonly && !$field->disabled) {
+                    $value = $post[$key] ?? null;
+
                     $this->model[$key] = $this->app->ui_persistence->typecastLoadField($field->field, $value);
                 }
             } catch (\atk4\core\Exception $e) {

diff --git a/src/FormLayout/_Abstract.php b/src/FormLayout/_Abstract.php
@@ -99,11 +99,7 @@ protected function _addField($decorator, $field)
     public function addFields($fields)
     {
         foreach ($fields as $field) {
-            if (is_array($field)) {
-                $this->addField(...$field);
-            } else {
-                $this->addField($field);
-            }
+            $this->addField(...(array) $field);
         }
 
         return $this;