Skip to content

Commit f528c54

Browse files
come-nccome-nc
authored
Merge pull request #31759 from nextcloud/fix/fix-composer-autoloader
Build autoloader with new composer version
2 parents 72b8deb + d84e87e commit f528c54

130 files changed

Lines changed: 210 additions & 404 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/accessibility/composer/composer/InstalledVersions.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
* See also https://getcomposer.org/doc/07-runtime.md#installed-versions
2222
*
2323
* To require its presence, you can require `composer-runtime-api ^2.0`
24+
*
25+
* @final
2426
*/
2527
class InstalledVersions
2628
{

‎apps/accessibility/composer/composer/autoload_classmap.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// autoload_classmap.php @generated by Composer
44

5-
$vendorDir = dirname(dirname(__FILE__));
5+
$vendorDir = dirname(__DIR__);
66
$baseDir = $vendorDir;
77

88
return array(

‎apps/accessibility/composer/composer/autoload_namespaces.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// autoload_namespaces.php @generated by Composer
44

5-
$vendorDir = dirname(dirname(__FILE__));
5+
$vendorDir = dirname(__DIR__);
66
$baseDir = $vendorDir;
77

88
return array(

‎apps/accessibility/composer/composer/autoload_psr4.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// autoload_psr4.php @generated by Composer
44

5-
$vendorDir = dirname(dirname(__FILE__));
5+
$vendorDir = dirname(__DIR__);
66
$baseDir = $vendorDir;
77

88
return array(

‎apps/accessibility/composer/composer/autoload_real.php‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,11 @@ public static function getLoader()
2323
}
2424

2525
spl_autoload_register(array('ComposerAutoloaderInitAccessibility', 'loadClassLoader'), true, true);
26-
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
26+
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
2727
spl_autoload_unregister(array('ComposerAutoloaderInitAccessibility', 'loadClassLoader'));
2828

29-
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
30-
if ($useStaticLoader) {
31-
require __DIR__ . '/autoload_static.php';
32-
33-
call_user_func(\Composer\Autoload\ComposerStaticInitAccessibility::getInitializer($loader));
34-
} else {
35-
$classMap = require __DIR__ . '/autoload_classmap.php';
36-
if ($classMap) {
37-
$loader->addClassMap($classMap);
38-
}
39-
}
29+
require __DIR__ . '/autoload_static.php';
30+
\Composer\Autoload\ComposerStaticInitAccessibility::getInitializer($loader)();
4031

4132
$loader->setClassMapAuthoritative(true);
4233
$loader->register(true);

‎apps/admin_audit/composer/composer/InstalledVersions.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
* See also https://getcomposer.org/doc/07-runtime.md#installed-versions
2222
*
2323
* To require its presence, you can require `composer-runtime-api ^2.0`
24+
*
25+
* @final
2426
*/
2527
class InstalledVersions
2628
{

‎apps/admin_audit/composer/composer/autoload_classmap.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// autoload_classmap.php @generated by Composer
44

5-
$vendorDir = dirname(dirname(__FILE__));
5+
$vendorDir = dirname(__DIR__);
66
$baseDir = $vendorDir;
77

88
return array(

‎apps/admin_audit/composer/composer/autoload_namespaces.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// autoload_namespaces.php @generated by Composer
44

5-
$vendorDir = dirname(dirname(__FILE__));
5+
$vendorDir = dirname(__DIR__);
66
$baseDir = $vendorDir;
77

88
return array(

‎apps/admin_audit/composer/composer/autoload_psr4.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// autoload_psr4.php @generated by Composer
44

5-
$vendorDir = dirname(dirname(__FILE__));
5+
$vendorDir = dirname(__DIR__);
66
$baseDir = $vendorDir;
77

88
return array(

‎apps/admin_audit/composer/composer/autoload_real.php‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,11 @@ public static function getLoader()
2323
}
2424

2525
spl_autoload_register(array('ComposerAutoloaderInitAdminAudit', 'loadClassLoader'), true, true);
26-
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
26+
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
2727
spl_autoload_unregister(array('ComposerAutoloaderInitAdminAudit', 'loadClassLoader'));
2828

29-
$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
30-
if ($useStaticLoader) {
31-
require __DIR__ . '/autoload_static.php';
32-
33-
call_user_func(\Composer\Autoload\ComposerStaticInitAdminAudit::getInitializer($loader));
34-
} else {
35-
$classMap = require __DIR__ . '/autoload_classmap.php';
36-
if ($classMap) {
37-
$loader->addClassMap($classMap);
38-
}
39-
}
29+
require __DIR__ . '/autoload_static.php';
30+
\Composer\Autoload\ComposerStaticInitAdminAudit::getInitializer($loader)();
4031

4132
$loader->setClassMapAuthoritative(true);
4233
$loader->register(true);

0 commit comments

Comments
 (0)