Merge branch '6.4' into 7.0

* 6.4:
  [DoctrineBridge] add missing changelog mention for isSameDatabase arg introduced in #48059
  [DependencyInjection] Skip scanning scalar values in compiler passes when not needed
  Bump Symfony version to 6.3.2
  Update VERSION for 6.3.1
  Update CHANGELOG for 6.3.1
  Bump Symfony version to 6.2.13
  Update VERSION for 6.2.12
  Update CHANGELOG for 6.2.12
  Bump Symfony version to 5.4.26
  Update VERSION for 5.4.25
  Update CONTRIBUTORS for 5.4.25
  Update CHANGELOG for 5.4.25

Author: nicolas-grekas

Compiler/AbstractRecursivePass.php

@@ -31,6 +31,7 @@ abstract class AbstractRecursivePass implements CompilerPassInterface
      */
     protected $container;
     protected $currentId;
+    protected bool $skipScalars = false;
 
     private bool $processExpressions = false;
     private ExpressionLanguage $expressionLanguage;
@@ -77,6 +78,9 @@ protected function processValue(mixed $value, bool $isRoot = false)
     {
         if (\is_array($value)) {
             foreach ($value as $k => $v) {
+                if ((!$v || \is_scalar($v)) && $this->skipScalars) {
+                    continue;
+                }
                 if ($isRoot) {
                     if ($v->hasTag('container.excluded')) {
                         continue;

Compiler/AliasDeprecatedPublicServicesPass.php

@@ -17,16 +17,9 @@
 
 final class AliasDeprecatedPublicServicesPass extends AbstractRecursivePass
 {
-    private array $aliases = [];
-
-    protected function processValue(mixed $value, bool $isRoot = false): mixed
-    {
-        if ($value instanceof Reference && isset($this->aliases[$id = (string) $value])) {
-            return new Reference($this->aliases[$id], $value->getInvalidBehavior());
-        }
+    protected bool $skipScalars = true;
 
-        return parent::processValue($value, $isRoot);
-    }
+    private array $aliases = [];
 
     public function process(ContainerBuilder $container): void
     {
@@ -56,4 +49,13 @@ public function process(ContainerBuilder $container): void
 
         parent::process($container);
     }
+
+    protected function processValue(mixed $value, bool $isRoot = false): mixed
+    {
+        if ($value instanceof Reference && isset($this->aliases[$id = (string) $value])) {
+            return new Reference($this->aliases[$id], $value->getInvalidBehavior());
+        }
+
+        return parent::processValue($value, $isRoot);
+    }
 }

Compiler/AnalyzeServiceReferencesPass.php

@@ -32,6 +32,8 @@
  */
 class AnalyzeServiceReferencesPass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = true;
+
     private ServiceReferenceGraph $graph;
     private ?Definition $currentDefinition = null;
     private bool $onlyConstructorArguments;

Compiler/AttributeAutoconfigurationPass.php

@@ -22,6 +22,8 @@
  */
 final class AttributeAutoconfigurationPass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = true;
+
     private $classAttributeConfigurators = [];
     private $methodAttributeConfigurators = [];
     private $propertyAttributeConfigurators = [];

Compiler/AutowirePass.php

@@ -35,6 +35,8 @@
  */
 class AutowirePass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = true;
+
     private array $types;
     private array $ambiguousServiceTypes;
     private array $autowiringAliases;

Compiler/AutowireRequiredMethodsPass.php

@@ -21,6 +21,8 @@
  */
 class AutowireRequiredMethodsPass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = true;
+
     protected function processValue(mixed $value, bool $isRoot = false): mixed
     {
         $value = parent::processValue($value, $isRoot);

Compiler/AutowireRequiredPropertiesPass.php

@@ -24,6 +24,8 @@
  */
 class AutowireRequiredPropertiesPass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = true;
+
     protected function processValue(mixed $value, bool $isRoot = false): mixed
     {
         $value = parent::processValue($value, $isRoot);

Compiler/CheckArgumentsValidityPass.php

@@ -22,6 +22,8 @@
  */
 class CheckArgumentsValidityPass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = true;
+
     private bool $throwExceptions;
 
     public function __construct(bool $throwExceptions = true)

Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php

@@ -23,6 +23,8 @@
  */
 class CheckExceptionOnInvalidReferenceBehaviorPass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = true;
+
     private array $serviceLocatorContextIds = [];
 
     /**

Compiler/CheckReferenceValidityPass.php

@@ -25,6 +25,8 @@
  */
 class CheckReferenceValidityPass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = true;
+
     protected function processValue(mixed $value, bool $isRoot = false): mixed
     {
         if ($isRoot && $value instanceof Definition && ($value->isSynthetic() || $value->isAbstract())) {