fix whitespace/comma removal for smallint/bigint

atk4 · May 28, 2024 · f3aadbf · f3aadbf
1 parent 8c03a8c
commit f3aadbf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/Persistence.php b/src/Persistence.php
@@ -347,7 +347,9 @@ private function _typecastPreField(Field $field, $value, bool $fromLoad)
         if (is_string($value)) {
             switch ($field->type) {
                 case 'boolean':
+                case 'smallint':
                 case 'integer':
+                case 'bigint':
                     $value = preg_replace('~\s+|,~', '', $value);
 
                     break;

diff --git a/tests/FieldTest.php b/tests/FieldTest.php
@@ -613,7 +613,9 @@ public function testNormalize(): void
 
         $m->addField('string', ['type' => 'string']);
         $m->addField('text', ['type' => 'text']);
+        $m->addField('smallint', ['type' => 'smallint']);
         $m->addField('integer', ['type' => 'integer']);
+        $m->addField('bigint', ['type' => 'bigint']);
         $m->addField('money', ['type' => 'atk4_money']);
         $m->addField('float', ['type' => 'float']);
         $m->addField('boolean', ['type' => 'boolean']);
@@ -645,9 +647,15 @@ public function testNormalize(): void
         self::assertSame("Two\nLines", $m->get('text'));
 
         // integer, money, float
+        $m->set('smallint', '12,345.67676767');
+        self::assertSame(12345, $m->get('smallint'));
+
         $m->set('integer', '12,345.67676767');
         self::assertSame(12345, $m->get('integer'));
 
+        $m->set('bigint', '12,345.67676767');
+        self::assertSame(12345, (int) $m->get('bigint')); // once DBAL 3.x support is dropped, the explicit cast should no longer be needed
+
         $m->set('money', '12,345.67676767');
         self::assertSame(12345.6768, $m->get('money'));