[DependencyInjection] Skip scanning scalar values in compiler passes when not needed

bastnic · nicolas-grekas · commit 0f2db5724d3c · 2023-06-26T09:26:49.000+02:00
diff --git a/Compiler/AbstractRecursivePass.php b/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;
diff --git a/Compiler/AliasDeprecatedPublicServicesPass.php b/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);
+    }
 }
diff --git a/Compiler/AnalyzeServiceReferencesPass.php b/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;
diff --git a/Compiler/AttributeAutoconfigurationPass.php b/Compiler/AttributeAutoconfigurationPass.php
@@ -22,6 +22,8 @@
  */
 final class AttributeAutoconfigurationPass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = true;
+
     private $classAttributeConfigurators = [];
     private $methodAttributeConfigurators = [];
     private $propertyAttributeConfigurators = [];
diff --git a/Compiler/AutowirePass.php b/Compiler/AutowirePass.php
@@ -35,6 +35,8 @@
  */
 class AutowirePass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = true;
+
     private array $types;
     private array $ambiguousServiceTypes;
     private array $autowiringAliases;
diff --git a/Compiler/AutowireRequiredMethodsPass.php b/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);
diff --git a/Compiler/AutowireRequiredPropertiesPass.php b/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);
diff --git a/Compiler/CheckArgumentsValidityPass.php b/Compiler/CheckArgumentsValidityPass.php
@@ -22,6 +22,8 @@
  */
 class CheckArgumentsValidityPass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = true;
+
     private bool $throwExceptions;
 
     public function __construct(bool $throwExceptions = true)
diff --git a/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php b/Compiler/CheckExceptionOnInvalidReferenceBehaviorPass.php
@@ -23,6 +23,8 @@
  */
 class CheckExceptionOnInvalidReferenceBehaviorPass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = true;
+
     private array $serviceLocatorContextIds = [];
 
     /**
diff --git a/Compiler/CheckReferenceValidityPass.php b/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())) {
diff --git a/Compiler/CheckTypeDeclarationsPass.php b/Compiler/CheckTypeDeclarationsPass.php
@@ -41,6 +41,8 @@
  */
 final class CheckTypeDeclarationsPass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = true;
+
     private const SCALAR_TYPES = [
         'int' => true,
         'float' => true,
diff --git a/Compiler/DecoratorServicePass.php b/Compiler/DecoratorServicePass.php
@@ -27,6 +27,8 @@
  */
 class DecoratorServicePass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = true;
+
     /**
      * @return void
      */
diff --git a/Compiler/DefinitionErrorExceptionPass.php b/Compiler/DefinitionErrorExceptionPass.php
@@ -25,6 +25,8 @@
  */
 class DefinitionErrorExceptionPass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = true;
+
     private array $erroredDefinitions = [];
     private array $targetReferences = [];
     private array $sourceReferences = [];
diff --git a/Compiler/InlineServiceDefinitionsPass.php b/Compiler/InlineServiceDefinitionsPass.php
@@ -24,6 +24,8 @@
  */
 class InlineServiceDefinitionsPass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = true;
+
     private ?AnalyzeServiceReferencesPass $analyzingPass;
     private array $cloningIds = [];
     private array $connectedIds = [];
diff --git a/Compiler/RegisterServiceSubscribersPass.php b/Compiler/RegisterServiceSubscribersPass.php
@@ -31,6 +31,8 @@
  */
 class RegisterServiceSubscribersPass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = true;
+
     protected function processValue(mixed $value, bool $isRoot = false): mixed
     {
         if (!$value instanceof Definition || $value->isAbstract() || $value->isSynthetic() || !$value->hasTag('container.service_subscriber')) {
diff --git a/Compiler/RemoveUnusedDefinitionsPass.php b/Compiler/RemoveUnusedDefinitionsPass.php
@@ -22,6 +22,8 @@
  */
 class RemoveUnusedDefinitionsPass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = true;
+
     private array $connectedIds = [];
 
     /**
diff --git a/Compiler/ReplaceAliasByActualDefinitionPass.php b/Compiler/ReplaceAliasByActualDefinitionPass.php
@@ -24,6 +24,8 @@
  */
 class ReplaceAliasByActualDefinitionPass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = true;
+
     private array $replacements;
 
     /**
diff --git a/Compiler/ResolveBindingsPass.php b/Compiler/ResolveBindingsPass.php
@@ -28,6 +28,8 @@
  */
 class ResolveBindingsPass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = true;
+
     private array $usedBindings = [];
     private array $unusedBindings = [];
     private array $errorMessages = [];
diff --git a/Compiler/ResolveChildDefinitionsPass.php b/Compiler/ResolveChildDefinitionsPass.php
@@ -27,6 +27,8 @@
  */
 class ResolveChildDefinitionsPass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = true;
+
     private array $currentPath;
 
     protected function processValue(mixed $value, bool $isRoot = false): mixed
diff --git a/Compiler/ResolveEnvPlaceholdersPass.php b/Compiler/ResolveEnvPlaceholdersPass.php
@@ -18,6 +18,8 @@
  */
 class ResolveEnvPlaceholdersPass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = false;
+
     protected function processValue(mixed $value, bool $isRoot = false): mixed
     {
         if (\is_string($value)) {
diff --git a/Compiler/ResolveFactoryClassPass.php b/Compiler/ResolveFactoryClassPass.php
@@ -19,6 +19,8 @@
  */
 class ResolveFactoryClassPass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = true;
+
     protected function processValue(mixed $value, bool $isRoot = false): mixed
     {
         if ($value instanceof Definition && \is_array($factory = $value->getFactory()) && null === $factory[0]) {
diff --git a/Compiler/ResolveHotPathPass.php b/Compiler/ResolveHotPathPass.php
@@ -23,6 +23,8 @@
  */
 class ResolveHotPathPass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = true;
+
     private array $resolvedIds = [];
 
     /**
diff --git a/Compiler/ResolveNamedArgumentsPass.php b/Compiler/ResolveNamedArgumentsPass.php
@@ -24,6 +24,8 @@
  */
 class ResolveNamedArgumentsPass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = true;
+
     protected function processValue(mixed $value, bool $isRoot = false): mixed
     {
         if ($value instanceof AbstractArgument && $value->getText().'.' === $value->getTextWithContext()) {
diff --git a/Compiler/ResolveNoPreloadPass.php b/Compiler/ResolveNoPreloadPass.php
@@ -24,6 +24,8 @@ class ResolveNoPreloadPass extends AbstractRecursivePass
 {
     private const DO_PRELOAD_TAG = '.container.do_preload';
 
+    protected bool $skipScalars = true;
+
     private array $resolvedIds = [];
 
     /**
diff --git a/Compiler/ResolveParameterPlaceHoldersPass.php b/Compiler/ResolveParameterPlaceHoldersPass.php
@@ -23,6 +23,8 @@
  */
 class ResolveParameterPlaceHoldersPass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = false;
+
     private ParameterBagInterface $bag;
 
     public function __construct(
diff --git a/Compiler/ResolveReferencesToAliasesPass.php b/Compiler/ResolveReferencesToAliasesPass.php
@@ -22,6 +22,8 @@
  */
 class ResolveReferencesToAliasesPass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = true;
+
     /**
      * @return void
      */
diff --git a/Compiler/ResolveServiceSubscribersPass.php b/Compiler/ResolveServiceSubscribersPass.php
@@ -23,6 +23,8 @@
  */
 class ResolveServiceSubscribersPass extends AbstractRecursivePass
 {
+    protected bool $skipScalars = true;
+
     private ?string $serviceLocator = null;
 
     protected function processValue(mixed $value, bool $isRoot = false): mixed
diff --git a/Compiler/ResolveTaggedIteratorArgumentPass.php b/Compiler/ResolveTaggedIteratorArgumentPass.php
@@ -22,6 +22,8 @@ class ResolveTaggedIteratorArgumentPass extends AbstractRecursivePass
 {
     use PriorityTaggedServiceTrait;
 
+    protected bool $skipScalars = true;
+
     protected function processValue(mixed $value, bool $isRoot = false): mixed
     {
         if (!$value instanceof TaggedIteratorArgument) {
diff --git a/Compiler/ServiceLocatorTagPass.php b/Compiler/ServiceLocatorTagPass.php
@@ -30,6 +30,8 @@ final class ServiceLocatorTagPass extends AbstractRecursivePass
 {
     use PriorityTaggedServiceTrait;
 
+    protected bool $skipScalars = true;
+
     protected function processValue(mixed $value, bool $isRoot = false): mixed
     {
         if ($value instanceof ServiceLocatorArgument) {
diff --git a/ParameterBag/ParameterBag.php b/ParameterBag/ParameterBag.php
@@ -198,7 +198,7 @@ public function resolveValue(mixed $value, array $resolving = []): mixed
             return $args;
         }
 
-        if (!\is_string($value) || 2 > \strlen($value)) {
+        if (!\is_string($value) || '' === $value || !str_contains($value, '%')) {
             return $value;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,8 @@`
`32`	`32`	`*/`
`33`	`33`	`class AnalyzeServiceReferencesPass extends AbstractRecursivePass`
`34`	`34`	`{`
	`35`	`+ protected bool $skipScalars = true;`
	`36`	`+`
`35`	`37`	`private ServiceReferenceGraph $graph;`
`36`	`38`	`private ?Definition $currentDefinition = null;`
`37`	`39`	`private bool $onlyConstructorArguments;`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@`
`22`	`22`	`*/`
`23`	`23`	`final class AttributeAutoconfigurationPass extends AbstractRecursivePass`
`24`	`24`	`{`
	`25`	`+ protected bool $skipScalars = true;`
	`26`	`+`
`25`	`27`	`private $classAttributeConfigurators = [];`
`26`	`28`	`private $methodAttributeConfigurators = [];`
`27`	`29`	`private $propertyAttributeConfigurators = [];`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,8 @@`
`35`	`35`	`*/`
`36`	`36`	`class AutowirePass extends AbstractRecursivePass`
`37`	`37`	`{`
	`38`	`+ protected bool $skipScalars = true;`
	`39`	`+`
`38`	`40`	`private array $types;`
`39`	`41`	`private array $ambiguousServiceTypes;`
`40`	`42`	`private array $autowiringAliases;`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@`
`21`	`21`	`*/`
`22`	`22`	`class AutowireRequiredMethodsPass extends AbstractRecursivePass`
`23`	`23`	`{`
	`24`	`+ protected bool $skipScalars = true;`
	`25`	`+`
`24`	`26`	`protected function processValue(mixed $value, bool $isRoot = false): mixed`
`25`	`27`	`{`
`26`	`28`	`$value = parent::processValue($value, $isRoot);`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@`
`24`	`24`	`*/`
`25`	`25`	`class AutowireRequiredPropertiesPass extends AbstractRecursivePass`
`26`	`26`	`{`
	`27`	`+ protected bool $skipScalars = true;`
	`28`	`+`
`27`	`29`	`protected function processValue(mixed $value, bool $isRoot = false): mixed`
`28`	`30`	`{`
`29`	`31`	`$value = parent::processValue($value, $isRoot);`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,8 @@`
`23`	`23`	`*/`
`24`	`24`	`class CheckExceptionOnInvalidReferenceBehaviorPass extends AbstractRecursivePass`
`25`	`25`	`{`
	`26`	`+ protected bool $skipScalars = true;`
	`27`	`+`
`26`	`28`	`private array $serviceLocatorContextIds = [];`
`27`	`29`
`28`	`30`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@`
`25`	`25`	`*/`
`26`	`26`	`class CheckReferenceValidityPass extends AbstractRecursivePass`
`27`	`27`	`{`
	`28`	`+ protected bool $skipScalars = true;`
	`29`	`+`
`28`	`30`	`protected function processValue(mixed $value, bool $isRoot = false): mixed`
`29`	`31`	`{`
`30`	`32`	`if ($isRoot && $value instanceof Definition && ($value->isSynthetic() \|\| $value->isAbstract())) {`