Update Autoloader

Author: natanfelles

system/Autoloader/Autoloader.php

@@ -76,7 +76,6 @@
  */
 class Autoloader
 {
-
 	/**
 	 * Stores namespaces as key, and path as values.
 	 *
@@ -98,6 +97,8 @@ class Autoloader
 	 * the valid parts that we'll need.
 	 *
 	 * @param \Config\Autoload $config
+	 *
+	 * @return $this
 	 */
 	public function initialize(\Config\Autoload $config)
 	{
@@ -110,25 +111,25 @@ public function initialize(\Config\Autoload $config)
 
 		if (isset($config->psr4))
 		{
-			$this->prefixes = $config->psr4;
+			$this->addNamespace($config->psr4);
 		}
 
 		if (isset($config->classmap))
 		{
 			$this->classmap = $config->classmap;
 		}
 
-		$this->addNamespace(APP_NAMESPACE, APPPATH);
+		//$this->addNamespace(APP_NAMESPACE, APPPATH);
 
 		unset($config);
+
+		return $this;
 	}
 
 	//--------------------------------------------------------------------
 
 	/**
 	 * Register the loader with the SPL autoloader stack.
-	 *
-	 * @codeCoverageIgnore
 	 */
 	public function register()
 	{
@@ -146,21 +147,21 @@ public function register()
 		$config = is_array($this->classmap) ? $this->classmap : [];
 
 		spl_autoload_register(function ($class) use ($config) {
-			if (! array_key_exists($class, $config))
+			if (empty($config[$class]))
 			{
 				return false;
 			}
 
 			include_once $config[$class];
 		}, true, // Throw exception
-						   true // Prepend
+			true // Prepend
 		);
 	}
 
 	//--------------------------------------------------------------------
 
 	/**
-	 * Registers a namespace with the autoloader.
+	 * Registers namespaces with the autoloader.
 	 *
 	 * @param array|string $namespace
 	 * @param string       $path
@@ -169,16 +170,28 @@ public function register()
 	 */
 	public function addNamespace($namespace, string $path = null)
 	{
-		if (\is_array($namespace))
+		if (is_array($namespace))
 		{
 			foreach ($namespace as $prefix => $path)
 			{
-				$this->prefixes[$prefix] = $path;
+				$prefix = trim($prefix, '\\');
+
+				if (is_array($path))
+				{
+					foreach ($path as $dir)
+					{
+						$this->prefixes[$prefix][] = rtrim($dir, '/') . '/';
+					}
+
+					continue;
+				}
+
+				$this->prefixes[$prefix][] = rtrim($path, '/') . '/';
 			}
 		}
 		else
 		{
-			$this->prefixes[$namespace] = $path;
+			$this->prefixes[trim($namespace, '\\')][] = rtrim($path, '/') . '/';
 		}
 
 		return $this;
@@ -187,9 +200,13 @@ public function addNamespace($namespace, string $path = null)
 	//--------------------------------------------------------------------
 
 	/**
+	 * Get namespaces with prefixes as keys and paths as values.
+	 *
+	 * If a prefix param is set, returns only paths to the given prefix.
+	 *
 	 * @var string|null $prefix
 	 *
-	 * @return array|string
+	 * @return array
 	 */
 	public function getNamespace(string $prefix = null)
 	{
@@ -198,7 +215,7 @@ public function getNamespace(string $prefix = null)
 			return $this->prefixes;
 		}
 
-		return $this->prefixes[$prefix];
+		return $this->prefixes[trim($prefix, '\\')] ?? [];
 	}
 
 	//--------------------------------------------------------------------
@@ -212,7 +229,7 @@ public function getNamespace(string $prefix = null)
 	 */
 	public function removeNamespace(string $namespace)
 	{
-		unset($this->prefixes[$namespace]);
+		unset($this->prefixes[trim($namespace, '\\')]);
 
 		return $this;
 	}
@@ -224,7 +241,7 @@ public function removeNamespace(string $namespace)
 	 *
 	 * @param string $class The fully qualified class name.
 	 *
-	 * @return mixed            The mapped file on success, or boolean false
+	 * @return string|false The mapped file on success, or boolean false
 	 *                          on failure.
 	 */
 	public function loadClass(string $class)
@@ -251,7 +268,7 @@ public function loadClass(string $class)
 	 *
 	 * @param string $class The fully-qualified class name
 	 *
-	 * @return mixed            The mapped file name on success, or boolean false on fail
+	 * @return string|false The mapped file name on success, or boolean false on fail
 	 */
 	protected function loadInNamespace(string $class)
 	{
@@ -262,18 +279,14 @@ protected function loadInNamespace(string $class)
 
 		foreach ($this->prefixes as $namespace => $directories)
 		{
-			if (is_string($directories))
-			{
-				$directories = [$directories];
-			}
-
 			foreach ($directories as $directory)
 			{
 				$directory = rtrim($directory, '/');
 
 				if (strpos($class, $namespace) === 0)
 				{
-					$filePath = $directory . str_replace('\\', '/', substr($class, strlen($namespace))) . '.php';
+					$filePath = $directory . str_replace('\\', '/',
+							substr($class, strlen($namespace))) . '.php';
 					$filename = $this->requireFile($filePath);
 
 					if ($filename)
@@ -333,11 +346,9 @@ protected function loadLegacy(string $class)
 	 * A central way to require a file is loaded. Split out primarily
 	 * for testing purposes.
 	 *
-	 * @codeCoverageIgnore
-	 *
 	 * @param string $file
 	 *
-	 * @return boolean
+	 * @return string|false The filename on success, false if the file is not loaded
 	 */
 	protected function requireFile(string $file)
 	{
@@ -382,6 +393,5 @@ public function sanitizeFilename(string $filename): string
 
 		return $filename;
 	}
-
 	//--------------------------------------------------------------------
 }