diff --git a/core/lib/Drupal/Core/Database/Connection.php b/core/lib/Drupal/Core/Database/Connection.php index 94a07d3599dc2d2f0a59a76c8cdbdac357f37a4f..aad323229f06b03fec929c21aebb758bcf8e4e59 100644 --- a/core/lib/Drupal/Core/Database/Connection.php +++ b/core/lib/Drupal/Core/Database/Connection.php @@ -1736,13 +1736,13 @@ abstract public function nextId($existing_id = 0); * * @deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Database * drivers should instantiate \PDOStatement objects by calling - * \PDO::prepare in their Collection::prepareStatement method instead. + * \PDO::prepare in their Connection::prepareStatement method instead. * \PDO::prepare should not be called outside of driver code. * * @see https://www.drupal.org/node/3137786 */ public function prepare($statement, array $driver_options = []) { - @trigger_error('Connection::prepare() is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Database drivers should instantiate \PDOStatement objects by calling \PDO::prepare in their Collection::prepareStatement method instead. \PDO::prepare should not be called outside of driver code. See https://www.drupal.org/node/3137786', E_USER_DEPRECATED); + @trigger_error('Connection::prepare() is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Database drivers should instantiate \PDOStatement objects by calling \PDO::prepare in their Connection::prepareStatement method instead. \PDO::prepare should not be called outside of driver code. See https://www.drupal.org/node/3137786', E_USER_DEPRECATED); return $this->connection->prepare($statement, $driver_options); } diff --git a/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php index 817cebd05581faeb53aa4bb31281425b389aa04c..d59e2d07bc06137ff549cabf0446645e919db0d7 100644 --- a/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php +++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Connection.php @@ -349,7 +349,7 @@ public static function sqlFunctionLikeBinary($pattern, $subject) { * {@inheritdoc} */ public function prepare($statement, array $driver_options = []) { - @trigger_error('Connection::prepare() is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Database drivers should instantiate \PDOStatement objects by calling \PDO::prepare in their Collection::prepareStatement method instead. \PDO::prepare should not be called outside of driver code. See https://www.drupal.org/node/3137786', E_USER_DEPRECATED); + @trigger_error('Connection::prepare() is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Database drivers should instantiate \PDOStatement objects by calling \PDO::prepare in their Connection::prepareStatement method instead. \PDO::prepare should not be called outside of driver code. See https://www.drupal.org/node/3137786', E_USER_DEPRECATED); return new Statement($this->connection, $this, $statement, $driver_options); } diff --git a/core/tests/Drupal/KernelTests/Core/Database/DatabaseExceptionWrapperTest.php b/core/tests/Drupal/KernelTests/Core/Database/DatabaseExceptionWrapperTest.php index 0d2ea9fdc4233bb70fecf84f7a9a5a6d335043af..1b2984ed4f5d9a423065b6b46b204cfc114044cd 100644 --- a/core/tests/Drupal/KernelTests/Core/Database/DatabaseExceptionWrapperTest.php +++ b/core/tests/Drupal/KernelTests/Core/Database/DatabaseExceptionWrapperTest.php @@ -17,7 +17,7 @@ class DatabaseExceptionWrapperTest extends KernelTestBase { * Tests deprecation of Connection::prepare. * * @group legacy - * @expectedDeprecation Connection::prepare() is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Database drivers should instantiate \PDOStatement objects by calling \PDO::prepare in their Collection::prepareStatement method instead. \PDO::prepare should not be called outside of driver code. See https://www.drupal.org/node/3137786 + * @expectedDeprecation Connection::prepare() is deprecated in drupal:9.1.0 and is removed from drupal:10.0.0. Database drivers should instantiate \PDOStatement objects by calling \PDO::prepare in their Connection::prepareStatement method instead. \PDO::prepare should not be called outside of driver code. See https://www.drupal.org/node/3137786 */ public function testPrepare() { $connection = Database::getConnection();