Merge pull request #5515 from morozov/remove-deprecated

Remove the APIs deprecated in DBAL 3.x
doctrine · Jul 17, 2022 · 77f0aff · 77f0aff
2 parents 8d74be5 + ac58f35
commit 77f0aff
Show file tree

Hide file tree

Showing 16 changed files with 51 additions and 369 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -8,6 +8,18 @@ awareness about deprecated code.
 
 # Upgrade to 4.0
 
+## BC BREAK: removed `SqlitePlatform` methods.
+
+1. `getTinyIntTypeDeclarationSQL()`,
+2. `getMediumIntTypeDeclarationSQL()`.
+
+## BC BREAK: removed `AbstractPlatform` methods.
+
+1. `getDefaultSchemaName()`,
+2. `getIdentitySequenceName()`,
+3. `supportsCreateDropDatabase()`,
+4. `usesSequenceEmulatedIdentityColumns()`.
+
 ## BC BREAK: removed support for the `NULL` value of schema asset filter.
 
 The argument of `Configuration::setSchemaAssetsFilter()` is now required and non-nullable.

diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -39,22 +39,6 @@
                     See https://github.com/doctrine/dbal/pull/4317
                 -->
                 <file name="tests/Functional/LegacyAPITest.php"/>
-                <!--
-                    TODO: remove in 4.0.0
-                -->
-                <referencedMethod name="Doctrine\DBAL\Platforms\SqlitePlatform::getTinyIntTypeDeclarationSQL"/>
-                <referencedMethod name="Doctrine\DBAL\Platforms\SqlitePlatform::getMediumIntTypeDeclarationSQL"/>
-                <!--
-                    TODO: remove in 4.0.0
-                -->
-                <referencedMethod name="Doctrine\DBAL\Platforms\AbstractPlatform::getDefaultSchemaName"/>
-                <referencedMethod name="Doctrine\DBAL\Platforms\AbstractPlatform::getIdentitySequenceName"/>
-                <referencedMethod name="Doctrine\DBAL\Platforms\AbstractPlatform::supportsCreateDropDatabase"/>
-                <referencedMethod name="Doctrine\DBAL\Platforms\AbstractPlatform::usesSequenceEmulatedIdentityColumns"/>
-                <referencedMethod name="Doctrine\DBAL\Platforms\DB2Platform::supportsCreateDropDatabase"/>
-                <referencedMethod name="Doctrine\DBAL\Platforms\OraclePlatform::usesSequenceEmulatedIdentityColumns"/>
-                <referencedMethod name="Doctrine\DBAL\Platforms\PostgreSQLPlatform::getIdentitySequenceName"/>
-                <referencedMethod name="Doctrine\DBAL\Platforms\PostgreSQLPlatform::usesSequenceEmulatedIdentityColumns"/>
             </errorLevel>
         </DeprecatedMethod>
         <DocblockTypeContradiction>

diff --git a/src/Platforms/AbstractPlatform.php b/src/Platforms/AbstractPlatform.php
@@ -37,7 +37,6 @@
 use Doctrine\DBAL\Types;
 use Doctrine\DBAL\Types\Exception\TypeNotFound;
 use Doctrine\DBAL\Types\Type;
-use Doctrine\Deprecations\Deprecation;
 use InvalidArgumentException;
 use UnexpectedValueException;
 
@@ -2075,31 +2074,19 @@ public function getSequenceNextValSQL(string $sequence): string
      * Returns the SQL to create a new database.
      *
      * @param string $name The name of the database that should be created.
-     *
-     * @throws Exception If not supported on this platform.
      */
     public function getCreateDatabaseSQL(string $name): string
     {
-        if (! $this->supportsCreateDropDatabase()) {
-            throw NotSupported::new(__METHOD__);
-        }
-
         return 'CREATE DATABASE ' . $name;
     }
 
     /**
      * Returns the SQL snippet to drop an existing database.
      *
      * @param string $name The name of the database that should be dropped.
-     *
-     * @throws Exception If not supported on this platform.
      */
     public function getDropDatabaseSQL(string $name): string
     {
-        if (! $this->supportsCreateDropDatabase()) {
-            throw NotSupported::new(__METHOD__);
-        }
-
         return 'DROP DATABASE ' . $name;
     }
 
@@ -2183,44 +2170,6 @@ public function supportsIdentityColumns(): bool
         return false;
     }
 
-    /**
-     * Whether the platform emulates identity columns through sequences.
-     *
-     * Some platforms that do not support identity columns natively
-     * but support sequences can emulate identity columns by using
-     * sequences.
-     *
-     * @deprecated
-     */
-    public function usesSequenceEmulatedIdentityColumns(): bool
-    {
-        Deprecation::trigger(
-            'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pull/5513',
-            '%s is deprecated.',
-            __METHOD__
-        );
-
-        return false;
-    }
-
-    /**
-     * Returns the name of the sequence for a particular identity column in a particular table.
-     *
-     * @deprecated
-     *
-     * @see usesSequenceEmulatedIdentityColumns
-     *
-     * @param string $tableName  The name of the table to return the sequence name for.
-     * @param string $columnName The name of the identity column in the table to return the sequence name for.
-     *
-     * @throws Exception If not supported on this platform.
-     */
-    public function getIdentitySequenceName(string $tableName, string $columnName): string
-    {
-        throw NotSupported::new(__METHOD__);
-    }
-
     /**
      * Whether the platform supports partial indexes.
      */
@@ -2261,30 +2210,6 @@ public function supportsSchemas(): bool
         return false;
     }
 
-    /**
-     * Returns the default schema name.
-     *
-     * @deprecated
-     *
-     * @throws Exception If not supported on this platform.
-     */
-    public function getDefaultSchemaName(): string
-    {
-        throw NotSupported::new(__METHOD__);
-    }
-
-    /**
-     * Whether this platform supports create database.
-     *
-     * Some databases don't allow to create and drop databases at all or only with certain tools.
-     *
-     * @deprecated
-     */
-    public function supportsCreateDropDatabase(): bool
-    {
-        return true;
-    }
-
     /**
      * Whether this platform support to add inline column comments as postfix.
      */

diff --git a/src/Platforms/DB2Platform.php b/src/Platforms/DB2Platform.php
@@ -14,7 +14,6 @@
 use Doctrine\DBAL\Schema\Identifier;
 use Doctrine\DBAL\Schema\Index;
 use Doctrine\DBAL\Schema\TableDiff;
-use Doctrine\Deprecations\Deprecation;
 
 use function array_merge;
 use function count;
@@ -206,21 +205,6 @@ public function getListViewsSQL(string $database): string
         return 'SELECT NAME, TEXT FROM SYSIBM.SYSVIEWS';
     }
 
-    /**
-     * @deprecated
-     */
-    public function supportsCreateDropDatabase(): bool
-    {
-        Deprecation::trigger(
-            'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pull/5513',
-            '%s is deprecated.',
-            __METHOD__
-        );
-
-        return false;
-    }
-
     public function supportsCommentOnStatement(): bool
     {
         return true;

diff --git a/src/Platforms/OraclePlatform.php b/src/Platforms/OraclePlatform.php
@@ -16,7 +16,6 @@
 use Doctrine\DBAL\Schema\TableDiff;
 use Doctrine\DBAL\TransactionIsolationLevel;
 use Doctrine\DBAL\Types\BinaryType;
-use Doctrine\Deprecations\Deprecation;
 use InvalidArgumentException;
 
 use function array_merge;
@@ -381,8 +380,7 @@ protected function getCreateAutoincrementSql(string $name, string $table, int $s
 END;";
 
         $sequenceName = $this->getIdentitySequenceName(
-            $tableIdentifier->isQuoted() ? $quotedTableName : $unquotedTableName,
-            $nameIdentifier->isQuoted() ? $quotedName : $unquotedName
+            $tableIdentifier->isQuoted() ? $quotedTableName : $unquotedTableName
         );
         $sequence     = new Sequence($sequenceName, $start);
         $sql[]        = $this->getCreateSequenceSQL($sequence);
@@ -426,8 +424,7 @@ public function getDropAutoincrementSql(string $table): array
         $table                       = $this->normalizeIdentifier($table);
         $autoincrementIdentifierName = $this->getAutoincrementIdentifierName($table);
         $identitySequenceName        = $this->getIdentitySequenceName(
-            $table->isQuoted() ? $table->getQuotedName($this) : $table->getName(),
-            ''
+            $table->isQuoted() ? $table->getQuotedName($this) : $table->getName()
         );
 
         return [
@@ -710,25 +707,7 @@ protected function getRenameIndexSQL(string $oldIndexName, Index $index, string
         return ['ALTER INDEX ' . $oldIndexName . ' RENAME TO ' . $index->getQuotedName($this)];
     }
 
-    /**
-     * @deprecated
-     */
-    public function usesSequenceEmulatedIdentityColumns(): bool
-    {
-        Deprecation::trigger(
-            'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pull/5513',
-            '%s is deprecated.',
-            __METHOD__
-        );
-
-        return true;
-    }
-
-    /**
-     * @internal The method should be only used from within the OraclePlatform class hierarchy.
-     */
-    public function getIdentitySequenceName(string $tableName, string $columnName): string
+    protected function getIdentitySequenceName(string $tableName): string
     {
         $table = new Identifier($tableName);
 

diff --git a/src/Platforms/PostgreSQLPlatform.php b/src/Platforms/PostgreSQLPlatform.php
@@ -16,7 +16,6 @@
 use Doctrine\DBAL\Schema\TableDiff;
 use Doctrine\DBAL\Types\BinaryType;
 use Doctrine\DBAL\Types\BlobType;
-use Doctrine\Deprecations\Deprecation;
 use UnexpectedValueException;
 
 use function array_diff;
@@ -125,21 +124,6 @@ public function supportsSchemas(): bool
         return true;
     }
 
-    /**
-     * @deprecated
-     */
-    public function getDefaultSchemaName(): string
-    {
-        Deprecation::trigger(
-            'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pull/5513',
-            '%s is deprecated.',
-            __METHOD__
-        );
-
-        return 'public';
-    }
-
     public function supportsIdentityColumns(): bool
     {
         return true;
@@ -150,36 +134,6 @@ public function supportsPartialIndexes(): bool
         return true;
     }
 
-    /**
-     * @deprecated
-     */
-    public function usesSequenceEmulatedIdentityColumns(): bool
-    {
-        Deprecation::trigger(
-            'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pull/5513',
-            '%s is deprecated.',
-            __METHOD__
-        );
-
-        return true;
-    }
-
-    /**
-     * @deprecated
-     */
-    public function getIdentitySequenceName(string $tableName, string $columnName): string
-    {
-        Deprecation::triggerIfCalledFromOutside(
-            'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pull/5513',
-            '%s is deprecated.',
-            __METHOD__
-        );
-
-        return $tableName . '_' . $columnName . '_seq';
-    }
-
     public function supportsCommentOnStatement(): bool
     {
         return true;

diff --git a/src/Platforms/SQLServerPlatform.php b/src/Platforms/SQLServerPlatform.php
@@ -17,7 +17,6 @@
 use Doctrine\DBAL\Schema\Sequence;
 use Doctrine\DBAL\Schema\SQLServerSchemaManager;
 use Doctrine\DBAL\Schema\TableDiff;
-use Doctrine\Deprecations\Deprecation;
 use InvalidArgumentException;
 
 use function array_merge;
@@ -109,21 +108,6 @@ public function supportsSchemas(): bool
         return true;
     }
 
-    /**
-     * @deprecated
-     */
-    public function getDefaultSchemaName(): string
-    {
-        Deprecation::trigger(
-            'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pull/5513',
-            '%s is deprecated.',
-            __METHOD__
-        );
-
-        return 'dbo';
-    }
-
     public function supportsColumnCollation(): bool
     {
         return true;