From: Tim Düsterhus <duesterhus@woltlab.com>
Date: Sun, 6 Nov 2016 13:16:45 +0000 (+0100)
Subject: Append composer's autoloader
X-Git-Tag: 3.0.0_Beta_5~66^2~13
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=694976995b2fa666951c90ba3f4622f74b687e36;p=GitHub%2FWoltLab%2FWCF.git

Append composer's autoloader
---

diff --git a/wcfsetup/install/files/lib/system/api/autoload.php b/wcfsetup/install/files/lib/system/api/autoload.php
index 42e256858d..0ba15eede3 100644
--- a/wcfsetup/install/files/lib/system/api/autoload.php
+++ b/wcfsetup/install/files/lib/system/api/autoload.php
@@ -2,6 +2,6 @@
 
 // autoload.php @generated by Composer
 
-require_once __DIR__ . '/composer' . '/autoload_real.php';
+require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInit4a4e0e985ef68770d710dc260edc44ab::getLoader();
diff --git a/wcfsetup/install/files/lib/system/api/composer.json b/wcfsetup/install/files/lib/system/api/composer.json
index a2ebfdb80b..98e6d3d83c 100644
--- a/wcfsetup/install/files/lib/system/api/composer.json
+++ b/wcfsetup/install/files/lib/system/api/composer.json
@@ -1,6 +1,7 @@
 {
     "config": {
-        "vendor-dir": "./"
+        "vendor-dir": "./",
+        "prepend-autoloader": false
     },
     "require": {
         "ezyang/htmlpurifier": "4.8.*",
diff --git a/wcfsetup/install/files/lib/system/api/composer.lock b/wcfsetup/install/files/lib/system/api/composer.lock
index 3b446b280d..79be2bfd28 100644
--- a/wcfsetup/install/files/lib/system/api/composer.lock
+++ b/wcfsetup/install/files/lib/system/api/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "b368975e316f52b2af949a6d8fdc560e",
+    "hash": "ef930cc4ef43476a8a27b9745f651069",
     "content-hash": "d9f12e8c782481ed844e535718c478c3",
     "packages": [
         {
diff --git a/wcfsetup/install/files/lib/system/api/composer/autoload_real.php b/wcfsetup/install/files/lib/system/api/composer/autoload_real.php
index 287ef08662..e52eb9805b 100644
--- a/wcfsetup/install/files/lib/system/api/composer/autoload_real.php
+++ b/wcfsetup/install/files/lib/system/api/composer/autoload_real.php
@@ -19,7 +19,7 @@ class ComposerAutoloaderInit4a4e0e985ef68770d710dc260edc44ab
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit4a4e0e985ef68770d710dc260edc44ab', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit4a4e0e985ef68770d710dc260edc44ab', 'loadClassLoader'), true, false);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
         spl_autoload_unregister(array('ComposerAutoloaderInit4a4e0e985ef68770d710dc260edc44ab', 'loadClassLoader'));
 
@@ -45,7 +45,7 @@ class ComposerAutoloaderInit4a4e0e985ef68770d710dc260edc44ab
             }
         }
 
-        $loader->register(true);
+        $loader->register(false);
 
         if ($useStaticLoader) {
             $includeFiles = Composer\Autoload\ComposerStaticInit4a4e0e985ef68770d710dc260edc44ab::$files;