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

[yaffs-website] / web / core / lib / Drupal / Core / Database / Driver / mysql / Install / Tasks.php

diff --git a/web/core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php b/web/core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php
index 67f25269ab20395e5c709252768970aa12cb0e12..17fc9a3dfc84d7cffad83b63bcc1855071ac6c4a 100644 (file)
--- a/web/core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php
+++ b/web/core/lib/Drupal/Core/Database/Driver/mysql/Install/Tasks.php
@@ -59,13 +59,13 @@ class Tasks extends InstallTasks {
   protected function connect() {
     try {
       // This doesn't actually test the connection.
-      db_set_active();
+      Database::setActiveConnection();
       // Now actually do a check.
       try {
         Database::getConnection();
       }
       catch (\Exception $e) {
-        // Detect utf8mb4 incompability.
+        // Detect utf8mb4 incompatibility.
         if ($e->getCode() == Connection::UNSUPPORTED_CHARSET || ($e->getCode() == Connection::SQLSTATE_SYNTAX_ERROR && $e->errorInfo[1] == Connection::UNKNOWN_CHARSET)) {
           $this->fail(t('Your MySQL server and PHP MySQL driver must support utf8mb4 character encoding. Make sure to use a database system that supports this (such as MySQL/MariaDB/Percona 5.5.3 and up), and that the utf8mb4 character set is compiled in. See the <a href=":documentation" target="_blank">MySQL documentation</a> for more information.', [':documentation' => 'https://dev.mysql.com/doc/refman/5.0/en/cannot-initialize-character-set.html']));
           $info = Database::getConnectionInfo();