MAGETWO-52981: [Github] Setup:upgrade does not work with custom mysql port #4548

Author: shiftedreality

lib/internal/Magento/Framework/DB/Test/Unit/Adapter/Pdo/MysqlTest.php

@@ -526,28 +526,27 @@ public function getIndexNameDataProvider()
         ];
     }
 
-    /**
-     * @test
-     */
-    public function connectPortThrow()
+    public function testConfigValidation()
     {
-        $arguments = [
-            'config' => ['host' => 'localhost'],
-        ];
-        $subject = (new ObjectManager($this))->getObject(Mysql::class, $arguments);
-        $this->assertInstanceOf(Mysql::class, $subject);
+        $subject = (new ObjectManager($this))->getObject(
+            Mysql::class,
+            [
+                'config' => ['host' => 'localhost'],
+            ]
+        );
 
-        $arguments = [
-            'config' => ['host' => 'localhost', 'port' => '33390'],
-        ];
+        $this->assertInstanceOf(Mysql::class, $subject);
+    }
 
-        try {
-            (new ObjectManager($this))->getObject(Mysql::class, $arguments);
-            $this->fail('an expected exception was not thrown');
-        } catch (\InvalidArgumentException $e) {
-            $expected = 'MySQL adapter: Port must be configured within host (like \'localhost:33390\') ' .
-                        'parameter, not within port';
-            $this->assertSame($expected, $e->getMessage());
-        }
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Port must be configured within host (like 'localhost:33390') parameter, not within port
+     */
+    public function testConfigValidationByPortWithException()
+    {
+        (new ObjectManager($this))->getObject(
+            Mysql::class,
+            ['config' => ['host' => 'localhost', 'port' => '33390']]
+        );
     }
 }

lib/internal/Magento/Framework/Model/ResourceModel/Type/Db/Pdo/Mysql.php

@@ -116,8 +116,7 @@ private function getValidConfig(array $config)
 
         if (isset($config['port'])) {
             throw new \InvalidArgumentException(
-                "MySQL adapter: Port must be configured within host (like '$config[host]:$config[port]') parameter, " .
-                "not within port"
+                "Port must be configured within host (like '$config[host]:$config[port]') parameter, not within port"
             );
         }