Merge branch '6.4' into 7.0

* 6.4: (32 commits)
  [Validator] Fix registering "is_valid()" for `#[Expression]`
  [Scheduler] Trigger unique messages at runtime
  [Scheduler] Fix CHANGELOG
  [Clock] Add `DatePoint`: an immutable DateTime implementation with stricter error handling and return types
  [Scheduler] Allow modifying the schedule at runtime and recalculate heap
  [Cache] Fix Redis6Proxy
  [Finder] Disable failing test about open_basedir
  Fix merge
  Fix merge
  Minor CS fixes
  Deprecate `Kernel::stripComments()`
  Remove setAccessible reflection call in tests
  [Notifier] Telegram Bridge add escaping for \
  [Component][AssertMapper] add type hint of an argument in asset mapper command
  [Translation] [Phrase] Refacto ReadConfig and WriteConfig into arrays
  [Routing] Fix routing collection defaults when adding a new route to a collection
  [Messenger] Fix cloned TraceableStack not unstacking the stack independently
  [Translation] Add `--as-tree` option  to `translation:pull` command
  [Mime] Allow to add some headers as a strings
  [Translation] Give current locale to locale switcher runWithLocale callback
  ...

Author: nicolas-grekas

Command/DebugCommand.php

@@ -165,11 +165,11 @@ private function getPropertyData(ClassMetadataInterface $classMetadata, string $
         foreach ($propertyMetadata as $metadata) {
             $autoMapingStrategy = 'Not supported';
             if ($metadata instanceof GenericMetadata) {
-                switch ($metadata->getAutoMappingStrategy()) {
-                    case AutoMappingStrategy::ENABLED: $autoMapingStrategy = 'Enabled'; break;
-                    case AutoMappingStrategy::DISABLED: $autoMapingStrategy = 'Disabled'; break;
-                    case AutoMappingStrategy::NONE: $autoMapingStrategy = 'None'; break;
-                }
+                $autoMapingStrategy = match ($metadata->getAutoMappingStrategy()) {
+                    AutoMappingStrategy::ENABLED => 'Enabled',
+                    AutoMappingStrategy::DISABLED => 'Disabled',
+                    AutoMappingStrategy::NONE => 'None',
+                };
             }
             $traversalStrategy = 'None';
             if (TraversalStrategy::TRAVERSE === $metadata->getTraversalStrategy()) {

Constraints/ExpressionLanguageProvider.php

@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Validator\Constraints;
+
+use Symfony\Component\ExpressionLanguage\ExpressionFunction;
+use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
+
+class ExpressionLanguageProvider implements ExpressionFunctionProviderInterface
+{
+    public function getFunctions(): array
+    {
+        return [
+            new ExpressionFunction('is_valid', function (...$arguments) {
+                return sprintf(
+                    '0 === $context->getValidator()->inContext($context)->validate(%s)->getViolations()->count()',
+                    implode(', ', $arguments)
+                );
+            }, function (array $variables, ...$arguments): bool {
+                return 0 === $variables['context']->getValidator()->inContext($variables['context'])->validate(...$arguments)->getViolations()->count();
+            }),
+        ];
+    }
+}

Constraints/ExpressionValidator.php

@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\Validator\Constraints;
 
-use Symfony\Component\ExpressionLanguage\ExpressionFunction;
-use Symfony\Component\ExpressionLanguage\ExpressionFunctionProviderInterface;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
@@ -22,15 +20,14 @@
  * @author Fabien Potencier <[email protected]>
  * @author Bernhard Schussek <[email protected]>
  */
-class ExpressionValidator extends ConstraintValidator implements ExpressionFunctionProviderInterface
+class ExpressionValidator extends ConstraintValidator
 {
     private ExpressionLanguage $expressionLanguage;
 
     public function __construct(ExpressionLanguage $expressionLanguage = null)
     {
         if ($expressionLanguage) {
-            $this->expressionLanguage = clone $expressionLanguage;
-            $this->expressionLanguage->registerProvider($this);
+            $this->expressionLanguage = $expressionLanguage;
         }
     }
 
@@ -53,25 +50,11 @@ public function validate(mixed $value, Constraint $constraint): void
         }
     }
 
-    public function getFunctions(): array
-    {
-        return [
-            new ExpressionFunction('is_valid', function (...$arguments) {
-                return sprintf(
-                    '0 === $context->getValidator()->inContext($context)->validate(%s)->getViolations()->count()',
-                    implode(', ', $arguments)
-                );
-            }, function (array $variables, ...$arguments): bool {
-                return 0 === $variables['context']->getValidator()->inContext($variables['context'])->validate(...$arguments)->getViolations()->count();
-            }),
-        ];
-    }
-
     private function getExpressionLanguage(): ExpressionLanguage
     {
         if (!isset($this->expressionLanguage)) {
             $this->expressionLanguage = new ExpressionLanguage();
-            $this->expressionLanguage->registerProvider($this);
+            $this->expressionLanguage->registerProvider(new ExpressionLanguageProvider());
         }
 
         return $this->expressionLanguage;

Tests/Constraints/ExpressionValidatorTest.php

@@ -13,6 +13,7 @@
 
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\Validator\Constraints\Expression;
+use Symfony\Component\Validator\Constraints\ExpressionLanguageProvider;
 use Symfony\Component\Validator\Constraints\ExpressionValidator;
 use Symfony\Component\Validator\Constraints\NotNull;
 use Symfony\Component\Validator\Constraints\Range;
@@ -359,10 +360,8 @@ public function testIsValidExpressionInvalid()
      */
     public function testCompileIsValid(string $expression, array $names, string $expected)
     {
-        $provider = new ExpressionValidator();
-
         $expressionLanguage = new ExpressionLanguage();
-        $expressionLanguage->registerProvider($provider);
+        $expressionLanguage->registerProvider(new ExpressionLanguageProvider());
 
         $result = $expressionLanguage->compile($expression, $names);
 

Tests/Mapping/Loader/YamlFileLoaderTest.php

@@ -21,12 +21,12 @@
 use Symfony\Component\Validator\Constraints\Range;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Mapping\Loader\YamlFileLoader;
-use Symfony\Component\Validator\Tests\Fixtures\NestedAttribute\Entity;
-use Symfony\Component\Validator\Tests\Fixtures\NestedAttribute\GroupSequenceProviderEntity;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintB;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintWithRequiredArgument;
 use Symfony\Component\Validator\Tests\Fixtures\Entity_81;
+use Symfony\Component\Validator\Tests\Fixtures\NestedAttribute\Entity;
+use Symfony\Component\Validator\Tests\Fixtures\NestedAttribute\GroupSequenceProviderEntity;
 
 class YamlFileLoaderTest extends TestCase
 {

Tests/Mapping/MemberMetadataTest.php

@@ -18,10 +18,10 @@
 use Symfony\Component\Validator\Constraints\Valid;
 use Symfony\Component\Validator\Exception\ConstraintDefinitionException;
 use Symfony\Component\Validator\Mapping\MemberMetadata;
-use Symfony\Component\Validator\Tests\Fixtures\NestedAttribute\Entity;
 use Symfony\Component\Validator\Tests\Fixtures\ClassConstraint;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintA;
 use Symfony\Component\Validator\Tests\Fixtures\ConstraintB;
+use Symfony\Component\Validator\Tests\Fixtures\NestedAttribute\Entity;
 use Symfony\Component\Validator\Tests\Fixtures\PropertyConstraint;
 
 class MemberMetadataTest extends TestCase

Tests/Mapping/PropertyMetadataTest.php

@@ -14,10 +14,10 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Validator\Exception\ValidatorException;
 use Symfony\Component\Validator\Mapping\PropertyMetadata;
-use Symfony\Component\Validator\Tests\Fixtures\NestedAttribute\Entity;
-use Symfony\Component\Validator\Tests\Fixtures\NestedAttribute\EntityParent;
 use Symfony\Component\Validator\Tests\Fixtures\Entity_74;
 use Symfony\Component\Validator\Tests\Fixtures\Entity_74_Proxy;
+use Symfony\Component\Validator\Tests\Fixtures\NestedAttribute\Entity;
+use Symfony\Component\Validator\Tests\Fixtures\NestedAttribute\EntityParent;
 
 class PropertyMetadataTest extends TestCase
 {

Tests/Validator/RecursiveValidatorTest.php

@@ -44,14 +44,14 @@
 use Symfony\Component\Validator\ObjectInitializerInterface;
 use Symfony\Component\Validator\Tests\Constraints\Fixtures\ChildA;
 use Symfony\Component\Validator\Tests\Constraints\Fixtures\ChildB;
-use Symfony\Component\Validator\Tests\Fixtures\NestedAttribute\Entity;
-use Symfony\Component\Validator\Tests\Fixtures\NestedAttribute\EntityParent;
-use Symfony\Component\Validator\Tests\Fixtures\NestedAttribute\GroupSequenceProviderEntity;
 use Symfony\Component\Validator\Tests\Fixtures\CascadedChild;
 use Symfony\Component\Validator\Tests\Fixtures\CascadingEntity;
 use Symfony\Component\Validator\Tests\Fixtures\EntityWithGroupedConstraintOnMethods;
 use Symfony\Component\Validator\Tests\Fixtures\FailingConstraint;
 use Symfony\Component\Validator\Tests\Fixtures\FakeMetadataFactory;
+use Symfony\Component\Validator\Tests\Fixtures\NestedAttribute\Entity;
+use Symfony\Component\Validator\Tests\Fixtures\NestedAttribute\EntityParent;
+use Symfony\Component\Validator\Tests\Fixtures\NestedAttribute\GroupSequenceProviderEntity;
 use Symfony\Component\Validator\Tests\Fixtures\Reference;
 use Symfony\Component\Validator\Validator\ContextualValidatorInterface;
 use Symfony\Component\Validator\Validator\LazyProperty;