Merge branch '4.4' into 5.0

* 4.4:
  [Validator] Fix auto-mapping constraints should not be validated
  [Debug] Updated the README to deprecate the component
  [Cache] fix memory leak when using PhpFilesAdapter
  [Yaml] Implement multiline string as scalar block for tagged values
  [HttpFoundation] Use `Cache-Control: must-revalidate` only if explicit lifetime has been given
  [FrameworkBundle] Use UserInterface to @return in getUser method
  [CI] Replace php7.4snapshot with php7.4 in Travis configuration
  [ExpressionLanguage][Node][BinaryNode] Process division by zero
  Fixing bad order of operations with null coalescing operator
  forward caught exception
  [Validator][ConstraintValidator] Stop passing unnecessary timezone argument to \DateTime
  add tags before processing them
  [FrameworkBundle][ContainerLintCommand] Reinitialize bundles when the container is reprepared
  [Process] change the syntax of portable prepared command lines
  [MonologBridge] Fix debug processor datetime type

Author: nicolas-grekas

Tests/Validator/DoctrineLoaderTest.php

@@ -21,11 +21,12 @@
 use Symfony\Bridge\Doctrine\Tests\Fixtures\DoctrineLoaderParentEntity;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use Symfony\Bridge\Doctrine\Validator\DoctrineLoader;
-use Symfony\Component\Validator\Constraints\DisableAutoMapping;
 use Symfony\Component\Validator\Constraints\Length;
+use Symfony\Component\Validator\Mapping\AutoMappingStrategy;
 use Symfony\Component\Validator\Mapping\CascadingStrategy;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Mapping\Loader\AutoMappingTrait;
+use Symfony\Component\Validator\Mapping\PropertyMetadata;
 use Symfony\Component\Validator\Mapping\TraversalStrategy;
 use Symfony\Component\Validator\Tests\Fixtures\Entity;
 use Symfony\Component\Validator\Validation;
@@ -140,11 +141,12 @@ public function testLoadClassMetadata()
         $this->assertInstanceOf(Length::class, $textFieldConstraints[0]);
         $this->assertSame(1000, $textFieldConstraints[0]->max);
 
+        /** @var PropertyMetadata[] $noAutoMappingMetadata */
         $noAutoMappingMetadata = $classMetadata->getPropertyMetadata('noAutoMapping');
         $this->assertCount(1, $noAutoMappingMetadata);
         $noAutoMappingConstraints = $noAutoMappingMetadata[0]->getConstraints();
-        $this->assertCount(1, $noAutoMappingConstraints);
-        $this->assertInstanceOf(DisableAutoMapping::class, $noAutoMappingConstraints[0]);
+        $this->assertCount(0, $noAutoMappingConstraints);
+        $this->assertSame(AutoMappingStrategy::DISABLED, $noAutoMappingMetadata[0]->getAutoMappingStrategy());
     }
 
     public function testFieldMappingsConfiguration()
@@ -205,13 +207,15 @@ public function testClassNoAutoMapping()
         $classMetadata = $validator->getMetadataFor(new DoctrineLoaderNoAutoMappingEntity());
 
         $classConstraints = $classMetadata->getConstraints();
-        $this->assertCount(1, $classConstraints);
-        $this->assertInstanceOf(DisableAutoMapping::class, $classConstraints[0]);
+        $this->assertCount(0, $classConstraints);
+        $this->assertSame(AutoMappingStrategy::DISABLED, $classMetadata->getAutoMappingStrategy());
 
         $maxLengthMetadata = $classMetadata->getPropertyMetadata('maxLength');
         $this->assertEmpty($maxLengthMetadata);
 
+        /** @var PropertyMetadata[] $autoMappingExplicitlyEnabledMetadata */
         $autoMappingExplicitlyEnabledMetadata = $classMetadata->getPropertyMetadata('autoMappingExplicitlyEnabled');
-        $this->assertCount(2, $autoMappingExplicitlyEnabledMetadata[0]->constraints);
+        $this->assertCount(1, $autoMappingExplicitlyEnabledMetadata[0]->constraints);
+        $this->assertSame(AutoMappingStrategy::ENABLED, $autoMappingExplicitlyEnabledMetadata[0]->getAutoMappingStrategy());
     }
 }

Validator/DoctrineLoader.php

@@ -16,10 +16,9 @@
 use Doctrine\ORM\Mapping\ClassMetadataInfo;
 use Doctrine\ORM\Mapping\MappingException as OrmMappingException;
 use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
-use Symfony\Component\Validator\Constraints\DisableAutoMapping;
-use Symfony\Component\Validator\Constraints\EnableAutoMapping;
 use Symfony\Component\Validator\Constraints\Length;
 use Symfony\Component\Validator\Constraints\Valid;
+use Symfony\Component\Validator\Mapping\AutoMappingStrategy;
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Symfony\Component\Validator\Mapping\Loader\AutoMappingTrait;
 use Symfony\Component\Validator\Mapping\Loader\LoaderInterface;
@@ -76,13 +75,16 @@ public function loadClassMetadata(ClassMetadata $metadata): bool
             $enabledForProperty = $enabledForClass;
             $lengthConstraint = null;
             foreach ($metadata->getPropertyMetadata($mapping['fieldName']) as $propertyMetadata) {
+                // Enabling or disabling auto-mapping explicitly always takes precedence
+                if (AutoMappingStrategy::DISABLED === $propertyMetadata->getAutoMappingStrategy()) {
+                    continue 2;
+                }
+                if (AutoMappingStrategy::ENABLED === $propertyMetadata->getAutoMappingStrategy()) {
+                    $enabledForProperty = true;
+                }
+
                 foreach ($propertyMetadata->getConstraints() as $constraint) {
-                    // Enabling or disabling auto-mapping explicitly always takes precedence
-                    if ($constraint instanceof DisableAutoMapping) {
-                        continue 3;
-                    } elseif ($constraint instanceof EnableAutoMapping) {
-                        $enabledForProperty = true;
-                    } elseif ($constraint instanceof Length) {
+                    if ($constraint instanceof Length) {
                         $lengthConstraint = $constraint;
                     }
                 }

composer.json

@@ -35,7 +35,7 @@
         "symfony/proxy-manager-bridge": "^4.4|^5.0",
         "symfony/security-core": "^5.0",
         "symfony/expression-language": "^4.4|^5.0",
-        "symfony/validator": "^5.0",
+        "symfony/validator": "^5.0.1",
         "symfony/translation": "^4.4|^5.0",
         "symfony/var-dumper": "^4.4|^5.0",
         "doctrine/annotations": "~1.7",
@@ -55,7 +55,7 @@
         "symfony/property-info": "<5",
         "symfony/security-bundle": "<5",
         "symfony/security-core": "<5",
-        "symfony/validator": "<5"
+        "symfony/validator": "<5.0.1"
     },
     "suggest": {
         "symfony/form": "",