Merge commit 'refs/pull/4275/head' of https://github.com/magento/magento2 into MAGETWO-52981

Author: shiftedreality

dev/tests/integration/framework/Magento/TestFramework/Db/Mysql.php

@@ -13,6 +13,11 @@
 
 class Mysql extends \Magento\TestFramework\Db\AbstractDb
 {
+    /**
+     * Default port
+     */
+    const DEFAULT_PORT = 3306;
+
     /**
      * Defaults extra file name
      */
@@ -32,12 +37,25 @@ class Mysql extends \Magento\TestFramework\Db\AbstractDb
      */
     private $_defaultsExtraFile;
 
+    /**
+     * Port number for connection
+     *
+     * @var integer
+     */
+    private $_port;
+
     /**
      * {@inheritdoc}
      */
     public function __construct($host, $user, $password, $schema, $varPath, \Magento\Framework\Shell $shell)
     {
         parent::__construct($host, $user, $password, $schema, $varPath, $shell);
+        $this->_port = self::DEFAULT_PORT;
+        if (strpos($this->_host, ':') !== false) {
+            list($host, $port) = explode(':', $this->_host);
+            $this->_host = $host;
+            $this->_port = (int) $port;
+        }
         $this->_dbDumpFile = $this->_varPath . '/setup_dump_' . $this->_schema . '.sql';
         $this->_defaultsExtraFile = rtrim($this->_varPath, '\\/') . '/' . self::DEFAULTS_EXTRA_FILE_NAME;
     }
@@ -49,10 +67,11 @@ public function cleanup()
     {
         $this->ensureDefaultsExtraFile();
         $this->_shell->execute(
-            'mysql --defaults-file=%s --host=%s %s -e %s',
+            'mysql --defaults-file=%s --host=%s --port=%s %s -e %s',
             [
                 $this->_defaultsExtraFile,
                 $this->_host,
+                $this->_port,
                 $this->_schema,
                 "DROP DATABASE `{$this->_schema}`; CREATE DATABASE `{$this->_schema}`"
             ]
@@ -86,8 +105,8 @@ public function storeDbDump()
     {
         $this->ensureDefaultsExtraFile();
         $this->_shell->execute(
-            'mysqldump --defaults-file=%s --host=%s  %s > %s',
-            [$this->_defaultsExtraFile, $this->_host, $this->_schema, $this->getSetupDbDumpFilename()]
+            'mysqldump --defaults-file=%s --host=%s --port=%s %s > %s',
+            [$this->_defaultsExtraFile, $this->_host, $this->_port, $this->_schema, $this->getSetupDbDumpFilename()]
         );
     }
 
@@ -102,8 +121,8 @@ public function restoreFromDbDump()
             throw new \LogicException("DB dump file does not exist: " . $this->getSetupDbDumpFilename());
         }
         $this->_shell->execute(
-            'mysql --defaults-file=%s --host=%s %s < %s',
-            [$this->_defaultsExtraFile, $this->_host, $this->_schema, $this->getSetupDbDumpFilename()]
+            'mysql --defaults-file=%s --host=%s --port=%s %s < %s',
+            [$this->_defaultsExtraFile, $this->_host, $this->_port, $this->_schema, $this->getSetupDbDumpFilename()]
         );
     }