Verified Commit 813b178f authored by quietone's avatar quietone
Browse files

Issue #3481418 by tomdearden, longwave: Typo in error message when MySQL socket connection fails 

(cherry picked from commit c28f87af)
parent 99f96526

core/modules/mysql/src/Driver/Database/mysql/Connection.php

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ public static function open(array &$connection_options = []) { 
            // Show message for socket connection via 'host' option.

            $message = 'Drupal was attempting to connect to the database server via a socket, but the socket file could not be found.';

            $message .= ' A Unix socket file is used if you do not specify a host name or if you specify the special host name localhost.';

            $message .= ' To connect via TPC/IP use an IP address (127.0.0.1 for IPv4) instead of "localhost".';

            $message .= ' To connect via TCP/IP use an IP address (127.0.0.1 for IPv4) instead of "localhost".';

            $message .= ' This message normally means that there is no MySQL server running on the system or that you are using an incorrect Unix socket file name when trying to connect to the server.';

            throw new DatabaseConnectionRefusedException($e->getMessage() . ' [Tip: ' . $message . '] ', $e->getCode(), $e);

          }

core/tests/Drupal/FunctionalTests/Installer/InstallerBrokenDatabaseCredentialsTest.php

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ public function testRequirementsProblem(): void { 
    $this->assertSession()->titleEquals('Requirements problem | Drupal');

    $this->assertSession()->pageTextContains('Database settings');

    $this->assertSession()->pageTextContains('Resolve all issues below to continue the installation. For help configuring your database server,');

    $this->assertSession()->pageTextContains('[Tip: Drupal was attempting to connect to the database server via a socket, but the socket file could not be found. A Unix socket file is used if you do not specify a host name or if you specify the special host name localhost. To connect via TPC/IP use an IP address (127.0.0.1 for IPv4) instead of "localhost". This message normally means that there is no MySQL server running on the system or that you are using an incorrect Unix socket file name when trying to connect to the server.]');

    $this->assertSession()->pageTextContains('[Tip: Drupal was attempting to connect to the database server via a socket, but the socket file could not be found. A Unix socket file is used if you do not specify a host name or if you specify the special host name localhost. To connect via TCP/IP use an IP address (127.0.0.1 for IPv4) instead of "localhost". This message normally means that there is no MySQL server running on the system or that you are using an incorrect Unix socket file name when trying to connect to the server.]');

  }



}