update: 修复加载器冲突

NHZEX · Aug 20, 2023 · e047c47 · e047c47
1 parent c5d2e3d
commit e047c47
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/third-party-src/composer.json b/third-party-src/composer.json
@@ -31,6 +31,7 @@
     "config": {
         "sort-packages": true,
         "platform-check": false,
-        "optimize-autoloader": true
+        "optimize-autoloader": true,
+        "prepend-autoloader": false
     }
 }
diff --git a/third-party/composer.json b/third-party/composer.json
@@ -31,6 +31,7 @@
     "config": {
         "sort-packages": true,
         "platform-check": false,
-        "optimize-autoloader": true
+        "optimize-autoloader": true,
+        "prepend-autoloader": false
     }
 }
diff --git a/third-party/vendor/composer/autoload_real.php b/third-party/vendor/composer/autoload_real.php
@@ -22,14 +22,14 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit855b9cd4faec8c788c376d9f12d5eec8', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit855b9cd4faec8c788c376d9f12d5eec8', 'loadClassLoader'), true, false);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
         spl_autoload_unregister(array('ComposerAutoloaderInit855b9cd4faec8c788c376d9f12d5eec8', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
         call_user_func(\Composer\Autoload\ComposerStaticInit855b9cd4faec8c788c376d9f12d5eec8::getInitializer($loader));
 
-        $loader->register(true);
+        $loader->register(false);
 
         $filesToLoad = \Composer\Autoload\ComposerStaticInit855b9cd4faec8c788c376d9f12d5eec8::$files;
         $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {