Leverage First-class callable syntax

Author: tigitz

Extension/DataCollector/FormDataCollector.php

@@ -235,7 +235,7 @@ protected function getCasters(): array
                     Caster::PREFIX_VIRTUAL.'type_class' => new ClassStub(\get_class($f->getConfig()->getType()->getInnerType())),
                 ];
             },
-            FormView::class => [StubCaster::class, 'cutInternals'],
+            FormView::class => StubCaster::cutInternals(...),
             ConstraintViolationInterface::class => function (ConstraintViolationInterface $v, array $a) {
                 return [
                     Caster::PREFIX_VIRTUAL.'root' => $v->getRoot(),

Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php

@@ -141,7 +141,7 @@ public function testCreateFromChoicesFlatValuesAsCallable()
     {
         $list = $this->factory->createListFromChoices(
             ['A' => $this->obj1, 'B' => $this->obj2, 'C' => $this->obj3, 'D' => $this->obj4],
-            [$this, 'getValue']
+            $this->getValue(...)
         );
 
         $this->assertObjectListWithCustomValues($list);
@@ -186,7 +186,7 @@ public function testCreateFromChoicesGroupedValuesAsCallable()
                 'Group 1' => ['A' => $this->obj1, 'B' => $this->obj2],
                 'Group 2' => ['C' => $this->obj3, 'D' => $this->obj4],
             ],
-            [$this, 'getValue']
+            $this->getValue(...)
         );
 
         $this->assertObjectListWithCustomValues($list);
@@ -335,7 +335,7 @@ public function testCreateViewFlatPreferredChoiceGroupsSameOrder()
             [$this->obj4, $this->obj2, $this->obj1, $this->obj3],
             null, // label
             null, // index
-            [$this, 'getGroup']
+            $this->getGroup(...)
         );
 
         $preferredLabels = array_map(static function (ChoiceGroupView $groupView): array {
@@ -380,7 +380,7 @@ public function testCreateViewFlatPreferredChoicesAsCallable()
     {
         $view = $this->factory->createView(
             $this->list,
-            [$this, 'isPreferred']
+            $this->isPreferred(...)
         );
 
         $this->assertFlatView($view);
@@ -430,7 +430,7 @@ public function testCreateViewFlatLabelAsCallable()
         $view = $this->factory->createView(
             $this->list,
             [$this->obj2, $this->obj3],
-            [$this, 'getLabel']
+            $this->getLabel(...)
         );
 
         $this->assertFlatView($view);
@@ -486,7 +486,7 @@ public function testCreateViewFlatIndexAsCallable()
             $this->list,
             [$this->obj2, $this->obj3],
             null, // label
-            [$this, 'getFormIndex']
+            $this->getFormIndex(...)
         );
 
         $this->assertFlatViewWithCustomIndices($view);
@@ -580,7 +580,7 @@ public function testCreateViewFlatGroupByAsCallable()
             [$this->obj2, $this->obj3],
             null, // label
             null, // index
-            [$this, 'getGroup']
+            $this->getGroup(...)
         );
 
         $this->assertGroupedView($view);
@@ -593,7 +593,7 @@ public function testCreateViewFlatGroupByAsCallableReturnsArray()
             [],
             null, // label
             null, // index
-            [$this, 'getGroupArray']
+            $this->getGroupArray(...)
         );
 
         $this->assertGroupedViewWithChoiceDuplication($view);
@@ -606,7 +606,7 @@ public function testCreateViewFlatGroupByObjectThatCanBeCastToString()
             [$this->obj2, $this->obj3],
             null, // label
             null, // index
-            [$this, 'getGroupAsObject']
+            $this->getGroupAsObject(...)
         );
 
         $this->assertGroupedView($view);
@@ -699,7 +699,7 @@ public function testCreateViewFlatAttrAsCallable()
             null, // label
             null, // index
             null, // group
-            [$this, 'getAttr']
+            $this->getAttr(...)
         );
 
         $this->assertFlatViewWithAttr($view);
@@ -837,7 +837,7 @@ public function testCreateViewFlatlabelTranslationParametersAsCallable()
             null, // index
             null, // group
             null, // attr
-            [$this, 'getlabelTranslationParameters']
+            $this->getlabelTranslationParameters(...)
         );
 
         $this->assertFlatViewWithlabelTranslationParameters($view);

Tests/Extension/Validator/Constraints/FormValidatorTest.php

@@ -423,7 +423,7 @@ public function testHandleGroupSequenceValidationGroups()
     public function testHandleCallbackValidationGroups()
     {
         $object = new \stdClass();
-        $options = ['validation_groups' => [$this, 'getValidationGroups']];
+        $options = ['validation_groups' => $this->getValidationGroups(...)];
         $form = $this->getCompoundForm($object, $options);
         $form->submit([]);
 
@@ -543,7 +543,7 @@ public function testUseInheritedCallbackValidationGroup()
     {
         $object = new \stdClass();
 
-        $parentOptions = ['validation_groups' => [$this, 'getValidationGroups']];
+        $parentOptions = ['validation_groups' => $this->getValidationGroups(...)];
         $parent = $this->getBuilder('parent', null, $parentOptions)
             ->setCompound(true)
             ->setDataMapper(new DataMapper())

Tests/Extension/Validator/Type/BaseValidatorExtensionTest.php

@@ -57,7 +57,7 @@ public function testValidationGroupsCanBeSetToFalse()
     public function testValidationGroupsCanBeSetToCallback()
     {
         $form = $this->createForm([
-            'validation_groups' => [$this, 'testValidationGroupsCanBeSetToCallback'],
+            'validation_groups' => $this->testValidationGroupsCanBeSetToCallback(...),
         ]);
 
         $this->assertIsCallable($form->getConfig()->getOption('validation_groups'));