Update Dumper

Author: maab16

src/Dumper.php

@@ -143,4 +143,42 @@ public function prepareCreateTables()
                 return (!$this->createTables) ? '--data-only' : '';
         }
     }
+
+    public function getDumpCommand(string $credentialFile = '', $destinationPath = '')
+    {
+        $destinationPath = !empty($destinationPath) ? $destinationPath : $this->destinationPath;
+        switch (strtolower($this->getDumperClassName())) {
+            case 'mysqldumper':
+                $dumpCommand = $this->prepareDumpCommand($credentialFile, $destinationPath);
+                break;
+            default:
+                $dumpCommand = $this->prepareDumpCommand($destinationPath);
+                break;
+        }
+
+        return $this->removeExtraSpaces($dumpCommand);
+    }
+
+    public function getRestoreCommand(string $credentialFile = '', string $filePath = '')
+    {
+        $filePath = !empty($filePath) ? '"' . $filePath : $this->restorePath;
+        switch (strtolower($this->getDumperClassName())) {
+            case 'mysqldumper':
+                $restoreCommand = $this->prepareRestoreCommand($credentialFile, $filePath);
+                break;
+            default:
+                $restoreCommand = $this->prepareRestoreCommand($filePath);
+                break;
+        }
+
+        return $this->removeExtraSpaces($restoreCommand);
+    }
+
+    public function getDumperClassName()
+    {
+        $classWithNamespace = static::class;
+        $partials           = explode("\\", $classWithNamespace);
+        $className          = end($partials);
+        return $className;
+    }
 }

src/Traits/DumperTrait.php

@@ -233,36 +233,6 @@ public function getRestorePath()
         return $this->restorePath;
     }
 
-    public function getDumpCommand(string $credentialFile = '', $destinationPath = '')
-    {
-        $destinationPath = !empty($destinationPath) ? $destinationPath : $this->destinationPath;
-        switch (strtolower($this->getDumperClassName())) {
-            case 'mysqldumper':
-                $dumpCommand = $this->prepareDumpCommand($credentialFile, $destinationPath);
-                break;
-            default:
-                $dumpCommand = $this->prepareDumpCommand($destinationPath);
-                break;
-        }
-
-        return $this->removeExtraSpaces($dumpCommand);
-    }
-
-    public function getRestoreCommand(string $credentialFile = '', string $filePath = '')
-    {
-        $filePath = !empty($filePath) ? '"' . $filePath : $this->restorePath;
-        switch (strtolower($this->getDumperClassName())) {
-            case 'mysqldumper':
-                $restoreCommand = $this->prepareRestoreCommand($credentialFile, $filePath);
-                break;
-            default:
-                $restoreCommand = $this->prepareRestoreCommand($filePath);
-                break;
-        }
-
-        return $this->removeExtraSpaces($restoreCommand);
-    }
-
     public function removeExtraSpaces(string $str)
     {
         return preg_replace('/\s+/', ' ', $str);
@@ -277,12 +247,4 @@ public function quoteCommand(string $command)
     {
         return static::isWindows() ? "\"{$command}\"" : "'{$command}'";
     }
-
-    public function getDumperClassName()
-    {
-        $classWithNamespace = static::class;
-        $partials           = explode("\\", $classWithNamespace);
-        $className          = end($partials);
-        return $className;
-    }
 }