Permalink
Browse files

Fix plugin path filtering when directories do not exist.

When paths do not exist we should correctly remove them from the output
paths.

Fixes #2748
  • Loading branch information...
1 parent 605351d commit 4d57d3ce5b2b9e13e233fc25f39faa09bf15ed14 @markstory markstory committed Jan 31, 2014
@@ -191,9 +191,11 @@ public function findPath($pathOptions) {
$valid = false;
foreach ($pathOptions as $i => $path) {
if (!is_dir($path)) {
- array_splice($pathOptions, $i, 1);
+ unset($pathOptions[$i]);
}
}
+ $pathOptions = array_values($pathOptions);
+
$max = count($pathOptions);
while (!$valid) {
foreach ($pathOptions as $i => $option) {
@@ -185,7 +185,9 @@ public function testExecuteWithOneArg() {
public function testFindPathNonExistant() {
$paths = App::path('plugins');
$last = count($paths);
- $paths[] = '/fake/path';
+
+ array_unshift($paths, '/fake/path');
+ $paths[] = '/fake/path2';
$this->Task = $this->getMock('PluginTask',
array('in', 'out', 'err', 'createFile', '_stop'),

0 comments on commit 4d57d3c

Please sign in to comment.