Set default value for booleans to "false"

rougin · Oct 12, 2024 · 3899dc4 · 3899dc4
1 parent 305b366
commit 3899dc4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/src/Template/Wildfire/Model.php b/src/Template/Wildfire/Model.php
@@ -138,7 +138,7 @@ protected function setInputMethod()
                     $type = $type . '|null';
                 }
 
-                if ($col->isNull() || $type === 'boolean')
+                if ($col->isNull())
                 {
                     $lines[] = 'if (array_key_exists(\'' . $name . '\', $data))';
                     $lines[] = '{';
@@ -149,8 +149,22 @@ protected function setInputMethod()
                 }
                 else
                 {
-                    $lines[] = '/** @var ' . $type . ' */';
-                    $lines[] = '$' . $name . ' = $data[\'' . $name . '\'];';
+
+                    if ($type === 'boolean')
+                    {
+                        $lines[] = '$' . $name . ' = false;';
+                        $lines[] = 'if (array_key_exists(\'' . $name . '\', $data))';
+                        $lines[] = '{';
+                        $lines[] = '    /** @var ' . $type . ' */';
+                        $lines[] = '    $' . $name . ' = $data[\'' . $name . '\'];';
+                        $lines[] = '}';
+                    }
+                    else
+                    {
+                        $lines[] = '/** @var ' . $type . ' */';
+                        $lines[] = '$' . $name . ' = $data[\'' . $name . '\'];';
+                    }
+
                     $lines[] = '$load[\'' . $name . '\'] = $' . $name . ';';
                 }
 

diff --git a/tests/Fixture/Plates/Wildfire/Model.php b/tests/Fixture/Plates/Wildfire/Model.php
@@ -95,12 +95,13 @@ protected function input($data, $id = null)
         $year = $data['year'];
         $load['year'] = $year;
 
+        $admin = false;
         if (array_key_exists('admin', $data))
         {
             /** @var boolean */
             $admin = $data['admin'];
-            $load['admin'] = $admin;
         }
+        $load['admin'] = $admin;
 
         if (array_key_exists('remarks', $data))
         {