Remove unused code and unnecessary else branches

Author: alexandre-daubois

src/Symfony/Bridge/Monolog/Formatter/ConsoleFormatter.php

@@ -114,7 +114,7 @@ public function format(LogRecord $record): mixed
             $extra = '';
         }
 
-        $formatted = strtr($this->options['format'], [
+        return strtr($this->options['format'], [
             '%datetime%' => $record->datetime->format($this->options['date_format']),
             '%start_tag%' => \sprintf('<%s>', self::LEVEL_COLOR_MAP[$record->level->value]),
             '%level_name%' => \sprintf($this->options['level_name_format'], $record->level->getName()),
@@ -124,8 +124,6 @@ public function format(LogRecord $record): mixed
             '%context%' => $context,
             '%extra%' => $extra,
         ]);
-
-        return $formatted;
     }
 
     /**

src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler/Deprecation.php

@@ -149,8 +149,6 @@ public function __construct(string $message, array $trace, string $file, bool $l
         if (($test instanceof TestCase || $test instanceof TestSuite) && ('trigger_error' !== $trace[$i - 2]['function'] || isset($trace[$i - 2]['class']))) {
             $this->originClass = \get_class($test);
             $this->originMethod = $test->getName();
-
-            return;
         }
     }
 

src/Symfony/Bridge/PsrHttpMessage/Factory/PsrHttpFactory.php

@@ -195,8 +195,7 @@ public function createResponse(Response $symfonyResponse): ResponseInterface
         }
 
         $protocolVersion = $symfonyResponse->getProtocolVersion();
-        $response = $response->withProtocolVersion($protocolVersion);
 
-        return $response;
+        return $response->withProtocolVersion($protocolVersion);
     }
 }

src/Symfony/Bridge/Twig/Command/DebugCommand.php

@@ -344,15 +344,13 @@ private function getMetadata(string $type, mixed $entity): mixed
             }
 
             // format args
-            $args = array_map(function (\ReflectionParameter $param) {
+            return array_map(function (\ReflectionParameter $param) {
                 if ($param->isDefaultValueAvailable()) {
                     return $param->getName().' = '.json_encode($param->getDefaultValue());
                 }
 
                 return $param->getName();
             }, $args);
-
-            return $args;
         }
 
         return null;

src/Symfony/Bridge/Twig/NodeVisitor/TranslationDefaultDomainNodeVisitor.php

@@ -50,12 +50,12 @@ public function enterNode(Node $node, Environment $env): Node
                 $this->scope->set('domain', $node->getNode('expr'));
 
                 return $node;
-            } else {
-                $name = new AssignNameExpression(self::INTERNAL_VAR_NAME, $node->getTemplateLine());
-                $this->scope->set('domain', new NameExpression(self::INTERNAL_VAR_NAME, $node->getTemplateLine()));
-
-                return new SetNode(false, new Node([$name]), new Node([$node->getNode('expr')]), $node->getTemplateLine());
             }
+
+            $name = new AssignNameExpression(self::INTERNAL_VAR_NAME, $node->getTemplateLine());
+            $this->scope->set('domain', new NameExpression(self::INTERNAL_VAR_NAME, $node->getTemplateLine()));
+
+            return new SetNode(false, new Node([$name]), new Node([$node->getNode('expr')]), $node->getTemplateLine());
         }
 
         if (!$this->scope->has('domain')) {

src/Symfony/Bundle/FrameworkBundle/Controller/ControllerResolver.php

@@ -27,9 +27,9 @@ protected function instantiateController(string $class): object
         if ($controller instanceof AbstractController) {
             if (null === $previousContainer = $controller->setContainer($this->container)) {
                 throw new \LogicException(\sprintf('"%s" has no container set, did you forget to define it as a service subscriber?', $class));
-            } else {
-                $controller->setContainer($previousContainer);
             }
+
+            $controller->setContainer($previousContainer);
         }
 
         return $controller;

src/Symfony/Component/Config/Builder/ClassBuilder.php

@@ -82,7 +82,7 @@ public function build(): string
             }
         }
 
-        $content = strtr('<?php
+        return strtr('<?php
 
 namespace NAMESPACE;
 
@@ -95,8 +95,6 @@ class CLASS IMPLEMENTS
 BODY
 }
 ', ['NAMESPACE' => $this->namespace, 'REQUIRE' => $require, 'USE' => $use, 'CLASS' => $this->getName(), 'IMPLEMENTS' => $implements, 'BODY' => $body]);
-
-        return $content;
     }
 
     public function addRequire(self $class): void

src/Symfony/Component/Console/Application.php

@@ -383,8 +383,6 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti
 
         if (CompletionInput::TYPE_OPTION_NAME === $input->getCompletionType()) {
             $suggestions->suggestOptions($this->getDefinition()->getOptions());
-
-            return;
         }
     }
 

src/Symfony/Component/Console/Helper/ProgressBar.php

@@ -610,7 +610,7 @@ private function buildLine(): string
     {
         \assert(null !== $this->format);
 
-        $regex = "{%([a-z\-_]+)(?:\:([^%]+))?%}i";
+        $regex = '{%([a-z\-_]+)(?:\:([^%]+))?%}i';
         $callback = function ($matches) {
             if ($formatter = $this->getPlaceholderFormatter($matches[1])) {
                 $text = $formatter($this, $this->output);

src/Symfony/Component/Console/Helper/ProgressIndicator.php

@@ -171,7 +171,7 @@ private function display(): void
             return;
         }
 
-        $this->overwrite(preg_replace_callback("{%([a-z\-_]+)(?:\:([^%]+))?%}i", function ($matches) {
+        $this->overwrite(preg_replace_callback('{%([a-z\-_]+)(?:\:([^%]+))?%}i', function ($matches) {
             if ($formatter = self::getPlaceholderFormatterDefinition($matches[1])) {
                 return $formatter($this);
             }