Browse Source

Merge pull request #3687 from ndm2/3.0-project-task-fix

3.0 - Project Task - Fixes and windows compatibility
Mark Story 11 years ago
parent
commit
54e433970f
1 changed files with 5 additions and 4 deletions
  1. 5 4
      src/Console/Command/Task/ProjectTask.php

+ 5 - 4
src/Console/Command/Task/ProjectTask.php

@@ -103,9 +103,10 @@ class ProjectTask extends BakeTask {
 			}
 			}
 		}
 		}
 		$composer = false;
 		$composer = false;
-		if (!empty($_SERVER['PATH'])) {
-			$path = explode(PATH_SEPARATOR, $_SERVER['PATH']);
-			$composer = $this->_searchPath($path);
+		$path = env('PATH');
+		if (!empty($path)) {
+			$paths = explode(PATH_SEPARATOR, $path);
+			$composer = $this->_searchPath($paths);
 		}
 		}
 		return $composer;
 		return $composer;
 	}
 	}
@@ -120,7 +121,7 @@ class ProjectTask extends BakeTask {
 		$composer = ['composer.phar', 'composer'];
 		$composer = ['composer.phar', 'composer'];
 		foreach ($path as $dir) {
 		foreach ($path as $dir) {
 			foreach ($composer as $cmd) {
 			foreach ($composer as $cmd) {
-				if (file_exists($dir . DS . $cmd)) {
+				if (is_file($dir . DS . $cmd)) {
 					$this->_io->verbose('Found composer executable in ' . $dir);
 					$this->_io->verbose('Found composer executable in ' . $dir);
 					return $dir . DS . $cmd;
 					return $dir . DS . $cmd;
 				}
 				}