merged branch fabpot/exec-fix (PR #6882)

fabpot · fabpot · commit 81aed8f5dbdb · 2013-02-04T13:41:13.000+01:00
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #6882). Commits ------- b8ef96e [Finder] fixed regression in the Finder component (it was possible to use it without using exec before, closes #6357) Discussion ---------- [Finder] fixed regression in the Finder component (it was possible to use it without using exec before, closes #6357) | Q | A | ------------- | --- | Bug fix? | yes (fixed a BC break) | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #6357 | License | MIT | Doc PR | n/a
diff --git a/src/Symfony/Component/Finder/Shell/Shell.php b/src/Symfony/Component/Finder/Shell/Shell.php
@@ -52,7 +52,11 @@ public function testCommand($command)
     {
         if (self::TYPE_WINDOWS === $this->type) {
             // todo: find a way to test if windows command exists
-            return true;
+            return false;
+        }
+
+        if (!function_exists('exec')) {
+            return false;
         }
 
         // todo: find a better way (command could not be available)

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,11 @@ public function testCommand($command)`
`52`	`52`	`{`
`53`	`53`	`if (self::TYPE_WINDOWS === $this->type) {`
`54`	`54`	`// todo: find a way to test if windows command exists`
`55`		`- return true;`
	`55`	`+ return false;`
	`56`	`+ }`
	`57`	`+`
	`58`	`+ if (!function_exists('exec')) {`
	`59`	`+ return false;`
`56`	`60`	`}`
`57`	`61`
`58`	`62`	`// todo: find a better way (command could not be available)`