Don't marshal arrays to 1.

cakephp · Aug 15, 2018 · a7e21d3 · a7e21d3
1 parent 2e91a0e
commit a7e21d3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Database/Type/IntegerType.php b/src/Database/Type/IntegerType.php
@@ -130,12 +130,9 @@ public function marshal($value)
         if ($value === null || $value === '') {
             return null;
         }
-        if (is_numeric($value) || ctype_digit($value)) {
+        if (is_numeric($value)) {
             return (int)$value;
         }
-        if (is_array($value)) {
-            return 1;
-        }
 
         return null;
     }

diff --git a/tests/TestCase/Database/Type/IntegerTypeTest.php b/tests/TestCase/Database/Type/IntegerTypeTest.php
@@ -159,7 +159,10 @@ public function testMarshal()
         $this->assertNull($result);
 
         $result = $this->type->marshal(['3', '4']);
-        $this->assertSame(1, $result);
+        $this->assertNull($result);
+
+        $result = $this->type->marshal('+0123.45e2');
+        $this->assertSame(12345, $result);
     }
 
     /**