wip

Author: michalsn

system/Autoloader/Autoloader.php

@@ -93,6 +93,11 @@ class Autoloader
      */
     protected $helpers = ['url'];
 
+    /**
+     * Whether this autoloader has been registered with SPL.
+     */
+    private bool $registered = false;
+
     public function __construct(private readonly string $composerPath = COMPOSER_PATH)
     {
     }
@@ -170,8 +175,13 @@ private function loadComposerAutoloader(Modules $modules): void
      */
     public function register()
     {
-        spl_autoload_register($this->loadClassmap(...), true);
-        spl_autoload_register($this->loadClass(...), true);
+        if ($this->registered) {
+            return;
+        }
+
+        spl_autoload_register([$this, 'loadClassmap'], true);
+        spl_autoload_register([$this, 'loadClass'], true);
+        $this->registered = true;
 
         foreach ($this->files as $file) {
             $this->includeFile($file);
@@ -183,8 +193,13 @@ public function register()
      */
     public function unregister(): void
     {
-        spl_autoload_unregister($this->loadClass(...));
-        spl_autoload_unregister($this->loadClassmap(...));
+        if (! $this->registered) {
+            return;
+        }
+
+        spl_autoload_unregister([$this, 'loadClass']);
+        spl_autoload_unregister([$this, 'loadClassmap']);
+        $this->registered = false;
     }
 
     /**

system/Test/CIUnitTestCase.php

@@ -514,7 +514,7 @@ public function assertCloseEnoughString($expected, $actual, string $message = ''
     protected function createApplication()
     {
         // Initialize the autoloader.
-        service('autoloader')->initialize(new Autoload(), new Modules());
+        service('autoloader')->initialize(new Autoload(), new Modules())->register();
 
         $app = new MockCodeIgniter(new App());
         $app->initialize();

tests/system/Config/ServicesTest.php

@@ -439,6 +439,19 @@ public function testResetReRegistersAutoloader(): void
         $this->assertInstanceOf(Test::class, $test);
     }
 
+    #[PreserveGlobalState(false)]
+    #[RunInSeparateProcess]
+    public function testResetDoesNotDuplicateAutoloaderCallbacks(): void
+    {
+        $initial = count(spl_autoload_functions() ?: []);
+
+        Services::reset(true);
+        $this->assertSame($initial, count(spl_autoload_functions() ?: []));
+
+        Services::reset(true);
+        $this->assertSame($initial, count(spl_autoload_functions() ?: []));
+    }
+
     public function testFilters(): void
     {
         $result = Services::filters();