Issue #3338328 by Spokje, andypost, longwave, effulgentsia, jungle, catch,...

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

(cherry picked from commit a6c9dbbe)

composer.json

@@ -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": "*",

composer/Metapackage/CoreRecommended/composer.json

@@ -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"
     }
 }

composer/Metapackage/DevDependencies/composer.json

@@ -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"
     }
 }

composer/Metapackage/PinnedDevDependencies/composer.json

@@ -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"

core/composer.json

@@ -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",

core/lib/Drupal/Component/DependencyInjection/Container.php

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

core/lib/Drupal/Component/DependencyInjection/composer.json

@@ -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": {

core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php

@@ -210,6 +210,9 @@ public function hasListeners($event_name = NULL): bool {
 
   /**
    * {@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 @@ public function addListener($event_name, $listener, $priority = 0) {
 
   /**
    * {@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 @@ public function removeListener($event_name, $listener) {
 
   /**
    * {@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 @@ public function addSubscriber(EventSubscriberInterface $subscriber) {
 
   /**
    * {@inheritdoc}
+   *
+   * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
+   * @return void
    */
   public function removeSubscriber(EventSubscriberInterface $subscriber) {
     foreach ($subscriber->getSubscribedEvents() as $event_name => $params) {

core/lib/Drupal/Component/EventDispatcher/composer.json

@@ -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": {

core/lib/Drupal/Component/HttpFoundation/composer.json

@@ -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"
 }

core/lib/Drupal/Component/Plugin/composer.json

@@ -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"
 }

core/lib/Drupal/Component/Serialization/composer.json

@@ -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"
 }

core/lib/Drupal/Core/Command/DbCommandBase.php

@@ -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')

core/lib/Drupal/Core/DependencyInjection/Compiler/AuthenticationProviderPass.php

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

core/lib/Drupal/Core/DependencyInjection/Compiler/BackendCompilerPass.php

@@ -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;

core/lib/Drupal/Core/DependencyInjection/Compiler/ProxyServicesPass.php

@@ -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) {

core/lib/Drupal/Core/DependencyInjection/Compiler/StackedKernelPass.php

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

core/lib/Drupal/Core/DependencyInjection/Compiler/TaggedHandlersPass.php

@@ -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

core/lib/Drupal/Core/DependencyInjection/ContainerBuilder.php

@@ -36,6 +36,9 @@ 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.
@@ -67,6 +70,9 @@ public function setAlias($alias, $id): Alias {
 
   /**
    * {@inheritdoc}
+   *
+   * phpcs:ignore Drupal.Commenting.FunctionComment.VoidReturn
+   * @return void
    */
   public function setParameter($name, $value) {
     if (strtolower($name) !== $name) {