diff --git a/core/lib/Drupal/Component/DependencyInjection/Container.php b/core/lib/Drupal/Component/DependencyInjection/Container.php
index 104da1276d951da99bfdaa614c7a49c93e21f29f..e291a8ff05575c97e181c10edcb171bb072c5c68 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 41afec903e944f9053b53ade87815b0b8e5e7969..b8e74ccc692a67d9ced44f0a3f886f67d6ffa5a1 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 78006c71f2c1cb396101b96425e7e3ec5d1d92be..fca703f4df47e8fa1ffbb84d31d3f82e14ad1456 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 7cae1ffcbee2ee794823503791b1ad99926fadbc..ec0e4d187b011ca71dd5f2d7016de7f7e0880abd 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 6da8b5739d1dd5b0d8d549f795477e50325a0fb7..eeae570c5c45d5b8853f69ef078ef9e1c3154f38 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 a8f761d26110c32963fe6c5314f7e9dd4c6004a6..91ded72e015454ef465ff28067b5986e082a6ae2 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 bde03d802d04808cbc3febc46bee9ad4180cf981..058a85379063adb6f79fb2b7349fb95e0657efab 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 77d529fa7ee8b57ac7e55592abec0eeedd4f15ee..ddbad1d26db1a578d44b69f45836829cc4631b7c 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 be07b7a9243b6c684aad1616b7559ec17c52542f..c1486734089f2b7300a69d2247221c0a0024f2bc 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 b690559c75290c8be2e6ffe23473a5b746da5aa7..514cd9e9f550a10d5b4e842db051027019ade26d 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 84c529b4dfc399f55f506e902357290db13fbd07..79548b02d59abb504aaee07baf1ba9ff232e9ad3 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 d0c661cc89f952a41caa593431764b3b92334666..6bd6cffb3135eac18b87d5ba15ae4ca87525209f 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 d644e66d3c0a651ea9ea6254c7cd4c09a0004252..ee9af88b22a87461a82e53a29bb92339ad83a465 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 7a801c2b12b002e6bdd475769779f78900489b18..39a26b65457f66abec8efa16e40c16d5b06aee11 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 fffe5d36ae22aed55126b566fca422ef7f5a1f60..b753d44df1237f4e5335933bc398ab477c9a648b 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 dbd4c852fc7bd58df5ce625f2d6e87aff17b2a62..1d036a9e79f953cb95877c818f56c9edc6b6c946 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 08ccdfe6653e3973c2bf0fa5ec94ecef1d3fc407..ba5523d7f0b357dea1acdd8a382d5701d1de8621 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 d7d0a2032170f84643a6bd7db2a15ddbea0e18c5..ac8f23929b3e61445587eb46d65d31d834e24ad4 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 2fd79ed700fc58903428a5374dd38dd37f19443c..13e40fa660d147220a897c67f8c1a8b49adb5248 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 f00b5ed9344234e4ed1f7c6df5c334d284132bc5..cf794ebe4b6b084096257741542c34c6fc360a6c 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 a749fa9ddab7b9dc11c280444f73be1bca2bcb49..526ae6932544eb2d3d528fcd693b075e1667e7ca 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 a794311ede70a84c54a6cabc2bbed2b818b21ec2..f2fe2f378ff8613b52621a9815213e90a9b518ea 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 6e789ccf60a85dedb8a26244174b383291273f90..7c35260b21670c324cbde5b6aa1756c68d9398db 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 21be12d0e0eee3b2b64b787acb6d2fa25d16b319..78bbf8043c2896e64b1cf1c885c3598f9996280c 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 39162ac0ded1e4a2d952aa663a500dcc3ab4218b..f6beb7c729382e882473497da1a4527181c86fa3 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 dfb1e15ad2ce7c392df38f7b8462450f5e695434..779ba1dd4d93ff222c0df590f7ae1ecba40bcc21 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 5533be502931d753d3a44ba0951302b5f6551099..501d2fd7aa448a60a063b2540cd490d40bfbd0f3 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 44da46dff66a8bb781afc1fc9d0aebd975e36f09..8049b0187ab330e9abc9fc922ee0c5ccdd395a10 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 2ab7f6484a6a9915ab9a9c2764e00f19a53b12cf..505404fee3a192b175594dc1b2084d5e21efe1d1 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 a0a33b69bfd610f93469a20592d4c9d637ea2c3a..959f6fcb1ee25d7c68ad8e2a141981638aca84ef 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 a3ac834bbb89f7b6827cff7b7abc4fe2cd9d2736..095b276aa8610985e52ef17bf09d2825588608c5 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 4395286a0f4d0b385de8b47d1835bb9e9aa920a6..a7d52bc58d6ac616b13e8ebde6b1d25fb91ea70e 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 b89e5791ae310302493c253fc923112607c1aa54..0711971c0b2701688fd174a94a9df7965f523737 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 edcfafcd98ba337265e3b831be81767f9320d28e..86e3b5541fc60696b6c8d677836ac7847d38669c 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 125ed9e7357dedb280d799c73b07b3ab1a072889..b87c79b42be866df83f339c610a8b6dfb641dcab 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 5fddc84c0a80a7f3b1f8f01ea4f5ec80eeacecd8..58438b4cf130e8c96faf01ed3d190c24050bcd22 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 6102ab9e78ff855d0cf5526c1bc516cde947039a..d33a86304c0182f0d1c825fbc982db58a1a43098 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 2b46bcad410b5ad61eb50df56db59c7c9bd41e9b..dd0ce17b9788e4f64f12b685444be4b8b172460a 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 d37088fba0da2d9e1975010df3b6a53949181270..1b3166e52ad58b1c0c2c21bda9e1b20c7c1beb65 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 32d7cd3c6b49fd53395575f9c1bf326660884fef..a561247b632c057745526cf2430172944b26e2ef 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 {}
 
 }