apply 3rd parameter $prioritizeApp = true to FileLocator::search()

Author: samsonasik

system/Autoloader/FileLocator.php

@@ -226,28 +226,43 @@ public function getClassname(string $file) : string
 	 *      'app/Modules/bar/Config/Routes.php',
 	 *  ]
 	 *
-	 * @param string $path
-	 * @param string $ext
+	 * @param string  $path
+	 * @param string  $ext
+	 * @param boolean $prioritizeApp
 	 *
 	 * @return array
 	 */
-	public function search(string $path, string $ext = 'php'): array
+	public function search(string $path, string $ext = 'php', bool $prioritizeApp = true): array
 	{
 		$path = $this->ensureExt($path, $ext);
 
 		$foundPaths = [];
+		$appPaths   = [];
 
 		foreach ($this->getNamespaces() as $namespace)
 		{
 			if (isset($namespace['path']) && is_file($namespace['path'] . $path))
 			{
-				$foundPaths[] = $namespace['path'] . $path;
+				$fullPath = $namespace['path'] . $path;
+				if ($prioritizeApp || strpos($fullPath, APPPATH) !== 0)
+				{
+					$foundPaths[] = $fullPath;
+				}
+				else
+				{
+					$appPaths[] = $fullPath;
+				}
 			}
 		}
 
 		// Remove any duplicates
 		$foundPaths = array_unique($foundPaths);
 
+		if (! $prioritizeApp && ! empty($appPaths))
+		{
+			$foundPaths = array_merge($foundPaths, array_unique($appPaths));
+		}
+
 		return $foundPaths;
 	}
 

system/Language/Language.php

@@ -338,16 +338,7 @@ protected function load(string $file, string $locale, bool $return = false)
 	 */
 	protected function requireFile(string $path): array
 	{
-		$files = Services::locator()->search($path);
-		$files = array_merge(
-			array_filter($files, function ($value) {
-				return strpos($value, APPPATH) === false;
-			}),
-			array_filter($files, function ($value) {
-				return strpos($value, APPPATH) === 0;
-			})
-		);
-
+		$files   = Services::locator()->search($path, 'php', false);
 		$strings = [];
 
 		foreach ($files as $file)

tests/system/Autoloader/FileLocatorTest.php

@@ -191,6 +191,22 @@ public function testSearchForFileNotExist()
 		$this->assertArrayNotHasKey(0, $foundFiles);
 	}
 
+	//--------------------------------------------------------------------
+
+	public function testSearchPrioritizeSystemOverApp()
+	{
+		$foundFiles = $this->locator->search('Language/en/Validation.php', 'php', false);
+
+		$this->assertEquals([
+			SYSTEMPATH . 'Language/en/Validation.php',
+			APPPATH . 'Language/en/Validation.php',
+		],
+			$foundFiles
+		);
+	}
+
+	//--------------------------------------------------------------------
+
 	public function testListNamespaceFilesEmptyPrefixAndPath()
 	{
 		$this->assertEmpty($this->locator->listNamespaceFiles('', ''));