Merge branch '7.4' into 8.0

* 7.4:
  [HttpFoundation] Fix session cookie_lifetime not applied in mock session storage
  [Validator] Fix test
  [Serializer] Fix denormalization of magic `__set` properties
  [Config] Fix NodeDefinition template to be covariant
  Add 'sms' to hostless schemes
  [Validator] Fix required options check when extending a constraint with a simplified constructor
  [Validator] Skip ExpressionLanguage requirement in When constraint for closure expressions
  [Cache] Add timeout and slot eviction to LockRegistry stampede prevention
  [Console] Fix OUTPUT_RAW corrupting binary content on Windows
  [Form] Fix session data contamination by non-serializable objects in form flow
  [Mime] Use shell_exec() instead of passthru() in FileBinaryMimeTypeGuesser
  [HttpClient] Fix streaming from CachingHttpClient
  [DoctrineBridge] Rename `_schema_subscriber_check` table to `schema_subscriber_check_` for Oracle compatibility
  [HttpClient] Fix CachingHttpClient compatibility with decorator clients on 304 responses
  [FrameworkBundle] Fix stale container after reboot in KernelTestCase
  [Form] Fix duplicate validation errors when ValidatorExtension is instantiated multiple times

Author: nicolas-grekas

Constraints/When.php

@@ -40,7 +40,7 @@ class When extends Composite
      */
     public function __construct(string|Expression|\Closure $expression, array|Constraint|null $constraints = null, ?array $values = null, ?array $groups = null, $payload = null, ?array $options = null, array|Constraint $otherwise = [])
     {
-        if (!class_exists(ExpressionLanguage::class)) {
+        if (!$expression instanceof \Closure && !class_exists(ExpressionLanguage::class)) {
             throw new LogicException(\sprintf('The "symfony/expression-language" component is required to use the "%s" constraint. Try running "composer require symfony/expression-language".', __CLASS__));
         }
 

Tests/ConstraintTest.php

@@ -16,6 +16,7 @@
 use Symfony\Component\Validator\Exception\InvalidArgumentException;
 use Symfony\Component\Validator\Tests\Fixtures\ClassConstraint;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
+use Symfony\Component\Validator\Tests\Fixtures\CustomRegex;
 
 class ConstraintTest extends TestCase
 {
@@ -74,4 +75,11 @@ public function testGetErrorNameForUnknownCode()
         $this->expectException(InvalidArgumentException::class);
         Constraint::getErrorName(1);
     }
+
+    public function testChildConstraintCanSatisfyRequiredOptionsOfParent()
+    {
+        $constraint = new CustomRegex();
+
+        $this->assertSame('/^xxxxx$/', $constraint->pattern);
+    }
 }

Tests/Constraints/WhenWithoutExpressionLanguageTest.php

@@ -0,0 +1,58 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Tests\Constraints;
+
+use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
+use PHPUnit\Framework\TestCase;
+use Symfony\Bridge\PhpUnit\ClassExistsMock;
+use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
+use Symfony\Component\Validator\Constraints\NotNull;
+use Symfony\Component\Validator\Constraints\When;
+use Symfony\Component\Validator\Exception\LogicException;
+
+#[RunTestsInSeparateProcesses]
+final class WhenWithoutExpressionLanguageTest extends TestCase
+{
+    public static function setUpBeforeClass(): void
+    {
+        ClassExistsMock::register(When::class);
+        ClassExistsMock::withMockedClasses([
+            ExpressionLanguage::class => false,
+        ]);
+    }
+
+    public static function tearDownAfterClass(): void
+    {
+        ClassExistsMock::withMockedClasses([]);
+    }
+
+    public function testClosureDoesNotRequireExpressionLanguage()
+    {
+        $when = new When(
+            expression: static fn () => true,
+            constraints: [new NotNull()],
+        );
+
+        self::assertInstanceOf(\Closure::class, $when->expression);
+    }
+
+    public function testStringExpressionRequiresExpressionLanguage()
+    {
+        $this->expectException(LogicException::class);
+        $this->expectExceptionMessage('The "symfony/expression-language" component is required');
+
+        new When(
+            expression: 'true',
+            constraints: [new NotNull()],
+        );
+    }
+}

Tests/Fixtures/CustomRegex.php

@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Tests\Fixtures;
+
+use Symfony\Component\Validator\Constraints\Regex;
+
+class CustomRegex extends Regex
+{
+    public function __construct()
+    {
+        parent::__construct(pattern: '/^xxxxx$/');
+    }
+}