Merge branch '4.4' into 5.4

nicolas-grekas · nicolas-grekas · commit 29c4337eabcf · 2022-06-27T18:58:25.000+02:00
* 4.4:
  CS fixes
  Bump Symfony version to 4.4.44
  Update VERSION for 4.4.43
  Update CONTRIBUTORS for 4.4.43
  Update CHANGELOG for 4.4.43
diff --git a/ChoiceList/ArrayChoiceList.php b/ChoiceList/ArrayChoiceList.php
@@ -219,7 +219,7 @@ private function castableToString(array $choices, array &$cache = []): bool
                 }
 
                 continue;
-            } elseif (!is_scalar($choice)) {
+            } elseif (!\is_scalar($choice)) {
                 return false;
             }
 
diff --git a/ChoiceList/Loader/FilterChoiceLoaderDecorator.php b/ChoiceList/Loader/FilterChoiceLoaderDecorator.php
@@ -36,7 +36,7 @@ protected function loadChoices(): iterable
         }
 
         foreach ($structuredValues as $group => $values) {
-            if (is_array($values)) {
+            if (\is_array($values)) {
                 if ($values && $filtered = array_filter($list->getChoicesForValues($values), $this->filter)) {
                     $choices[$group] = $filtered;
                 }
diff --git a/Extension/Core/EventListener/TransformationFailureListener.php b/Extension/Core/EventListener/TransformationFailureListener.php
@@ -50,7 +50,7 @@ public function convertTransformationFailureToFormError(FormEvent $event)
             }
         }
 
-        $clientDataAsString = is_scalar($form->getViewData()) ? (string) $form->getViewData() : get_debug_type($form->getViewData());
+        $clientDataAsString = \is_scalar($form->getViewData()) ? (string) $form->getViewData() : get_debug_type($form->getViewData());
         $messageTemplate = $form->getConfig()->getOption('invalid_message', 'The value {{ value }} is not valid.');
         $messageParameters = array_replace(['{{ value }}' => $clientDataAsString], $form->getConfig()->getOption('invalid_message_parameters', []));
 
diff --git a/Extension/Core/Type/ChoiceType.php b/Extension/Core/Type/ChoiceType.php
@@ -194,7 +194,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 if (\count($unknownValues) > 0) {
                     $form = $event->getForm();
 
-                    $clientDataAsString = is_scalar($form->getViewData()) ? (string) $form->getViewData() : (\is_array($form->getViewData()) ? implode('", "', array_keys($unknownValues)) : \gettype($form->getViewData()));
+                    $clientDataAsString = \is_scalar($form->getViewData()) ? (string) $form->getViewData() : (\is_array($form->getViewData()) ? implode('", "', array_keys($unknownValues)) : \gettype($form->getViewData()));
 
                     if (null !== $this->translator) {
                         $message = $this->translator->trans($messageTemplate, ['{{ value }}' => $clientDataAsString], 'validators');
diff --git a/Extension/Core/Type/ColorType.php b/Extension/Core/Type/ColorType.php
@@ -55,7 +55,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
             $messageTemplate = 'This value is not a valid HTML5 color.';
             $messageParameters = [
-                '{{ value }}' => is_scalar($value) ? (string) $value : \gettype($value),
+                '{{ value }}' => \is_scalar($value) ? (string) $value : \gettype($value),
             ];
             $message = $this->translator ? $this->translator->trans($messageTemplate, $messageParameters, 'validators') : $messageTemplate;
 
diff --git a/Extension/Core/Type/FileType.php b/Extension/Core/Type/FileType.php
@@ -181,7 +181,7 @@ private function getFileUploadError(int $errorCode)
      */
     private static function getMaxFilesize()
     {
-        $iniMax = strtolower(ini_get('upload_max_filesize'));
+        $iniMax = strtolower(\ini_get('upload_max_filesize'));
 
         if ('' === $iniMax) {
             return \PHP_INT_MAX;
diff --git a/Extension/Validator/Constraints/FormValidator.php b/Extension/Validator/Constraints/FormValidator.php
@@ -171,7 +171,7 @@ public function validate($form, Constraint $formConstraint)
             // child.
             // See also https://github.com/symfony/symfony/issues/4359
             if ($childrenSynchronized) {
-                $clientDataAsString = is_scalar($form->getViewData())
+                $clientDataAsString = \is_scalar($form->getViewData())
                     ? (string) $form->getViewData()
                     : get_debug_type($form->getViewData());
 
diff --git a/Form.php b/Form.php
@@ -356,7 +356,7 @@ public function setData($modelData)
         }
 
         // Treat data as strings unless a transformer exists
-        if (is_scalar($modelData) && !$this->config->getViewTransformers() && !$this->config->getModelTransformers()) {
+        if (\is_scalar($modelData) && !$this->config->getViewTransformers() && !$this->config->getModelTransformers()) {
             $modelData = (string) $modelData;
         }
 
@@ -539,7 +539,7 @@ public function submit($submittedData, bool $clearMissing = true)
         // and radio buttons with empty values.
         if (false === $submittedData) {
             $submittedData = null;
-        } elseif (is_scalar($submittedData)) {
+        } elseif (\is_scalar($submittedData)) {
             $submittedData = (string) $submittedData;
         } elseif ($this->config->getRequestHandler()->isFileUpload($submittedData)) {
             if (!$this->config->getOption('allow_file_upload')) {
@@ -1154,7 +1154,7 @@ private function normToView($value)
         // compound forms is passed to the data mapper and thus should
         // not be converted to a string before.
         if (!($transformers = $this->config->getViewTransformers()) && !$this->config->getCompound()) {
-            return null === $value || is_scalar($value) ? (string) $value : $value;
+            return null === $value || \is_scalar($value) ? (string) $value : $value;
         }
 
         try {
diff --git a/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php b/Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php
@@ -285,12 +285,12 @@ public function testCreateViewFlat()
         $view = $this->factory->createView($this->list);
 
         $this->assertEquals(new ChoiceListView(
-                [
-                    0 => new ChoiceView($this->obj1, '0', 'A'),
-                    1 => new ChoiceView($this->obj2, '1', 'B'),
-                    2 => new ChoiceView($this->obj3, '2', 'C'),
-                    3 => new ChoiceView($this->obj4, '3', 'D'),
-                ], []
+            [
+                0 => new ChoiceView($this->obj1, '0', 'A'),
+                1 => new ChoiceView($this->obj2, '1', 'B'),
+                2 => new ChoiceView($this->obj3, '2', 'C'),
+                3 => new ChoiceView($this->obj4, '3', 'D'),
+            ], []
         ), $view);
     }
 
@@ -365,12 +365,12 @@ public function testCreateViewFlatPreferredChoicesEmptyArray()
         );
 
         $this->assertEquals(new ChoiceListView(
-                [
-                    0 => new ChoiceView($this->obj1, '0', 'A'),
-                    1 => new ChoiceView($this->obj2, '1', 'B'),
-                    2 => new ChoiceView($this->obj3, '2', 'C'),
-                    3 => new ChoiceView($this->obj4, '3', 'D'),
-                ], []
+            [
+                0 => new ChoiceView($this->obj1, '0', 'A'),
+                1 => new ChoiceView($this->obj2, '1', 'B'),
+                2 => new ChoiceView($this->obj3, '2', 'C'),
+                3 => new ChoiceView($this->obj4, '3', 'D'),
+            ], []
         ), $view);
     }
 
@@ -960,64 +960,64 @@ private function assertObjectListWithCustomValues(ChoiceListInterface $list)
     private function assertFlatView($view)
     {
         $this->assertEquals(new ChoiceListView(
-                [
-                    0 => new ChoiceView($this->obj1, '0', 'A'),
-                    1 => new ChoiceView($this->obj2, '1', 'B'),
-                    2 => new ChoiceView($this->obj3, '2', 'C'),
-                    3 => new ChoiceView($this->obj4, '3', 'D'),
-                ], [
-                    1 => new ChoiceView($this->obj2, '1', 'B'),
-                    2 => new ChoiceView($this->obj3, '2', 'C'),
-                ]
+            [
+                0 => new ChoiceView($this->obj1, '0', 'A'),
+                1 => new ChoiceView($this->obj2, '1', 'B'),
+                2 => new ChoiceView($this->obj3, '2', 'C'),
+                3 => new ChoiceView($this->obj4, '3', 'D'),
+            ], [
+                1 => new ChoiceView($this->obj2, '1', 'B'),
+                2 => new ChoiceView($this->obj3, '2', 'C'),
+            ]
         ), $view);
     }
 
     private function assertFlatViewWithCustomIndices($view)
     {
         $this->assertEquals(new ChoiceListView(
-                [
-                    'w' => new ChoiceView($this->obj1, '0', 'A'),
-                    'x' => new ChoiceView($this->obj2, '1', 'B'),
-                    'y' => new ChoiceView($this->obj3, '2', 'C'),
-                    'z' => new ChoiceView($this->obj4, '3', 'D'),
-                ], [
-                    'x' => new ChoiceView($this->obj2, '1', 'B'),
-                    'y' => new ChoiceView($this->obj3, '2', 'C'),
-                ]
+            [
+                'w' => new ChoiceView($this->obj1, '0', 'A'),
+                'x' => new ChoiceView($this->obj2, '1', 'B'),
+                'y' => new ChoiceView($this->obj3, '2', 'C'),
+                'z' => new ChoiceView($this->obj4, '3', 'D'),
+            ], [
+                'x' => new ChoiceView($this->obj2, '1', 'B'),
+                'y' => new ChoiceView($this->obj3, '2', 'C'),
+            ]
         ), $view);
     }
 
     private function assertFlatViewWithAttr($view)
     {
         $this->assertEquals(new ChoiceListView(
-                [
-                    0 => new ChoiceView($this->obj1, '0', 'A'),
-                    1 => new ChoiceView(
-                        $this->obj2,
-                        '1',
-                        'B',
-                        ['attr1' => 'value1']
-                    ),
-                    2 => new ChoiceView(
-                        $this->obj3,
-                        '2',
-                        'C',
-                        ['attr2' => 'value2']
-                    ),
-                    3 => new ChoiceView($this->obj4, '3', 'D'),
-                ], [
-                    1 => new ChoiceView(
-                        $this->obj2,
-                        '1',
-                        'B',
-                        ['attr1' => 'value1']
-                    ),
-                    2 => new ChoiceView(
-                        $this->obj3,
-                        '2',
-                        'C',
-                        ['attr2' => 'value2']
-                    ),
+            [
+                0 => new ChoiceView($this->obj1, '0', 'A'),
+                1 => new ChoiceView(
+                    $this->obj2,
+                    '1',
+                    'B',
+                    ['attr1' => 'value1']
+                ),
+                2 => new ChoiceView(
+                    $this->obj3,
+                    '2',
+                    'C',
+                    ['attr2' => 'value2']
+                ),
+                3 => new ChoiceView($this->obj4, '3', 'D'),
+            ], [
+                1 => new ChoiceView(
+                    $this->obj2,
+                    '1',
+                    'B',
+                    ['attr1' => 'value1']
+                ),
+                2 => new ChoiceView(
+                    $this->obj3,
+                    '2',
+                    'C',
+                    ['attr2' => 'value2']
+                ),
                 ]
         ), $view);
     }
@@ -1040,30 +1040,30 @@ private function assertFlatViewWithlabelTranslationParameters($view)
     private function assertGroupedView($view)
     {
         $this->assertEquals(new ChoiceListView(
-                [
-                    'Group 1' => new ChoiceGroupView(
-                        'Group 1',
-                        [
-                            0 => new ChoiceView($this->obj1, '0', 'A'),
-                            1 => new ChoiceView($this->obj2, '1', 'B'),
-                        ]
-                    ),
-                    'Group 2' => new ChoiceGroupView(
-                        'Group 2',
-                        [
-                            2 => new ChoiceView($this->obj3, '2', 'C'),
-                            3 => new ChoiceView($this->obj4, '3', 'D'),
-                        ]
-                    ),
-                ], [
-                    'Group 1' => new ChoiceGroupView(
-                        'Group 1',
-                        [1 => new ChoiceView($this->obj2, '1', 'B')]
-                    ),
-                    'Group 2' => new ChoiceGroupView(
-                        'Group 2',
-                        [2 => new ChoiceView($this->obj3, '2', 'C')]
-                    ),
+            [
+                'Group 1' => new ChoiceGroupView(
+                    'Group 1',
+                    [
+                        0 => new ChoiceView($this->obj1, '0', 'A'),
+                        1 => new ChoiceView($this->obj2, '1', 'B'),
+                    ]
+                ),
+                'Group 2' => new ChoiceGroupView(
+                    'Group 2',
+                    [
+                        2 => new ChoiceView($this->obj3, '2', 'C'),
+                        3 => new ChoiceView($this->obj4, '3', 'D'),
+                    ]
+                ),
+            ], [
+                'Group 1' => new ChoiceGroupView(
+                    'Group 1',
+                    [1 => new ChoiceView($this->obj2, '1', 'B')]
+                ),
+                'Group 2' => new ChoiceGroupView(
+                    'Group 2',
+                    [2 => new ChoiceView($this->obj3, '2', 'C')]
+                ),
                 ]
         ), $view);
     }
diff --git a/Tests/CompoundFormTest.php b/Tests/CompoundFormTest.php
@@ -806,9 +806,9 @@ public function testGetErrors()
         $errors = $this->form->getErrors();
 
         $this->assertSame(
-             "ERROR: Error 1\n".
-             "ERROR: Error 2\n",
-             (string) $errors
+            "ERROR: Error 1\n".
+            "ERROR: Error 2\n",
+            (string) $errors
         );
 
         $this->assertSame([$error1, $error2], iterator_to_array($errors));
@@ -826,15 +826,15 @@ public function testGetErrorsDeep()
         $errors = $this->form->getErrors(true);
 
         $this->assertSame(
-             "ERROR: Error 1\n".
-             "ERROR: Error 2\n".
-             "ERROR: Nested Error\n",
-             (string) $errors
+            "ERROR: Error 1\n".
+            "ERROR: Error 2\n".
+            "ERROR: Nested Error\n",
+            (string) $errors
         );
 
         $this->assertSame(
-             [$error1, $error2, $nestedError],
-             iterator_to_array($errors)
+            [$error1, $error2, $nestedError],
+            iterator_to_array($errors)
         );
     }
 
@@ -850,11 +850,11 @@ public function testGetErrorsDeepRecursive()
         $errors = $this->form->getErrors(true, false);
 
         $this->assertSame(
-             "ERROR: Error 1\n".
-             "ERROR: Error 2\n".
-             "Child:\n".
-             "    ERROR: Nested Error\n",
-             (string) $errors
+            "ERROR: Error 1\n".
+            "ERROR: Error 2\n".
+            "Child:\n".
+            "    ERROR: Nested Error\n",
+            (string) $errors
         );
 
         $errorsAsArray = iterator_to_array($errors);
diff --git a/Tests/Extension/Core/Type/ChoiceTypeTest.php b/Tests/Extension/Core/Type/ChoiceTypeTest.php
@@ -15,9 +15,8 @@
 use Symfony\Component\Form\ChoiceList\Loader\CallbackChoiceLoader;
 use Symfony\Component\Form\ChoiceList\View\ChoiceGroupView;
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Exception\TransformationFailedException;
-use Symfony\Component\Form\Extension\Validator\ValidatorExtension;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\Tests\Fixtures\ChoiceList\DeprecatedChoiceListFactory;
 use Symfony\Component\OptionsResolver\Exception\InvalidOptionsException;
diff --git a/Tests/Extension/Validator/Constraints/FormValidatorFunctionalTest.php b/Tests/Extension/Validator/Constraints/FormValidatorFunctionalTest.php
@@ -458,12 +458,12 @@ function () {
                 }
             ));
         $formBuilder->get('field2')->addModelTransformer(new CallbackTransformer(
-                function () {
-                },
-                function () {
-                    throw new TransformationFailedException('This value is invalid.');
-                }
-            ));
+            function () {
+            },
+            function () {
+                throw new TransformationFailedException('This value is invalid.');
+            }
+        ));
         $form = $formBuilder->getForm();
 
         $form->submit([
diff --git a/Tests/Extension/Validator/Constraints/FormValidatorTest.php b/Tests/Extension/Validator/Constraints/FormValidatorTest.php
@@ -309,9 +309,9 @@ public function testAddInvalidErrorEvenIfNoValidationGroups()
             ])
             ->setData($object)
             ->addViewTransformer(new CallbackTransformer(
-                    function ($data) { return $data; },
-                    function () { throw new TransformationFailedException(); }
-                ))
+                function ($data) { return $data; },
+                function () { throw new TransformationFailedException(); }
+            ))
             ->getForm();
 
         // Launch transformer
diff --git a/Tests/SimpleFormTest.php b/Tests/SimpleFormTest.php
@@ -169,7 +169,7 @@ public function testFalseIsConvertedToNull()
 
         $config = new FormConfigBuilder('name', null, new EventDispatcher());
         $config->addEventListener(FormEvents::PRE_SUBMIT, static function (FormEvent $event) use (&$passedDataIsNull): void {
-            $passedDataIsNull = $event->getData() === null;
+            $passedDataIsNull = null === $event->getData();
         });
         $form = new Form($config);
 
diff --git a/Util/ServerParams.php b/Util/ServerParams.php

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ private function castableToString(array $choices, array &$cache = []): bool`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`continue;`
`222`		`- } elseif (!is_scalar($choice)) {`
	`222`	`+ } elseif (!\is_scalar($choice)) {`
`223`	`223`	`return false;`
`224`	`224`	`}`
`225`	`225`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ protected function loadChoices(): iterable`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`foreach ($structuredValues as $group => $values) {`
`39`		`- if (is_array($values)) {`
	`39`	`+ if (\is_array($values)) {`
`40`	`40`	`if ($values && $filtered = array_filter($list->getChoicesForValues($values), $this->filter)) {`
`41`	`41`	`$choices[$group] = $filtered;`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function convertTransformationFailureToFormError(FormEvent $event)`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`53`		`- $clientDataAsString = is_scalar($form->getViewData()) ? (string) $form->getViewData() : get_debug_type($form->getViewData());`
	`53`	`+ $clientDataAsString = \is_scalar($form->getViewData()) ? (string) $form->getViewData() : get_debug_type($form->getViewData());`
`54`	`54`	`$messageTemplate = $form->getConfig()->getOption('invalid_message', 'The value {{ value }} is not valid.');`
`55`	`55`	`$messageParameters = array_replace(['{{ value }}' => $clientDataAsString], $form->getConfig()->getOption('invalid_message_parameters', []));`
`56`	`56`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ private function getFileUploadError(int $errorCode)`
`181`	`181`	`*/`
`182`	`182`	`private static function getMaxFilesize()`
`183`	`183`	`{`
`184`		`- $iniMax = strtolower(ini_get('upload_max_filesize'));`
	`184`	`+ $iniMax = strtolower(\ini_get('upload_max_filesize'));`
`185`	`185`
`186`	`186`	`if ('' === $iniMax) {`
`187`	`187`	`return \PHP_INT_MAX;`