Skip to content

Commit c5513d3

Browse files
nextcloud-commandnextcloud-command
committed
chore(autoloader): Dump autoloader
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
1 parent 82ab86d commit c5513d3

File tree

126 files changed

+1121
-388
lines changed

Some content is hidden

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

126 files changed

+1121
-388
lines changed

‎composer/InstalledVersions.php‎

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ class InstalledVersions
3232
*/
3333
private static $installed;
3434

35+
/**
36+
* @var bool
37+
*/
38+
private static $installedIsLocalDir;
39+
3540
/**
3641
* @var bool|null
3742
*/
@@ -309,6 +314,12 @@ public static function reload($data)
309314
{
310315
self::$installed = $data;
311316
self::$installedByVendor = array();
317+
318+
// when using reload, we disable the duplicate protection to ensure that self::$installed data is
319+
// always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
320+
// so we have to assume it does not, and that may result in duplicate data being returned when listing
321+
// all installed packages for example
322+
self::$installedIsLocalDir = false;
312323
}
313324

314325
/**
@@ -322,19 +333,27 @@ private static function getInstalled()
322333
}
323334

324335
$installed = array();
336+
$copiedLocalDir = false;
325337

326338
if (self::$canGetVendors) {
339+
$selfDir = strtr(__DIR__, '\\', '/');
327340
foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
341+
$vendorDir = strtr($vendorDir, '\\', '/');
328342
if (isset(self::$installedByVendor[$vendorDir])) {
329343
$installed[] = self::$installedByVendor[$vendorDir];
330344
} elseif (is_file($vendorDir.'/composer/installed.php')) {
331345
/** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
332346
$required = require $vendorDir.'/composer/installed.php';
333-
$installed[] = self::$installedByVendor[$vendorDir] = $required;
334-
if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
335-
self::$installed = $installed[count($installed) - 1];
347+
self::$installedByVendor[$vendorDir] = $required;
348+
$installed[] = $required;
349+
if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
350+
self::$installed = $required;
351+
self::$installedIsLocalDir = true;
336352
}
337353
}
354+
if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
355+
$copiedLocalDir = true;
356+
}
338357
}
339358
}
340359

@@ -350,7 +369,7 @@ private static function getInstalled()
350369
}
351370
}
352371

353-
if (self::$installed !== array()) {
372+
if (self::$installed !== array() && !$copiedLocalDir) {
354373
$installed[] = self::$installed;
355374
}
356375

‎composer/autoload_classmap.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,6 +1400,7 @@
14001400
'Doctrine\\DBAL\\Exception\\SyntaxErrorException' => $vendorDir . '/doctrine/dbal/src/Exception/SyntaxErrorException.php',
14011401
'Doctrine\\DBAL\\Exception\\TableExistsException' => $vendorDir . '/doctrine/dbal/src/Exception/TableExistsException.php',
14021402
'Doctrine\\DBAL\\Exception\\TableNotFoundException' => $vendorDir . '/doctrine/dbal/src/Exception/TableNotFoundException.php',
1403+
'Doctrine\\DBAL\\Exception\\TransactionRolledBack' => $vendorDir . '/doctrine/dbal/src/Exception/TransactionRolledBack.php',
14031404
'Doctrine\\DBAL\\Exception\\UniqueConstraintViolationException' => $vendorDir . '/doctrine/dbal/src/Exception/UniqueConstraintViolationException.php',
14041405
'Doctrine\\DBAL\\ExpandArrayParameters' => $vendorDir . '/doctrine/dbal/src/ExpandArrayParameters.php',
14051406
'Doctrine\\DBAL\\FetchMode' => $vendorDir . '/doctrine/dbal/src/FetchMode.php',
@@ -1579,8 +1580,8 @@
15791580
'Doctrine\\DBAL\\Types\\VarDateTimeImmutableType' => $vendorDir . '/doctrine/dbal/src/Types/VarDateTimeImmutableType.php',
15801581
'Doctrine\\DBAL\\Types\\VarDateTimeType' => $vendorDir . '/doctrine/dbal/src/Types/VarDateTimeType.php',
15811582
'Doctrine\\DBAL\\VersionAwarePlatformDriver' => $vendorDir . '/doctrine/dbal/src/VersionAwarePlatformDriver.php',
1582-
'Doctrine\\Deprecations\\Deprecation' => $vendorDir . '/doctrine/deprecations/lib/Doctrine/Deprecations/Deprecation.php',
1583-
'Doctrine\\Deprecations\\PHPUnit\\VerifyDeprecations' => $vendorDir . '/doctrine/deprecations/lib/Doctrine/Deprecations/PHPUnit/VerifyDeprecations.php',
1583+
'Doctrine\\Deprecations\\Deprecation' => $vendorDir . '/doctrine/deprecations/src/Deprecation.php',
1584+
'Doctrine\\Deprecations\\PHPUnit\\VerifyDeprecations' => $vendorDir . '/doctrine/deprecations/src/PHPUnit/VerifyDeprecations.php',
15841585
'Egulias\\EmailValidator\\EmailLexer' => $vendorDir . '/egulias/email-validator/src/EmailLexer.php',
15851586
'Egulias\\EmailValidator\\EmailParser' => $vendorDir . '/egulias/email-validator/src/EmailParser.php',
15861587
'Egulias\\EmailValidator\\EmailValidator' => $vendorDir . '/egulias/email-validator/src/EmailValidator.php',

‎composer/autoload_psr4.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
'GuzzleHttp\\' => array($vendorDir . '/guzzlehttp/guzzle/src'),
7878
'Fusonic\\OpenGraph\\' => array($vendorDir . '/fusonic/opengraph/src'),
7979
'Egulias\\EmailValidator\\' => array($vendorDir . '/egulias/email-validator/src'),
80-
'Doctrine\\Deprecations\\' => array($vendorDir . '/doctrine/deprecations/lib/Doctrine/Deprecations'),
80+
'Doctrine\\Deprecations\\' => array($vendorDir . '/doctrine/deprecations/src'),
8181
'Doctrine\\DBAL\\' => array($vendorDir . '/doctrine/dbal/src'),
8282
'Doctrine\\Common\\Lexer\\' => array($vendorDir . '/doctrine/lexer/src'),
8383
'Doctrine\\Common\\Cache\\' => array($vendorDir . '/doctrine/cache/lib/Doctrine/Common/Cache'),

‎composer/autoload_static.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
478478
),
479479
'Doctrine\\Deprecations\\' =>
480480
array (
481-
0 => __DIR__ . '/..' . '/doctrine/deprecations/lib/Doctrine/Deprecations',
481+
0 => __DIR__ . '/..' . '/doctrine/deprecations/src',
482482
),
483483
'Doctrine\\DBAL\\' =>
484484
array (
@@ -1933,6 +1933,7 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
19331933
'Doctrine\\DBAL\\Exception\\SyntaxErrorException' => __DIR__ . '/..' . '/doctrine/dbal/src/Exception/SyntaxErrorException.php',
19341934
'Doctrine\\DBAL\\Exception\\TableExistsException' => __DIR__ . '/..' . '/doctrine/dbal/src/Exception/TableExistsException.php',
19351935
'Doctrine\\DBAL\\Exception\\TableNotFoundException' => __DIR__ . '/..' . '/doctrine/dbal/src/Exception/TableNotFoundException.php',
1936+
'Doctrine\\DBAL\\Exception\\TransactionRolledBack' => __DIR__ . '/..' . '/doctrine/dbal/src/Exception/TransactionRolledBack.php',
19361937
'Doctrine\\DBAL\\Exception\\UniqueConstraintViolationException' => __DIR__ . '/..' . '/doctrine/dbal/src/Exception/UniqueConstraintViolationException.php',
19371938
'Doctrine\\DBAL\\ExpandArrayParameters' => __DIR__ . '/..' . '/doctrine/dbal/src/ExpandArrayParameters.php',
19381939
'Doctrine\\DBAL\\FetchMode' => __DIR__ . '/..' . '/doctrine/dbal/src/FetchMode.php',
@@ -2112,8 +2113,8 @@ class ComposerStaticInit2f23f73bc0cc116b4b1eee1521aa8652
21122113
'Doctrine\\DBAL\\Types\\VarDateTimeImmutableType' => __DIR__ . '/..' . '/doctrine/dbal/src/Types/VarDateTimeImmutableType.php',
21132114
'Doctrine\\DBAL\\Types\\VarDateTimeType' => __DIR__ . '/..' . '/doctrine/dbal/src/Types/VarDateTimeType.php',
21142115
'Doctrine\\DBAL\\VersionAwarePlatformDriver' => __DIR__ . '/..' . '/doctrine/dbal/src/VersionAwarePlatformDriver.php',
2115-
'Doctrine\\Deprecations\\Deprecation' => __DIR__ . '/..' . '/doctrine/deprecations/lib/Doctrine/Deprecations/Deprecation.php',
2116-
'Doctrine\\Deprecations\\PHPUnit\\VerifyDeprecations' => __DIR__ . '/..' . '/doctrine/deprecations/lib/Doctrine/Deprecations/PHPUnit/VerifyDeprecations.php',
2116+
'Doctrine\\Deprecations\\Deprecation' => __DIR__ . '/..' . '/doctrine/deprecations/src/Deprecation.php',
2117+
'Doctrine\\Deprecations\\PHPUnit\\VerifyDeprecations' => __DIR__ . '/..' . '/doctrine/deprecations/src/PHPUnit/VerifyDeprecations.php',
21172118
'Egulias\\EmailValidator\\EmailLexer' => __DIR__ . '/..' . '/egulias/email-validator/src/EmailLexer.php',
21182119
'Egulias\\EmailValidator\\EmailParser' => __DIR__ . '/..' . '/egulias/email-validator/src/EmailParser.php',
21192120
'Egulias\\EmailValidator\\EmailValidator' => __DIR__ . '/..' . '/egulias/email-validator/src/EmailValidator.php',

‎composer/installed.json‎

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -543,17 +543,17 @@
543543
},
544544
{
545545
"name": "doctrine/dbal",
546-
"version": "3.9.1",
547-
"version_normalized": "3.9.1.0",
546+
"version": "3.9.4",
547+
"version_normalized": "3.9.4.0",
548548
"source": {
549549
"type": "git",
550550
"url": "https://github.com/doctrine/dbal.git",
551-
"reference": "d7dc08f98cba352b2bab5d32c5e58f7e745c11a7"
551+
"reference": "ec16c82f20be1a7224e65ac67144a29199f87959"
552552
},
553553
"dist": {
554554
"type": "zip",
555-
"url": "https://api.github.com/repos/doctrine/dbal/zipball/d7dc08f98cba352b2bab5d32c5e58f7e745c11a7",
556-
"reference": "d7dc08f98cba352b2bab5d32c5e58f7e745c11a7",
555+
"url": "https://api.github.com/repos/doctrine/dbal/zipball/ec16c82f20be1a7224e65ac67144a29199f87959",
556+
"reference": "ec16c82f20be1a7224e65ac67144a29199f87959",
557557
"shasum": ""
558558
},
559559
"require": {
@@ -569,20 +569,18 @@
569569
"doctrine/coding-standard": "12.0.0",
570570
"fig/log-test": "^1",
571571
"jetbrains/phpstorm-stubs": "2023.1",
572-
"phpstan/phpstan": "1.12.0",
573-
"phpstan/phpstan-strict-rules": "^1.6",
574-
"phpunit/phpunit": "9.6.20",
575-
"psalm/plugin-phpunit": "0.18.4",
572+
"phpstan/phpstan": "2.1.1",
573+
"phpstan/phpstan-strict-rules": "^2",
574+
"phpunit/phpunit": "9.6.22",
576575
"slevomat/coding-standard": "8.13.1",
577576
"squizlabs/php_codesniffer": "3.10.2",
578577
"symfony/cache": "^5.4|^6.0|^7.0",
579-
"symfony/console": "^4.4|^5.4|^6.0|^7.0",
580-
"vimeo/psalm": "4.30.0"
578+
"symfony/console": "^4.4|^5.4|^6.0|^7.0"
581579
},
582580
"suggest": {
583581
"symfony/console": "For helpful console commands such as SQL execution and import of files."
584582
},
585-
"time": "2024-09-01T13:49:23+00:00",
583+
"time": "2025-01-16T08:28:55+00:00",
586584
"bin": [
587585
"bin/doctrine-dbal"
588586
],
@@ -639,7 +637,7 @@
639637
],
640638
"support": {
641639
"issues": "https://github.com/doctrine/dbal/issues",
642-
"source": "https://github.com/doctrine/dbal/tree/3.9.1"
640+
"source": "https://github.com/doctrine/dbal/tree/3.9.4"
643641
},
644642
"funding": [
645643
{
@@ -659,40 +657,38 @@
659657
},
660658
{
661659
"name": "doctrine/deprecations",
662-
"version": "1.1.3",
663-
"version_normalized": "1.1.3.0",
660+
"version": "1.1.4",
661+
"version_normalized": "1.1.4.0",
664662
"source": {
665663
"type": "git",
666664
"url": "https://github.com/doctrine/deprecations.git",
667-
"reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab"
665+
"reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9"
668666
},
669667
"dist": {
670668
"type": "zip",
671-
"url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
672-
"reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab",
669+
"url": "https://api.github.com/repos/doctrine/deprecations/zipball/31610dbb31faa98e6b5447b62340826f54fbc4e9",
670+
"reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9",
673671
"shasum": ""
674672
},
675673
"require": {
676674
"php": "^7.1 || ^8.0"
677675
},
678676
"require-dev": {
679-
"doctrine/coding-standard": "^9",
680-
"phpstan/phpstan": "1.4.10 || 1.10.15",
681-
"phpstan/phpstan-phpunit": "^1.0",
677+
"doctrine/coding-standard": "^9 || ^12",
678+
"phpstan/phpstan": "1.4.10 || 2.0.3",
679+
"phpstan/phpstan-phpunit": "^1.0 || ^2",
682680
"phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
683-
"psalm/plugin-phpunit": "0.18.4",
684-
"psr/log": "^1 || ^2 || ^3",
685-
"vimeo/psalm": "4.30.0 || 5.12.0"
681+
"psr/log": "^1 || ^2 || ^3"
686682
},
687683
"suggest": {
688684
"psr/log": "Allows logging deprecations via PSR-3 logger implementation"
689685
},
690-
"time": "2024-01-30T19:34:25+00:00",
686+
"time": "2024-12-07T21:18:45+00:00",
691687
"type": "library",
692688
"installation-source": "dist",
693689
"autoload": {
694690
"psr-4": {
695-
"Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations"
691+
"Doctrine\\Deprecations\\": "src"
696692
}
697693
},
698694
"notification-url": "https://packagist.org/downloads/",
@@ -703,7 +699,7 @@
703699
"homepage": "https://www.doctrine-project.org/",
704700
"support": {
705701
"issues": "https://github.com/doctrine/deprecations/issues",
706-
"source": "https://github.com/doctrine/deprecations/tree/1.1.3"
702+
"source": "https://github.com/doctrine/deprecations/tree/1.1.4"
707703
},
708704
"install-path": "../doctrine/deprecations"
709705
},

‎composer/installed.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,18 @@
8383
'dev_requirement' => false,
8484
),
8585
'doctrine/dbal' => array(
86-
'pretty_version' => '3.9.1',
87-
'version' => '3.9.1.0',
88-
'reference' => 'd7dc08f98cba352b2bab5d32c5e58f7e745c11a7',
86+
'pretty_version' => '3.9.4',
87+
'version' => '3.9.4.0',
88+
'reference' => 'ec16c82f20be1a7224e65ac67144a29199f87959',
8989
'type' => 'library',
9090
'install_path' => __DIR__ . '/../doctrine/dbal',
9191
'aliases' => array(),
9292
'dev_requirement' => false,
9393
),
9494
'doctrine/deprecations' => array(
95-
'pretty_version' => '1.1.3',
96-
'version' => '1.1.3.0',
97-
'reference' => 'dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab',
95+
'pretty_version' => '1.1.4',
96+
'version' => '1.1.4.0',
97+
'reference' => '31610dbb31faa98e6b5447b62340826f54fbc4e9',
9898
'type' => 'library',
9999
'install_path' => __DIR__ . '/../doctrine/deprecations',
100100
'aliases' => array(),

0 commit comments

Comments
 (0)