Merge branch '6.1' into 6.2

* 6.1:
  Replace switch statement with match expression

Author: javiereguiluz

bundles/prepend_extension.rst

@@ -65,18 +65,16 @@ in case a specific other bundle is not registered::
             // disable AcmeGoodbyeBundle in bundles
             $config = ['use_acme_goodbye' => false];
             foreach ($container->getExtensions() as $name => $extension) {
-                switch ($name) {
-                    case 'acme_something':
-                    case 'acme_other':
-                        // set use_acme_goodbye to false in the config of
-                        // acme_something and acme_other
-                        //
-                        // note that if the user manually configured
-                        // use_acme_goodbye to true in config/services.yaml
-                        // then the setting would in the end be true and not false
-                        $container->prependExtensionConfig($name, $config);
-                        break;
-                }
+                match ($name) {
+                    // set use_acme_goodbye to false in the config of
+                    // acme_something and acme_other
+                    //
+                    // note that if the user manually configured
+                    // use_acme_goodbye to true in config/services.yaml
+                    // then the setting would in the end be true and not false
+                    'acme_something', 'acme_other' => $container->prependExtensionConfig($name, $config),
+                    default => null
+                };
             }
         }
 

form/type_guesser.rst

@@ -105,30 +105,21 @@ With this knowledge, you can implement the ``guessType()`` method of the
             }
 
             // otherwise, base the type on the @var annotation
-            switch ($annotations['var']) {
-                case 'string':
-                    // there is a high confidence that the type is text when
-                    // @var string is used
-                    return new TypeGuess(TextType::class, [], Guess::HIGH_CONFIDENCE);
-
-                case 'int':
-                case 'integer':
-                    // integers can also be the id of an entity or a checkbox (0 or 1)
-                    return new TypeGuess(IntegerType::class, [], Guess::MEDIUM_CONFIDENCE);
-
-                case 'float':
-                case 'double':
-                case 'real':
-                    return new TypeGuess(NumberType::class, [], Guess::MEDIUM_CONFIDENCE);
-
-                case 'boolean':
-                case 'bool':
-                    return new TypeGuess(CheckboxType::class, [], Guess::HIGH_CONFIDENCE);
-
-                default:
-                    // there is a very low confidence that this one is correct
-                    return new TypeGuess(TextType::class, [], Guess::LOW_CONFIDENCE);
-            }
+            return match($annotations['var']) {
+                // there is a high confidence that the type is text when
+                // @var string is used
+                'string' => new TypeGuess(TextType::class, [], Guess::HIGH_CONFIDENCE),
+
+                // integers can also be the id of an entity or a checkbox (0 or 1)
+                'int', 'integer' => new TypeGuess(IntegerType::class, [], Guess::MEDIUM_CONFIDENCE),
+
+                'float', 'double', 'real' => new TypeGuess(NumberType::class, [], Guess::MEDIUM_CONFIDENCE),
+
+                'boolean', 'bool' => new TypeGuess(CheckboxType::class, [], Guess::HIGH_CONFIDENCE),
+
+                // there is a very low confidence that this one is correct
+                default => new TypeGuess(TextType::class, [], Guess::LOW_CONFIDENCE)
+            };
         }
 
         protected function readPhpDocAnnotations(string $class, string $property): array

security/voters.rst

@@ -153,14 +153,11 @@ would look like this::
             /** @var Post $post */
             $post = $subject;
 
-            switch ($attribute) {
-                case self::VIEW:
-                    return $this->canView($post, $user);
-                case self::EDIT:
-                    return $this->canEdit($post, $user);
-            }
-
-            throw new \LogicException('This code should not be reached!');
+            return match($attribute) {
+                self::VIEW => $this->canView($post, $user),
+                self::EDIT => $this->canEdit($post, $user),
+                default => throw new \LogicException('This code should not be reached!')
+            };
         }
 
         private function canView(Post $post, User $user): bool