[doctrineGH-3956] Convert CLI HelperSet deprecations to Doctrine API.

beberlei · Mar 22, 2021 · 0e1dfa6 · 0e1dfa6
1 parent f4773bd
commit 0e1dfa6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 17 deletions.
diff --git a/lib/Doctrine/DBAL/Tools/Console/Command/ReservedWordsCommand.php b/lib/Doctrine/DBAL/Tools/Console/Command/ReservedWordsCommand.php
@@ -23,6 +23,7 @@
 use Doctrine\DBAL\Platforms\Keywords\SQLServer2012Keywords;
 use Doctrine\DBAL\Platforms\Keywords\SQLServerKeywords;
 use Doctrine\DBAL\Tools\Console\ConnectionProvider;
+use Doctrine\Deprecations\Deprecation;
 use Exception;
 use InvalidArgumentException;
 use Symfony\Component\Console\Command\Command;
@@ -36,9 +37,6 @@
 use function implode;
 use function is_array;
 use function is_string;
-use function trigger_error;
-
-use const E_USER_DEPRECATED;
 
 class ReservedWordsCommand extends Command
 {
@@ -74,9 +72,10 @@ public function __construct(?ConnectionProvider $connectionProvider = null)
             return;
         }
 
-        @trigger_error(
-            'Not passing a connection provider as the first constructor argument is deprecated',
-            E_USER_DEPRECATED
+        Deprecation::trigger(
+            'doctrine/dbal',
+            'https://github.com/doctrine/dbal/pull/3956',
+            'Not passing a connection provider as the first constructor argument is deprecated'
         );
     }
 

diff --git a/lib/Doctrine/DBAL/Tools/Console/Command/RunSqlCommand.php b/lib/Doctrine/DBAL/Tools/Console/Command/RunSqlCommand.php
@@ -5,6 +5,7 @@
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Tools\Console\ConnectionProvider;
 use Doctrine\DBAL\Tools\Dumper;
+use Doctrine\Deprecations\Deprecation;
 use Exception;
 use LogicException;
 use RuntimeException;
@@ -18,9 +19,6 @@
 use function is_numeric;
 use function is_string;
 use function stripos;
-use function trigger_error;
-
-use const E_USER_DEPRECATED;
 
 /**
  * Task for executing arbitrary SQL that can come from a file or directly from
@@ -39,9 +37,10 @@ public function __construct(?ConnectionProvider $connectionProvider = null)
             return;
         }
 
-        @trigger_error(
-            'Not passing a connection provider as the first constructor argument is deprecated',
-            E_USER_DEPRECATED
+        Deprecation::trigger(
+            'doctrine/dbal',
+            'https://github.com/doctrine/dbal/pull/3956',
+            'Not passing a connection provider as the first constructor argument is deprecated'
         );
     }
 

diff --git a/lib/Doctrine/DBAL/Tools/Console/ConsoleRunner.php b/lib/Doctrine/DBAL/Tools/Console/ConsoleRunner.php
@@ -8,15 +8,13 @@
 use Doctrine\DBAL\Tools\Console\Command\RunSqlCommand;
 use Doctrine\DBAL\Tools\Console\Helper\ConnectionHelper;
 use Doctrine\DBAL\Version;
+use Doctrine\Deprecations\Deprecation;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\HelperSet;
 use TypeError;
 
 use function sprintf;
-use function trigger_error;
-
-use const E_USER_DEPRECATED;
 
 /**
  * Handles running the Console Tools inside Symfony Console context.
@@ -53,11 +51,13 @@ public static function run($helperSetOrConnectionProvider, $commands = [])
 
         $connectionProvider = null;
         if ($helperSetOrConnectionProvider instanceof HelperSet) {
-            @trigger_error(sprintf(
+            Deprecation::trigger(
+                'doctrine/dbal',
+                'https://github.com/doctrine/dbal/pull/3956',
                 'Passing an instance of "%s" as the first argument is deprecated. Pass an instance of "%s" instead.',
                 HelperSet::class,
                 ConnectionProvider::class
-            ), E_USER_DEPRECATED);
+            );
             $connectionProvider = null;
             $cli->setHelperSet($helperSetOrConnectionProvider);
         } elseif ($helperSetOrConnectionProvider instanceof ConnectionProvider) {