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
cakephp · Jan 31, 2014 · 4d57d3c · 4d57d3c
1 parent 605351d
commit 4d57d3c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/Cake/Console/Command/Task/PluginTask.php b/lib/Cake/Console/Command/Task/PluginTask.php
@@ -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) {

diff --git a/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php
@@ -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'),