Fixed 'null' comparison and missed 'self::isExecutable' calls

Author: sebastianfeldmann

src/Util/Cli.php

@@ -67,17 +67,18 @@ public static function detectCmdLocation($cmd, $path = null, $optionalLocations
         // explicit path given, so check it out
         if (null !== $path) {
             $command = $path . DIRECTORY_SEPARATOR . $cmd;
-            if (!is_executable($command)) {
+            $bin     = self::isExecutable($command);
+            if (null === $bin) {
                 throw new RuntimeException(sprintf('wrong path specified for \'%s\': %s', $cmd, $path));
             }
-            return $command;
+            return $bin;
         }
 
         // on nx systems use 'which' command.
         if (!defined('PHP_WINDOWS_VERSION_BUILD')) {
             $command = `which $cmd`;
             $bin     = self::isExecutable($command);
-            if ($bin) {
+            if (null !== $bin) {
                 return $bin;
             }
         }
@@ -87,7 +88,7 @@ public static function detectCmdLocation($cmd, $path = null, $optionalLocations
         foreach ($pathList as $path) {
             $command = $path . DIRECTORY_SEPARATOR . $cmd;
             $bin     = self::isExecutable($command);
-            if ($bin) {
+            if (null !== $bin) {
                 return $bin;
             }
         }
@@ -96,7 +97,7 @@ public static function detectCmdLocation($cmd, $path = null, $optionalLocations
         foreach ($optionalLocations as $path) {
             $command = $path . DIRECTORY_SEPARATOR . $cmd;
             $bin     = self::isExecutable($command);
-            if ($bin) {
+            if (null !== $bin) {
                 return $bin;
             }
         }