Merge branch '4.3' into 4.4

* 4.3:
  [Security\Core] Make SodiumPasswordEncoder validate BCrypt-ed passwords
  [Validator] Fix TimezoneValidator default option
  [Messenger] Inject RoutableMessageBus instead of bus locator
  [DomCrawler] Fix type error with null Form::$currentUri
  [Contracts] Fixed typos
  do not enable validator auto mapping by default
  [HttpClient] remove unused argument

Author: Robin Chalas

Constraints/Timezone.php

@@ -43,7 +43,7 @@ class Timezone extends Constraint
     /**
      * {@inheritdoc}
      */
-    public function __construct(array $options = null)
+    public function __construct($options = null)
     {
         parent::__construct($options);
 
@@ -58,4 +58,12 @@ public function __construct(array $options = null)
             throw new ConstraintDefinitionException('The option "intlCompatible" can only be used when the PHP intl extension is available.');
         }
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getDefaultOption()
+    {
+        return 'zone';
+    }
 }

Constraints/TimezoneValidator.php

@@ -75,28 +75,6 @@ public function validate($value, Constraint $constraint)
               ->addViolation();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getDefaultOption()
-    {
-        return 'zone';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function formatValue($value, $format = 0)
-    {
-        $value = parent::formatValue($value, $format);
-
-        if (!$value || \DateTimeZone::PER_COUNTRY === $value) {
-            return $value;
-        }
-
-        return array_search($value, (new \ReflectionClass(\DateTimeZone::class))->getConstants(), true) ?: $value;
-    }
-
     private static function getPhpTimezones(int $zone, string $countryCode = null): array
     {
         if (null !== $countryCode) {

DependencyInjection/AddAutoMappingConfigurationPass.php

@@ -70,8 +70,12 @@ public function process(ContainerBuilder $container)
     /**
      * Builds a regexp to check if a class is auto-mapped.
      */
-    private function getRegexp(array $patterns): string
+    private function getRegexp(array $patterns): ?string
     {
+        if (!$patterns) {
+            return null;
+        }
+
         $regexps = [];
         foreach ($patterns as $pattern) {
             // Escape namespace

Tests/Constraints/TimezoneTest.php

@@ -23,7 +23,7 @@ public function testValidTimezoneConstraints()
     {
         new Timezone();
         new Timezone(['zone' => \DateTimeZone::ALL]);
-        new Timezone(['zone' => \DateTimeZone::ALL_WITH_BC]);
+        new Timezone(\DateTimeZone::ALL_WITH_BC);
         new Timezone([
             'zone' => \DateTimeZone::PER_COUNTRY,
             'countryCode' => 'AR',

Tests/Constraints/TimezoneValidatorTest.php

@@ -267,9 +267,7 @@ public function testGroupedTimezonesWithInvalidCountry()
      */
     public function testDeprecatedTimezonesAreValidWithBC(string $timezone)
     {
-        $constraint = new Timezone([
-            'zone' => \DateTimeZone::ALL_WITH_BC,
-        ]);
+        $constraint = new Timezone(\DateTimeZone::ALL_WITH_BC);
 
         $this->validator->validate($timezone, $constraint);
 

Tests/DependencyInjection/AddAutoMappingConfigurationPassTest.php

@@ -70,4 +70,17 @@ public function mappingProvider(): array
             ['Symfony\Component\Validator\Tests\Fixtures\\**', ['trailing_double_star'], '{^App\\\\|^Symfony\\\\Component\\\\Validator\\\\Tests\\\\Fixtures\\\\.*?$}'],
         ];
     }
+
+    public function testDoNotMapAllClassesWhenConfigIsEmpty()
+    {
+        $container = new ContainerBuilder();
+        $container->setParameter('validator.auto_mapping', []);
+
+        $container->register('validator.builder', ValidatorBuilder::class);
+        $container->register('loader')->addTag('validator.auto_mapper');
+
+        (new AddAutoMappingConfigurationPass())->process($container);
+
+        $this->assertNull($container->getDefinition('loader')->getArgument('$classValidatorRegexp'));
+    }
 }