Merge pull request doctrine#4933 from morozov/remove-drop-and-create

Remove AbstractSchemaManager::dropAndCreate*() and ::tryMethod() methods
derrabus · Oct 27, 2021 · 6655575 · 6655575
2 parents de6b461 + b9acccd
commit 6655575
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 173 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -8,6 +8,19 @@ awareness about deprecated code.
 
 # Upgrade to 4.0
 
+## BC BREAK: Removed `AbstractSchemaManager::dropAndCreate*()` and `::tryMethod()` methods.
+
+The following `AbstractSchemaManager` methods have been removed:
+
+1. `AbstractSchemaManager::dropAndCreateConstraint()`,
+6. `AbstractSchemaManager::dropAndCreateDatabase()`,
+3. `AbstractSchemaManager::dropAndCreateForeignKey()`,
+2. `AbstractSchemaManager::dropAndCreateIndex()`,
+4. `AbstractSchemaManager::dropAndCreateSequence()`,
+5. `AbstractSchemaManager::dropAndCreateTable()`,
+7. `AbstractSchemaManager::dropAndCreateView()`,
+8. `AbstractSchemaManager::tryMethod()`.
+
 ## BC BREAK: Removed support for SQL Server 2016 and older
 
 DBAL is now tested only with SQL Server 2017 and newer.

diff --git a/psalm.xml.dist b/psalm.xml.dist
@@ -55,11 +55,6 @@
                     See https://github.com/doctrine/dbal/pull/4317
                 -->
                 <file name="tests/Functional/LegacyAPITest.php"/>
-                <!--
-                    TODO: remove in 4.0.0
-                    See https://github.com/doctrine/dbal/pull/4897
-                -->
-                <referencedMethod name="Doctrine\DBAL\Schema\AbstractSchemaManager::tryMethod"/>
             </errorLevel>
         </DeprecatedMethod>
         <DocblockTypeContradiction>

diff --git a/src/Schema/AbstractSchemaManager.php b/src/Schema/AbstractSchemaManager.php
@@ -12,8 +12,6 @@
 use Doctrine\DBAL\Exception\DatabaseRequired;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\Exception\NotSupported;
-use Doctrine\Deprecations\Deprecation;
-use Throwable;
 
 use function array_filter;
 use function array_intersect;
@@ -64,37 +62,6 @@ public function getDatabasePlatform(): AbstractPlatform
         return $this->_platform;
     }
 
-    /**
-     * Tries any method on the schema manager. Normally a method throws an
-     * exception when your DBMS doesn't support it or if an error occurs.
-     * This method allows you to try and method on your SchemaManager
-     * instance and will return false if it does not work or is not supported.
-     *
-     * <code>
-     * $result = $sm->tryMethod('dropView', 'view_name');
-     * </code>
-     *
-     * @deprecated
-     *
-     * @param mixed ...$arguments
-     *
-     * @return mixed
-     */
-    public function tryMethod(string $method, ...$arguments)
-    {
-        Deprecation::triggerIfCalledFromOutside(
-            'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pull/4897',
-            'AbstractSchemaManager::tryMethod() is deprecated.'
-        );
-
-        try {
-            return $this->$method(...$arguments);
-        } catch (Throwable $e) {
-            return false;
-        }
-    }
-
     /**
      * Lists the available databases for this connection.
      *
@@ -481,134 +448,6 @@ public function createView(View $view): void
         $this->_execSql($this->_platform->getCreateViewSQL($view->getQuotedName($this->_platform), $view->getSql()));
     }
 
-    /* dropAndCreate*() Methods */
-
-    /**
-     * Drops and creates a new index on a table.
-     *
-     * @deprecated Use {@link dropIndex()} and {@link createIndex()} instead.
-     *
-     * @param string $table The name of the table on which the index is to be created.
-     *
-     * @throws Exception
-     */
-    public function dropAndCreateIndex(Index $index, string $table): void
-    {
-        Deprecation::trigger(
-            'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pull/4897',
-            'AbstractSchemaManager::dropAndCreateIndex() is deprecated.'
-            . ' Use AbstractSchemaManager::dropIndex() and AbstractSchemaManager::createIndex() instead.'
-        );
-
-        $this->tryMethod('dropIndex', $index->getQuotedName($this->_platform), $table);
-        $this->createIndex($index, $table);
-    }
-
-    /**
-     * Drops and creates a new foreign key.
-     *
-     * @deprecated Use {@link dropForeignKey()} and {@link createForeignKey()} instead.
-     *
-     * @param ForeignKeyConstraint $foreignKey An associative array that defines properties
-     *                                         of the foreign key to be created.
-     * @param string               $table      The name of the table on which the foreign key is to be created.
-     *
-     * @throws Exception
-     */
-    public function dropAndCreateForeignKey(ForeignKeyConstraint $foreignKey, string $table): void
-    {
-        Deprecation::trigger(
-            'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pull/4897',
-            'AbstractSchemaManager::dropAndCreateForeignKey() is deprecated.'
-            . ' Use AbstractSchemaManager::dropForeignKey() and AbstractSchemaManager::createForeignKey() instead.'
-        );
-
-        $this->tryMethod('dropForeignKey', $foreignKey, $table);
-        $this->createForeignKey($foreignKey, $table);
-    }
-
-    /**
-     * Drops and create a new sequence.
-     *
-     * @deprecated Use {@link dropSequence()} and {@link createSequence()} instead.
-     *
-     * @throws Exception
-     */
-    public function dropAndCreateSequence(Sequence $sequence): void
-    {
-        Deprecation::trigger(
-            'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pull/4897',
-            'AbstractSchemaManager::dropAndCreateSequence() is deprecated.'
-            . ' Use AbstractSchemaManager::dropSequence() and AbstractSchemaManager::createSequence() instead.'
-        );
-
-        $this->tryMethod('dropSequence', $sequence->getQuotedName($this->_platform));
-        $this->createSequence($sequence);
-    }
-
-    /**
-     * Drops and creates a new table.
-     *
-     * @deprecated Use {@link dropTable()} and {@link createTable()} instead.
-     *
-     * @throws Exception
-     */
-    public function dropAndCreateTable(Table $table): void
-    {
-        Deprecation::trigger(
-            'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pull/4897',
-            'AbstractSchemaManager::dropAndCreateTable() is deprecated.'
-            . ' Use AbstractSchemaManager::dropTable() and AbstractSchemaManager::createTable() instead.'
-        );
-
-        $this->tryMethod('dropTable', $table->getQuotedName($this->_platform));
-        $this->createTable($table);
-    }
-
-    /**
-     * Drops and creates a new database.
-     *
-     * @deprecated Use {@link dropDatabase()} and {@link createDatabase()} instead.
-     *
-     * @throws Exception
-     */
-    public function dropAndCreateDatabase(string $database): void
-    {
-        Deprecation::trigger(
-            'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pull/4897',
-            'AbstractSchemaManager::dropAndCreateDatabase() is deprecated.'
-            . ' Use AbstractSchemaManager::dropDatabase() and AbstractSchemaManager::createDatabase() instead.'
-        );
-
-        $this->tryMethod('dropDatabase', $database);
-        $this->createDatabase($database);
-    }
-
-    /**
-     * Drops and creates a new view.
-     *
-     * @deprecated Use {@link dropView()} and {@link createView()} instead.
-     *
-     * @throws Exception
-     */
-    public function dropAndCreateView(View $view): void
-    {
-        Deprecation::trigger(
-            'doctrine/dbal',
-            'https://github.com/doctrine/dbal/pull/4897',
-            'AbstractSchemaManager::dropAndCreateView() is deprecated.'
-            . ' Use AbstractSchemaManager::dropView() and AbstractSchemaManager::createView() instead.'
-        );
-
-        $this->tryMethod('dropView', $view->getQuotedName($this->_platform));
-        $this->createView($view);
-    }
-
     /**
      * Alters an existing schema.
      *

diff --git a/src/Schema/OracleSchemaManager.php b/src/Schema/OracleSchemaManager.php
@@ -5,6 +5,7 @@
 namespace Doctrine\DBAL\Schema;
 
 use Doctrine\DBAL\Exception;
+use Doctrine\DBAL\Exception\DatabaseObjectNotFoundException;
 use Doctrine\DBAL\Platforms\OraclePlatform;
 use Doctrine\DBAL\Types\Type;
 
@@ -286,7 +287,10 @@ protected function dropAutoincrement(string $table): bool
 
     public function dropTable(string $name): void
     {
-        $this->tryMethod('dropAutoincrement', $name);
+        try {
+            $this->dropAutoincrement($name);
+        } catch (DatabaseObjectNotFoundException $e) {
+        }
 
         parent::dropTable($name);
     }

diff --git a/tests/Functional/Schema/SchemaManagerFunctionalTestCase.php b/tests/Functional/Schema/SchemaManagerFunctionalTestCase.php
@@ -513,12 +513,6 @@ public function testCreateSchema(): void
 
     public function testMigrateSchema(): void
     {
-        // see https://github.com/doctrine/dbal/issues/4760
-        $this->schemaManager->tryMethod('dropTable', 'blob_table');
-
-        // see https://github.com/doctrine/dbal/issues/4761
-        $this->schemaManager->tryMethod('dropTable', 'test_binary_table');
-
         $this->createTestTable('table_to_alter');
         $this->createTestTable('table_to_drop');