remove unnecessary array_unique

codeigniter4 · Jul 9, 2020 · 041ee1a · 041ee1a
1 parent d9a793b
commit 041ee1a
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/system/Autoloader/FileLocator.php b/system/Autoloader/FileLocator.php
@@ -244,23 +244,20 @@ public function search(string $path, string $ext = 'php', bool $prioritizeApp =
 			if (isset($namespace['path']) && is_file($namespace['path'] . $path))
 			{
 				$fullPath = $namespace['path'] . $path;
-				if ($prioritizeApp || strpos($fullPath, APPPATH) !== 0)
+				if (($prioritizeApp || strpos($fullPath, APPPATH) !== 0) && ! in_array($fullPath, $foundPaths, true))
 				{
 					$foundPaths[] = $fullPath;
 				}
 				else
 				{
-					if (! in_array($fullPath, $appPaths, true) && strpos($fullPath, APPPATH) === 0)
+					if (strpos($fullPath, APPPATH) === 0 && ! in_array($fullPath, $appPaths, true))
 					{
 						$appPaths[] = $fullPath;
 					}
 				}
 			}
 		}
 
-		// Remove any duplicates
-		$foundPaths = array_unique($foundPaths);
-
 		if (! $prioritizeApp && ! empty($appPaths))
 		{
 			$foundPaths = array_merge($foundPaths, $appPaths);