Moved 'addCommandLocation' to 'Binary' class

Author: sebastianfeldmann

src/Backup/Cli/Binary.php

@@ -31,6 +31,20 @@ abstract class Binary
      */
     protected $exec;
 
+    /**
+     * Optional command locations
+     *
+     * @var array
+     */
+    private static $optionalCommandLocations = array(
+        'mongodump' => array(),
+        'mysqldump' => array(
+            '/usr/local/mysql/bin/mysqldump', // Mac OS X
+            '/usr/mysql/bin/mysqldump',       // Linux
+        ),
+        'tar'       => array(),
+    );
+
     /**
      * Executes the cli commands and handles compression
      *
@@ -156,4 +170,26 @@ protected function unlinkErrorFile($file)
             unlink($file);
         }
     }
+
+    /**
+     * Adds a new 'path' to the list of optional command locations.
+     *
+     * @param string $command
+     * @param string $path
+     */
+    public static function addCommandLocation($command, $path)
+    {
+        self::$optionalCommandLocations[$command][] = $path;
+    }
+
+    /**
+     * Returns the list of optional 'mysqldump' locations.
+     *
+     * @param  string $command
+     * @return array
+     */
+    public static function getCommandLocations($command)
+    {
+        return isset(self::$optionalCommandLocations[$command]) ? self::$optionalCommandLocations[$command] : array();
+    }
 }

src/Backup/Source/Mongodump.php

@@ -148,7 +148,11 @@ public function setup(array $conf = array())
     protected function setupMongodump(array $conf)
     {
         if (empty($this->binary)) {
-            $this->binary = Util\Cli::detectCmdLocation('mongodump', Util\Arr::getValue($conf, 'pathToMongodump'));
+            $this->binary = Util\Cli::detectCmdLocation(
+                'mongodump',
+                Util\Arr::getValue($conf, 'pathToMongodump'),
+                Binary::getCommandLocations('mongodump')
+            );
         }
     }
 

src/Backup/Source/Mysqldump.php

@@ -115,16 +115,6 @@ class Mysqldump extends Binary implements Source
      */
     private $validateConnection;
 
-    /**
-     * Optional 'mysqldump' command locations
-     *
-     * @var array
-     */
-    private static $optionalCommandLocations = array(
-        '/usr/local/mysql/bin/mysqldump', // Mac OS X
-        '/usr/mysql/bin/mysqldump',       // Linux
-    );
-
     /**
      * Setup.
      *
@@ -158,7 +148,7 @@ protected function setupMysqldump(array $conf)
             $this->binary = Util\Cli::detectCmdLocation(
                 'mysqldump',
                 Util\Arr::getValue($conf, 'pathToMysqldump'),
-                self::$optionalCommandLocations
+                Binary::getCommandLocations('mysqldump')
             );
         }
     }
@@ -304,24 +294,4 @@ public function checkConnection($host, $user, $password, array $databases = arra
             unset($mysqli);
         }
     }
-
-    /**
-     * Adds a new 'path' to the list of optional command locations.
-     *
-     * @param string $path
-     */
-    public static function addCommandLocation($path)
-    {
-        self::$optionalCommandLocations[] = $path;
-    }
-
-    /**
-     * Returns the list of optional 'mysqldump' locations.
-     *
-     * @return array
-     */
-    public static function getCommandLocations()
-    {
-        return self::$optionalCommandLocations;
-    }
 }

src/Backup/Source/Tar.php

@@ -71,7 +71,11 @@ public function setup(array $conf = array())
     protected function setupTar(array $conf)
     {
         if (empty($this->binary)) {
-            $this->binary = Util\Cli::detectCmdLocation('tar', Util\Arr::getValue($conf, 'pathToTar'));
+            $this->binary = Util\Cli::detectCmdLocation(
+                'tar',
+                Util\Arr::getValue($conf, 'pathToTar'),
+                Binary::getCommandLocations('tar')
+            );
         }
     }
 

tests/phpbu/Backup/Cli/BinaryTest.php

@@ -109,6 +109,30 @@ public function testExecuteCompressedOutputCompressorFail()
         $this->assertEquals(1, count($res->getOutput()));
     }
 
+    /**
+     * Tests Binary::getCommandLocations
+     */
+    public function testCommandLocationsDefault()
+    {
+        $list = Binary::getCommandLocations('tar');
+        $this->assertEquals(0, count($list));
+
+        $list = Binary::getCommandLocations('mysqldump');
+        $this->assertEquals(2, count($list));
+    }
+
+    /**
+     * Tests Binary::getCommandLocations
+     */
+    public function testAddCommandLocations()
+    {
+        Binary::addCommandLocation('mongodump', '/foo/mongodump');
+        $list = Binary::getCommandLocations('mongodump');
+
+        $this->assertEquals(1, count($list));
+        $this->assertEquals('/foo/mongodump', $list[0]);
+    }
+
     /**
      * Create Target Mock.
      *

tests/phpbu/Backup/Source/MysqldumpTest.php

@@ -264,28 +264,6 @@ public function testBackupFail()
         $this->mysqldump->backup($target, $appResult);
     }
 
-    /**
-     * Tests Mysqldump::getCommandLocations
-     */
-    public function testCommandLocationsDefault()
-    {
-        $list = Mysqldump::getCommandLocations();
-
-        $this->assertEquals(2, count($list));
-    }
-
-    /**
-     * Tests Mysqldump::getCommandLocations
-     */
-    public function testAddCommandLocations()
-    {
-        Mysqldump::addCommandLocation('/foo/mysql.exe');
-        $list = Mysqldump::getCommandLocations();
-
-        $this->assertEquals(3, count($list));
-        $this->assertEquals('/foo/mysql.exe', $list[2]);
-    }
-
     /**
      * Create Cli\Result mock.
      *