allow incorrect decimal / float formatting

cakephp · Dec 14, 2018 · f195735 · f195735
1 parent 41a16ec
commit f195735
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/src/Database/Type/DecimalType.php b/src/Database/Type/DecimalType.php
@@ -158,7 +158,12 @@ public function marshal($value)
             return (float)$value;
         }
 
-        return null;
+        // allow custom decimal format (@see https://github.com/cakephp/cakephp/issues/12800)
+        if (preg_match('/[^0-9,. ]/', $value)) {
+            return null;
+        }
+
+        return $value;
     }
 
     /**

diff --git a/src/Database/Type/FloatType.php b/src/Database/Type/FloatType.php
@@ -147,7 +147,12 @@ public function marshal($value)
             return (float)$value;
         }
 
-        return null;
+        // allow custom decimal format (@see https://github.com/cakephp/cakephp/issues/12800)
+        if (preg_match('/[^0-9,. ]/', $value)) {
+            return null;
+        }
+
+        return $value;
     }
 
     /**

diff --git a/tests/TestCase/Database/Type/DecimalTypeTest.php b/tests/TestCase/Database/Type/DecimalTypeTest.php
@@ -167,6 +167,9 @@ public function testMarshal()
         $result = $this->type->marshal('2.51');
         $this->assertSame(2.51, $result);
 
+        $result = $this->type->marshal('1 230,73');
+        $this->assertSame('1 230,73', $result);
+
         $result = $this->type->marshal('3.5 bears');
         $this->assertNull($result);
 

diff --git a/tests/TestCase/Database/Type/FloatTypeTest.php b/tests/TestCase/Database/Type/FloatTypeTest.php
@@ -156,6 +156,9 @@ public function testMarshal()
         $result = $this->type->marshal('2.51');
         $this->assertSame(2.51, $result);
 
+        $result = $this->type->marshal('1 230,73');
+        $this->assertSame('1 230,73', $result);
+
         $result = $this->type->marshal('3.5 bears');
         $this->assertNull($result);