Merge pull request #4756 from samsonasik/include_once_not_needed_on_config_no_namespace

[Autoloader] include_once is not needed on Autoloader::loadClass() with no namespace

Author: samsonasik

system/Autoloader/Autoloader.php

@@ -22,17 +22,17 @@
  * An autoloader that uses both PSR4 autoloading, and traditional classmaps.
  *
  * Given a foo-bar package of classes in the file system at the following paths:
- *```
+ * ```
  *      /path/to/packages/foo-bar/
  *          /src
  *              Baz.php         # Foo\Bar\Baz
  *              Qux/
  *                  Quux.php    # Foo\Bar\Qux\Quux
- *```
+ * ```
  * you can add the path to the configuration array that is passed in the constructor.
  * The Config array consists of 2 primary keys, both of which are associative arrays:
  * 'psr4', and 'classmap'.
- *```
+ * ```
  *      $Config = [
  *          'psr4' => [
  *              'Foo\Bar'   => '/path/to/packages/foo-bar'
@@ -41,17 +41,17 @@
  *              'MyClass'   => '/path/to/class/file.php'
  *          ]
  *      ];
- *```
+ * ```
  * Example:
- *```
+ * ```
  *      <?php
  *      // our configuration array
  *      $Config = [ ... ];
  *      $loader = new \CodeIgniter\Autoloader\Autoloader($Config);
  *
  *      // register the autoloader
  *      $loader->register();
- *```
+ * ```
  */
 class Autoloader
 {
@@ -258,15 +258,6 @@ protected function loadInNamespace(string $class)
 	{
 		if (strpos($class, '\\') === false)
 		{
-			$class    = 'Config\\' . $class;
-			$filePath = APPPATH . str_replace('\\', DIRECTORY_SEPARATOR, $class) . '.php';
-			$filename = $this->includeFile($filePath);
-
-			if ($filename)
-			{
-				return $filename;
-			}
-
 			return false;
 		}
 
@@ -353,7 +344,9 @@ protected function discoverComposerNamespaces()
 			return;
 		}
 
-		/** @var ClassLoader $composer */
+		/**
+		 * @var ClassLoader $composer
+		 */
 		$composer = include COMPOSER_PATH;
 		$paths    = $composer->getPrefixesPsr4();
 		$classes  = $composer->getClassMap();

tests/system/Autoloader/AutoloaderTest.php

@@ -172,19 +172,9 @@ public function testRemoveNamespace()
 		$this->assertFalse((bool) $this->loader->loadClass('My\App\AutoloaderTest'));
 	}
 
-	public function testloadClassConfigFound()
+	public function testloadClassNonNamespaced()
 	{
-		$this->loader->addNamespace('Config', APPPATH . 'Config');
-		$this->assertSame(
-			APPPATH . 'Config' . DIRECTORY_SEPARATOR . 'Modules.php',
-			$this->loader->loadClass('Modules')
-		);
-	}
-
-	public function testloadClassConfigNotFound()
-	{
-		$this->loader->addNamespace('Config', APPPATH . 'Config');
-		$this->assertFalse($this->loader->loadClass('NotFound'));
+		$this->assertFalse($this->loader->loadClass('Modules'));
 	}
 
 	//--------------------------------------------------------------------