Skip to content

Commit 60164ba

Browse files
JoblersTuneJoblersTune
authored
chore: updated Drupal core to 10.6.2 (#181)
1 parent 874263b commit 60164ba

File tree

721 files changed

+14474
-10107
lines changed

Some content is hidden

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

721 files changed

+14474
-10107
lines changed

‎composer.lock‎

Lines changed: 168 additions & 296 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/composer/InstalledVersions.php‎

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

35-
/**
36-
* @var bool
37-
*/
38-
private static $installedIsLocalDir;
39-
4035
/**
4136
* @var bool|null
4237
*/
@@ -314,12 +309,6 @@ public static function reload($data)
314309
{
315310
self::$installed = $data;
316311
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;
323312
}
324313

325314
/**
@@ -333,27 +322,19 @@ private static function getInstalled()
333322
}
334323

335324
$installed = array();
336-
$copiedLocalDir = false;
337325

338326
if (self::$canGetVendors) {
339-
$selfDir = strtr(__DIR__, '\\', '/');
340327
foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
341-
$vendorDir = strtr($vendorDir, '\\', '/');
342328
if (isset(self::$installedByVendor[$vendorDir])) {
343329
$installed[] = self::$installedByVendor[$vendorDir];
344330
} elseif (is_file($vendorDir.'/composer/installed.php')) {
345331
/** @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 */
346332
$required = require $vendorDir.'/composer/installed.php';
347-
self::$installedByVendor[$vendorDir] = $required;
348-
$installed[] = $required;
349-
if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
350-
self::$installed = $required;
351-
self::$installedIsLocalDir = true;
333+
$installed[] = self::$installedByVendor[$vendorDir] = $required;
334+
if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
335+
self::$installed = $installed[count($installed) - 1];
352336
}
353337
}
354-
if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
355-
$copiedLocalDir = true;
356-
}
357338
}
358339
}
359340

@@ -369,7 +350,7 @@ private static function getInstalled()
369350
}
370351
}
371352

372-
if (self::$installed !== array() && !$copiedLocalDir) {
353+
if (self::$installed !== array()) {
373354
$installed[] = self::$installed;
374355
}
375356

‎vendor/composer/LICENSE‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
Copyright (c) Nils Adermann, Jordi Boggiano
32

43
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -18,4 +17,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1817
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
1918
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2019
THE SOFTWARE.
21-

‎vendor/composer/autoload_classmap.php‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,15 @@
3939
'Drupal\\Core\\DrupalKernelInterface' => $baseDir . '/web/core/lib/Drupal/Core/DrupalKernelInterface.php',
4040
'Drupal\\Core\\Installer\\InstallerRedirectTrait' => $baseDir . '/web/core/lib/Drupal/Core/Installer/InstallerRedirectTrait.php',
4141
'Drupal\\Core\\Site\\Settings' => $baseDir . '/web/core/lib/Drupal/Core/Site/Settings.php',
42+
'Drupal\\DrupalInstalled' => $vendorDir . '/drupal/DrupalInstalled.php',
4243
'Normalizer' => $vendorDir . '/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php',
4344
'OS_Guess' => $vendorDir . '/pear/pear-core-minimal/src/OS/Guess.php',
4445
'Override' => $vendorDir . '/symfony/polyfill-php83/Resources/stubs/Override.php',
4546
'PEAR' => $vendorDir . '/pear/pear-core-minimal/src/PEAR.php',
4647
'PEAR_Error' => $vendorDir . '/pear/pear-core-minimal/src/PEAR.php',
4748
'PEAR_ErrorStack' => $vendorDir . '/pear/pear-core-minimal/src/PEAR/ErrorStack.php',
4849
'PEAR_Exception' => $vendorDir . '/pear/pear_exception/PEAR/Exception.php',
50+
'Psr\\Container\\ContainerInterface' => $vendorDir . '/psr/container/src/ContainerInterface.php',
4951
'ReturnTypeWillChange' => $vendorDir . '/symfony/polyfill-php81/Resources/stubs/ReturnTypeWillChange.php',
5052
'SQLite3Exception' => $vendorDir . '/symfony/polyfill-php83/Resources/stubs/SQLite3Exception.php',
5153
'SebastianBergmann\\Diff\\Chunk' => $vendorDir . '/sebastian/diff/src/Chunk.php',
@@ -64,5 +66,16 @@
6466
'SebastianBergmann\\Diff\\Output\\UnifiedDiffOutputBuilder' => $vendorDir . '/sebastian/diff/src/Output/UnifiedDiffOutputBuilder.php',
6567
'SebastianBergmann\\Diff\\Parser' => $vendorDir . '/sebastian/diff/src/Parser.php',
6668
'SebastianBergmann\\Diff\\TimeEfficientLongestCommonSubsequenceCalculator' => $vendorDir . '/sebastian/diff/src/TimeEfficientLongestCommonSubsequenceCalculator.php',
69+
'Symfony\\Component\\DependencyInjection\\ContainerInterface' => $vendorDir . '/symfony/dependency-injection/ContainerInterface.php',
70+
'Symfony\\Component\\HttpFoundation\\FileBag' => $vendorDir . '/symfony/http-foundation/FileBag.php',
71+
'Symfony\\Component\\HttpFoundation\\HeaderBag' => $vendorDir . '/symfony/http-foundation/HeaderBag.php',
72+
'Symfony\\Component\\HttpFoundation\\HeaderUtils' => $vendorDir . '/symfony/http-foundation/HeaderUtils.php',
73+
'Symfony\\Component\\HttpFoundation\\ParameterBag' => $vendorDir . '/symfony/http-foundation/ParameterBag.php',
74+
'Symfony\\Component\\HttpFoundation\\Request' => $vendorDir . '/symfony/http-foundation/Request.php',
75+
'Symfony\\Component\\HttpFoundation\\RequestStack' => $vendorDir . '/symfony/http-foundation/RequestStack.php',
76+
'Symfony\\Component\\HttpFoundation\\ServerBag' => $vendorDir . '/symfony/http-foundation/ServerBag.php',
77+
'Symfony\\Component\\HttpKernel\\HttpKernel' => $vendorDir . '/symfony/http-kernel/HttpKernel.php',
78+
'Symfony\\Component\\HttpKernel\\HttpKernelInterface' => $vendorDir . '/symfony/http-kernel/HttpKernelInterface.php',
79+
'Symfony\\Component\\HttpKernel\\TerminableInterface' => $vendorDir . '/symfony/http-kernel/TerminableInterface.php',
6780
'System' => $vendorDir . '/pear/pear-core-minimal/src/System.php',
6881
);

‎vendor/composer/autoload_psr4.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
'Psr\\Http\\Client\\' => array($vendorDir . '/psr/http-client/src'),
5252
'Psr\\EventDispatcher\\' => array($vendorDir . '/psr/event-dispatcher/src'),
5353
'Psr\\Container\\' => array($vendorDir . '/psr/container/src'),
54-
'Psr\\Cache\\' => array($vendorDir . '/psr/cache/src'),
5554
'PhpParser\\' => array($vendorDir . '/nikic/php-parser/lib/PhpParser'),
5655
'Peast\\' => array($vendorDir . '/mck89/peast/lib/Peast'),
5756
'Masterminds\\' => array($vendorDir . '/masterminds/html5/src'),
@@ -76,7 +75,6 @@
7675
'DrupalCodeGenerator\\' => array($vendorDir . '/chi-teck/drupal-code-generator/src'),
7776
'Doctrine\\Deprecations\\' => array($vendorDir . '/doctrine/deprecations/src'),
7877
'Doctrine\\Common\\Lexer\\' => array($vendorDir . '/doctrine/lexer/src'),
79-
'Doctrine\\Common\\Annotations\\' => array($vendorDir . '/doctrine/annotations/lib/Doctrine/Common/Annotations'),
8078
'Dflydev\\DotAccessData\\' => array($vendorDir . '/dflydev/dot-access-data/src'),
8179
'Consolidation\\SiteProcess\\' => array($vendorDir . '/consolidation/site-process/src'),
8280
'Consolidation\\SiteAlias\\' => array($vendorDir . '/consolidation/site-alias/src'),

‎vendor/composer/autoload_static.php‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ class ComposerStaticInit969219525714a33a1696abd06bf370ac
100100
'Psr\\Http\\Client\\' => 16,
101101
'Psr\\EventDispatcher\\' => 20,
102102
'Psr\\Container\\' => 14,
103-
'Psr\\Cache\\' => 10,
104103
'PhpParser\\' => 10,
105104
'Peast\\' => 6,
106105
),
@@ -146,7 +145,6 @@ class ComposerStaticInit969219525714a33a1696abd06bf370ac
146145
'DrupalCodeGenerator\\' => 20,
147146
'Doctrine\\Deprecations\\' => 22,
148147
'Doctrine\\Common\\Lexer\\' => 22,
149-
'Doctrine\\Common\\Annotations\\' => 28,
150148
'Dflydev\\DotAccessData\\' => 22,
151149
),
152150
'C' =>
@@ -349,10 +347,6 @@ class ComposerStaticInit969219525714a33a1696abd06bf370ac
349347
array (
350348
0 => __DIR__ . '/..' . '/psr/container/src',
351349
),
352-
'Psr\\Cache\\' =>
353-
array (
354-
0 => __DIR__ . '/..' . '/psr/cache/src',
355-
),
356350
'PhpParser\\' =>
357351
array (
358352
0 => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser',
@@ -449,10 +443,6 @@ class ComposerStaticInit969219525714a33a1696abd06bf370ac
449443
array (
450444
0 => __DIR__ . '/..' . '/doctrine/lexer/src',
451445
),
452-
'Doctrine\\Common\\Annotations\\' =>
453-
array (
454-
0 => __DIR__ . '/..' . '/doctrine/annotations/lib/Doctrine/Common/Annotations',
455-
),
456446
'Dflydev\\DotAccessData\\' =>
457447
array (
458448
0 => __DIR__ . '/..' . '/dflydev/dot-access-data/src',
@@ -550,13 +540,15 @@ class ComposerStaticInit969219525714a33a1696abd06bf370ac
550540
'Drupal\\Core\\DrupalKernelInterface' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/DrupalKernelInterface.php',
551541
'Drupal\\Core\\Installer\\InstallerRedirectTrait' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Installer/InstallerRedirectTrait.php',
552542
'Drupal\\Core\\Site\\Settings' => __DIR__ . '/../..' . '/web/core/lib/Drupal/Core/Site/Settings.php',
543+
'Drupal\\DrupalInstalled' => __DIR__ . '/..' . '/drupal/DrupalInstalled.php',
553544
'Normalizer' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php',
554545
'OS_Guess' => __DIR__ . '/..' . '/pear/pear-core-minimal/src/OS/Guess.php',
555546
'Override' => __DIR__ . '/..' . '/symfony/polyfill-php83/Resources/stubs/Override.php',
556547
'PEAR' => __DIR__ . '/..' . '/pear/pear-core-minimal/src/PEAR.php',
557548
'PEAR_Error' => __DIR__ . '/..' . '/pear/pear-core-minimal/src/PEAR.php',
558549
'PEAR_ErrorStack' => __DIR__ . '/..' . '/pear/pear-core-minimal/src/PEAR/ErrorStack.php',
559550
'PEAR_Exception' => __DIR__ . '/..' . '/pear/pear_exception/PEAR/Exception.php',
551+
'Psr\\Container\\ContainerInterface' => __DIR__ . '/..' . '/psr/container/src/ContainerInterface.php',
560552
'ReturnTypeWillChange' => __DIR__ . '/..' . '/symfony/polyfill-php81/Resources/stubs/ReturnTypeWillChange.php',
561553
'SQLite3Exception' => __DIR__ . '/..' . '/symfony/polyfill-php83/Resources/stubs/SQLite3Exception.php',
562554
'SebastianBergmann\\Diff\\Chunk' => __DIR__ . '/..' . '/sebastian/diff/src/Chunk.php',
@@ -575,6 +567,17 @@ class ComposerStaticInit969219525714a33a1696abd06bf370ac
575567
'SebastianBergmann\\Diff\\Output\\UnifiedDiffOutputBuilder' => __DIR__ . '/..' . '/sebastian/diff/src/Output/UnifiedDiffOutputBuilder.php',
576568
'SebastianBergmann\\Diff\\Parser' => __DIR__ . '/..' . '/sebastian/diff/src/Parser.php',
577569
'SebastianBergmann\\Diff\\TimeEfficientLongestCommonSubsequenceCalculator' => __DIR__ . '/..' . '/sebastian/diff/src/TimeEfficientLongestCommonSubsequenceCalculator.php',
570+
'Symfony\\Component\\DependencyInjection\\ContainerInterface' => __DIR__ . '/..' . '/symfony/dependency-injection/ContainerInterface.php',
571+
'Symfony\\Component\\HttpFoundation\\FileBag' => __DIR__ . '/..' . '/symfony/http-foundation/FileBag.php',
572+
'Symfony\\Component\\HttpFoundation\\HeaderBag' => __DIR__ . '/..' . '/symfony/http-foundation/HeaderBag.php',
573+
'Symfony\\Component\\HttpFoundation\\HeaderUtils' => __DIR__ . '/..' . '/symfony/http-foundation/HeaderUtils.php',
574+
'Symfony\\Component\\HttpFoundation\\ParameterBag' => __DIR__ . '/..' . '/symfony/http-foundation/ParameterBag.php',
575+
'Symfony\\Component\\HttpFoundation\\Request' => __DIR__ . '/..' . '/symfony/http-foundation/Request.php',
576+
'Symfony\\Component\\HttpFoundation\\RequestStack' => __DIR__ . '/..' . '/symfony/http-foundation/RequestStack.php',
577+
'Symfony\\Component\\HttpFoundation\\ServerBag' => __DIR__ . '/..' . '/symfony/http-foundation/ServerBag.php',
578+
'Symfony\\Component\\HttpKernel\\HttpKernel' => __DIR__ . '/..' . '/symfony/http-kernel/HttpKernel.php',
579+
'Symfony\\Component\\HttpKernel\\HttpKernelInterface' => __DIR__ . '/..' . '/symfony/http-kernel/HttpKernelInterface.php',
580+
'Symfony\\Component\\HttpKernel\\TerminableInterface' => __DIR__ . '/..' . '/symfony/http-kernel/TerminableInterface.php',
578581
'System' => __DIR__ . '/..' . '/pear/pear-core-minimal/src/System.php',
579582
);
580583

‎vendor/composer/include_paths.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
$baseDir = dirname($vendorDir);
77

88
return array(
9-
$vendorDir . '/pear/archive_tar',
109
$vendorDir . '/pear/console_getopt',
11-
$vendorDir . '/pear/pear-core-minimal/src',
1210
$vendorDir . '/pear/pear_exception',
11+
$vendorDir . '/pear/pear-core-minimal/src',
12+
$vendorDir . '/pear/archive_tar',
1313
);

0 commit comments

Comments
 (0)