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

Issue #3338328 by Spokje, andypost, longwave, effulgentsia, jungle, catch, smustgrave, Wim Leers: Update to Symfony 6.3

merge-requests/3996/head
catch 2023-05-14 15:45:05 +01:00
parent 6654fa8e41
commit a6c9dbbe28
71 changed files with 739 additions and 300 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
composer.json
View File

@ -30,15 +30,15 @@
"phpstan/phpstan": "^1.10.1",
"phpstan/phpstan-phpunit": "^1.3.11",
"phpunit/phpunit": "^9.5",
"symfony/browser-kit": "^6.2",
"symfony/css-selector": "^6.2",
"symfony/dom-crawler": "^6.2",
"symfony/error-handler": "^6.2",
"symfony/filesystem": "^6.2",
"symfony/finder": "^6.2",
"symfony/lock": "^6.2",
"symfony/phpunit-bridge": "^6.2",
"symfony/var-dumper": "^6.2"
"symfony/browser-kit": "^6.3",
"symfony/css-selector": "^6.3",
"symfony/dom-crawler": "^6.3",
"symfony/error-handler": "^6.3",
"symfony/filesystem": "^6.3",
"symfony/finder": "^6.3",
"symfony/lock": "^6.3",
"symfony/phpunit-bridge": "^6.3",
"symfony/var-dumper": "^6.3"
},
"replace": {
"symfony/polyfill-php72": "*",

485
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

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

@ -32,32 +32,33 @@
"psr/log": "~3.0.0",
"ralouphie/getallheaders": "~3.0.3",
"sebastian/diff": "~4.0.4",
"symfony/console": "~v6.2.10",
"symfony/dependency-injection": "~v6.2.10",
"symfony/console": "~v6.3.0-BETA2",
"symfony/dependency-injection": "~v6.3.0-BETA3",
"symfony/deprecation-contracts": "~v3.2.1",
"symfony/error-handler": "~v6.2.10",
"symfony/event-dispatcher": "~v6.2.8",
"symfony/error-handler": "~v6.3.0-BETA3",
"symfony/event-dispatcher": "~v6.3.0-BETA1",
"symfony/event-dispatcher-contracts": "~v3.2.1",
"symfony/http-foundation": "~v6.2.10",
"symfony/http-kernel": "~v6.2.10",
"symfony/mime": "~v6.2.10",
"symfony/http-foundation": "~v6.3.0-BETA3",
"symfony/http-kernel": "~v6.3.0-BETA3",
"symfony/mime": "~v6.3.0-BETA1",
"symfony/polyfill-ctype": "~v1.27.0",
"symfony/polyfill-iconv": "~v1.27.0",
"symfony/polyfill-intl-grapheme": "~v1.27.0",
"symfony/polyfill-intl-idn": "~v1.27.0",
"symfony/polyfill-intl-normalizer": "~v1.27.0",
"symfony/polyfill-mbstring": "~v1.27.0",
"symfony/process": "~v6.2.10",
"symfony/polyfill-php83": "~v1.27.0",
"symfony/process": "~v6.3.0-BETA1",
"symfony/psr-http-message-bridge": "~v2.2.0",
"symfony/routing": "~v6.2.8",
"symfony/serializer": "~v6.2.10",
"symfony/routing": "~v6.3.0-BETA1",
"symfony/serializer": "~v6.3.0-BETA3",
"symfony/service-contracts": "~v3.2.1",
"symfony/string": "~v6.2.8",
"symfony/translation-contracts": "~v3.2.1",
"symfony/validator": "~v6.2.10",
"symfony/var-dumper": "~v6.2.10",
"symfony/validator": "~v6.3.0-BETA1",
"symfony/var-dumper": "~v6.3.0-BETA1",
"symfony/var-exporter": "~v6.2.10",
"symfony/yaml": "~v6.2.10",
"symfony/yaml": "~v6.3.0-BETA1",
"twig/twig": "~v3.6.0"
}
}

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

@ -22,14 +22,14 @@
"phpstan/phpstan": "^1.10.1",
"phpstan/phpstan-phpunit": "^1.3.11",
"phpunit/phpunit": "^9.5",
"symfony/browser-kit": "^6.2",
"symfony/css-selector": "^6.2",
"symfony/dom-crawler": "^6.2",
"symfony/error-handler": "^6.2",
"symfony/filesystem": "^6.2",
"symfony/finder": "^6.2",
"symfony/lock": "^6.2",
"symfony/phpunit-bridge": "^6.2",
"symfony/var-dumper": "^6.2"
"symfony/browser-kit": "^6.3",
"symfony/css-selector": "^6.3",
"symfony/dom-crawler": "^6.3",
"symfony/error-handler": "^6.3",
"symfony/filesystem": "^6.3",
"symfony/finder": "^6.3",
"symfony/lock": "^6.3",
"symfony/phpunit-bridge": "^6.3",
"symfony/var-dumper": "^6.3"
}
}

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

@ -67,13 +67,13 @@
"sirbrillig/phpcs-variable-analysis": "v2.11.16",
"slevomat/coding-standard": "8.11.1",
"squizlabs/php_codesniffer": "3.7.2",
"symfony/browser-kit": "v6.2.7",
"symfony/css-selector": "v6.2.7",
"symfony/dom-crawler": "v6.2.9",
"symfony/filesystem": "v6.2.10",
"symfony/finder": "v6.2.7",
"symfony/lock": "v6.2.8",
"symfony/phpunit-bridge": "v6.2.10",
"symfony/browser-kit": "v6.3.0-BETA1",
"symfony/css-selector": "v6.3.0-BETA1",
"symfony/dom-crawler": "v6.3.0-BETA1",
"symfony/filesystem": "v6.3.0-BETA1",
"symfony/finder": "v6.3.0-BETA1",
"symfony/lock": "v6.3.0-BETA1",
"symfony/phpunit-bridge": "v6.3.0-BETA1",
"theseer/tokenizer": "1.2.1",
"webflo/drupal-finder": "1.2.2",
"webmozart/assert": "1.11.0"

22
core/composer.json
View File

@ -18,18 +18,18 @@
"ext-tokenizer": "*",
"ext-xml": "*",
"php": ">=8.1.0",
"symfony/console": "^6.2",
"symfony/dependency-injection": "^6.2",
"symfony/event-dispatcher": "^6.2",
"symfony/http-foundation": "^6.2",
"symfony/http-kernel": "^6.2",
"symfony/mime": "^6.2",
"symfony/routing": "^6.2",
"symfony/serializer": "^6.2",
"symfony/validator": "^6.2",
"symfony/process": "^6.2",
"symfony/console": "^6.3",
"symfony/dependency-injection": "^6.3",
"symfony/event-dispatcher": "^6.3",
"symfony/http-foundation": "^6.3",
"symfony/http-kernel": "^6.3",
"symfony/mime": "^6.3",
"symfony/routing": "^6.3",
"symfony/serializer": "^6.3",
"symfony/validator": "^6.3",
"symfony/process": "^6.3",
"symfony/polyfill-iconv": "^1.26",
"symfony/yaml": "^6.2",
"symfony/yaml": "^6.3",
"twig/twig": "^3.5.0",
"doctrine/annotations": "^1.14",
"guzzlehttp/guzzle": "^7.5",

6
core/lib/Drupal/Component/DependencyInjection/Container.php
View File

@ -304,6 +304,9 @@ class Container implements ContainerInterface, ResetInterface {
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function set($id, $service) {
$this->services[$id] = $service;
@ -340,6 +343,9 @@ class Container implements ContainerInterface, ResetInterface {
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function setParameter($name, $value) {
if ($this->frozen) {

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

@ -14,7 +14,7 @@
},
"require": {
"php": ">=8.1.0",
"symfony/dependency-injection": "^6.2",
"symfony/dependency-injection": "^6.3",
"symfony/service-contracts": "v3.2.1"
},
"suggest": {

12
core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php
View File

@ -210,6 +210,9 @@ class ContainerAwareEventDispatcher implements EventDispatcherInterface {
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function addListener($event_name, $listener, $priority = 0) {
$this->listeners[$event_name][$priority][] = ['callable' => $listener];
@ -218,6 +221,9 @@ class ContainerAwareEventDispatcher implements EventDispatcherInterface {
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function removeListener($event_name, $listener) {
if (!isset($this->listeners[$event_name])) {
@ -255,6 +261,9 @@ class ContainerAwareEventDispatcher implements EventDispatcherInterface {
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function addSubscriber(EventSubscriberInterface $subscriber) {
foreach ($subscriber->getSubscribedEvents() as $event_name => $params) {
@ -274,6 +283,9 @@ class ContainerAwareEventDispatcher implements EventDispatcherInterface {
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function removeSubscriber(EventSubscriberInterface $subscriber) {
foreach ($subscriber->getSubscribedEvents() as $event_name => $params) {

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

@ -8,8 +8,8 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=8.1.0",
"symfony/dependency-injection": "^6.2",
"symfony/event-dispatcher": "^6.2",
"symfony/dependency-injection": "^6.3",
"symfony/event-dispatcher": "^6.3",
"symfony/event-dispatcher-contracts": "v3.2.1"
},
"autoload": {

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

@ -8,7 +8,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=8.1.0",
"symfony/http-foundation": "^6.2"
"symfony/http-foundation": "^6.3"
},
"autoload": {
"psr-4": {
@ -19,5 +19,6 @@
"_readme": [
"This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
]
}
},
"minimum-stability": "beta"
}

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

@ -10,7 +10,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=8.1.0",
"symfony/validator": "^6.2"
"symfony/validator": "^6.3"
},
"autoload": {
"psr-4": {
@ -24,5 +24,6 @@
"_readme": [
"This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
]
}
},
"minimum-stability": "beta"
}

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

@ -8,7 +8,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=8.1.0",
"symfony/yaml": "^6.2"
"symfony/yaml": "^6.3"
},
"autoload": {
"psr-4": {
@ -19,5 +19,6 @@
"_readme": [
"This file was partially generated automatically. See: https://www.drupal.org/node/3293830"
]
}
},
"minimum-stability": "beta"
}

3
core/lib/Drupal/Core/Command/DbCommandBase.php
View File

@ -14,6 +14,9 @@ class DbCommandBase extends Command {
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
protected function configure() {
$this->addOption('database', NULL, InputOption::VALUE_OPTIONAL, 'The database connection name to use.', 'default')

3
core/lib/Drupal/Core/DependencyInjection/Compiler/AuthenticationProviderPass.php
View File

@ -12,6 +12,9 @@ class AuthenticationProviderPass implements CompilerPassInterface {
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function process(ContainerBuilder $container) {
$authentication_providers = [];

3
core/lib/Drupal/Core/DependencyInjection/Compiler/BackendCompilerPass.php
View File

@ -35,6 +35,9 @@ class BackendCompilerPass implements CompilerPassInterface {
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function process(ContainerBuilder $container) {
$driver_backend = NULL;

3
core/lib/Drupal/Core/DependencyInjection/Compiler/ProxyServicesPass.php
View File

@ -16,6 +16,9 @@ class ProxyServicesPass implements CompilerPassInterface {
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function process(ContainerBuilder $container) {
foreach ($container->getDefinitions() as $service_id => $definition) {

3
core/lib/Drupal/Core/DependencyInjection/Compiler/StackedKernelPass.php
View File

@ -50,6 +50,9 @@ class StackedKernelPass implements CompilerPassInterface {
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function process(ContainerBuilder $container) {

2
core/lib/Drupal/Core/DependencyInjection/Compiler/TaggedHandlersPass.php
View File

@ -101,6 +101,8 @@ class TaggedHandlersPass implements CompilerPassInterface {
* If a tagged handler does not implement the required interface.
* @throws \Symfony\Component\DependencyInjection\Exception\LogicException
* If at least one tagged service is required but none are found.
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function process(ContainerBuilder $container) {
// Avoid using ContainerBuilder::findTaggedServiceIds() as that results in

6
core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
View File

@ -36,6 +36,9 @@ class ContainerBuilder extends SymfonyContainerBuilder implements ContainerInter
* override Symfony's ContainerBuilder's restriction on setting services in a
* frozen builder.
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*
* @todo Restrict this to synthetic services only. Ideally, the upstream
* ContainerBuilder class should be fixed to allow setting synthetic
* services in a frozen builder.
@ -67,6 +70,9 @@ class ContainerBuilder extends SymfonyContainerBuilder implements ContainerInter
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function setParameter($name, $value) {
if (strtolower($name) !== $name) {

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

@ -531,6 +531,9 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function setContainer(ContainerInterface $container = NULL) {
if (isset($this->container)) {
@ -670,6 +673,9 @@ class DrupalKernel implements DrupalKernelInterface, TerminableInterface {
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function terminate(Request $request, Response $response) {
// Only run terminate() when essential services have been set up properly

9
core/lib/Drupal/Core/Entity/EntityConstraintViolationList.php
View File

@ -187,6 +187,9 @@ class EntityConstraintViolationList extends ConstraintViolationList implements E
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function add(ConstraintViolationInterface $violation) {
parent::add($violation);
@ -196,6 +199,9 @@ class EntityConstraintViolationList extends ConstraintViolationList implements E
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function remove($offset) {
parent::remove($offset);
@ -205,6 +211,9 @@ class EntityConstraintViolationList extends ConstraintViolationList implements E
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function set($offset, ConstraintViolationInterface $violation) {
parent::set($offset, $violation);

3
core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/BundleConstraintValidator.php
View File

@ -12,6 +12,9 @@ class BundleConstraintValidator extends ConstraintValidator {
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function validate($entity, Constraint $constraint) {
if (!isset($entity)) {

3
core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityTypeConstraintValidator.php
View File

@ -12,6 +12,9 @@ class EntityTypeConstraintValidator extends ConstraintValidator {
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function validate($entity, Constraint $constraint) {
if (!isset($entity)) {

3
core/lib/Drupal/Core/Render/MetadataBubblingUrlGenerator.php
View File

@ -49,6 +49,9 @@ class MetadataBubblingUrlGenerator implements UrlGeneratorInterface {
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function setContext(SymfonyRequestContext $context) {
$this->urlGenerator->setContext($context);

3
core/lib/Drupal/Core/Routing/AccessAwareRouter.php
View File

@ -65,6 +65,9 @@ class AccessAwareRouter implements AccessAwareRouterInterface {
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function setContext(SymfonyRequestContext $context) {
$this->router->setContext($context);

3
core/lib/Drupal/Core/Routing/UrlGenerator.php
View File

@ -96,6 +96,9 @@ class UrlGenerator implements UrlGeneratorInterface {
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function setContext(SymfonyRequestContext $context) {
$this->context = $context;

3
core/lib/Drupal/Core/Session/MetadataBag.php
View File

@ -51,6 +51,9 @@ class MetadataBag extends SymfonyMetadataBag {
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function stampNew($lifetime = NULL) {
parent::stampNew($lifetime);

3
core/lib/Drupal/Core/TypedData/Validation/ConstraintViolationBuilder.php
View File

@ -214,6 +214,9 @@ class ConstraintViolationBuilder implements ConstraintViolationBuilderInterface
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function addViolation()
{

15
core/lib/Drupal/Core/TypedData/Validation/ExecutionContext.php
View File

@ -133,7 +133,7 @@ class ExecutionContext implements ExecutionContextInterface {
/**
* {@inheritdoc}
*/
public function setNode($value, $object, MetadataInterface $metadata = NULL, $propertyPath) {
public function setNode($value, $object, MetadataInterface $metadata = NULL, $propertyPath): void {
$this->value = $value;
$this->data = $object;
$this->metadata = $metadata;
@ -143,19 +143,22 @@ class ExecutionContext implements ExecutionContextInterface {
/**
* {@inheritdoc}
*/
public function setGroup($group) {
public function setGroup($group): void {
$this->group = $group;
}
/**
* {@inheritdoc}
*/
public function setConstraint(Constraint $constraint) {
public function setConstraint(Constraint $constraint): void {
$this->constraint = $constraint;
}
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function addViolation($message, array $parameters = []) {
$this->violations->add(new ConstraintViolation($this->translator->trans($message, $parameters, $this->translationDomain), $message, $parameters, $this->root, $this->propertyPath, $this->value, NULL, NULL, $this->constraint));
@ -241,7 +244,7 @@ class ExecutionContext implements ExecutionContextInterface {
/**
* {@inheritdoc}
*/
public function markConstraintAsValidated($cache_key, $constraint_hash) {
public function markConstraintAsValidated($cache_key, $constraint_hash): void {
$this->validatedConstraints[$cache_key . ':' . $constraint_hash] = TRUE;
}
@ -255,7 +258,7 @@ class ExecutionContext implements ExecutionContextInterface {
/**
* {@inheritdoc}
*/
public function markGroupAsValidated($cache_key, $group_hash) {
public function markGroupAsValidated($cache_key, $group_hash): void {
$this->validatedObjects[$cache_key][$group_hash] = TRUE;
}
@ -269,7 +272,7 @@ class ExecutionContext implements ExecutionContextInterface {
/**
* {@inheritdoc}
*/
public function markObjectAsInitialized($cache_key) {
public function markObjectAsInitialized($cache_key): void {
throw new \LogicException('\Symfony\Component\Validator\Context\ExecutionContextInterface::markObjectAsInitialized is unsupported.');
}

3
core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/NotNullConstraintValidator.php
View File

@ -19,6 +19,9 @@ class NotNullConstraintValidator extends NotNullValidator {
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function validate($value, Constraint $constraint) {
$typed_data = $this->getTypedData();

3
core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidator.php
View File

@ -24,6 +24,9 @@ class PrimitiveTypeConstraintValidator extends ConstraintValidator {
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function validate($value, Constraint $constraint) {

3
core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/RangeConstraintValidator.php
View File

@ -14,6 +14,9 @@ class RangeConstraintValidator extends ConstraintValidator {
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function validate($value, Constraint $constraint) {
if (!$constraint instanceof Range) {

11
core/modules/jsonapi/src/Normalizer/ConfigEntityDenormalizer.php
View File

@ -36,7 +36,18 @@ final class ConfigEntityDenormalizer extends EntityDenormalizerBase {
* {@inheritdoc}
*/
public function hasCacheableSupportsMethod(): bool {
@trigger_error(__METHOD__ . '() is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Use getSupportedTypes() instead. See https://www.drupal.org/node/3359695', E_USER_DEPRECATED);
return TRUE;
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
ConfigEntityInterface::class => TRUE,
];
}
}

11
core/modules/jsonapi/src/Normalizer/ContentEntityDenormalizer.php
View File

@ -92,7 +92,18 @@ final class ContentEntityDenormalizer extends EntityDenormalizerBase {
* {@inheritdoc}
*/
public function hasCacheableSupportsMethod(): bool {
@trigger_error(__METHOD__ . '() is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Use getSupportedTypes() instead. See https://www.drupal.org/node/3359695', E_USER_DEPRECATED);
return TRUE;
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
ContentEntityInterface::class => TRUE,
];
}
}

11
core/modules/jsonapi/src/Normalizer/DataNormalizer.php
View File

@ -34,7 +34,18 @@ class DataNormalizer extends NormalizerBase {
* {@inheritdoc}
*/
public function hasCacheableSupportsMethod(): bool {
@trigger_error(__METHOD__ . '() is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Use getSupportedTypes() instead. See https://www.drupal.org/node/3359695', E_USER_DEPRECATED);
return TRUE;
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
Data::class => TRUE,
];
}
}

9
core/modules/jsonapi/src/Normalizer/EntityAccessDeniedHttpExceptionNormalizer.php
View File

@ -65,4 +65,13 @@ class EntityAccessDeniedHttpExceptionNormalizer extends HttpExceptionNormalizer
return $errors;
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
EntityAccessDeniedHttpException::class => TRUE,
];
}
}

9
core/modules/jsonapi/src/Normalizer/EntityReferenceFieldNormalizer.php
View File

@ -115,4 +115,13 @@ class EntityReferenceFieldNormalizer extends FieldNormalizer {
return FALSE;
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
EntityReferenceFieldItemListInterface::class => TRUE,
];
}
}

11
core/modules/jsonapi/src/Normalizer/FieldItemNormalizer.php
View File

@ -244,7 +244,18 @@ class FieldItemNormalizer extends NormalizerBase implements DenormalizerInterfac
* {@inheritdoc}
*/
public function hasCacheableSupportsMethod(): bool {
@trigger_error(__METHOD__ . '() is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Use getSupportedTypes() instead. See https://www.drupal.org/node/3359695', E_USER_DEPRECATED);
return TRUE;
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
FieldItemInterface::class => TRUE,
];
}
}

11
core/modules/jsonapi/src/Normalizer/FieldNormalizer.php
View File

@ -100,7 +100,18 @@ class FieldNormalizer extends NormalizerBase implements DenormalizerInterface {
* {@inheritdoc}
*/
public function hasCacheableSupportsMethod(): bool {
@trigger_error(__METHOD__ . '() is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Use getSupportedTypes() instead. See https://www.drupal.org/node/3359695', E_USER_DEPRECATED);
return TRUE;
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
FieldItemListInterface::class => TRUE,
];
}
}

11
core/modules/jsonapi/src/Normalizer/HttpExceptionNormalizer.php
View File

@ -168,7 +168,18 @@ class HttpExceptionNormalizer extends NormalizerBase {
* {@inheritdoc}
*/
public function hasCacheableSupportsMethod(): bool {
@trigger_error(__METHOD__ . '() is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Use getSupportedTypes() instead. See https://www.drupal.org/node/3359695', E_USER_DEPRECATED);
return TRUE;
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
HttpException::class => TRUE,
];
}
}

11
core/modules/jsonapi/src/Normalizer/JsonApiDocumentTopLevelNormalizer.php
View File

@ -336,7 +336,18 @@ class JsonApiDocumentTopLevelNormalizer extends NormalizerBase implements Denorm
* {@inheritdoc}
*/
public function hasCacheableSupportsMethod(): bool {
@trigger_error(__METHOD__ . '() is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Use getSupportedTypes() instead. See https://www.drupal.org/node/3359695', E_USER_DEPRECATED);
return TRUE;
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
JsonApiDocumentTopLevel::class => TRUE,
];
}
}

11
core/modules/jsonapi/src/Normalizer/LinkCollectionNormalizer.php
View File

@ -154,7 +154,18 @@ class LinkCollectionNormalizer extends NormalizerBase {
* {@inheritdoc}
*/
public function hasCacheableSupportsMethod(): bool {
@trigger_error(__METHOD__ . '() is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Use getSupportedTypes() instead. See https://www.drupal.org/node/3359695', E_USER_DEPRECATED);
return TRUE;
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
LinkCollection::class => TRUE,
];
}
}

11
core/modules/jsonapi/src/Normalizer/RelationshipNormalizer.php
View File

@ -33,7 +33,18 @@ class RelationshipNormalizer extends NormalizerBase {
* {@inheritdoc}
*/
public function hasCacheableSupportsMethod(): bool {
@trigger_error(__METHOD__ . '() is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Use getSupportedTypes() instead. See https://www.drupal.org/node/3359695', E_USER_DEPRECATED);
return TRUE;
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
Relationship::class => TRUE,
];
}
}

11
core/modules/jsonapi/src/Normalizer/ResourceIdentifierNormalizer.php
View File

@ -143,7 +143,18 @@ class ResourceIdentifierNormalizer extends NormalizerBase implements Denormalize
* {@inheritdoc}
*/
public function hasCacheableSupportsMethod(): bool {
@trigger_error(__METHOD__ . '() is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Use getSupportedTypes() instead. See https://www.drupal.org/node/3359695', E_USER_DEPRECATED);
return TRUE;
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
ResourceIdentifier::class => TRUE,
];
}
}

11
core/modules/jsonapi/src/Normalizer/ResourceObjectNormalizer.php
View File

@ -206,7 +206,18 @@ class ResourceObjectNormalizer extends NormalizerBase {
* {@inheritdoc}
*/
public function hasCacheableSupportsMethod(): bool {
@trigger_error(__METHOD__ . '() is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Use getSupportedTypes() instead. See https://www.drupal.org/node/3359695', E_USER_DEPRECATED);
return TRUE;
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
ResourceObject::class => TRUE,
];
}
}

9
core/modules/jsonapi/src/Normalizer/UnprocessableHttpEntityExceptionNormalizer.php
View File

@ -78,4 +78,13 @@ class UnprocessableHttpEntityExceptionNormalizer extends HttpExceptionNormalizer
return $errors;
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
UnprocessableHttpEntityException::class => TRUE,
];
}
}

3
core/modules/link/src/Plugin/Validation/Constraint/LinkAccessConstraintValidator.php
View File

@ -41,6 +41,9 @@ class LinkAccessConstraintValidator extends ConstraintValidator implements Conta
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function validate($value, Constraint $constraint) {
if (isset($value)) {

3
core/modules/link/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidator.php
View File

@ -13,6 +13,9 @@ class LinkExternalProtocolsConstraintValidator extends ConstraintValidator {
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function validate($value, Constraint $constraint) {
if (isset($value)) {

3
core/modules/link/src/Plugin/Validation/Constraint/LinkNotExistingInternalConstraintValidator.php
View File

@ -15,6 +15,9 @@ class LinkNotExistingInternalConstraintValidator extends ConstraintValidator {
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function validate($value, Constraint $constraint) {
if (isset($value)) {

11
core/modules/serialization/src/Normalizer/ComplexDataNormalizer.php
View File

@ -48,7 +48,18 @@ class ComplexDataNormalizer extends NormalizerBase {
* {@inheritdoc}
*/
public function hasCacheableSupportsMethod(): bool {
@trigger_error(__METHOD__ . '() is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Use getSupportedTypes() instead. See https://www.drupal.org/node/3359695', E_USER_DEPRECATED);
return TRUE;
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
ComplexDataInterface::class => TRUE,
];
}
}

9
core/modules/serialization/src/Normalizer/ConfigEntityNormalizer.php
View File

@ -47,4 +47,13 @@ class ConfigEntityNormalizer extends EntityNormalizer {
return array_diff_key($data, ['_core' => TRUE]);
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
ConfigEntityInterface::class => TRUE,
];
}
}

9
core/modules/serialization/src/Normalizer/ContentEntityNormalizer.php
View File

@ -34,4 +34,13 @@ class ContentEntityNormalizer extends EntityNormalizer {
return $attributes;
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
ContentEntityInterface::class => TRUE,
];
}
}

9
core/modules/serialization/src/Normalizer/DateTimeIso8601Normalizer.php
View File

@ -87,4 +87,13 @@ class DateTimeIso8601Normalizer extends DateTimeNormalizer {
return $datetime->format(DateTimeItemInterface::DATETIME_STORAGE_FORMAT);
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
DateTimeIso8601::class => TRUE,
];
}
}

11
core/modules/serialization/src/Normalizer/DateTimeNormalizer.php
View File

@ -119,7 +119,18 @@ class DateTimeNormalizer extends NormalizerBase implements DenormalizerInterface
* {@inheritdoc}
*/
public function hasCacheableSupportsMethod(): bool {
@trigger_error(__METHOD__ . '() is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Use getSupportedTypes() instead. See https://www.drupal.org/node/3359695', E_USER_DEPRECATED);
return TRUE;
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
DateTimeInterface::class => TRUE,
];
}
}

9
core/modules/serialization/src/Normalizer/EntityNormalizer.php
View File

@ -75,4 +75,13 @@ class EntityNormalizer extends ComplexDataNormalizer implements DenormalizerInte
return $entity;
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
EntityInterface::class => TRUE,
];
}
}

9
core/modules/serialization/src/Normalizer/EntityReferenceFieldItemNormalizer.php
View File

@ -92,4 +92,13 @@ class EntityReferenceFieldItemNormalizer extends FieldItemNormalizer {
return parent::constructValue($data, $context);
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
EntityReferenceItem::class => TRUE,
];
}
}

9
core/modules/serialization/src/Normalizer/FieldItemNormalizer.php
View File

@ -39,4 +39,13 @@ class FieldItemNormalizer extends ComplexDataNormalizer implements DenormalizerI
return $field_item;
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
FieldItemInterface::class => TRUE,
];
}
}

9
core/modules/serialization/src/Normalizer/FieldNormalizer.php
View File

@ -54,4 +54,13 @@ class FieldNormalizer extends ListNormalizer implements DenormalizerInterface {
return $items;
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
FieldItemListInterface::class => TRUE,
];
}
}

11
core/modules/serialization/src/Normalizer/MarkupNormalizer.php
View File

@ -25,7 +25,18 @@ class MarkupNormalizer extends NormalizerBase {
* {@inheritdoc}
*/
public function hasCacheableSupportsMethod(): bool {
@trigger_error(__METHOD__ . '() is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Use getSupportedTypes() instead. See https://www.drupal.org/node/3359695', E_USER_DEPRECATED);
return TRUE;
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
MarkupInterface::class => TRUE,
];
}
}

14
core/modules/serialization/src/Normalizer/NormalizerBase.php
View File

@ -3,14 +3,13 @@
namespace Drupal\serialization\Normalizer;
use Drupal\Core\Cache\CacheableDependencyInterface;
use Symfony\Component\Serializer\Normalizer\CacheableSupportsMethodInterface;
use Symfony\Component\Serializer\SerializerAwareInterface;
use Symfony\Component\Serializer\SerializerAwareTrait;
/**
* Base class for Normalizers.
*/
abstract class NormalizerBase implements SerializerAwareInterface, CacheableNormalizerInterface, CacheableSupportsMethodInterface {
abstract class NormalizerBase implements SerializerAwareInterface, CacheableNormalizerInterface {
use SerializerAwareTrait;
@ -103,7 +102,18 @@ abstract class NormalizerBase implements SerializerAwareInterface, CacheableNorm
* {@inheritdoc}
*/
public function hasCacheableSupportsMethod(): bool {
@trigger_error(__METHOD__ . '() is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Use getSupportedTypes() instead. See https://www.drupal.org/node/3359695', E_USER_DEPRECATED);
return FALSE;
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
'*' => FALSE,
];
}
}

11
core/modules/serialization/src/Normalizer/PrimitiveDataNormalizer.php
View File

@ -45,7 +45,18 @@ class PrimitiveDataNormalizer extends NormalizerBase {
* {@inheritdoc}
*/
public function hasCacheableSupportsMethod(): bool {
@trigger_error(__METHOD__ . '() is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Use getSupportedTypes() instead. See https://www.drupal.org/node/3359695', E_USER_DEPRECATED);
return TRUE;
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
PrimitiveInterface::class => TRUE,
];
}
}

9
core/modules/serialization/src/Normalizer/TimestampItemNormalizer.php
View File

@ -42,4 +42,13 @@ class TimestampItemNormalizer extends FieldItemNormalizer {
return ['value' => $this->serializer->denormalize($data['value'], Timestamp::class, NULL, $context)];
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
TimestampItem::class => TRUE,
];
}
}

9
core/modules/serialization/src/Normalizer/TimestampNormalizer.php
View File

@ -44,4 +44,13 @@ class TimestampNormalizer extends DateTimeNormalizer {
return $denormalized->getTimestamp();
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
Timestamp::class => TRUE,
];
}
}

11
core/modules/serialization/src/Normalizer/TypedDataNormalizer.php
View File

@ -31,7 +31,18 @@ class TypedDataNormalizer extends NormalizerBase {
* {@inheritdoc}
*/
public function hasCacheableSupportsMethod(): bool {
@trigger_error(__METHOD__ . '() is deprecated in drupal:10.1.0 and is removed from drupal:11.0.0. Use getSupportedTypes() instead. See https://www.drupal.org/node/3359695', E_USER_DEPRECATED);
return TRUE;
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
TypedDataInterface::class => TRUE,
];
}
}

6
core/modules/serialization/src/RegisterSerializationClassesCompilerPass.php
View File

@ -12,10 +12,10 @@ use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
class RegisterSerializationClassesCompilerPass implements CompilerPassInterface {
/**
* Adds services to the Serializer.
* {@inheritdoc}
*
* @param \Symfony\Component\DependencyInjection\ContainerBuilder $container
* The container to process.
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function process(ContainerBuilder $container) {
$definition = $container->getDefinition('serializer');

9
core/modules/serialization/tests/serialization_test/src/SerializationTestNormalizer.php
View File

@ -31,4 +31,13 @@ class SerializationTestNormalizer implements NormalizerInterface {
return static::$format === $format;
}
/**
* {@inheritdoc}
*/
public function getSupportedTypes(?string $format): array {
return [
\stdClass::class => TRUE,
];
}
}

3
core/modules/user/src/Plugin/Validation/Constraint/ProtectedUserFieldConstraintValidator.php
View File

@ -53,6 +53,9 @@ class ProtectedUserFieldConstraintValidator extends ConstraintValidator implemen
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function validate($items, Constraint $constraint) {
if (!isset($items)) {

3
core/modules/user/src/Plugin/Validation/Constraint/UserMailRequiredValidator.php
View File

@ -16,6 +16,9 @@ class UserMailRequiredValidator extends ConstraintValidator {
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function validate($items, Constraint $constraint) {
/** @var \Drupal\Core\Field\FieldItemListInterface $items */

2
core/tests/Drupal/BuildTests/Composer/Template/ComposerProjectTemplatesTest.php
View File

@ -32,7 +32,7 @@ class ComposerProjectTemplatesTest extends ComposerBuildTestBase {
*
* @see https://getcomposer.org/doc/04-schema.md#minimum-stability
*/
protected const MINIMUM_STABILITY = 'stable';
protected const MINIMUM_STABILITY = 'beta';
/**
* The order of stability strings from least stable to most stable.

3
core/tests/Drupal/Tests/Core/DependencyInjection/DependencySerializationTest.php
View File

@ -79,6 +79,9 @@ class DependencySerializationTestDummy implements ContainerAwareInterface {
/**
* {@inheritdoc}
*
* phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
* @return void
*/
public function setContainer(ContainerInterface $container = NULL) {
$this->container = $container;