Merge pull request #123 from francoispluchino/phpunit-vendor-dir

Find phpunit in vendor bin directory
liuggio · Dec 14, 2017 · a6d46c4 · a6d46c4
2 parents c63d56d + d3d4739
commit a6d46c4
Showing 1 changed file with 20 additions and 12 deletions.
diff --git a/src/Process/ProcessFactory.php b/src/Process/ProcessFactory.php
@@ -79,27 +79,35 @@ private static function isWindows()
 
     private static function getWindowsBinCmd()
     {
+        if (file_exists(getcwd().'/vendor/bin/phpunit')) {
+            return 'vendor\bin\phpunit {}';
+        }
+
         if (file_exists(getcwd().'/bin/phpunit')) {
-            $cmd = 'bin\phpunit {}';
-        } elseif (file_exists(getenv('APPDATA').'\Composer\vendor\bin\phpunit')) {
-            $cmd = '%APPDATA%\Composer\vendor\bin\phpunit {}';
-        } else {
-            $cmd = 'phpunit {}';
+            return 'bin\phpunit {}';
+        }
+
+        if (file_exists(getenv('APPDATA').'\Composer\vendor\bin\phpunit')) {
+            return '%APPDATA%\Composer\vendor\bin\phpunit {}';
         }
 
-        return $cmd;
+        return 'phpunit {}';
     }
 
     private static function getUnixBinCmd()
     {
+        if (file_exists(getcwd().'/vendor/bin/phpunit')) {
+            return 'vendor/bin/phpunit {}';
+        }
+
         if (file_exists(getcwd().'/bin/phpunit')) {
-            $cmd = 'bin/phpunit {}';
-        } elseif (file_exists(getenv('HOME').'/.composer/vendor/bin/phpunit')) {
-            $cmd = '~/.composer/vendor/bin/phpunit {}';
-        } else {
-            $cmd = 'phpunit {}';
+            return 'bin/phpunit {}';
+        }
+
+        if (file_exists(getenv('HOME').'/.composer/vendor/bin/phpunit')) {
+            return '~/.composer/vendor/bin/phpunit {}';
         }
 
-        return $cmd;
+        return 'phpunit {}';
     }
 }