Merge branch '4.4' into 5.4

* 4.4:
  [Serializer] Fix passing null to str_contains()
  [DependencyInjection] Don't reset env placeholders during compilation
  [HttpClient] Fix overriding default options with null
  [DependencyInjection] Clarify that using expressions in parameters is not allowed
  [GHA] Cancel running CI jobs when a PR is updated
  [Validator] Improve tests for the Image and File constraints
  [Validator][Tests] Fix AssertingContextualValidator not throwing on remaining expectations

Author: nicolas-grekas

Compiler/MergeExtensionConfigurationPass.php

@@ -79,10 +79,6 @@ public function process(ContainerBuilder $container)
                     $container->getParameterBag()->mergeEnvPlaceholders($resolvingBag);
                 }
 
-                if ($configAvailable) {
-                    BaseNode::resetPlaceholders();
-                }
-
                 throw $e;
             }
 
@@ -95,10 +91,6 @@ public function process(ContainerBuilder $container)
             $container->getParameterBag()->add($parameters);
         }
 
-        if ($configAvailable) {
-            BaseNode::resetPlaceholders();
-        }
-
         $container->addDefinitions($definitions);
         $container->addAliases($aliases);
     }

Compiler/ValidateEnvPlaceholdersPass.php

@@ -48,46 +48,42 @@ public function process(ContainerBuilder $container)
 
         $defaultBag = new ParameterBag($resolvingBag->all());
         $envTypes = $resolvingBag->getProvidedTypes();
-        try {
-            foreach ($resolvingBag->getEnvPlaceholders() + $resolvingBag->getUnusedEnvPlaceholders() as $env => $placeholders) {
-                $values = [];
-                if (false === $i = strpos($env, ':')) {
-                    $default = $defaultBag->has("env($env)") ? $defaultBag->get("env($env)") : self::TYPE_FIXTURES['string'];
-                    $defaultType = null !== $default ? get_debug_type($default) : 'string';
-                    $values[$defaultType] = $default;
-                } else {
-                    $prefix = substr($env, 0, $i);
-                    foreach ($envTypes[$prefix] ?? ['string'] as $type) {
-                        $values[$type] = self::TYPE_FIXTURES[$type] ?? null;
-                    }
-                }
-                foreach ($placeholders as $placeholder) {
-                    BaseNode::setPlaceholder($placeholder, $values);
+        foreach ($resolvingBag->getEnvPlaceholders() + $resolvingBag->getUnusedEnvPlaceholders() as $env => $placeholders) {
+            $values = [];
+            if (false === $i = strpos($env, ':')) {
+                $default = $defaultBag->has("env($env)") ? $defaultBag->get("env($env)") : self::TYPE_FIXTURES['string'];
+                $defaultType = null !== $default ? get_debug_type($default) : 'string';
+                $values[$defaultType] = $default;
+            } else {
+                $prefix = substr($env, 0, $i);
+                foreach ($envTypes[$prefix] ?? ['string'] as $type) {
+                    $values[$type] = self::TYPE_FIXTURES[$type] ?? null;
                 }
             }
+            foreach ($placeholders as $placeholder) {
+                BaseNode::setPlaceholder($placeholder, $values);
+            }
+        }
 
-            $processor = new Processor();
-
-            foreach ($extensions as $name => $extension) {
-                if (!($extension instanceof ConfigurationExtensionInterface || $extension instanceof ConfigurationInterface)
-                    || !$config = array_filter($container->getExtensionConfig($name))
-                ) {
-                    // this extension has no semantic configuration or was not called
-                    continue;
-                }
+        $processor = new Processor();
 
-                $config = $resolvingBag->resolveValue($config);
+        foreach ($extensions as $name => $extension) {
+            if (!($extension instanceof ConfigurationExtensionInterface || $extension instanceof ConfigurationInterface)
+                || !$config = array_filter($container->getExtensionConfig($name))
+            ) {
+                // this extension has no semantic configuration or was not called
+                continue;
+            }
 
-                if ($extension instanceof ConfigurationInterface) {
-                    $configuration = $extension;
-                } elseif (null === $configuration = $extension->getConfiguration($config, $container)) {
-                    continue;
-                }
+            $config = $resolvingBag->resolveValue($config);
 
-                $this->extensionConfig[$name] = $processor->processConfiguration($configuration, $config);
+            if ($extension instanceof ConfigurationInterface) {
+                $configuration = $extension;
+            } elseif (null === $configuration = $extension->getConfiguration($config, $container)) {
+                continue;
             }
-        } finally {
-            BaseNode::resetPlaceholders();
+
+            $this->extensionConfig[$name] = $processor->processConfiguration($configuration, $config);
         }
 
         $resolvingBag->clearUnusedEnvPlaceholders();

Loader/Configurator/ParametersConfigurator.php

@@ -12,6 +12,8 @@
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\ExpressionLanguage\Expression;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
@@ -34,6 +36,10 @@ public function __construct(ContainerBuilder $container)
      */
     final public function set(string $name, $value): self
     {
+        if ($value instanceof Expression) {
+            throw new InvalidArgumentException(sprintf('Using an expression in parameter "%s" is not allowed.', $name));
+        }
+
         $this->container->setParameter($name, static::processValue($value, true));
 
         return $this;

Loader/YamlFileLoader.php

@@ -900,6 +900,10 @@ private function resolveServices($value, string $file, bool $isParameter = false
                 $value[$k] = $this->resolveServices($v, $file, $isParameter);
             }
         } elseif (\is_string($value) && str_starts_with($value, '@=')) {
+            if ($isParameter) {
+                throw new InvalidArgumentException(sprintf('Using expressions in parameters is not allowed in "%s".', $file));
+            }
+
             if (!class_exists(Expression::class)) {
                 throw new \LogicException('The "@=" expression syntax cannot be used without the ExpressionLanguage component. Try running "composer require symfony/expression-language".');
             }