From 33530051d55208b0682cd9a4b8886dc6f5ac36f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dalibor=20Karlovi=C4=87?= Date: Wed, 16 Aug 2023 17:34:30 +0200 Subject: [PATCH 1/2] fix: don't trigger deprecation if called internally --- src/Schema/AbstractSchemaManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Schema/AbstractSchemaManager.php b/src/Schema/AbstractSchemaManager.php index a7d92d2608d..e4ac0d85422 100644 --- a/src/Schema/AbstractSchemaManager.php +++ b/src/Schema/AbstractSchemaManager.php @@ -242,7 +242,7 @@ protected function doListTableColumns($table, $database = null): array if ($database === null) { $database = $this->getDatabase(__METHOD__); } else { - Deprecation::trigger( + Deprecation::triggerIfCalledFromOutside( 'doctrine/dbal', 'https://github.com/doctrine/dbal/issues/5284', 'Passing $database to AbstractSchemaManager::listTableColumns() is deprecated.', From 3780d3ae69c22b2253ef28be4e0a4ae23ae1a74a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dalibor=20Karlovi=C4=87?= Date: Wed, 16 Aug 2023 17:53:30 +0200 Subject: [PATCH 2/2] fix: correct the deprecation method name --- src/Schema/AbstractSchemaManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Schema/AbstractSchemaManager.php b/src/Schema/AbstractSchemaManager.php index e4ac0d85422..7e1fd93ff2d 100644 --- a/src/Schema/AbstractSchemaManager.php +++ b/src/Schema/AbstractSchemaManager.php @@ -245,7 +245,7 @@ protected function doListTableColumns($table, $database = null): array Deprecation::triggerIfCalledFromOutside( 'doctrine/dbal', 'https://github.com/doctrine/dbal/issues/5284', - 'Passing $database to AbstractSchemaManager::listTableColumns() is deprecated.', + 'Passing $database to AbstractSchemaManager::doListTableColumns() is deprecated.', ); }