From: Tim Düsterhus Date: Wed, 25 May 2022 13:44:51 +0000 (+0200) Subject: Regenerate composer autoloader X-Git-Tag: 5.5.0_Beta_4~18 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0b2cf258cc824c78eb1168141244ffbc1a8954be;p=GitHub%2FWoltLab%2FWCF.git Regenerate composer autoloader --- diff --git a/wcfsetup/install/files/lib/system/api/autoload.php b/wcfsetup/install/files/lib/system/api/autoload.php index 4a0e648118..b5930ce8fb 100644 --- a/wcfsetup/install/files/lib/system/api/autoload.php +++ b/wcfsetup/install/files/lib/system/api/autoload.php @@ -2,6 +2,11 @@ // autoload.php @generated by Composer +if (PHP_VERSION_ID < 50600) { + echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL; + exit(1); +} + require_once __DIR__ . '/composer/autoload_real.php'; return ComposerAutoloaderInita1f5f7c74275d47a45049a2936db1d0d::getLoader(); diff --git a/wcfsetup/install/files/lib/system/api/composer/autoload_classmap.php b/wcfsetup/install/files/lib/system/api/composer/autoload_classmap.php index b0f2f2e851..ea7a810d88 100644 --- a/wcfsetup/install/files/lib/system/api/composer/autoload_classmap.php +++ b/wcfsetup/install/files/lib/system/api/composer/autoload_classmap.php @@ -2,7 +2,7 @@ // autoload_classmap.php @generated by Composer -$vendorDir = dirname(dirname(__FILE__)); +$vendorDir = dirname(__DIR__); $baseDir = $vendorDir; return array( diff --git a/wcfsetup/install/files/lib/system/api/composer/autoload_files.php b/wcfsetup/install/files/lib/system/api/composer/autoload_files.php index cdd5c382ef..c487621e68 100644 --- a/wcfsetup/install/files/lib/system/api/composer/autoload_files.php +++ b/wcfsetup/install/files/lib/system/api/composer/autoload_files.php @@ -2,7 +2,7 @@ // autoload_files.php @generated by Composer -$vendorDir = dirname(dirname(__FILE__)); +$vendorDir = dirname(__DIR__); $baseDir = $vendorDir; return array( diff --git a/wcfsetup/install/files/lib/system/api/composer/autoload_namespaces.php b/wcfsetup/install/files/lib/system/api/composer/autoload_namespaces.php index 67a9a9a041..de98c72873 100644 --- a/wcfsetup/install/files/lib/system/api/composer/autoload_namespaces.php +++ b/wcfsetup/install/files/lib/system/api/composer/autoload_namespaces.php @@ -2,7 +2,7 @@ // autoload_namespaces.php @generated by Composer -$vendorDir = dirname(dirname(__FILE__)); +$vendorDir = dirname(__DIR__); $baseDir = $vendorDir; return array( diff --git a/wcfsetup/install/files/lib/system/api/composer/autoload_psr4.php b/wcfsetup/install/files/lib/system/api/composer/autoload_psr4.php index 442bbe6d0f..b36a4b4588 100644 --- a/wcfsetup/install/files/lib/system/api/composer/autoload_psr4.php +++ b/wcfsetup/install/files/lib/system/api/composer/autoload_psr4.php @@ -2,7 +2,7 @@ // autoload_psr4.php @generated by Composer -$vendorDir = dirname(dirname(__FILE__)); +$vendorDir = dirname(__DIR__); $baseDir = $vendorDir; return array( 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 05eb3408c4..15e78e0228 100644 --- a/wcfsetup/install/files/lib/system/api/composer/autoload_real.php +++ b/wcfsetup/install/files/lib/system/api/composer/autoload_real.php @@ -25,42 +25,19 @@ class ComposerAutoloaderInita1f5f7c74275d47a45049a2936db1d0d require __DIR__ . '/platform_check.php'; spl_autoload_register(array('ComposerAutoloaderInita1f5f7c74275d47a45049a2936db1d0d', 'loadClassLoader'), true, false); - self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); + self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); spl_autoload_unregister(array('ComposerAutoloaderInita1f5f7c74275d47a45049a2936db1d0d', 'loadClassLoader')); $includePaths = require __DIR__ . '/include_paths.php'; $includePaths[] = get_include_path(); set_include_path(implode(PATH_SEPARATOR, $includePaths)); - $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); - if ($useStaticLoader) { - require __DIR__ . '/autoload_static.php'; - - call_user_func(\Composer\Autoload\ComposerStaticInita1f5f7c74275d47a45049a2936db1d0d::getInitializer($loader)); - } else { - $map = require __DIR__ . '/autoload_namespaces.php'; - foreach ($map as $namespace => $path) { - $loader->set($namespace, $path); - } - - $map = require __DIR__ . '/autoload_psr4.php'; - foreach ($map as $namespace => $path) { - $loader->setPsr4($namespace, $path); - } - - $classMap = require __DIR__ . '/autoload_classmap.php'; - if ($classMap) { - $loader->addClassMap($classMap); - } - } + require __DIR__ . '/autoload_static.php'; + call_user_func(\Composer\Autoload\ComposerStaticInita1f5f7c74275d47a45049a2936db1d0d::getInitializer($loader)); $loader->register(false); - if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInita1f5f7c74275d47a45049a2936db1d0d::$files; - } else { - $includeFiles = require __DIR__ . '/autoload_files.php'; - } + $includeFiles = \Composer\Autoload\ComposerStaticInita1f5f7c74275d47a45049a2936db1d0d::$files; foreach ($includeFiles as $fileIdentifier => $file) { composerRequirea1f5f7c74275d47a45049a2936db1d0d($fileIdentifier, $file); } diff --git a/wcfsetup/install/files/lib/system/api/composer/include_paths.php b/wcfsetup/install/files/lib/system/api/composer/include_paths.php index 68aeefeb8d..0d7111cca3 100644 --- a/wcfsetup/install/files/lib/system/api/composer/include_paths.php +++ b/wcfsetup/install/files/lib/system/api/composer/include_paths.php @@ -2,7 +2,7 @@ // include_paths.php @generated by Composer -$vendorDir = dirname(dirname(__FILE__)); +$vendorDir = dirname(__DIR__); $baseDir = $vendorDir; return array(