Convert switch cases to match expression

Author: tigitz

Console/Descriptor/Descriptor.php

@@ -46,49 +46,22 @@ public function describe(OutputInterface $output, mixed $object, array $options
             (new AnalyzeServiceReferencesPass(false, false))->process($object);
         }
 
-        switch (true) {
-            case $object instanceof RouteCollection:
-                $this->describeRouteCollection($object, $options);
-                break;
-            case $object instanceof Route:
-                $this->describeRoute($object, $options);
-                break;
-            case $object instanceof ParameterBag:
-                $this->describeContainerParameters($object, $options);
-                break;
-            case $object instanceof ContainerBuilder && !empty($options['env-vars']):
-                $this->describeContainerEnvVars($this->getContainerEnvVars($object), $options);
-                break;
-            case $object instanceof ContainerBuilder && isset($options['group_by']) && 'tags' === $options['group_by']:
-                $this->describeContainerTags($object, $options);
-                break;
-            case $object instanceof ContainerBuilder && isset($options['id']):
-                $this->describeContainerService($this->resolveServiceDefinition($object, $options['id']), $options, $object);
-                break;
-            case $object instanceof ContainerBuilder && isset($options['parameter']):
-                $this->describeContainerParameter($object->resolveEnvPlaceholders($object->getParameter($options['parameter'])), $options);
-                break;
-            case $object instanceof ContainerBuilder && isset($options['deprecations']):
-                $this->describeContainerDeprecations($object, $options);
-                break;
-            case $object instanceof ContainerBuilder:
-                $this->describeContainerServices($object, $options);
-                break;
-            case $object instanceof Definition:
-                $this->describeContainerDefinition($object, $options);
-                break;
-            case $object instanceof Alias:
-                $this->describeContainerAlias($object, $options);
-                break;
-            case $object instanceof EventDispatcherInterface:
-                $this->describeEventDispatcherListeners($object, $options);
-                break;
-            case \is_callable($object):
-                $this->describeCallable($object, $options);
-                break;
-            default:
-                throw new \InvalidArgumentException(sprintf('Object of type "%s" is not describable.', get_debug_type($object)));
-        }
+        match (true) {
+            $object instanceof RouteCollection => $this->describeRouteCollection($object, $options),
+            $object instanceof Route => $this->describeRoute($object, $options),
+            $object instanceof ParameterBag => $this->describeContainerParameters($object, $options),
+            $object instanceof ContainerBuilder && !empty($options['env-vars']) => $this->describeContainerEnvVars($this->getContainerEnvVars($object), $options),
+            $object instanceof ContainerBuilder && isset($options['group_by']) && 'tags' === $options['group_by'] => $this->describeContainerTags($object, $options),
+            $object instanceof ContainerBuilder && isset($options['id']) => $this->describeContainerService($this->resolveServiceDefinition($object, $options['id']), $options, $object),
+            $object instanceof ContainerBuilder && isset($options['parameter']) => $this->describeContainerParameter($object->resolveEnvPlaceholders($object->getParameter($options['parameter'])), $options),
+            $object instanceof ContainerBuilder && isset($options['deprecations']) => $this->describeContainerDeprecations($object, $options),
+            $object instanceof ContainerBuilder => $this->describeContainerServices($object, $options),
+            $object instanceof Definition => $this->describeContainerDefinition($object, $options),
+            $object instanceof Alias => $this->describeContainerAlias($object, $options),
+            $object instanceof EventDispatcherInterface => $this->describeEventDispatcherListeners($object, $options),
+            \is_callable($object) => $this->describeCallable($object, $options),
+            default => throw new \InvalidArgumentException(sprintf('Object of type "%s" is not describable.', get_debug_type($object))),
+        };
 
         if ($object instanceof ContainerBuilder) {
             $object->getCompiler()->getServiceReferenceGraph()->clear();

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -2268,26 +2268,14 @@ private function assertCachePoolServiceDefinitionIsCreated(ContainerBuilder $con
             $parentDefinition = $container->findDefinition($parentId);
         } while ($parentDefinition instanceof ChildDefinition);
 
-        switch ($adapter) {
-            case 'cache.adapter.apcu':
-                $this->assertSame(ApcuAdapter::class, $parentDefinition->getClass());
-                break;
-            case 'cache.app':
-            case 'cache.adapter.filesystem':
-                $this->assertSame(FilesystemAdapter::class, $parentDefinition->getClass());
-                break;
-            case 'cache.adapter.psr6':
-                $this->assertSame(ProxyAdapter::class, $parentDefinition->getClass());
-                break;
-            case 'cache.adapter.redis':
-                $this->assertSame(RedisAdapter::class, $parentDefinition->getClass());
-                break;
-            case 'cache.adapter.array':
-                $this->assertSame(ArrayAdapter::class, $parentDefinition->getClass());
-                break;
-            default:
-                $this->fail('Unresolved adapter: '.$adapter);
-        }
+        match ($adapter) {
+            'cache.adapter.apcu' => $this->assertSame(ApcuAdapter::class, $parentDefinition->getClass()),
+            'cache.app', 'cache.adapter.filesystem' => $this->assertSame(FilesystemAdapter::class, $parentDefinition->getClass()),
+            'cache.adapter.psr6' => $this->assertSame(ProxyAdapter::class, $parentDefinition->getClass()),
+            'cache.adapter.redis' => $this->assertSame(RedisAdapter::class, $parentDefinition->getClass()),
+            'cache.adapter.array' => $this->assertSame(ArrayAdapter::class, $parentDefinition->getClass()),
+            default => $this->fail('Unresolved adapter: '.$adapter),
+        };
     }
 }