Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3432860 by longwave, catch: Update to Symfony 7.0

merge-requests/7008/head
Alex Pott 2024-04-01 18:21:00 +01:00
parent 553a47cd4a
commit a65bbd5dcd
No known key found for this signature in database
GPG Key ID: BDA67E7EE836E5CE
15 changed files with 480 additions and 510 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
composer.json
View File

@ -34,13 +34,13 @@
"phpstan/phpstan": "^1.10.62",
"phpstan/phpstan-phpunit": "^1.3.16",
"phpunit/phpunit": "^9.6.13",
"symfony/browser-kit": "^6.4",
"symfony/css-selector": "^6.4",
"symfony/dom-crawler": "^6.4",
"symfony/error-handler": "^6.4",
"symfony/lock": "^6.4",
"symfony/phpunit-bridge": "^6.4",
"symfony/var-dumper": "^6.4"
"symfony/browser-kit": "^7.0",
"symfony/css-selector": "^7.0",
"symfony/dom-crawler": "^7.0",
"symfony/error-handler": "^7.0",
"symfony/lock": "^7.0",
"symfony/phpunit-bridge": "^7.0",
"symfony/var-dumper": "^7.0"
},
"replace": {
"symfony/polyfill-php72": "*",

835
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

52
composer/Metapackage/CoreRecommended/composer.json
View File

@ -31,35 +31,35 @@
"psr/log": "~3.0.0",
"ralouphie/getallheaders": "~3.0.3",
"sebastian/diff": "~4.0.5",
"symfony/console": "~v6.4.1",
"symfony/dependency-injection": "~v6.4.1",
"symfony/console": "~v7.0.4",
"symfony/dependency-injection": "~v7.0.4",
"symfony/deprecation-contracts": "~v3.4.0",
"symfony/error-handler": "~v6.4.0",
"symfony/event-dispatcher": "~v6.4.0",
"symfony/error-handler": "~v7.0.4",
"symfony/event-dispatcher": "~v7.0.3",
"symfony/event-dispatcher-contracts": "~v3.4.0",
"symfony/filesystem": "~v6.4.0",
"symfony/finder": "~v6.4.0",
"symfony/http-foundation": "~v6.4.0",
"symfony/http-kernel": "~v6.4.1",
"symfony/mailer": "~v6.4.0",
"symfony/mime": "~v6.4.0",
"symfony/filesystem": "~v7.0.3",
"symfony/finder": "~v7.0.0",
"symfony/http-foundation": "~v7.0.4",
"symfony/http-kernel": "~v7.0.5",
"symfony/mailer": "~v7.0.4",
"symfony/mime": "~v7.0.3",
"symfony/polyfill-ctype": "~v1.29.0",
"symfony/polyfill-iconv": "~v1.28.0",
"symfony/polyfill-intl-grapheme": "~v1.28.0",
"symfony/polyfill-intl-idn": "~v1.28.0",
"symfony/polyfill-intl-normalizer": "~v1.28.0",
"symfony/polyfill-mbstring": "~v1.28.0",
"symfony/process": "~v6.4.0",
"symfony/psr-http-message-bridge": "~v6.4.0",
"symfony/routing": "~v6.4.1",
"symfony/serializer": "~v6.4.1",
"symfony/service-contracts": "~v3.4.0",
"symfony/string": "~v6.4.0",
"symfony/translation-contracts": "~v3.4.0",
"symfony/validator": "~v6.4.0",
"symfony/var-dumper": "~v6.4.0",
"symfony/var-exporter": "~v6.4.1",
"symfony/yaml": "~v6.4.3",
"symfony/polyfill-iconv": "~v1.29.0",
"symfony/polyfill-intl-grapheme": "~v1.29.0",
"symfony/polyfill-intl-idn": "~v1.29.0",
"symfony/polyfill-intl-normalizer": "~v1.29.0",
"symfony/polyfill-mbstring": "~v1.29.0",
"symfony/process": "~v7.0.4",
"symfony/psr-http-message-bridge": "~v7.0.3",
"symfony/routing": "~v7.0.5",
"symfony/serializer": "~v7.0.4",
"symfony/service-contracts": "~v3.4.1",
"symfony/string": "~v7.0.4",
"symfony/translation-contracts": "~v3.4.1",
"symfony/validator": "~v7.0.5",
"symfony/var-dumper": "~v7.0.4",
"symfony/var-exporter": "~v7.0.4",
"symfony/yaml": "~v7.0.3",
"twig/twig": "~v3.8.0"
}
}

14
composer/Metapackage/DevDependencies/composer.json
View File

@ -26,12 +26,12 @@
"phpstan/phpstan": "^1.10.62",
"phpstan/phpstan-phpunit": "^1.3.16",
"phpunit/phpunit": "^9.6.13",
"symfony/browser-kit": "^6.4",
"symfony/css-selector": "^6.4",
"symfony/dom-crawler": "^6.4",
"symfony/error-handler": "^6.4",
"symfony/lock": "^6.4",
"symfony/phpunit-bridge": "^6.4",
"symfony/var-dumper": "^6.4"
"symfony/browser-kit": "^7.0",
"symfony/css-selector": "^7.0",
"symfony/dom-crawler": "^7.0",
"symfony/error-handler": "^7.0",
"symfony/lock": "^7.0",
"symfony/phpunit-bridge": "^7.0",
"symfony/var-dumper": "^7.0"
}
}

10
composer/Metapackage/PinnedDevDependencies/composer.json
View File

@ -80,11 +80,11 @@
"sirbrillig/phpcs-variable-analysis": "v2.11.17",
"slevomat/coding-standard": "8.14.1",
"squizlabs/php_codesniffer": "3.8.0",
"symfony/browser-kit": "v6.4.0",
"symfony/css-selector": "v6.4.0",
"symfony/dom-crawler": "v6.4.0",
"symfony/lock": "v6.4.0",
"symfony/phpunit-bridge": "v6.4.1",
"symfony/browser-kit": "v7.0.3",
"symfony/css-selector": "v7.0.3",
"symfony/dom-crawler": "v7.0.4",
"symfony/lock": "v7.0.3",
"symfony/phpunit-bridge": "v7.0.4",
"theseer/tokenizer": "1.2.2",
"webflo/drupal-finder": "1.2.2",
"webmozart/assert": "1.11.0"

30
core/composer.json
View File

@ -18,21 +18,21 @@
"ext-tokenizer": "*",
"ext-xml": "*",
"php": ">=8.3.0",
"symfony/console": "^6.4",
"symfony/dependency-injection": "^6.4",
"symfony/event-dispatcher": "^6.4",
"symfony/filesystem": "^6.4",
"symfony/finder": "^6.4",
"symfony/http-foundation": "^6.4",
"symfony/http-kernel": "^6.4",
"symfony/mailer": "^6.4",
"symfony/mime": "^6.4",
"symfony/routing": "^6.4",
"symfony/serializer": "^6.4",
"symfony/validator": "^6.4",
"symfony/process": "^6.4",
"symfony/console": "^7.0",
"symfony/dependency-injection": "^7.0",
"symfony/event-dispatcher": "^7.0",
"symfony/filesystem": "^7.0",
"symfony/finder": "^7.0",
"symfony/http-foundation": "^7.0",
"symfony/http-kernel": "^7.0",
"symfony/mailer": "^7.0",
"symfony/mime": "^7.0",
"symfony/routing": "^7.0",
"symfony/serializer": "^7.0",
"symfony/validator": "^7.0",
"symfony/process": "^7.0",
"symfony/polyfill-iconv": "^1.26",
"symfony/yaml": "^6.4",
"symfony/yaml": "^7.0",
"twig/twig": "^3.5.0",
"doctrine/annotations": "^2.0",
"doctrine/lexer": "^2.0",
@ -40,7 +40,7 @@
"guzzlehttp/psr7": "^2.4.5",
"egulias/email-validator": "^3.2.1|^4.0",
"masterminds/html5": "^2.7",
"symfony/psr-http-message-bridge": "^2.1|^6.4",
"symfony/psr-http-message-bridge": "^7.0",
"composer-runtime-api": "^2.1",
"composer/semver": "^3.3",
"asm89/stack-cors": "^2.1",

4
core/lib/Drupal/Component/DependencyInjection/composer.json
View File

@ -14,8 +14,8 @@
},
"require": {
"php": ">=8.3.0",
"symfony/dependency-injection": "^6.4",
"symfony/service-contracts": "v3.4.0"
"symfony/dependency-injection": "^7.0",
"symfony/service-contracts": "v3.4.1"
},
"suggest": {
"symfony/expression-language": "For using expressions in service container configuration"

4
core/lib/Drupal/Component/EventDispatcher/composer.json
View File

@ -8,8 +8,8 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=8.3.0",
"symfony/dependency-injection": "^6.4",
"symfony/event-dispatcher": "^6.4",
"symfony/dependency-injection": "^7.0",
"symfony/event-dispatcher": "^7.0",
"symfony/event-dispatcher-contracts": "v3.4.0"
},
"autoload": {

2
core/lib/Drupal/Component/HttpFoundation/composer.json
View File

@ -8,7 +8,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=8.3.0",
"symfony/http-foundation": "^6.4"
"symfony/http-foundation": "^7.0"
},
"autoload": {
"psr-4": {

2
core/lib/Drupal/Component/Plugin/composer.json
View File

@ -10,7 +10,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=8.3.0",
"symfony/validator": "^6.4"
"symfony/validator": "^7.0"
},
"autoload": {
"psr-4": {

2
core/lib/Drupal/Component/Serialization/composer.json
View File

@ -8,7 +8,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=8.3.0",
"symfony/yaml": "^6.4"
"symfony/yaml": "^7.0"
},
"autoload": {
"psr-4": {

1
core/lib/Drupal/Core/Composer/Composer.php
View File

@ -60,7 +60,6 @@ class Composer {
}
if ($repository->findPackage('symfony/dependency-injection', $constraint)) {
$autoload['classmap'] = array_merge($autoload['classmap'], [
$vendor_dir . '/symfony/dependency-injection/ContainerAwareInterface.php',
$vendor_dir . '/symfony/dependency-injection/ContainerInterface.php',
]);
}

2
core/lib/Drupal/Core/DrupalKernel.php
View File

@ -1629,7 +1629,7 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
// TrustedHostsRequestFactory makes sure to pass in the server variables
// from the main request.
$request_factory = new TrustedHostsRequestFactory($host);
Request::setFactory([$request_factory, 'createRequest']);
Request::setFactory([$request_factory, 'createRequest'](...));
}
catch (\UnexpectedValueException $e) {

9
core/lib/Drupal/Core/Field/FieldItemList.php
View File

@ -265,12 +265,13 @@ class FieldItemList extends ItemList implements FieldItemListInterface {
// widgets.
$cardinality = $this->getFieldDefinition()->getFieldStorageDefinition()->getCardinality();
if ($cardinality != FieldStorageDefinitionInterface::CARDINALITY_UNLIMITED) {
$options['max'] = $cardinality;
if ($label = $this->getFieldDefinition()->getLabel()) {
$options['maxMessage'] = $this->t('%name: this field cannot hold more than @count values.', ['%name' => $label, '@count' => $cardinality]);
}
$constraints[] = $this->getTypedDataManager()
->getValidationConstraintManager()
->create('Count', [
'max' => $cardinality,
'maxMessage' => t('%name: this field cannot hold more than @count values.', ['%name' => $this->getFieldDefinition()->getLabel(), '@count' => $cardinality]),
]);
->create('Count', $options);
}
return $constraints;

9
core/lib/Drupal/Core/Field/Plugin/Field/FieldType/StringItem.php
View File

@ -59,12 +59,13 @@ class StringItem extends StringItemBase {
if ($max_length = $this->getSetting('max_length')) {
$constraint_manager = \Drupal::typedDataManager()->getValidationConstraintManager();
$options['max'] = $max_length;
if ($label = $this->getFieldDefinition()->getLabel()) {
$options['maxMessage'] = $this->t('%name: may not be longer than @max characters.', ['%name' => $label, '@max' => $max_length]);
}
$constraints[] = $constraint_manager->create('ComplexData', [
'value' => [
'Length' => [
'max' => $max_length,
'maxMessage' => $this->t('%name: may not be longer than @max characters.', ['%name' => $this->getFieldDefinition()->getLabel(), '@max' => $max_length]),
],
'Length' => $options,
],
]);
}