Merge branch '5.4' into 6.0

chalasr · chalasr · commit 603289e5d17d · 2021-10-11T18:08:10.000+02:00
* 5.4:
  [Security][WIP] Add authenticators info to the profiler
  [Translation] Use symfony default locale when pulling translations from providers
  added missing translations for Bosnian (bs)
  Add the missing greek translations for security core and validator component
  [HttpKernel] Fix return types in `EventDataCollector`
  Do not call substr_count() if ip is null to avoid deprecation warning in PHP 8.1
  [Security][Validator] Add missing translations for Slovenian (sl)
  [Messenger] Add worker metadata inside logs
  [Messenger] Log when worker should stop and when `SIGTERM` is received
  cs fix
  [Security][Validator] Add missing translations for Finnish (fi)
  [VarDumper] returns a 500 when dd() is executed
  chore(VarDumper): declare that dd() never returns
  [MonologBridge] Deprecate the Swiftmailer handler
  [Cache] Commit items implicitly only when deferred keys are requested
  [MonologBridge] Deprecates ResetLoggersWorkerSubscriber
  Fix "can not" spelling
  [HttpClient] fix missing kernel.reset tag on TraceableHttpClient services
  [Form] Fix ChoiceType Extension to effectively set and use the translator
  Added new CssColor constraint
diff --git a/AbstractExtension.php b/AbstractExtension.php
@@ -53,7 +53,7 @@ public function getType(string $name): FormTypeInterface
         }
 
         if (!isset($this->types[$name])) {
-            throw new InvalidArgumentException(sprintf('The type "%s" can not be loaded by this extension.', $name));
+            throw new InvalidArgumentException(sprintf('The type "%s" cannot be loaded by this extension.', $name));
         }
 
         return $this->types[$name];
diff --git a/Extension/Core/CoreExtension.php b/Extension/Core/CoreExtension.php
@@ -45,7 +45,7 @@ protected function loadTypes(): array
             new Type\FormType($this->propertyAccessor),
             new Type\BirthdayType(),
             new Type\CheckboxType(),
-            new Type\ChoiceType($this->choiceListFactory),
+            new Type\ChoiceType($this->choiceListFactory, $this->translator),
             new Type\CollectionType(),
             new Type\CountryType(),
             new Type\DateIntervalType(),
diff --git a/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php b/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
@@ -159,7 +159,7 @@ public function reverseTransform(mixed $value): ?\DateTime
      *
      * @param bool $ignoreTimezone Use UTC regardless of the configured timezone
      *
-     * @throws TransformationFailedException in case the date formatter can not be constructed
+     * @throws TransformationFailedException in case the date formatter cannot be constructed
      */
     protected function getIntlDateFormatter(bool $ignoreTimezone = false): \IntlDateFormatter
     {
diff --git a/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php b/Extension/Core/DataTransformer/MoneyToLocalizedStringTransformer.php
@@ -36,7 +36,7 @@ public function __construct(?int $scale = 2, ?bool $grouping = true, ?int $round
      * @param int|float|null $value Normalized number
      *
      * @throws TransformationFailedException if the given value is not numeric or
-     *                                       if the value can not be transformed
+     *                                       if the value cannot be transformed
      */
     public function transform(mixed $value): string
     {
@@ -56,7 +56,7 @@ public function transform(mixed $value): string
      * @param string $value Localized money string
      *
      * @throws TransformationFailedException if the given value is not a string
-     *                                       or if the value can not be transformed
+     *                                       or if the value cannot be transformed
      */
     public function reverseTransform(mixed $value): int|float|null
     {
diff --git a/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php b/Extension/Core/DataTransformer/NumberToLocalizedStringTransformer.php
@@ -44,7 +44,7 @@ public function __construct(int $scale = null, ?bool $grouping = false, ?int $ro
      * @param int|float|null $value Number value
      *
      * @throws TransformationFailedException if the given value is not numeric
-     *                                       or if the value can not be transformed
+     *                                       or if the value cannot be transformed
      */
     public function transform(mixed $value): string
     {
@@ -75,7 +75,7 @@ public function transform(mixed $value): string
      * @param string $value The localized value
      *
      * @throws TransformationFailedException if the given value is not a string
-     *                                       or if the value can not be transformed
+     *                                       or if the value cannot be transformed
      */
     public function reverseTransform(mixed $value): int|float|null
     {
diff --git a/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php b/Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php
@@ -44,7 +44,7 @@ public function transform(mixed $value): array
      * Extracts the duplicated value from an array.
      *
      * @throws TransformationFailedException if the given value is not an array or
-     *                                       if the given array can not be transformed
+     *                                       if the given array cannot be transformed
      */
     public function reverseTransform(mixed $array): mixed
     {
diff --git a/Extension/Core/DataTransformer/WeekToArrayTransformer.php b/Extension/Core/DataTransformer/WeekToArrayTransformer.php
@@ -58,7 +58,7 @@ public function transform(mixed $value): array
      *
      * @return string|null A week date string following the format Y-\WW
      *
-     * @throws TransformationFailedException If the given value can not be merged in a valid week date string,
+     * @throws TransformationFailedException If the given value cannot be merged in a valid week date string,
      *                                       or if the obtained week date does not exists
      */
     public function reverseTransform(mixed $value): ?string
diff --git a/Extension/Core/Type/DateIntervalType.php b/Extension/Core/Type/DateIntervalType.php
@@ -55,7 +55,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             throw new InvalidConfigurationException('The single_text widget does not support invertible intervals.');
         }
         if ($options['with_weeks'] && $options['with_days']) {
-            throw new InvalidConfigurationException('You can not enable weeks and days fields together.');
+            throw new InvalidConfigurationException('You cannot enable weeks and days fields together.');
         }
         $format = 'P';
         $parts = [];
diff --git a/Extension/Core/Type/TimeType.php b/Extension/Core/Type/TimeType.php
@@ -43,7 +43,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $format = 'H';
 
         if ($options['with_seconds'] && !$options['with_minutes']) {
-            throw new InvalidConfigurationException('You can not disable minutes if you have enabled seconds.');
+            throw new InvalidConfigurationException('You cannot disable minutes if you have enabled seconds.');
         }
 
         if (null !== $options['reference_date'] && $options['reference_date']->getTimezone()->getName() !== $options['model_timezone']) {
diff --git a/FormRegistryInterface.php b/FormRegistryInterface.php
@@ -23,7 +23,7 @@ interface FormRegistryInterface
      *
      * This methods registers the type extensions from the form extensions.
      *
-     * @throws Exception\InvalidArgumentException if the type can not be retrieved from any extension
+     * @throws Exception\InvalidArgumentException if the type cannot be retrieved from any extension
      */
     public function getType(string $name): ResolvedFormTypeInterface;
 
diff --git a/PreloadedExtension.php b/PreloadedExtension.php
@@ -46,7 +46,7 @@ public function __construct(array $types, array $typeExtensions, FormTypeGuesser
     public function getType(string $name): FormTypeInterface
     {
         if (!isset($this->types[$name])) {
-            throw new InvalidArgumentException(sprintf('The type "%s" can not be loaded by this extension.', $name));
+            throw new InvalidArgumentException(sprintf('The type "%s" cannot be loaded by this extension.', $name));
         }
 
         return $this->types[$name];
diff --git a/ResolvedFormTypeFactoryInterface.php b/ResolvedFormTypeFactoryInterface.php
@@ -28,7 +28,7 @@ interface ResolvedFormTypeFactoryInterface
      * @param FormTypeExtensionInterface[] $typeExtensions
      *
      * @throws Exception\UnexpectedTypeException  if the types parent {@link FormTypeInterface::getParent()} is not a string
-     * @throws Exception\InvalidArgumentException if the types parent can not be retrieved from any extension
+     * @throws Exception\InvalidArgumentException if the types parent cannot be retrieved from any extension
      */
     public function createResolvedType(FormTypeInterface $type, array $typeExtensions, ResolvedFormTypeInterface $parent = null): ResolvedFormTypeInterface;
 }
diff --git a/Tests/Extension/Core/Type/ChoiceTypeTranslationTest.php b/Tests/Extension/Core/Type/ChoiceTypeTranslationTest.php
@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Form\Tests\Extension\Core\Type;
+
+use Symfony\Component\Form\Extension\Core\CoreExtension;
+use Symfony\Component\Form\Test\TypeTestCase;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+class ChoiceTypeTranslationTest extends TypeTestCase
+{
+    public const TESTED_TYPE = 'Symfony\Component\Form\Extension\Core\Type\ChoiceType';
+
+    private $choices = [
+        'Bernhard' => 'a',
+        'Fabien' => 'b',
+        'Kris' => 'c',
+        'Jon' => 'd',
+        'Roman' => 'e',
+    ];
+
+    protected function getExtensions()
+    {
+        $translator = $this->createMock(TranslatorInterface::class);
+        $translator->expects($this->any())->method('trans')
+            ->willReturnCallback(function ($key, $params) {
+                return strtr(sprintf('Translation of: %s', $key), $params);
+            }
+        );
+
+        return array_merge(parent::getExtensions(), [new CoreExtension(null, null, $translator)]);
+    }
+
+    public function testInvalidMessageAwarenessForMultiple()
+    {
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
+            'multiple' => true,
+            'expanded' => false,
+            'choices' => $this->choices,
+            'invalid_message' => 'You are not able to use value "{{ value }}"',
+        ]);
+
+        $form->submit(['My invalid choice']);
+        $this->assertEquals(
+            "ERROR: Translation of: You are not able to use value \"My invalid choice\"\n",
+            (string) $form->getErrors(true)
+        );
+    }
+
+    public function testInvalidMessageAwarenessForMultipleWithoutScalarOrArrayViewData()
+    {
+        $form = $this->factory->create(static::TESTED_TYPE, null, [
+            'multiple' => true,
+            'expanded' => false,
+            'choices' => $this->choices,
+            'invalid_message' => 'You are not able to use value "{{ value }}"',
+        ]);
+
+        $form->submit(new \stdClass());
+        $this->assertEquals(
+            "ERROR: Translation of: You are not able to use value \"stdClass\"\n",
+            (string) $form->getErrors(true)
+        );
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function getType(string $name): FormTypeInterface`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`if (!isset($this->types[$name])) {`
`56`		`- throw new InvalidArgumentException(sprintf('The type "%s" can not be loaded by this extension.', $name));`
	`56`	`+ throw new InvalidArgumentException(sprintf('The type "%s" cannot be loaded by this extension.', $name));`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`return $this->types[$name];`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ public function reverseTransform(mixed $value): ?\DateTime`
`159`	`159`	`*`
`160`	`160`	`* @param bool $ignoreTimezone Use UTC regardless of the configured timezone`
`161`	`161`	`*`
`162`		`- * @throws TransformationFailedException in case the date formatter can not be constructed`
	`162`	`+ * @throws TransformationFailedException in case the date formatter cannot be constructed`
`163`	`163`	`*/`
`164`	`164`	`protected function getIntlDateFormatter(bool $ignoreTimezone = false): \IntlDateFormatter`
`165`	`165`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function __construct(?int $scale = 2, ?bool $grouping = true, ?int $round`
`36`	`36`	`* @param int\|float\|null $value Normalized number`
`37`	`37`	`*`
`38`	`38`	`* @throws TransformationFailedException if the given value is not numeric or`
`39`		`- * if the value can not be transformed`
	`39`	`+ * if the value cannot be transformed`
`40`	`40`	`*/`
`41`	`41`	`public function transform(mixed $value): string`
`42`	`42`	`{`
`@@ -56,7 +56,7 @@ public function transform(mixed $value): string`
`56`	`56`	`* @param string $value Localized money string`
`57`	`57`	`*`
`58`	`58`	`* @throws TransformationFailedException if the given value is not a string`
`59`		`- * or if the value can not be transformed`
	`59`	`+ * or if the value cannot be transformed`
`60`	`60`	`*/`
`61`	`61`	`public function reverseTransform(mixed $value): int\|float\|null`
`62`	`62`	`{`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function __construct(int $scale = null, ?bool $grouping = false, ?int $ro`
`44`	`44`	`* @param int\|float\|null $value Number value`
`45`	`45`	`*`
`46`	`46`	`* @throws TransformationFailedException if the given value is not numeric`
`47`		`- * or if the value can not be transformed`
	`47`	`+ * or if the value cannot be transformed`
`48`	`48`	`*/`
`49`	`49`	`public function transform(mixed $value): string`
`50`	`50`	`{`
`@@ -75,7 +75,7 @@ public function transform(mixed $value): string`
`75`	`75`	`* @param string $value The localized value`
`76`	`76`	`*`
`77`	`77`	`* @throws TransformationFailedException if the given value is not a string`
`78`		`- * or if the value can not be transformed`
	`78`	`+ * or if the value cannot be transformed`
`79`	`79`	`*/`
`80`	`80`	`public function reverseTransform(mixed $value): int\|float\|null`
`81`	`81`	`{`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function transform(mixed $value): array`
`44`	`44`	`* Extracts the duplicated value from an array.`
`45`	`45`	`*`
`46`	`46`	`* @throws TransformationFailedException if the given value is not an array or`
`47`		`- * if the given array can not be transformed`
	`47`	`+ * if the given array cannot be transformed`
`48`	`48`	`*/`
`49`	`49`	`public function reverseTransform(mixed $array): mixed`
`50`	`50`	`{`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public function transform(mixed $value): array`
`58`	`58`	`*`
`59`	`59`	`* @return string\|null A week date string following the format Y-\WW`
`60`	`60`	`*`
`61`		`- * @throws TransformationFailedException If the given value can not be merged in a valid week date string,`
	`61`	`+ * @throws TransformationFailedException If the given value cannot be merged in a valid week date string,`
`62`	`62`	`* or if the obtained week date does not exists`
`63`	`63`	`*/`
`64`	`64`	`public function reverseTransform(mixed $value): ?string`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)`
`55`	`55`	`throw new InvalidConfigurationException('The single_text widget does not support invertible intervals.');`
`56`	`56`	`}`
`57`	`57`	`if ($options['with_weeks'] && $options['with_days']) {`
`58`		`- throw new InvalidConfigurationException('You can not enable weeks and days fields together.');`
	`58`	`+ throw new InvalidConfigurationException('You cannot enable weeks and days fields together.');`
`59`	`59`	`}`
`60`	`60`	`$format = 'P';`
`61`	`61`	`$parts = [];`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)`
`43`	`43`	`$format = 'H';`
`44`	`44`
`45`	`45`	`if ($options['with_seconds'] && !$options['with_minutes']) {`
`46`		`- throw new InvalidConfigurationException('You can not disable minutes if you have enabled seconds.');`
	`46`	`+ throw new InvalidConfigurationException('You cannot disable minutes if you have enabled seconds.');`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`if (null !== $options['reference_date'] && $options['reference_date']->getTimezone()->getName() !== $options['model_timezone']) {`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ interface FormRegistryInterface`
`23`	`23`	`*`
`24`	`24`	`* This methods registers the type extensions from the form extensions.`
`25`	`25`	`*`
`26`		`- * @throws Exception\InvalidArgumentException if the type can not be retrieved from any extension`
	`26`	`+ * @throws Exception\InvalidArgumentException if the type cannot be retrieved from any extension`
`27`	`27`	`*/`
`28`	`28`	`public function getType(string $name): ResolvedFormTypeInterface;`
`29`	`29`