Marshal non scalar values to null.

cakephp · Aug 15, 2018 · 399624a · 399624a
1 parent a7e21d3
commit 399624a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/Database/Type/BoolType.php b/src/Database/Type/BoolType.php
@@ -161,6 +161,9 @@ public function marshal($value)
         if ($value === 'false') {
             return false;
         }
+        if (!is_scalar($value)) {
+            return null;
+        }
 
         return !empty($value);
     }

diff --git a/tests/TestCase/Database/Type/BoolTypeTest.php b/tests/TestCase/Database/Type/BoolTypeTest.php
@@ -157,7 +157,7 @@ public function testMarshal()
         $this->assertFalse($this->type->marshal(0));
         $this->assertFalse($this->type->marshal(''));
         $this->assertTrue($this->type->marshal('not empty'));
-        $this->assertTrue($this->type->marshal(['2', '3']));
+        $this->assertNull($this->type->marshal(['2', '3']));
     }
 
     /**