Marshal string values to null for FloatType and DecimalType.

This makes then consistent with what IntegerType does.
cakephp · Aug 15, 2018 · e960656 · e960656
1 parent 432ed3b
commit e960656
Show file tree

Hide file tree

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

diff --git a/src/Database/Type/FloatType.php b/src/Database/Type/FloatType.php
@@ -140,17 +140,14 @@ public function marshal($value)
         if ($value === null || $value === '') {
             return null;
         }
-        if (is_numeric($value)) {
-            return (float)$value;
-        }
         if (is_string($value) && $this->_useLocaleParser) {
             return $this->_parseValue($value);
         }
-        if (!is_scalar($value)) {
-            return null;
+        if (is_numeric($value)) {
+            return (float)$value;
         }
 
-        return $value;
+        return null;
     }
 
     /**

diff --git a/tests/TestCase/Database/Type/DecimalTypeTest.php b/tests/TestCase/Database/Type/DecimalTypeTest.php
@@ -159,7 +159,7 @@ public function testToDatabaseInvalid()
     public function testMarshal()
     {
         $result = $this->type->marshal('some data');
-        $this->assertSame('some data', $result);
+        $this->assertNull($result);
 
         $result = $this->type->marshal('');
         $this->assertNull($result);
@@ -168,7 +168,7 @@ public function testMarshal()
         $this->assertSame(2.51, $result);
 
         $result = $this->type->marshal('3.5 bears');
-        $this->assertSame('3.5 bears', $result);
+        $this->assertNull($result);
 
         $result = $this->type->marshal(['3', '4']);
         $this->assertNull($result);

diff --git a/tests/TestCase/Database/Type/FloatTypeTest.php b/tests/TestCase/Database/Type/FloatTypeTest.php
@@ -148,7 +148,7 @@ public function testToDatabase()
     public function testMarshal()
     {
         $result = $this->type->marshal('some data');
-        $this->assertSame('some data', $result);
+        $this->assertNull($result);
 
         $result = $this->type->marshal('');
         $this->assertNull($result);
@@ -157,7 +157,7 @@ public function testMarshal()
         $this->assertSame(2.51, $result);
 
         $result = $this->type->marshal('3.5 bears');
-        $this->assertSame('3.5 bears', $result);
+        $this->assertNull($result);
 
         $result = $this->type->marshal(['3', '4']);
         $this->assertNull($result);