Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2848821 by voleger, harsha012, vidhatanand, Sharique, alexpott, mondrake: Replace all calls to db_close, which is deprecated

8.7.x
Nathaniel Catchpole 2018-08-22 20:56:09 +09:00
parent 74c323ff09
commit 89bafb75b7
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/includes/database.inc
View File

@ -456,6 +456,7 @@ function db_driver() {
* @see \Drupal\Core\Database\Database::closeConnection() * @see \Drupal\Core\Database\Database::closeConnection()
*/ */
function db_close(array $options = []) { function db_close(array $options = []) {
@trigger_error('db_close() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Use \Drupal\Core\Database\Database::closeConnection() instead. See https://www.drupal.org/node/2993033.', E_USER_DEPRECATED);
if (empty($options['target'])) { if (empty($options['target'])) {
$options['target'] = NULL; $options['target'] = NULL;
} }

2
core/lib/Drupal/Core/Database/Driver/pgsql/Install/Tasks.php
View File

@ -156,7 +156,7 @@ class Tasks extends InstallTasks {
// Close the database connection so that the configuration parameter // Close the database connection so that the configuration parameter
// is applied to the current connection. // is applied to the current connection.
db_close(); Database::closeConnection();
// Recheck, if it fails, finally just rely on the end user to do the // Recheck, if it fails, finally just rely on the end user to do the
// right thing. // right thing.

13
core/tests/Drupal/KernelTests/Core/Database/DatabaseLegacyTest.php
View File

@ -4,6 +4,8 @@ namespace Drupal\KernelTests\Core\Database;
use Drupal\Core\Database\Transaction; use Drupal\Core\Database\Transaction;
use Drupal\Core\Database\Database;
/** /**
* Deprecation tests cases for the database layer. * Deprecation tests cases for the database layer.
* *
@ -65,4 +67,15 @@ class DatabaseLegacyTest extends DatabaseTestBase {
$this->assertInstanceOf(Transaction::class, db_transaction()); $this->assertInstanceOf(Transaction::class, db_transaction());
} }
/**
* Tests the db_close() function.
*
* @expectedDeprecation db_close() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Use \Drupal\Core\Database\Database::closeConnection() instead. See https://www.drupal.org/node/2993033.
*/
public function testDbClose() {
$this->assertTrue(Database::isActiveConnection(), 'Database connection is active');
db_close();
$this->assertFalse(Database::isActiveConnection(), 'Database connection is not active');
}
} }