Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / modules / system / tests / src / Kernel / Scripts / DbCommandBaseTest.php

diff --git a/web/core/modules/system/tests/src/Kernel/Scripts/DbCommandBaseTest.php b/web/core/modules/system/tests/src/Kernel/Scripts/DbCommandBaseTest.php
index cb7f5eb7c4e1320523def9e5d867160d3af8c6b7..3bee38d1abf2525af750a163c362081bc1dcdece 100644 (file)
--- a/web/core/modules/system/tests/src/Kernel/Scripts/DbCommandBaseTest.php
+++ b/web/core/modules/system/tests/src/Kernel/Scripts/DbCommandBaseTest.php
@@ -35,7 +35,7 @@ class DbCommandBaseTest extends KernelTestBase {
     Database::addConnectionInfo('magic_db', 'default', Database::getConnectionInfo('default')['default']);
 
     $command_tester->execute([
-      '--database' => 'magic_db'
+      '--database' => 'magic_db',
     ]);
     $this->assertEquals('magic_db', $command->getDatabaseConnection($command_tester->getInput())->getKey(),
        'Special db key is returned');
@@ -48,7 +48,7 @@ class DbCommandBaseTest extends KernelTestBase {
     $command = new DbCommandBaseTester();
     $command_tester = new CommandTester($command);
     $command_tester->execute([
-      '--database' => 'dne'
+      '--database' => 'dne',
     ]);
     $this->setExpectedException(ConnectionNotDefinedException::class);
     $command->getDatabaseConnection($command_tester->getInput());
@@ -58,18 +58,16 @@ class DbCommandBaseTest extends KernelTestBase {
    * Test supplying database connection as a url.
    */
   public function testSpecifyDbUrl() {
-    $connection_info = Database::getConnectionInfo('default')['default'];
-
     $command = new DbCommandBaseTester();
     $command_tester = new CommandTester($command);
     $command_tester->execute([
-      '-db-url' => $connection_info['driver'] . '://' . $connection_info['username'] . ':' . $connection_info['password'] . '@' . $connection_info['host'] . '/' . $connection_info['database']
+      '-db-url' => Database::getConnectionInfoAsUrl(),
     ]);
     $this->assertEquals('db-tools', $command->getDatabaseConnection($command_tester->getInput())->getKey());
 
     Database::removeConnection('db-tools');
     $command_tester->execute([
-      '--database-url' => $connection_info['driver'] . '://' . $connection_info['username'] . ':' . $connection_info['password'] . '@' . $connection_info['host'] . '/' . $connection_info['database']
+      '--database-url' => Database::getConnectionInfoAsUrl(),
     ]);
     $this->assertEquals('db-tools', $command->getDatabaseConnection($command_tester->getInput())->getKey());
   }
@@ -91,9 +89,8 @@ class DbCommandBaseTest extends KernelTestBase {
     ]);
     $this->assertEquals('extra', $command->getDatabaseConnection($command_tester->getInput())->tablePrefix());
 
-    $connection_info = Database::getConnectionInfo('default')['default'];
     $command_tester->execute([
-      '-db-url' => $connection_info['driver'] . '://' . $connection_info['username'] . ':' . $connection_info['password'] . '@' . $connection_info['host'] . '/' . $connection_info['database'],
+      '-db-url' => Database::getConnectionInfoAsUrl(),
       '--prefix' => 'extra2',
     ]);
     $this->assertEquals('extra2', $command->getDatabaseConnection($command_tester->getInput())->tablePrefix());