Merge remote-tracking branch 'origin/B2B-1986-PR' into B2B-2079-combined

Author: danmooney2

setup/src/Magento/Setup/Test/Unit/Validator/DbValidatorTest.php

@@ -127,11 +127,13 @@ public function testCheckDatabaseConnectionDbNotAccessible()
             ->expects($this->atLeastOnce())
             ->method('query')
             ->willReturn($pdo);
-        $accessibleDbs = ['some_db', 'another_db'];
 
         $pdo->expects($this->atLeastOnce())
             ->method('fetchAll')
-            ->willReturn($accessibleDbs);
+            ->willThrowException(
+                new \Zend_Db_Statement_Exception("1044 - Access denied for user 'user'@'host' to database 'name'")
+            );
+
         $this->dbValidator->checkDatabaseConnection('name', 'host', 'user', 'password');
     }
 

setup/src/Magento/Setup/Validator/DbValidator.php

@@ -19,7 +19,7 @@ class DbValidator
     /**
      * Db prefix max length
      */
-    const DB_PREFIX_LENGTH = 5;
+    public const DB_PREFIX_LENGTH = 5;
 
     /**
      * DB connection factory