Merge pull request #8004 from kenjis/refactor-composer-loading

refactor: delete duplicate code for Composer loading

system/Autoloader/Autoloader.php

@@ -124,17 +124,21 @@ public function initialize(Autoload $config, Modules $modules)
         }
 
         if (is_file(COMPOSER_PATH)) {
-            $this->loadComposerInfo($modules);
+            $this->loadComposerAutoloader($modules);
         }
 
         return $this;
     }
 
-    private function loadComposerInfo(Modules $modules): void
+    private function loadComposerAutoloader(Modules $modules): void
     {
-        /**
-         * @var ClassLoader $composer
-         */
+        // The path to the vendor directory.
+        // We do not want to enforce this, so set the constant if Composer was used.
+        if (! defined('VENDORPATH')) {
+            define('VENDORPATH', dirname(COMPOSER_PATH) . DIRECTORY_SEPARATOR);
+        }
+
+        /** @var ClassLoader $composer */
         $composer = include COMPOSER_PATH;
 
         $this->loadComposerClassmap($composer);

system/bootstrap.php

@@ -104,17 +104,3 @@
 // Initialize and register the loader with the SPL autoloader stack.
 Services::autoloader()->initialize(new Autoload(), new Modules())->register();
 Services::autoloader()->loadHelpers();
-
-// Now load Composer's if it's available
-if (is_file(COMPOSER_PATH)) {
-    /*
-     * The path to the vendor directory.
-     *
-     * We do not want to enforce this, so set the constant if Composer was used.
-     */
-    if (! defined('VENDORPATH')) {
-        define('VENDORPATH', dirname(COMPOSER_PATH) . DIRECTORY_SEPARATOR);
-    }
-
-    require_once COMPOSER_PATH;
-}