From 0b8247ffac141da48acd2fe17cc760e66d294463 Mon Sep 17 00:00:00 2001
From: Marek Suscak <marek.suscak@gmail.com>
Date: Thu, 7 Feb 2019 04:15:34 +0100
Subject: [PATCH] Use the database_port as defined in the env. config

---
 Command/ExportCommand.php     | 5 ++++-
 Command/ImportCommand.php     | 5 ++++-
 Resources/config/services.xml | 2 ++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Command/ExportCommand.php b/Command/ExportCommand.php
index 3b15e09..ed2f123 100644
--- a/Command/ExportCommand.php
+++ b/Command/ExportCommand.php
@@ -30,6 +30,7 @@ class ExportCommand extends Command
 
     private $secret;
     private $databaseHost;
+    private $databasePort;
     private $databaseUser;
     private $databaseName;
     private $databasePassword;
@@ -39,6 +40,7 @@ class ExportCommand extends Command
     public function __construct(
         $secret,
         $databaseHost,
+        $databasePort,
         $databaseName,
         $databaseUser,
         $databasePassword,
@@ -48,6 +50,7 @@ public function __construct(
 
         $this->secret = $secret;
         $this->databaseHost = $databaseHost;
+        $this->databasePort = is_null($databasePort) ? 3306 : $databasePort;
         $this->databaseUser = $databaseUser;
         $this->databaseName = $databaseName;
         $this->databasePassword = $databasePassword;
@@ -97,7 +100,7 @@ private function exportDatabase()
     {
         $this->progressBar->setMessage("Exporting database...");
         $command =
-            "mysqldump -h {$this->databaseHost} -u " . escapeshellarg($this->databaseUser) .
+            "mysqldump -h {$this->databaseHost} -P {$this->databasePort} -u " . escapeshellarg($this->databaseUser) .
             ($this->databasePassword ? " -p" . escapeshellarg($this->databasePassword) : "") .
             " " . escapeshellarg($this->databaseName) . " > " . $this->exportDirectory . DIRECTORY_SEPARATOR . "{$this->secret}.sql";
 
diff --git a/Command/ImportCommand.php b/Command/ImportCommand.php
index 8a4a98e..69f1de9 100644
--- a/Command/ImportCommand.php
+++ b/Command/ImportCommand.php
@@ -31,6 +31,7 @@ class ImportCommand extends Command
 
     private $secret;
     private $databaseHost;
+    private $databasePort;
     private $databaseUser;
     private $databaseName;
     private $databasePassword;
@@ -39,6 +40,7 @@ class ImportCommand extends Command
     public function __construct(
         $secret,
         $databaseHost,
+        $databasePort,
         $databaseName,
         $databaseUser,
         $databasePassword,
@@ -48,6 +50,7 @@ public function __construct(
 
         $this->secret = $secret;
         $this->databaseHost = $databaseHost;
+        $this->databasePort = is_null($databasePort) ? 3306 : $databasePort;
         $this->databaseUser = $databaseUser;
         $this->databaseName = $databaseName;
         $this->databasePassword = $databasePassword;
@@ -162,7 +165,7 @@ private function importDatabase()
         $this->progressBar->setMessage("Importing database...");
         $filename = $this->getTempPath(".sql");
         $command =
-            "mysql -h {$this->databaseHost} -u " . escapeshellarg($this->databaseUser) .
+            "mysql -h {$this->databaseHost} -P {$this->databasePort} -u " . escapeshellarg($this->databaseUser) .
             ($this->databasePassword ? " -p" . escapeshellarg($this->databasePassword) : "") .
             " " . escapeshellarg($this->databaseName) . " < " . "{$filename}";
 
diff --git a/Resources/config/services.xml b/Resources/config/services.xml
index b3de1d6..2a2a685 100644
--- a/Resources/config/services.xml
+++ b/Resources/config/services.xml
@@ -9,6 +9,7 @@
             <tag name="console.command"/>
             <argument>%secret%</argument>
             <argument>%database_host%</argument>
+            <argument>%database_port%</argument>
             <argument>%database_name%</argument>
             <argument>%database_user%</argument>
             <argument>%database_password%</argument>
@@ -19,6 +20,7 @@
             <tag name="console.command"/>
             <argument>%secret%</argument>
             <argument>%database_host%</argument>
+            <argument>%database_port%</argument>
             <argument>%database_name%</argument>
             <argument>%database_user%</argument>
             <argument>%database_password%</argument>