revert change to /system/Autoloader/Autoloader.php as code removed in…

… 4.1
codeigniter4 · Sep 25, 2020 · 33ad399 · 33ad399
1 parent daf53e7
commit 33ad399
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/rector.php b/rector.php
@@ -14,6 +14,7 @@
 	$parameters->set(Option::EXCLUDE_PATHS, [
 		__DIR__ . '/app/Views',
 		__DIR__ . '/system/ThirdParty',
+		__DIR__ . '/system/Autoloader/Autoloader.php',
 		__DIR__ . '/system/Debug/Toolbar/Views/toolbar.tpl.php',
 	]);
 

diff --git a/system/Autoloader/Autoloader.php b/system/Autoloader/Autoloader.php
@@ -262,16 +262,16 @@ public function loadClass(string $class)
 		$class = trim($class, '\\');
 		$class = str_ireplace('.php', '', $class);
 
-		$mappedFile = $this->loadInNamespace($class);
+		$mapped_file = $this->loadInNamespace($class);
 
 		// Nothing? One last chance by looking
 		// in common CodeIgniter folders.
-		if (! $mappedFile)
+		if (! $mapped_file)
 		{
-			$mappedFile = $this->loadLegacy($class);
+			$mapped_file = $this->loadLegacy($class);
 		}
 
-		return $mappedFile;
+		return $mapped_file;
 	}
 
 	//--------------------------------------------------------------------