More short closures + isset instead of null checks + etc.

Author: nicolas-grekas

ChoiceList/ArrayChoiceList.php

@@ -69,7 +69,7 @@ public function __construct(iterable $choices, callable $value = null)
 
         if (null !== $value) {
             // If a deterministic value generator was passed, use it later
-            $this->valueCallback = $value;
+            $this->valueCallback = $value(...);
         } else {
             // Otherwise generate incrementing integers as values
             $value = static function () {

Test/TypeTestCase.php

@@ -35,13 +35,6 @@ protected function setUp(): void
         $this->builder = new FormBuilder('', null, $this->dispatcher, $this->factory);
     }
 
-    protected function tearDown(): void
-    {
-        if (\in_array(ValidatorExtensionTrait::class, class_uses($this))) {
-            $this->validator = null;
-        }
-    }
-
     protected function getExtensions()
     {
         $extensions = [];

Tests/Extension/Validator/Constraints/FormValidatorTest.php

@@ -264,8 +264,8 @@ public function testDontValidateIfNotSynchronized()
             ])
             ->setData($object)
             ->addViewTransformer(new CallbackTransformer(
-                fn ($data) => $data,
-                function () { throw new TransformationFailedException(); }
+                static fn ($data) => $data,
+                static fn () => throw new TransformationFailedException()
             ))
             ->getForm();
 
@@ -301,8 +301,8 @@ public function testAddInvalidErrorEvenIfNoValidationGroups()
             ])
             ->setData($object)
             ->addViewTransformer(new CallbackTransformer(
-                fn ($data) => $data,
-                function () { throw new TransformationFailedException(); }
+                static fn ($data) => $data,
+                static fn () => throw new TransformationFailedException()
             ))
             ->getForm();
 
@@ -336,8 +336,8 @@ public function testDontValidateConstraintsIfNotSynchronized()
         $form = $this->getBuilder('name', '\stdClass', $options)
             ->setData($object)
             ->addViewTransformer(new CallbackTransformer(
-                fn ($data) => $data,
-                function () { throw new TransformationFailedException(); }
+                static fn ($data) => $data,
+                static fn () => throw new TransformationFailedException()
             ))
             ->getForm();
 
@@ -367,8 +367,8 @@ public function testTransformationFailedExceptionInvalidMessageIsUsed()
             ])
             ->setData($object)
             ->addViewTransformer(new CallbackTransformer(
-                fn ($data) => $data,
-                function () {
+                static fn ($data) => $data,
+                static function () {
                     $failure = new TransformationFailedException();
                     $failure->setInvalidMessage('safe message to be used', ['{{ bar }}' => 'bar']);
 

Tests/Extension/Validator/ViolationMapper/ViolationMapperTest.php

@@ -72,8 +72,8 @@ protected function getForm($name = 'name', $propertyPath = null, $dataClass = nu
 
         if (!$synchronized) {
             $config->addViewTransformer(new CallbackTransformer(
-                fn ($normData) => $normData,
-                function () { throw new TransformationFailedException(); }
+                static fn ($normData) => $normData,
+                static fn () => throw new TransformationFailedException()
             ));
         }