Merge branch '4.4' into 5.0

* 4.4:
  [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

@@ -12,6 +12,7 @@ CHANGELOG
 4.4.0
 -----
 
+ * [BC BREAK] using null as `$classValidatorRegexp` value in `DoctrineLoader::__construct` will not enable auto-mapping for all classes anymore, use `'{.*}'` instead.
  * added `DoctrineClearEntityManagerWorkerSubscriber`
  * deprecated `RegistryInterface`, use `Doctrine\Persistence\ManagerRegistry`
  * added support for invokable event listeners

Tests/Validator/DoctrineLoaderTest.php

@@ -30,7 +30,6 @@
 use Symfony\Component\Validator\Mapping\TraversalStrategy;
 use Symfony\Component\Validator\Tests\Fixtures\Entity;
 use Symfony\Component\Validator\Validation;
-use Symfony\Component\Validator\ValidatorBuilder;
 
 /**
  * @author Kévin Dunglas <[email protected]>
@@ -151,10 +150,6 @@ public function testLoadClassMetadata()
 
     public function testFieldMappingsConfiguration()
     {
-        if (!method_exists(ValidatorBuilder::class, 'addLoader')) {
-            $this->markTestSkipped('Auto-mapping requires symfony/validation 4.2+');
-        }
-
         $validator = Validation::createValidatorBuilder()
             ->enableAnnotationMapping()
             ->addXmlMappings([__DIR__.'/../Resources/validator/BaseUser.xml'])
@@ -178,7 +173,7 @@ public function testFieldMappingsConfiguration()
      */
     public function testClassValidator(bool $expected, string $classValidatorRegexp = null)
     {
-        $doctrineLoader = new DoctrineLoader(DoctrineTestHelper::createTestEntityManager(), $classValidatorRegexp);
+        $doctrineLoader = new DoctrineLoader(DoctrineTestHelper::createTestEntityManager(), $classValidatorRegexp, false);
 
         $classMetadata = new ClassMetadata(DoctrineLoaderEntity::class);
         $this->assertSame($expected, $doctrineLoader->loadClassMetadata($classMetadata));
@@ -187,21 +182,18 @@ public function testClassValidator(bool $expected, string $classValidatorRegexp
     public function regexpProvider()
     {
         return [
-            [true, null],
+            [false, null],
+            [true, '{.*}'],
             [true, '{^'.preg_quote(DoctrineLoaderEntity::class).'$|^'.preg_quote(Entity::class).'$}'],
             [false, '{^'.preg_quote(Entity::class).'$}'],
         ];
     }
 
     public function testClassNoAutoMapping()
     {
-        if (!method_exists(ValidatorBuilder::class, 'addLoader')) {
-            $this->markTestSkipped('Auto-mapping requires symfony/validation 4.2+');
-        }
-
         $validator = Validation::createValidatorBuilder()
             ->enableAnnotationMapping()
-            ->addLoader(new DoctrineLoader(DoctrineTestHelper::createTestEntityManager()))
+            ->addLoader(new DoctrineLoader(DoctrineTestHelper::createTestEntityManager(), '{.*}'))
             ->getValidator();
 
         $classMetadata = $validator->getMetadataFor(new DoctrineLoaderNoAutoMappingEntity());