From f4167b86b8b7c3d0ba4ceff64452689b34361f99 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Tue, 27 Feb 2024 16:23:09 +0000
Subject: [PATCH] Issue #3407159 by longwave, quietone: [11.x] Add void returns
for Symfony 7
---
.../DependencyInjection/Container.php | 10 ++--------
.../ContainerAwareEventDispatcher.php | 20 ++++---------------
.../lib/Drupal/Core/Command/DbCommandBase.php | 5 +----
.../lib/Drupal/Core/Command/DbDumpCommand.php | 2 +-
.../Drupal/Core/Command/DbImportCommand.php | 2 +-
.../Compiler/AuthenticationProviderPass.php | 5 +----
.../Compiler/BackendCompilerPass.php | 5 +----
.../Compiler/ProxyServicesPass.php | 5 +----
.../Compiler/StackedKernelPass.php | 5 +----
.../Compiler/TaggedHandlersPass.php | 4 +---
.../DependencyInjection/ContainerBuilder.php | 10 ++--------
core/lib/Drupal/Core/DrupalKernel.php | 11 ++--------
.../Entity/EntityConstraintViolationList.php | 15 +++-----------
.../Constraint/BundleConstraintValidator.php | 5 +----
.../EntityTypeConstraintValidator.php | 5 +----
.../Render/MetadataBubblingUrlGenerator.php | 5 +----
.../Drupal/Core/Routing/AccessAwareRouter.php | 5 +----
core/lib/Drupal/Core/Routing/UrlGenerator.php | 5 +----
core/lib/Drupal/Core/Session/MetadataBag.php | 5 +----
.../Drupal/Core/Session/SessionManager.php | 2 +-
.../StackMiddleware/StackedHttpKernel.php | 5 +----
.../Validation/ConstraintViolationBuilder.php | 5 +----
.../TypedData/Validation/ExecutionContext.php | 5 +----
.../AllowedValuesConstraintValidator.php | 2 +-
.../Constraint/IsNullConstraintValidator.php | 2 +-
.../Constraint/NotNullConstraintValidator.php | 5 +----
.../PrimitiveTypeConstraintValidator.php | 5 +----
.../Constraint/RangeConstraintValidator.php | 5 +----
.../help_test/src/SupernovaGenerator.php | 2 +-
...gisterSerializationClassesCompilerPass.php | 2 +-
.../LinkAccessConstraintValidator.php | 5 +----
...nkExternalProtocolsConstraintValidator.php | 5 +----
...NotExistingInternalConstraintValidator.php | 5 +----
...gisterSerializationClassesCompilerPass.php | 5 +----
.../src/Session/TestSessionBag.php | 2 +-
.../src/Kernel/Scripts/DbCommandBaseTest.php | 2 +-
.../ProtectedUserFieldConstraintValidator.php | 5 +----
.../Constraint/UserMailRequiredValidator.php | 5 +----
.../DependencySerializationTest.php | 5 +----
.../Fixture/FinalTestHttpMiddlewareClass.php | 5 +----
40 files changed, 48 insertions(+), 165 deletions(-)
diff --git a/core/lib/Drupal/Component/DependencyInjection/Container.php b/core/lib/Drupal/Component/DependencyInjection/Container.php
index 104da1276d95..e291a8ff0557 100644
--- a/core/lib/Drupal/Component/DependencyInjection/Container.php
+++ b/core/lib/Drupal/Component/DependencyInjection/Container.php
@@ -304,11 +304,8 @@ protected function createService(array $definition, $id) {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function set($id, $service) {
+ public function set($id, $service): void {
$this->services[$id] = $service;
}
@@ -343,11 +340,8 @@ public function hasParameter($name): bool {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function setParameter($name, $value) {
+ public function setParameter($name, $value): void {
if ($this->frozen) {
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
}
diff --git a/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php b/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php
index 41afec903e94..b8e74ccc692a 100644
--- a/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php
+++ b/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php
@@ -210,22 +210,16 @@ public function hasListeners($event_name = NULL): bool {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function addListener($event_name, $listener, $priority = 0) {
+ public function addListener($event_name, $listener, $priority = 0): void {
$this->listeners[$event_name][$priority][] = ['callable' => $listener];
$this->unsorted[$event_name] = TRUE;
}
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function removeListener($event_name, $listener) {
+ public function removeListener($event_name, $listener): void {
if (!isset($this->listeners[$event_name])) {
return;
}
@@ -261,11 +255,8 @@ public function removeListener($event_name, $listener) {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function addSubscriber(EventSubscriberInterface $subscriber) {
+ public function addSubscriber(EventSubscriberInterface $subscriber): void {
foreach ($subscriber->getSubscribedEvents() as $event_name => $params) {
if (is_string($params)) {
$this->addListener($event_name, [$subscriber, $params]);
@@ -283,11 +274,8 @@ public function addSubscriber(EventSubscriberInterface $subscriber) {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function removeSubscriber(EventSubscriberInterface $subscriber) {
+ public function removeSubscriber(EventSubscriberInterface $subscriber): void {
foreach ($subscriber->getSubscribedEvents() as $event_name => $params) {
if (is_array($params) && is_array($params[0])) {
foreach ($params as $listener) {
diff --git a/core/lib/Drupal/Core/Command/DbCommandBase.php b/core/lib/Drupal/Core/Command/DbCommandBase.php
index 78006c71f2c1..fca703f4df47 100644
--- a/core/lib/Drupal/Core/Command/DbCommandBase.php
+++ b/core/lib/Drupal/Core/Command/DbCommandBase.php
@@ -14,11 +14,8 @@ class DbCommandBase extends Command {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- protected function configure() {
+ protected function configure(): void {
$this->addOption('database', NULL, InputOption::VALUE_OPTIONAL, 'The database connection name to use.', 'default')
->addOption('database-url', 'db-url', InputOption::VALUE_OPTIONAL, 'A database url to parse and use as the database connection.')
->addOption('prefix', NULL, InputOption::VALUE_OPTIONAL, 'Override or set the table prefix used in the database connection.');
diff --git a/core/lib/Drupal/Core/Command/DbDumpCommand.php b/core/lib/Drupal/Core/Command/DbDumpCommand.php
index 7cae1ffcbee2..ec0e4d187b01 100644
--- a/core/lib/Drupal/Core/Command/DbDumpCommand.php
+++ b/core/lib/Drupal/Core/Command/DbDumpCommand.php
@@ -38,7 +38,7 @@ class DbDumpCommand extends DbCommandBase {
/**
* {@inheritdoc}
*/
- protected function configure() {
+ protected function configure(): void {
$this->setName('dump-database-d8-mysql')
->setDescription('Dump the current database to a generation script')
->addOption('schema-only', NULL, InputOption::VALUE_OPTIONAL, 'A comma separated list of tables to only export the schema without data.', 'cache.*,sessions,watchdog')
diff --git a/core/lib/Drupal/Core/Command/DbImportCommand.php b/core/lib/Drupal/Core/Command/DbImportCommand.php
index 6da8b5739d1d..eeae570c5c45 100644
--- a/core/lib/Drupal/Core/Command/DbImportCommand.php
+++ b/core/lib/Drupal/Core/Command/DbImportCommand.php
@@ -22,7 +22,7 @@ class DbImportCommand extends DbCommandBase {
/**
* {@inheritdoc}
*/
- protected function configure() {
+ protected function configure(): void {
parent::configure();
$this->setName('import')
->setDescription('Import database from a generation script.')
diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/AuthenticationProviderPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/AuthenticationProviderPass.php
index a8f761d26110..91ded72e0154 100644
--- a/core/lib/Drupal/Core/DependencyInjection/Compiler/AuthenticationProviderPass.php
+++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/AuthenticationProviderPass.php
@@ -12,11 +12,8 @@ class AuthenticationProviderPass implements CompilerPassInterface {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function process(ContainerBuilder $container) {
+ public function process(ContainerBuilder $container): void {
$authentication_providers = [];
foreach ($container->findTaggedServiceIds('authentication_provider') as $service_id => $attributes) {
$authentication_provider = $attributes[0]['provider_id'];
diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/BackendCompilerPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/BackendCompilerPass.php
index bde03d802d04..058a85379063 100644
--- a/core/lib/Drupal/Core/DependencyInjection/Compiler/BackendCompilerPass.php
+++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/BackendCompilerPass.php
@@ -35,11 +35,8 @@ class BackendCompilerPass implements CompilerPassInterface {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function process(ContainerBuilder $container) {
+ public function process(ContainerBuilder $container): void {
$driver_backend = NULL;
if ($container->hasParameter('default_backend')) {
$default_backend = $container->getParameter('default_backend');
diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/ProxyServicesPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/ProxyServicesPass.php
index 77d529fa7ee8..ddbad1d26db1 100644
--- a/core/lib/Drupal/Core/DependencyInjection/Compiler/ProxyServicesPass.php
+++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/ProxyServicesPass.php
@@ -16,11 +16,8 @@ class ProxyServicesPass implements CompilerPassInterface {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function process(ContainerBuilder $container) {
+ public function process(ContainerBuilder $container): void {
foreach ($container->getDefinitions() as $service_id => $definition) {
if ($definition->isLazy()) {
$proxy_class = ProxyBuilder::buildProxyClassName($definition->getClass());
diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/StackedKernelPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/StackedKernelPass.php
index be07b7a9243b..c1486734089f 100644
--- a/core/lib/Drupal/Core/DependencyInjection/Compiler/StackedKernelPass.php
+++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/StackedKernelPass.php
@@ -52,11 +52,8 @@ class StackedKernelPass implements CompilerPassInterface {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function process(ContainerBuilder $container) {
+ public function process(ContainerBuilder $container): void {
if (!$container->hasDefinition('http_kernel')) {
return;
diff --git a/core/lib/Drupal/Core/DependencyInjection/Compiler/TaggedHandlersPass.php b/core/lib/Drupal/Core/DependencyInjection/Compiler/TaggedHandlersPass.php
index b690559c7529..514cd9e9f550 100644
--- a/core/lib/Drupal/Core/DependencyInjection/Compiler/TaggedHandlersPass.php
+++ b/core/lib/Drupal/Core/DependencyInjection/Compiler/TaggedHandlersPass.php
@@ -101,10 +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) {
+ public function process(ContainerBuilder $container): void {
// Avoid using ContainerBuilder::findTaggedServiceIds() as that results in
// additional iterations around all the service definitions.
foreach ($container->getDefinitions() as $id => $definition) {
diff --git a/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php b/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
index 84c529b4dfc3..79548b02d59a 100644
--- a/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
+++ b/core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php
@@ -36,14 +36,11 @@ public function __construct(ParameterBagInterface $parameterBag = NULL) {
* 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.
*/
- public function set($id, $service) {
+ public function set($id, $service): void {
SymfonyContainer::set($id, $service);
}
@@ -70,11 +67,8 @@ public function setAlias($alias, $id): Alias {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function setParameter($name, $value) {
+ public function setParameter($name, $value): void {
if (strtolower($name) !== $name) {
throw new \InvalidArgumentException("Parameter names must be lowercase: $name");
}
diff --git a/core/lib/Drupal/Core/DrupalKernel.php b/core/lib/Drupal/Core/DrupalKernel.php
index d0c661cc89f9..6bd6cffb3135 100644
--- a/core/lib/Drupal/Core/DrupalKernel.php
+++ b/core/lib/Drupal/Core/DrupalKernel.php
@@ -551,11 +551,8 @@ public function getContainer() {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function setContainer(ContainerInterface $container = NULL) {
+ public function setContainer(ContainerInterface $container = NULL): void {
if (isset($this->container)) {
throw new \Exception('The container should not override an existing container.');
}
@@ -564,7 +561,6 @@ public function setContainer(ContainerInterface $container = NULL) {
}
$this->container = $container;
- return $this;
}
/**
@@ -698,11 +694,8 @@ public function getServiceProviders($origin) {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function terminate(Request $request, Response $response) {
+ public function terminate(Request $request, Response $response): void {
if ($this->booted && $this->getHttpKernel() instanceof TerminableInterface) {
// Only run terminate() when essential services have been set up properly
// by preHandle() before.
diff --git a/core/lib/Drupal/Core/Entity/EntityConstraintViolationList.php b/core/lib/Drupal/Core/Entity/EntityConstraintViolationList.php
index d644e66d3c0a..ee9af88b22a8 100644
--- a/core/lib/Drupal/Core/Entity/EntityConstraintViolationList.php
+++ b/core/lib/Drupal/Core/Entity/EntityConstraintViolationList.php
@@ -201,11 +201,8 @@ public function getEntity() {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function add(ConstraintViolationInterface $violation) {
+ public function add(ConstraintViolationInterface $violation): void {
parent::add($violation);
$this->violationOffsetsByField = NULL;
$this->entityViolationOffsets = NULL;
@@ -213,11 +210,8 @@ public function add(ConstraintViolationInterface $violation) {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function remove($offset) {
+ public function remove($offset): void {
parent::remove($offset);
$this->violationOffsetsByField = NULL;
$this->entityViolationOffsets = NULL;
@@ -225,11 +219,8 @@ public function remove($offset) {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function set($offset, ConstraintViolationInterface $violation) {
+ public function set($offset, ConstraintViolationInterface $violation): void {
parent::set($offset, $violation);
$this->violationOffsetsByField = NULL;
$this->entityViolationOffsets = NULL;
diff --git a/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/BundleConstraintValidator.php b/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/BundleConstraintValidator.php
index 7a801c2b12b0..39a26b65457f 100644
--- a/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/BundleConstraintValidator.php
+++ b/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/BundleConstraintValidator.php
@@ -12,11 +12,8 @@ class BundleConstraintValidator extends ConstraintValidator {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function validate($entity, Constraint $constraint) {
+ public function validate($entity, Constraint $constraint): void {
if (!isset($entity)) {
return;
}
diff --git a/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityTypeConstraintValidator.php b/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityTypeConstraintValidator.php
index fffe5d36ae22..b753d44df123 100644
--- a/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityTypeConstraintValidator.php
+++ b/core/lib/Drupal/Core/Entity/Plugin/Validation/Constraint/EntityTypeConstraintValidator.php
@@ -12,11 +12,8 @@ class EntityTypeConstraintValidator extends ConstraintValidator {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function validate($entity, Constraint $constraint) {
+ public function validate($entity, Constraint $constraint): void {
if (!isset($entity)) {
return;
}
diff --git a/core/lib/Drupal/Core/Render/MetadataBubblingUrlGenerator.php b/core/lib/Drupal/Core/Render/MetadataBubblingUrlGenerator.php
index dbd4c852fc7b..1d036a9e79f9 100644
--- a/core/lib/Drupal/Core/Render/MetadataBubblingUrlGenerator.php
+++ b/core/lib/Drupal/Core/Render/MetadataBubblingUrlGenerator.php
@@ -49,11 +49,8 @@ public function __construct(UrlGeneratorInterface $url_generator, RendererInterf
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function setContext(SymfonyRequestContext $context) {
+ public function setContext(SymfonyRequestContext $context): void {
$this->urlGenerator->setContext($context);
}
diff --git a/core/lib/Drupal/Core/Routing/AccessAwareRouter.php b/core/lib/Drupal/Core/Routing/AccessAwareRouter.php
index 08ccdfe6653e..ba5523d7f0b3 100644
--- a/core/lib/Drupal/Core/Routing/AccessAwareRouter.php
+++ b/core/lib/Drupal/Core/Routing/AccessAwareRouter.php
@@ -65,11 +65,8 @@ public function __call($name, $arguments) {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function setContext(SymfonyRequestContext $context) {
+ public function setContext(SymfonyRequestContext $context): void {
$this->router->setContext($context);
}
diff --git a/core/lib/Drupal/Core/Routing/UrlGenerator.php b/core/lib/Drupal/Core/Routing/UrlGenerator.php
index d7d0a2032170..ac8f23929b3e 100644
--- a/core/lib/Drupal/Core/Routing/UrlGenerator.php
+++ b/core/lib/Drupal/Core/Routing/UrlGenerator.php
@@ -96,11 +96,8 @@ public function __construct(RouteProviderInterface $provider, OutboundPathProces
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function setContext(SymfonyRequestContext $context) {
+ public function setContext(SymfonyRequestContext $context): void {
$this->context = $context;
}
diff --git a/core/lib/Drupal/Core/Session/MetadataBag.php b/core/lib/Drupal/Core/Session/MetadataBag.php
index 2fd79ed700fc..13e40fa660d1 100644
--- a/core/lib/Drupal/Core/Session/MetadataBag.php
+++ b/core/lib/Drupal/Core/Session/MetadataBag.php
@@ -51,11 +51,8 @@ public function getCsrfTokenSeed() {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function stampNew($lifetime = NULL) {
+ public function stampNew($lifetime = NULL): void {
parent::stampNew($lifetime);
// Set the token seed immediately to avoid a race condition between two
diff --git a/core/lib/Drupal/Core/Session/SessionManager.php b/core/lib/Drupal/Core/Session/SessionManager.php
index f00b5ed93442..cf794ebe4b6b 100644
--- a/core/lib/Drupal/Core/Session/SessionManager.php
+++ b/core/lib/Drupal/Core/Session/SessionManager.php
@@ -174,7 +174,7 @@ protected function startNow() {
/**
* {@inheritdoc}
*/
- public function save() {
+ public function save(): void {
if ($this->isCli()) {
// We don't have anything to do if we are not allowed to save the session.
return;
diff --git a/core/lib/Drupal/Core/StackMiddleware/StackedHttpKernel.php b/core/lib/Drupal/Core/StackMiddleware/StackedHttpKernel.php
index a749fa9ddab7..526ae6932544 100644
--- a/core/lib/Drupal/Core/StackMiddleware/StackedHttpKernel.php
+++ b/core/lib/Drupal/Core/StackMiddleware/StackedHttpKernel.php
@@ -53,11 +53,8 @@ public function handle(Request $request, $type = HttpKernelInterface::MAIN_REQUE
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function terminate(Request $request, Response $response) {
+ public function terminate(Request $request, Response $response): void {
$previous = NULL;
foreach ($this->middlewares as $kernel) {
// If the previous kernel was terminable we can assume this middleware
diff --git a/core/lib/Drupal/Core/TypedData/Validation/ConstraintViolationBuilder.php b/core/lib/Drupal/Core/TypedData/Validation/ConstraintViolationBuilder.php
index a794311ede70..f2fe2f378ff8 100644
--- a/core/lib/Drupal/Core/TypedData/Validation/ConstraintViolationBuilder.php
+++ b/core/lib/Drupal/Core/TypedData/Validation/ConstraintViolationBuilder.php
@@ -214,11 +214,8 @@ public function setCause($cause): static
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function addViolation()
+ public function addViolation(): void
{
if (null === $this->plural) {
$translatedMessage = $this->translator->trans(
diff --git a/core/lib/Drupal/Core/TypedData/Validation/ExecutionContext.php b/core/lib/Drupal/Core/TypedData/Validation/ExecutionContext.php
index 6e789ccf60a8..7c35260b2167 100644
--- a/core/lib/Drupal/Core/TypedData/Validation/ExecutionContext.php
+++ b/core/lib/Drupal/Core/TypedData/Validation/ExecutionContext.php
@@ -156,11 +156,8 @@ public function setConstraint(Constraint $constraint): void {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function addViolation($message, array $parameters = []) {
+ public function addViolation($message, array $parameters = []): void {
$this->violations->add(new ConstraintViolation($this->translator->trans($message, $parameters, $this->translationDomain), $message, $parameters, $this->root, $this->propertyPath, $this->value, NULL, NULL, $this->constraint));
}
diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/AllowedValuesConstraintValidator.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/AllowedValuesConstraintValidator.php
index 21be12d0e0ee..78bbf8043c28 100644
--- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/AllowedValuesConstraintValidator.php
+++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/AllowedValuesConstraintValidator.php
@@ -47,7 +47,7 @@ public function __construct(AccountInterface $current_user) {
/**
* {@inheritdoc}
*/
- public function validate($value, Constraint $constraint) {
+ public function validate($value, Constraint $constraint): void {
$typed_data = $this->getTypedData();
if ($typed_data instanceof OptionsProviderInterface) {
diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/IsNullConstraintValidator.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/IsNullConstraintValidator.php
index 39162ac0ded1..f6beb7c72938 100644
--- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/IsNullConstraintValidator.php
+++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/IsNullConstraintValidator.php
@@ -20,7 +20,7 @@ class IsNullConstraintValidator extends IsNullValidator {
/**
* {@inheritdoc}
*/
- public function validate($value, Constraint $constraint) {
+ public function validate($value, Constraint $constraint): void {
$typed_data = $this->getTypedData();
if (($typed_data instanceof ListInterface || $typed_data instanceof ComplexDataInterface) && $typed_data->isEmpty()) {
$value = NULL;
diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/NotNullConstraintValidator.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/NotNullConstraintValidator.php
index dfb1e15ad2ce..779ba1dd4d93 100644
--- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/NotNullConstraintValidator.php
+++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/NotNullConstraintValidator.php
@@ -20,11 +20,8 @@ class NotNullConstraintValidator extends NotNullValidator {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function validate($value, Constraint $constraint) {
+ public function validate($value, Constraint $constraint): void {
$typed_data = $this->getTypedData();
// TRICKY: the Mapping and Sequence data types both extend ArrayElement
// (which implements ComplexDataInterface), but configuration schema sees a
diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidator.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidator.php
index 5533be502931..501d2fd7aa44 100644
--- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidator.php
+++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidator.php
@@ -25,11 +25,8 @@ class PrimitiveTypeConstraintValidator extends ConstraintValidator {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function validate($value, Constraint $constraint) {
+ public function validate($value, Constraint $constraint): void {
if (!isset($value)) {
return;
diff --git a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/RangeConstraintValidator.php b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/RangeConstraintValidator.php
index 44da46dff66a..8049b0187ab3 100644
--- a/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/RangeConstraintValidator.php
+++ b/core/lib/Drupal/Core/Validation/Plugin/Validation/Constraint/RangeConstraintValidator.php
@@ -14,11 +14,8 @@ class RangeConstraintValidator extends ConstraintValidator {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function validate($value, Constraint $constraint) {
+ public function validate($value, Constraint $constraint): void {
if (!$constraint instanceof Range) {
throw new UnexpectedTypeException($constraint, __NAMESPACE__ . '\Range');
}
diff --git a/core/modules/help/tests/modules/help_test/src/SupernovaGenerator.php b/core/modules/help/tests/modules/help_test/src/SupernovaGenerator.php
index 2ab7f6484a6a..505404fee3a1 100644
--- a/core/modules/help/tests/modules/help_test/src/SupernovaGenerator.php
+++ b/core/modules/help/tests/modules/help_test/src/SupernovaGenerator.php
@@ -13,7 +13,7 @@ class SupernovaGenerator implements UrlGeneratorInterface {
/**
* {@inheritdoc}
*/
- public function setContext(RequestContext $context) {
+ public function setContext(RequestContext $context): void {
throw new \Exception();
}
diff --git a/core/modules/jsonapi/src/DependencyInjection/Compiler/RegisterSerializationClassesCompilerPass.php b/core/modules/jsonapi/src/DependencyInjection/Compiler/RegisterSerializationClassesCompilerPass.php
index a0a33b69bfd6..959f6fcb1ee2 100644
--- a/core/modules/jsonapi/src/DependencyInjection/Compiler/RegisterSerializationClassesCompilerPass.php
+++ b/core/modules/jsonapi/src/DependencyInjection/Compiler/RegisterSerializationClassesCompilerPass.php
@@ -62,7 +62,7 @@ class RegisterSerializationClassesCompilerPass extends DrupalRegisterSerializati
* @param \Symfony\Component\DependencyInjection\ContainerBuilder $container
* The container to process.
*/
- public function process(ContainerBuilder $container) {
+ public function process(ContainerBuilder $container): void {
$definition = $container->getDefinition(static::OVERRIDDEN_SERVICE_ID);
// Retrieve registered Normalizers and Encoders from the container.
diff --git a/core/modules/link/src/Plugin/Validation/Constraint/LinkAccessConstraintValidator.php b/core/modules/link/src/Plugin/Validation/Constraint/LinkAccessConstraintValidator.php
index a3ac834bbb89..095b276aa861 100644
--- a/core/modules/link/src/Plugin/Validation/Constraint/LinkAccessConstraintValidator.php
+++ b/core/modules/link/src/Plugin/Validation/Constraint/LinkAccessConstraintValidator.php
@@ -41,11 +41,8 @@ public static function create(ContainerInterface $container) {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function validate($value, Constraint $constraint) {
+ public function validate($value, Constraint $constraint): void {
if (isset($value)) {
try {
$url = $value->getUrl();
diff --git a/core/modules/link/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidator.php b/core/modules/link/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidator.php
index 4395286a0f4d..a7d52bc58d6a 100644
--- a/core/modules/link/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidator.php
+++ b/core/modules/link/src/Plugin/Validation/Constraint/LinkExternalProtocolsConstraintValidator.php
@@ -13,11 +13,8 @@ class LinkExternalProtocolsConstraintValidator extends ConstraintValidator {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function validate($value, Constraint $constraint) {
+ public function validate($value, Constraint $constraint): void {
if (isset($value)) {
try {
/** @var \Drupal\Core\Url $url */
diff --git a/core/modules/link/src/Plugin/Validation/Constraint/LinkNotExistingInternalConstraintValidator.php b/core/modules/link/src/Plugin/Validation/Constraint/LinkNotExistingInternalConstraintValidator.php
index b89e5791ae31..0711971c0b27 100644
--- a/core/modules/link/src/Plugin/Validation/Constraint/LinkNotExistingInternalConstraintValidator.php
+++ b/core/modules/link/src/Plugin/Validation/Constraint/LinkNotExistingInternalConstraintValidator.php
@@ -15,11 +15,8 @@ class LinkNotExistingInternalConstraintValidator extends ConstraintValidator {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function validate($value, Constraint $constraint) {
+ public function validate($value, Constraint $constraint): void {
if (isset($value)) {
try {
/** @var \Drupal\Core\Url $url */
diff --git a/core/modules/serialization/src/RegisterSerializationClassesCompilerPass.php b/core/modules/serialization/src/RegisterSerializationClassesCompilerPass.php
index edcfafcd98ba..86e3b5541fc6 100644
--- a/core/modules/serialization/src/RegisterSerializationClassesCompilerPass.php
+++ b/core/modules/serialization/src/RegisterSerializationClassesCompilerPass.php
@@ -13,11 +13,8 @@ class RegisterSerializationClassesCompilerPass implements CompilerPassInterface
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function process(ContainerBuilder $container) {
+ public function process(ContainerBuilder $container): void {
$definition = $container->getDefinition('serializer');
// Retrieve registered Normalizers and Encoders from the container.
diff --git a/core/modules/system/tests/modules/session_test/src/Session/TestSessionBag.php b/core/modules/system/tests/modules/session_test/src/Session/TestSessionBag.php
index 125ed9e7357d..b87c79b42be8 100644
--- a/core/modules/system/tests/modules/session_test/src/Session/TestSessionBag.php
+++ b/core/modules/system/tests/modules/session_test/src/Session/TestSessionBag.php
@@ -72,7 +72,7 @@ public function getName(): string {
/**
* {@inheritdoc}
*/
- public function initialize(array &$attributes) {
+ public function initialize(array &$attributes): void {
$this->attributes = &$attributes;
}
diff --git a/core/modules/system/tests/src/Kernel/Scripts/DbCommandBaseTest.php b/core/modules/system/tests/src/Kernel/Scripts/DbCommandBaseTest.php
index 5fddc84c0a80..58438b4cf130 100644
--- a/core/modules/system/tests/src/Kernel/Scripts/DbCommandBaseTest.php
+++ b/core/modules/system/tests/src/Kernel/Scripts/DbCommandBaseTest.php
@@ -109,7 +109,7 @@ class DbCommandBaseTester extends DbCommandBase {
/**
* {@inheritdoc}
*/
- public function configure() {
+ public function configure(): void {
parent::configure();
$this->setName('test');
}
diff --git a/core/modules/user/src/Plugin/Validation/Constraint/ProtectedUserFieldConstraintValidator.php b/core/modules/user/src/Plugin/Validation/Constraint/ProtectedUserFieldConstraintValidator.php
index 6102ab9e78ff..d33a86304c01 100644
--- a/core/modules/user/src/Plugin/Validation/Constraint/ProtectedUserFieldConstraintValidator.php
+++ b/core/modules/user/src/Plugin/Validation/Constraint/ProtectedUserFieldConstraintValidator.php
@@ -53,11 +53,8 @@ public static function create(ContainerInterface $container) {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function validate($items, Constraint $constraint) {
+ public function validate($items, Constraint $constraint): void {
if (!isset($items)) {
return;
}
diff --git a/core/modules/user/src/Plugin/Validation/Constraint/UserMailRequiredValidator.php b/core/modules/user/src/Plugin/Validation/Constraint/UserMailRequiredValidator.php
index 2b46bcad410b..dd0ce17b9788 100644
--- a/core/modules/user/src/Plugin/Validation/Constraint/UserMailRequiredValidator.php
+++ b/core/modules/user/src/Plugin/Validation/Constraint/UserMailRequiredValidator.php
@@ -16,11 +16,8 @@ class UserMailRequiredValidator extends ConstraintValidator {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function validate($items, Constraint $constraint) {
+ public function validate($items, Constraint $constraint): void {
/** @var \Drupal\Core\Field\FieldItemListInterface $items */
/** @var \Drupal\user\UserInterface $account */
$account = $items->getEntity();
diff --git a/core/tests/Drupal/Tests/Core/DependencyInjection/DependencySerializationTest.php b/core/tests/Drupal/Tests/Core/DependencyInjection/DependencySerializationTest.php
index d37088fba0da..1b3166e52ad5 100644
--- a/core/tests/Drupal/Tests/Core/DependencyInjection/DependencySerializationTest.php
+++ b/core/tests/Drupal/Tests/Core/DependencyInjection/DependencySerializationTest.php
@@ -76,11 +76,8 @@ public function __construct(\stdClass $service) {
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function setContainer(ContainerInterface $container = NULL) {
+ public function setContainer(?ContainerInterface $container): void {
$this->container = $container;
}
diff --git a/core/tests/Drupal/Tests/Core/DependencyInjection/Fixture/FinalTestHttpMiddlewareClass.php b/core/tests/Drupal/Tests/Core/DependencyInjection/Fixture/FinalTestHttpMiddlewareClass.php
index 32d7cd3c6b49..a561247b632c 100644
--- a/core/tests/Drupal/Tests/Core/DependencyInjection/Fixture/FinalTestHttpMiddlewareClass.php
+++ b/core/tests/Drupal/Tests/Core/DependencyInjection/Fixture/FinalTestHttpMiddlewareClass.php
@@ -21,10 +21,7 @@ public function handle(Request $request, int $type = self::MAIN_REQUEST, bool $c
/**
* {@inheritdoc}
- *
- * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
- * @return void
*/
- public function terminate(Request $request, Response $response) {}
+ public function terminate(Request $request, Response $response): void {}
}
--
GitLab