diff --git a/src/Db/Adapter/MysqlAdapter.php b/src/Db/Adapter/MysqlAdapter.php index 54156672..5c0dd5d0 100644 --- a/src/Db/Adapter/MysqlAdapter.php +++ b/src/Db/Adapter/MysqlAdapter.php @@ -39,21 +39,6 @@ class MysqlAdapter extends AbstractAdapter self::PHINX_TYPE_MEDIUM_INTEGER, ]; - /** - * @var bool[] - */ - protected array $signedColumnTypes = [ - self::PHINX_TYPE_INTEGER => true, - self::PHINX_TYPE_TINY_INTEGER => true, - self::PHINX_TYPE_SMALL_INTEGER => true, - self::PHINX_TYPE_MEDIUM_INTEGER => true, - self::PHINX_TYPE_BIG_INTEGER => true, - self::PHINX_TYPE_FLOAT => true, - self::PHINX_TYPE_DECIMAL => true, - self::PHINX_TYPE_DOUBLE => true, - self::PHINX_TYPE_BOOLEAN => true, - ]; - // These constants roughly correspond to the maximum allowed value for each field, // except for the `_LONG` and `_BIG` variants, which are maxed at 32-bit // PHP_INT_MAX value. The `INT_REGULAR` field is just arbitrarily half of INT_BIG diff --git a/src/Db/Adapter/SqliteAdapter.php b/src/Db/Adapter/SqliteAdapter.php index f0c52592..3acde97a 100644 --- a/src/Db/Adapter/SqliteAdapter.php +++ b/src/Db/Adapter/SqliteAdapter.php @@ -60,62 +60,6 @@ class SqliteAdapter extends AbstractAdapter self::PHINX_TYPE_VARBINARY => 'varbinary_blob', ]; - /** - * List of aliases of supported column types - * - * @var string[] - */ - protected static array $supportedColumnTypeAliases = [ - 'varchar' => self::PHINX_TYPE_STRING, - 'tinyint' => self::PHINX_TYPE_TINY_INTEGER, - 'tinyinteger' => self::PHINX_TYPE_TINY_INTEGER, - 'smallint' => self::PHINX_TYPE_SMALL_INTEGER, - 'int' => self::PHINX_TYPE_INTEGER, - 'mediumint' => self::PHINX_TYPE_INTEGER, - 'mediuminteger' => self::PHINX_TYPE_INTEGER, - 'bigint' => self::PHINX_TYPE_BIG_INTEGER, - 'tinytext' => self::PHINX_TYPE_TEXT, - 'mediumtext' => self::PHINX_TYPE_TEXT, - 'longtext' => self::PHINX_TYPE_TEXT, - 'tinyblob' => self::PHINX_TYPE_BLOB, - 'mediumblob' => self::PHINX_TYPE_BLOB, - 'longblob' => self::PHINX_TYPE_BLOB, - 'real' => self::PHINX_TYPE_FLOAT, - ]; - - /** - * List of known but unsupported Phinx column types - * - * @var string[] - */ - protected static array $unsupportedColumnTypes = [ - self::PHINX_TYPE_BIT, - self::PHINX_TYPE_CIDR, - self::PHINX_TYPE_ENUM, - self::PHINX_TYPE_FILESTREAM, - self::PHINX_TYPE_GEOMETRY, - self::PHINX_TYPE_INET, - self::PHINX_TYPE_INTERVAL, - self::PHINX_TYPE_LINESTRING, - self::PHINX_TYPE_MACADDR, - self::PHINX_TYPE_POINT, - self::PHINX_TYPE_POLYGON, - self::PHINX_TYPE_SET, - ]; - - /** - * @var string[] - */ - protected array $definitionsWithLimits = [ - 'CHAR', - 'CHARACTER', - 'VARCHAR', - 'VARYING CHARACTER', - 'NCHAR', - 'NATIVE CHARACTER', - 'NVARCHAR', - ]; - /** * @var string */ diff --git a/src/Db/Adapter/SqlserverAdapter.php b/src/Db/Adapter/SqlserverAdapter.php index 5a399d2e..f8375a46 100644 --- a/src/Db/Adapter/SqlserverAdapter.php +++ b/src/Db/Adapter/SqlserverAdapter.php @@ -41,16 +41,6 @@ class SqlserverAdapter extends AbstractAdapter */ protected string $schema = 'dbo'; - /** - * @var bool[] - */ - protected array $signedColumnTypes = [ - self::PHINX_TYPE_INTEGER => true, - self::PHINX_TYPE_BIG_INTEGER => true, - self::PHINX_TYPE_FLOAT => true, - self::PHINX_TYPE_DECIMAL => true, - ]; - /** * Quotes a schema name for use in a query. * diff --git a/tests/TestCase/Config/AbstractConfigTestCase.php b/tests/TestCase/Config/AbstractConfigTestCase.php index de9ec7b4..41656181 100644 --- a/tests/TestCase/Config/AbstractConfigTestCase.php +++ b/tests/TestCase/Config/AbstractConfigTestCase.php @@ -39,20 +39,10 @@ public function getConfigArray() ]; return [ - 'default' => [ - 'paths' => [ - 'migrations' => '%%PHINX_CONFIG_PATH%%/testmigrations2', - 'seeds' => '%%PHINX_CONFIG_PATH%%/db/seeds', - ], - ], 'paths' => [ 'migrations' => $this->getMigrationPath(), 'seeds' => $this->getSeedPath(), ], - 'templates' => [ - 'file' => '%%PHINX_CONFIG_PATH%%/tpl/testtemplate.txt', - 'class' => '%%PHINX_CONFIG_PATH%%/tpl/testtemplate.php', - ], 'environment' => $adapter, ]; } diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 7021e8a9..cf62964b 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -122,10 +122,6 @@ ->add(new SimpleSnapshotPlugin()) ->add(new TestBlogPlugin()); -if (!defined('PHINX_VERSION')) { - define('PHINX_VERSION', strpos('@PHINX_VERSION@', '@PHINX_VERSION') === 0 ? 'UNKNOWN' : '@PHINX_VERSION@'); -} - // Create test database schema if (env('FIXTURE_SCHEMA_METADATA')) { $loader = new SchemaLoader();