Don't marshal arrays to 1.0.

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

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/Database/Type/DecimalType.php b/src/Database/Type/DecimalType.php
@@ -157,8 +157,8 @@ public function marshal($value)
         if (is_numeric($value)) {
             return (float)$value;
         }
-        if (is_array($value)) {
-            return 1;
+        if (!is_scalar($value)) {
+            return null;
         }
 
         return $value;

diff --git a/src/Database/Type/FloatType.php b/src/Database/Type/FloatType.php
@@ -146,8 +146,8 @@ public function marshal($value)
         if (is_string($value) && $this->_useLocaleParser) {
             return $this->_parseValue($value);
         }
-        if (is_array($value)) {
-            return 1.0;
+        if (!is_scalar($value)) {
+            return null;
         }
 
         return $value;

diff --git a/tests/TestCase/Database/Type/DecimalTypeTest.php b/tests/TestCase/Database/Type/DecimalTypeTest.php
@@ -171,7 +171,7 @@ public function testMarshal()
         $this->assertSame('3.5 bears', $result);
 
         $result = $this->type->marshal(['3', '4']);
-        $this->assertSame(1, $result);
+        $this->assertNull($result);
     }
 
     /**

diff --git a/tests/TestCase/Database/Type/FloatTypeTest.php b/tests/TestCase/Database/Type/FloatTypeTest.php
@@ -160,7 +160,7 @@ public function testMarshal()
         $this->assertSame('3.5 bears', $result);
 
         $result = $this->type->marshal(['3', '4']);
-        $this->assertSame(1.0, $result);
+        $this->assertNull($result);
     }
 
     /**