Leverage the match expression

Author: fancyweb

Extension/Validator/ValidatorTypeGuesser.php

@@ -16,6 +16,9 @@
 use Symfony\Component\Form\Guess\TypeGuess;
 use Symfony\Component\Form\Guess\ValueGuess;
 use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\Constraints\IsTrue;
+use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Validator\Constraints\NotNull;
 use Symfony\Component\Validator\Mapping\ClassMetadataInterface;
 use Symfony\Component\Validator\Mapping\Factory\MetadataFactoryInterface;
 
@@ -166,14 +169,12 @@ public function guessTypeForConstraint(Constraint $constraint): ?TypeGuess
      */
     public function guessRequiredForConstraint(Constraint $constraint): ?ValueGuess
     {
-        switch (\get_class($constraint)) {
-            case 'Symfony\Component\Validator\Constraints\NotNull':
-            case 'Symfony\Component\Validator\Constraints\NotBlank':
-            case 'Symfony\Component\Validator\Constraints\IsTrue':
-                return new ValueGuess(true, Guess::HIGH_CONFIDENCE);
-        }
-
-        return null;
+        return match (\get_class($constraint)) {
+            NotNull::class,
+            NotBlank::class,
+            IsTrue::class => new ValueGuess(true, Guess::HIGH_CONFIDENCE),
+            default => null,
+        };
     }
 
     /**

Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php

@@ -729,11 +729,11 @@ public function testCreateViewFlatAttrClosureReceivesKey()
             null, // index
             null, // group
             function ($object, $key) {
-                switch ($key) {
-                    case 'B': return ['attr1' => 'value1'];
-                    case 'C': return ['attr2' => 'value2'];
-                    default: return [];
-                }
+                return match ($key) {
+                    'B' => ['attr1' => 'value1'],
+                    'C' => ['attr2' => 'value2'],
+                    default => [],
+                };
             }
         );
 
@@ -749,11 +749,11 @@ public function testCreateViewFlatAttrClosureReceivesValue()
             null, // index
             null, // group
             function ($object, $key, $value) {
-                switch ($value) {
-                    case '1': return ['attr1' => 'value1'];
-                    case '2': return ['attr2' => 'value2'];
-                    default: return [];
-                }
+                return match ($value) {
+                    '1' => ['attr1' => 'value1'],
+                    '2' => ['attr2' => 'value2'],
+                    default => [],
+                };
             }
         );
 
@@ -852,10 +852,10 @@ public function testCreateViewFlatlabelTranslationParametersClosureReceivesKey()
             null, // group
             null, // attr
             function ($object, $key) {
-                switch ($key) {
-                    case 'D': return ['%placeholder1%' => 'value1'];
-                    default: return [];
-                }
+                return match ($key) {
+                    'D' => ['%placeholder1%' => 'value1'],
+                    default => [],
+                };
             }
         );
 
@@ -872,10 +872,10 @@ public function testCreateViewFlatlabelTranslationParametersClosureReceivesValue
             null, // group
             null, // attr
             function ($object, $key, $value) {
-                switch ($value) {
-                    case '3': return ['%placeholder1%' => 'value1'];
-                    default: return [];
-                }
+                return match ($value) {
+                    '3' => ['%placeholder1%' => 'value1'],
+                    default => [],
+                };
             }
         );