Merge pull request #3739 from alcaeus/change-deprecation-messages

Update deprecation messages to refer to DBAL
doctrine · Nov 20, 2019 · 567bfad · 567bfad
2 parents 9be84e7 + 738f01e
commit 567bfad
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/lib/Doctrine/DBAL/Driver/PDOStatement.php b/lib/Doctrine/DBAL/Driver/PDOStatement.php
@@ -195,7 +195,7 @@ private function convertParamType(int $type) : int
         if (! isset(self::PARAM_TYPE_MAP[$type])) {
             // TODO: next major: throw an exception
             @trigger_error(sprintf(
-                'Using a PDO parameter type (%d given) is deprecated and will cause an error in Doctrine 3.0',
+                'Using a PDO parameter type (%d given) is deprecated and will cause an error in Doctrine DBAL 3.0',
                 $type
             ), E_USER_DEPRECATED);
 
@@ -216,7 +216,7 @@ private function convertFetchMode(int $fetchMode) : int
             // TODO: next major: throw an exception
             @trigger_error(sprintf(
                 'Using a PDO fetch mode or their combination (%d given)' .
-                ' is deprecated and will cause an error in Doctrine 3.0',
+                ' is deprecated and will cause an error in Doctrine DBAL 3.0',
                 $fetchMode
             ), E_USER_DEPRECATED);
 

diff --git a/lib/Doctrine/DBAL/Schema/Column.php b/lib/Doctrine/DBAL/Schema/Column.php
@@ -80,7 +80,7 @@ public function setOptions(array $options)
                 // next major: throw an exception
                 @trigger_error(sprintf(
                     'The "%s" column option is not supported,' .
-                    ' setting it is deprecated and will cause an error in Doctrine 3.0',
+                    ' setting it is deprecated and will cause an error in Doctrine DBAL 3.0',
                     $name
                 ), E_USER_DEPRECATED);
 

diff --git a/tests/Doctrine/Tests/DBAL/Functional/PDOStatementTest.php b/tests/Doctrine/Tests/DBAL/Functional/PDOStatementTest.php
@@ -30,7 +30,7 @@ protected function setUp() : void
 
     /**
      * @group legacy
-     * @expectedDeprecation Using a PDO fetch mode or their combination (%d given) is deprecated and will cause an error in Doctrine 3.0
+     * @expectedDeprecation Using a PDO fetch mode or their combination (%d given) is deprecated and will cause an error in Doctrine DBAL 3.0
      */
     public function testPDOSpecificModeIsAccepted() : void
     {

diff --git a/tests/Doctrine/Tests/DBAL/Schema/ColumnTest.php b/tests/Doctrine/Tests/DBAL/Schema/ColumnTest.php
@@ -62,7 +62,7 @@ public function testToArray() : void
 
     /**
      * @group legacy
-     * @expectedDeprecation The "unknown_option" column option is not supported, setting it is deprecated and will cause an error in Doctrine 3.0
+     * @expectedDeprecation The "unknown_option" column option is not supported, setting it is deprecated and will cause an error in Doctrine DBAL 3.0
      */
     public function testSettingUnknownOptionIsStillSupported() : void
     {
@@ -73,7 +73,7 @@ public function testSettingUnknownOptionIsStillSupported() : void
 
     /**
      * @group legacy
-     * @expectedDeprecation The "unknown_option" column option is not supported, setting it is deprecated and will cause an error in Doctrine 3.0
+     * @expectedDeprecation The "unknown_option" column option is not supported, setting it is deprecated and will cause an error in Doctrine DBAL 3.0
      */
     public function testOptionsShouldNotBeIgnored() : void
     {