Support using mysql int constants on same types

Author: MasterOdin

src/Phinx/Db/Adapter/MysqlAdapter.php

@@ -1019,12 +1019,28 @@ public function getSqlType($type, $limit = null)
             case static::PHINX_TYPE_BIT:
                 return ['name' => 'bit', 'limit' => $limit ?: 64];
             case static::PHINX_TYPE_BIG_INTEGER:
+                if ($limit === static::INT_BIG) {
+                    $limit = 20;
+                }
+
                 return ['name' => 'bigint', 'limit' => $limit ?: 20];
             case static::PHINX_TYPE_MEDIUM_INTEGER:
+                if ($limit === static::INT_MEDIUM) {
+                    $limit = 8;
+                }
+
                 return ['name' => 'mediumint', 'limit' => $limit ?: 8];
             case static::PHINX_TYPE_SMALL_INTEGER:
+                if ($limit === static::INT_SMALL) {
+                    $limit = 6;
+                }
+
                 return ['name' => 'smallint', 'limit' => $limit ?: 6];
             case static::PHINX_TYPE_TINY_INTEGER:
+                if ($limit === static::INT_TINY) {
+                    $limit = 4;
+                }
+
                 return ['name' => 'tinyint', 'limit' => $limit ?: 4];
             case static::PHINX_TYPE_INTEGER:
                 if ($limit && $limit >= static::INT_TINY) {

tests/Phinx/Db/Adapter/MysqlAdapterTest.php

@@ -884,6 +884,48 @@ public function testChangeColumnDefaultToNull()
         $this->assertNull($rows[1]['Default']);
     }
 
+    public function sqlTypeProvider()
+    {
+        // TODO: add tests for missing types
+        return [
+          // tinyint
+          [AdapterInterface::PHINX_TYPE_TINY_INTEGER, null, 'tinyint', 4],
+          [AdapterInterface::PHINX_TYPE_TINY_INTEGER, 2, 'tinyint', 2],
+          [AdapterInterface::PHINX_TYPE_TINY_INTEGER, MysqlAdapter::INT_TINY, 'tinyint', 4],
+          // smallint
+          [AdapterInterface::PHINX_TYPE_SMALL_INTEGER, null, 'smallint', 6],
+          [AdapterInterface::PHINX_TYPE_SMALL_INTEGER, 3, 'smallint', 3],
+          [AdapterInterface::PHINX_TYPE_SMALL_INTEGER, MysqlAdapter::INT_SMALL, 'smallint', 6],
+          // medium
+          [AdapterInterface::PHINX_TYPE_MEDIUM_INTEGER, null, 'mediumint', 8],
+          [AdapterInterface::PHINX_TYPE_MEDIUM_INTEGER, 2, 'mediumint', 2],
+          [AdapterInterface::PHINX_TYPE_MEDIUM_INTEGER, MysqlAdapter::INT_MEDIUM, 'mediumint', 8],
+          // integer
+          [AdapterInterface::PHINX_TYPE_INTEGER, null, 'int', 11],
+          [AdapterInterface::PHINX_TYPE_INTEGER, 4, 'int', 4],
+          [AdapterInterface::PHINX_TYPE_INTEGER, MysqlAdapter::INT_TINY, 'tinyint', 4],
+          [AdapterInterface::PHINX_TYPE_INTEGER, MysqlAdapter::INT_SMALL, 'smallint', 6],
+          [AdapterInterface::PHINX_TYPE_INTEGER, MysqlAdapter::INT_MEDIUM, 'mediumint', 8],
+          [AdapterInterface::PHINX_TYPE_INTEGER, MysqlAdapter::INT_REGULAR, 'int', 11],
+          [AdapterInterface::PHINX_TYPE_INTEGER, MysqlAdapter::INT_BIG, 'bigint', 20],
+          // bigint
+          [AdapterInterface::PHINX_TYPE_BIG_INTEGER, null, 'bigint', 20],
+          [AdapterInterface::PHINX_TYPE_BIG_INTEGER, 4, 'bigint', 4],
+          [AdapterInterface::PHINX_TYPE_BIG_INTEGER, MysqlAdapter::INT_BIG, 'bigint', 20],
+        ];
+    }
+
+    /**
+     * @dataProvider sqlTypeProvider
+     * The second argument is not typed as MysqlAdapter::INT_BIG is a float, and all other values are integers
+     */
+    public function testGetSqlType(string $type, $limit, string $expectedType, int $expectedLimit)
+    {
+        $sqlType = $this->adapter->getSqlType($type, $limit);
+        $this->assertEquals($expectedType, $sqlType['name']);
+        $this->assertEquals($expectedLimit, $sqlType['limit']);
+    }
+
     public function testLongTextColumn()
     {
         $table = new \Phinx\Db\Table('t', [], $this->adapter);