Merge pull request #26 from foxted/master

Fix issue when no socket is defined
spatie · Apr 15, 2015 · 2182a72 · 2182a72
2 parents ade0c42 + d35d65a
commit 2182a72
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/BackupHandlers/Database/Databases/MySQLDatabase.php b/src/BackupHandlers/Database/Databases/MySQLDatabase.php
@@ -59,7 +59,7 @@ public function dump($destinationFile)
             escapeshellarg($temporaryCredentialsFile),
             escapeshellarg($this->database),
             escapeshellarg($destinationFile),
-            escapeshellarg($this->getSocketArgument())
+            escapeshellcmd($this->getSocketArgument())
         );
 
         return $this->console->run($command);

diff --git a/tests/database/MySQLDatabaseTest.php b/tests/database/MySQLDatabaseTest.php
@@ -52,7 +52,7 @@ public function testCustomSocket()
             $this->console, 'testDatabase', 'testUser', 'password', 'localhost', '3306', 'customSocket.sock'
         );
         $this->console->shouldReceive('run')
-            ->with("/mysqldump --defaults-extra-file='(.*)' --skip-comments --skip-extended-insert 'testDatabase' > 'testfile.sql' '--socket=customSocket.sock'/")
+            ->with("/mysqldump --defaults-extra-file='(.*)' --skip-comments --skip-extended-insert 'testDatabase' > 'testfile.sql' --socket=customSocket.sock/")
             ->once()
             ->andReturn(true);