Merge branch '5.0'

* 5.0:
  [DI] Service locators can't be decorated
  [HttpClient] force HTTP/1.1 when NTLM auth is used
  [Validation][FrameworkBundle] Allow EnableAutoMapping to work without auto-mapping namespaces
  [Console][SymfonyQuestionHelper] Handle multibytes question choices keys and custom prompt
  [DI] fix auto-binding service providers to their service subscribers
  [Mailer] fixed undefined index when sending mail

Author: nicolas-grekas

CHANGELOG.md

@@ -21,19 +21,20 @@ CHANGELOG
 4.4.0
 -----
 
- * added `EnableAutoMapping` and `DisableAutoMapping` constraints to enable or disable auto mapping for class or a property 
+ * [BC BREAK] using null as `$classValidatorRegexp` value in `PropertyInfoLoader::__construct` will not enable auto-mapping for all classes anymore, use `'{.*}'` instead.
+ * added `EnableAutoMapping` and `DisableAutoMapping` constraints to enable or disable auto mapping for class or a property
  * using anything else than a `string` as the code of a `ConstraintViolation` is deprecated, a `string` type-hint will
    be added to the constructor of the `ConstraintViolation` class and to the `ConstraintViolationBuilder::setCode()`
    method in 5.0
  * deprecated passing an `ExpressionLanguage` instance as the second argument of `ExpressionValidator::__construct()`. Pass it as the first argument instead.
- * added the `compared_value_path` parameter in violations when using any 
+ * added the `compared_value_path` parameter in violations when using any
    comparison constraint with the `propertyPath` option.
  * added support for checking an array of types in `TypeValidator`
  * added a new `allowEmptyString` option to the `Length` constraint to allow rejecting empty strings when `min` is set, by setting it to `false`.
  * Added new `minPropertyPath` and `maxPropertyPath` options
    to `Range` constraint in order to get the value to compare
    from an array or object
- * added the `min_limit_path` and `max_limit_path` parameters in violations when using 
+ * added the `min_limit_path` and `max_limit_path` parameters in violations when using
    `Range` constraint with respectively the `minPropertyPath` and
    `maxPropertyPath` options
  * added a new `notInRangeMessage` option to the `Range` constraint that will

DependencyInjection/AddAutoMappingConfigurationPass.php

@@ -59,13 +59,8 @@ public function process(ContainerBuilder $container)
         $validatorBuilder = $container->getDefinition($this->validatorBuilderService);
         foreach ($container->findTaggedServiceIds($this->tag) as $id => $tags) {
             $regexp = $this->getRegexp(array_merge($globalNamespaces, $servicesToNamespaces[$id] ?? []));
-            if (null === $regexp) {
-                $container->removeDefinition($id);
-                continue;
-            }
-
-            $container->getDefinition($id)->setArgument('$classValidatorRegexp', $regexp);
             $validatorBuilder->addMethodCall('addLoader', [new Reference($id)]);
+            $container->getDefinition($id)->setArgument('$classValidatorRegexp', $regexp);
         }
 
         $container->getParameterBag()->remove('validator.auto_mapping');

Mapping/Loader/AutoMappingTrait.php

@@ -29,6 +29,6 @@ private function isAutoMappingEnabledForClass(ClassMetadata $metadata, string $c
         }
 
         // Fallback on the config
-        return null === $classValidatorRegexp || preg_match($classValidatorRegexp, $metadata->getClassName());
+        return null !== $classValidatorRegexp && preg_match($classValidatorRegexp, $metadata->getClassName());
     }
 }

Tests/DependencyInjection/AddAutoMappingConfigurationPassTest.php

@@ -81,6 +81,6 @@ public function testDoNotMapAllClassesWhenConfigIsEmpty()
 
         (new AddAutoMappingConfigurationPass())->process($container);
 
-        $this->assertFalse($container->hasDefinition('loader'));
+        $this->assertNull($container->getDefinition('loader')->getArguments()['$classValidatorRegexp'] ?? null);
     }
 }

Tests/Mapping/Loader/PropertyInfoLoaderTest.php

@@ -86,7 +86,7 @@ public function testLoadClassMetadata()
             ))
         ;
 
-        $propertyInfoLoader = new PropertyInfoLoader($propertyInfoStub, $propertyInfoStub, $propertyInfoStub);
+        $propertyInfoLoader = new PropertyInfoLoader($propertyInfoStub, $propertyInfoStub, $propertyInfoStub, '{.*}');
 
         $validator = Validation::createValidatorBuilder()
             ->enableAnnotationMapping()
@@ -197,7 +197,8 @@ public function testClassValidator(bool $expected, string $classValidatorRegexp
     public function regexpProvider()
     {
         return [
-            [true, null],
+            [false, null],
+            [true, '{.*}'],
             [true, '{^'.preg_quote(PropertyInfoLoaderEntity::class).'$|^'.preg_quote(Entity::class).'$}'],
             [false, '{^'.preg_quote(Entity::class).'$}'],
         ];
@@ -217,7 +218,7 @@ public function testClassNoAutoMapping()
                 [new Type(Type::BUILTIN_TYPE_BOOL)]
             );
 
-        $propertyInfoLoader = new PropertyInfoLoader($propertyInfoStub, $propertyInfoStub, $propertyInfoStub);
+        $propertyInfoLoader = new PropertyInfoLoader($propertyInfoStub, $propertyInfoStub, $propertyInfoStub, '{.*}');
         $validator = Validation::createValidatorBuilder()
             ->enableAnnotationMapping()
             ->addLoader($propertyInfoLoader)