fix(autoloader): trigger autoloader_initialized from Boot and cleanup test listeners

Author: gilads-otiannoh24

system/Autoloader/Autoloader.php

@@ -14,7 +14,6 @@
 namespace CodeIgniter\Autoloader;
 
 use Closure;
-use CodeIgniter\Events\Events;
 use CodeIgniter\Exceptions\ConfigException;
 use CodeIgniter\Exceptions\InvalidArgumentException;
 use CodeIgniter\Exceptions\RuntimeException;
@@ -145,8 +144,6 @@ public function initialize(Autoload $config, Modules $modules)
             $this->loadComposerAutoloader($modules);
         }
 
-        Events::trigger('autoloader_initialized', $this);
-
         return $this;
     }
 

system/Boot.php

@@ -16,6 +16,7 @@
 use CodeIgniter\Cache\FactoriesCache;
 use CodeIgniter\CLI\Console;
 use CodeIgniter\Config\DotEnv;
+use CodeIgniter\Events\Events;
 use Config\App;
 use Config\Autoload;
 use Config\Modules;
@@ -319,7 +320,12 @@ protected static function loadAutoloader(): void
         require_once APPPATH . 'Config/Services.php';
 
         // Initialize and register the loader with the SPL autoloader stack.
-        Services::autoloader()->initialize(new Autoload(), new Modules())->register();
+        $autoloader = Services::autoloader()->initialize(new Autoload(), new Modules());
+        $autoloader->register();
+
+        if (function_exists('service')) {
+            Events::trigger('autoloader_initialized', $autoloader);
+        }
     }
 
     protected static function autoloadHelpers(): void

tests/system/Autoloader/AutoloaderTest.php

@@ -15,6 +15,7 @@
 
 use App\Controllers\Home;
 use Closure;
+use CodeIgniter\Boot;
 use CodeIgniter\Events\Events;
 use CodeIgniter\Exceptions\ConfigException;
 use CodeIgniter\Test\CIUnitTestCase;
@@ -71,6 +72,7 @@ protected function tearDown(): void
         parent::tearDown();
 
         $this->loader->unregister();
+        Events::removeAllListeners('autoloader_initialized');
     }
 
     public function testLoadStoredClass(): void
@@ -414,14 +416,10 @@ public function testAutoloaderInitializedEvent(): void
             $passedLoader = $loader;
         });
 
-        $config                      = new Autoload();
-        $modules                     = new Modules();
-        $modules->discoverInComposer = false;
-
-        $loader = new Autoloader();
-        $loader->initialize($config, $modules);
+        $method = self::getPrivateMethodInvoker(Boot::class, 'loadAutoloader');
+        $method();
 
         $this->assertTrue($triggered);
-        $this->assertSame($loader, $passedLoader);
+        $this->assertInstanceOf(Autoloader::class, $passedLoader);
     }
 }