diff options
| author | Côme Chilliet <91878298+come-nc@users.noreply.github.com> | 2022-03-30 17:32:46 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-30 17:32:46 +0300 |
| commit | f528c5416cea24fc8965d564508d267d713c165e (patch) | |
| tree | 3bc3b75be0fc7cf84cc9c203b616e3d4d0689555 /apps/user_ldap | |
| parent | 72b8deb1e62b85b947e2fbfeef2a13264a952d91 (diff) | |
| parent | d84e87eab952295940cd4bccc4c88082a2afa87a (diff) | |
Merge pull request #31759 from nextcloud/fix/fix-composer-autoloader
Build autoloader with new composer version
Diffstat (limited to 'apps/user_ldap')
5 files changed, 8 insertions, 15 deletions
diff --git a/apps/user_ldap/composer/composer/InstalledVersions.php b/apps/user_ldap/composer/composer/InstalledVersions.php index d50e0c9fcc4..41bc143c114 100644 --- a/apps/user_ldap/composer/composer/InstalledVersions.php +++ b/apps/user_ldap/composer/composer/InstalledVersions.php @@ -21,6 +21,8 @@ use Composer\Semver\VersionParser; * See also https://getcomposer.org/doc/07-runtime.md#installed-versions * * To require its presence, you can require `composer-runtime-api ^2.0` + * + * @final */ class InstalledVersions { diff --git a/apps/user_ldap/composer/composer/autoload_classmap.php b/apps/user_ldap/composer/composer/autoload_classmap.php index cffb2aaa9fe..7077dfd8ca1 100644 --- a/apps/user_ldap/composer/composer/autoload_classmap.php +++ b/apps/user_ldap/composer/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/apps/user_ldap/composer/composer/autoload_namespaces.php b/apps/user_ldap/composer/composer/autoload_namespaces.php index 71c9e91858d..3f5c9296251 100644 --- a/apps/user_ldap/composer/composer/autoload_namespaces.php +++ b/apps/user_ldap/composer/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/apps/user_ldap/composer/composer/autoload_psr4.php b/apps/user_ldap/composer/composer/autoload_psr4.php index 5251e2c1f81..787eb338039 100644 --- a/apps/user_ldap/composer/composer/autoload_psr4.php +++ b/apps/user_ldap/composer/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/apps/user_ldap/composer/composer/autoload_real.php b/apps/user_ldap/composer/composer/autoload_real.php index 7cfd2b52370..0e1a6558e55 100644 --- a/apps/user_ldap/composer/composer/autoload_real.php +++ b/apps/user_ldap/composer/composer/autoload_real.php @@ -23,20 +23,11 @@ class ComposerAutoloaderInitUser_LDAP } spl_autoload_register(array('ComposerAutoloaderInitUser_LDAP', 'loadClassLoader'), true, true); - self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__))); + self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); spl_autoload_unregister(array('ComposerAutoloaderInitUser_LDAP', 'loadClassLoader')); - $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\ComposerStaticInitUser_LDAP::getInitializer($loader)); - } else { - $classMap = require __DIR__ . '/autoload_classmap.php'; - if ($classMap) { - $loader->addClassMap($classMap); - } - } + require __DIR__ . '/autoload_static.php'; + \Composer\Autoload\ComposerStaticInitUser_LDAP::getInitializer($loader)(); $loader->setClassMapAuthoritative(true); $loader->register(true); |