minor symfony#58566 Reduce common control flows (alexandre-daubois)

This PR was merged into the 7.2 branch.

Discussion
----------

Reduce common control flows

| Q             | A
| ------------- | ---
| Branch?       | 7.2
| Bug fix?      | no
| New feature?  | no
| Deprecations? | no
| Issues        | -
| License       | MIT

Commits
-------

d71b4fa Reduce common control flows

Author: fabpot

src/Symfony/Bridge/Monolog/Tests/Handler/ConsoleHandlerTest.php

@@ -68,11 +68,7 @@ public function testVerbosityMapping($verbosity, $level, $isHandling, array $map
 
         $realOutput = $this->getMockBuilder(Output::class)->onlyMethods(['doWrite'])->getMock();
         $realOutput->setVerbosity($verbosity);
-        if ($realOutput->isDebug()) {
-            $log = "16:21:54 $levelName [app] My info message\n";
-        } else {
-            $log = "16:21:54 $levelName [app] My info message\n";
-        }
+        $log = "16:21:54 $levelName [app] My info message\n";
         $realOutput
             ->expects($isHandling ? $this->once() : $this->never())
             ->method('doWrite')

src/Symfony/Component/Console/Completion/CompletionInput.php

@@ -123,13 +123,13 @@ public function bind(InputDefinition $definition): void
         if ($this->currentIndex >= \count($this->tokens)) {
             if (!isset($this->arguments[$argumentName]) || $this->definition->getArgument($argumentName)->isArray()) {
                 $this->completionName = $argumentName;
-                $this->completionValue = '';
             } else {
                 // we've reached the end
                 $this->completionType = self::TYPE_NONE;
                 $this->completionName = null;
-                $this->completionValue = '';
             }
+
+            $this->completionValue = '';
         }
     }
 

src/Symfony/Component/Console/Tests/Logger/ConsoleLoggerTest.php

@@ -151,11 +151,7 @@ public function testContextReplacement()
 
     public function testObjectCastToString()
     {
-        if (method_exists($this, 'createPartialMock')) {
-            $dummy = $this->createPartialMock(DummyTest::class, ['__toString']);
-        } else {
-            $dummy = $this->createPartialMock(DummyTest::class, ['__toString']);
-        }
+        $dummy = $this->createPartialMock(DummyTest::class, ['__toString']);
         $dummy->method('__toString')->willReturn('DUMMY');
 
         $this->getLogger()->warning($dummy);

src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php

@@ -1139,16 +1139,15 @@ private function addNewInstance(Definition $definition, string $return = '', ?st
     {
         $tail = $return ? str_repeat(')', substr_count($return, '(') - substr_count($return, ')')).";\n" : '';
 
+        $arguments = [];
         if (BaseServiceLocator::class === $definition->getClass() && $definition->hasTag($this->serviceLocatorTag)) {
-            $arguments = [];
             foreach ($definition->getArgument(0) as $k => $argument) {
                 $arguments[$k] = $argument->getValues()[0];
             }
 
             return $return.$this->dumpValue(new ServiceLocatorArgument($arguments)).$tail;
         }
 
-        $arguments = [];
         foreach ($definition->getArguments() as $i => $value) {
             $arguments[] = (\is_string($i) ? $i.': ' : '').$this->dumpValue($value);
         }

src/Symfony/Component/DomCrawler/Form.php

@@ -421,16 +421,14 @@ private function initialize(): void
             $formId = Crawler::xpathLiteral($this->node->getAttribute('id'));
 
             $fieldNodes = $xpath->query(\sprintf('( descendant::input[@form=%s] | descendant::button[@form=%1$s] | descendant::textarea[@form=%1$s] | descendant::select[@form=%1$s] | //form[@id=%1$s]//input[not(@form)] | //form[@id=%1$s]//button[not(@form)] | //form[@id=%1$s]//textarea[not(@form)] | //form[@id=%1$s]//select[not(@form)] )[( not(ancestor::template) or ancestor::turbo-stream )]', $formId));
-            foreach ($fieldNodes as $node) {
-                $this->addField($node);
-            }
         } else {
             // do the xpath query with $this->node as the context node, to only find descendant elements
             // however, descendant elements with form attribute are not part of this form
             $fieldNodes = $xpath->query('( descendant::input[not(@form)] | descendant::button[not(@form)] | descendant::textarea[not(@form)] | descendant::select[not(@form)] )[( not(ancestor::template) or ancestor::turbo-stream )]', $this->node);
-            foreach ($fieldNodes as $node) {
-                $this->addField($node);
-            }
+        }
+
+        foreach ($fieldNodes as $node) {
+            $this->addField($node);
         }
 
         if ($this->baseHref && '' !== $this->node->getAttribute('action')) {

src/Symfony/Component/Form/Extension/DataCollector/FormDataExtractor.php

@@ -103,15 +103,13 @@ public function extractSubmittedData(FormInterface $form): array
                     continue;
                 }
 
+                $errorData['trace'][] = $cause;
                 if ($cause instanceof \Exception) {
-                    $errorData['trace'][] = $cause;
                     $cause = $cause->getPrevious();
 
                     continue;
                 }
 
-                $errorData['trace'][] = $cause;
-
                 break;
             }
 

src/Symfony/Component/HttpFoundation/Tests/RequestMatcher/SchemeRequestMatcherTest.php

@@ -25,18 +25,16 @@ public function test(string $requestScheme, array|string $matcherScheme, bool $i
         $httpRequest = Request::create('');
         $httpsRequest = Request::create('', 'get', [], [], [], ['HTTPS' => 'on']);
 
+        $matcher = new SchemeRequestMatcher($matcherScheme);
         if ($isMatch) {
             if ('https' === $requestScheme) {
-                $matcher = new SchemeRequestMatcher($matcherScheme);
                 $this->assertFalse($matcher->matches($httpRequest));
                 $this->assertTrue($matcher->matches($httpsRequest));
             } else {
-                $matcher = new SchemeRequestMatcher($matcherScheme);
                 $this->assertFalse($matcher->matches($httpsRequest));
                 $this->assertTrue($matcher->matches($httpRequest));
             }
         } else {
-            $matcher = new SchemeRequestMatcher($matcherScheme);
             $this->assertFalse($matcher->matches($httpRequest));
             $this->assertFalse($matcher->matches($httpsRequest));
         }

src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php

@@ -121,12 +121,12 @@ public function collect(Request $request, Response $response, ?\Throwable $excep
         ) {
             if ($response->headers->has('Content-Type') && str_contains($response->headers->get('Content-Type') ?? '', 'html')) {
                 $dumper = new HtmlDumper('php://output', $this->charset);
-                $dumper->setDisplayOptions(['fileLinkFormat' => $this->fileLinkFormat]);
             } else {
                 $dumper = new CliDumper('php://output', $this->charset);
-                $dumper->setDisplayOptions(['fileLinkFormat' => $this->fileLinkFormat]);
             }
 
+            $dumper->setDisplayOptions(['fileLinkFormat' => $this->fileLinkFormat]);
+
             foreach ($this->data as $dump) {
                 $this->doDump($dumper, $dump['data'], $dump['name'], $dump['file'], $dump['line'], $dump['label'] ?? '');
             }
@@ -235,12 +235,12 @@ public function __destruct()
 
             if ($this->webMode) {
                 $dumper = new HtmlDumper('php://output', $this->charset);
-                $dumper->setDisplayOptions(['fileLinkFormat' => $this->fileLinkFormat]);
             } else {
                 $dumper = new CliDumper('php://output', $this->charset);
-                $dumper->setDisplayOptions(['fileLinkFormat' => $this->fileLinkFormat]);
             }
 
+            $dumper->setDisplayOptions(['fileLinkFormat' => $this->fileLinkFormat]);
+
             foreach ($this->data as $i => $dump) {
                 $this->data[$i] = null;
                 $this->doDump($dumper, $dump['data'], $dump['name'], $dump['file'], $dump['line'], $dump['label'] ?? '');

src/Symfony/Component/HttpKernel/Tests/Log/LoggerTest.php

@@ -129,11 +129,7 @@ public function testContextReplacement()
 
     public function testObjectCastToString()
     {
-        if (method_exists($this, 'createPartialMock')) {
-            $dummy = $this->createPartialMock(DummyTest::class, ['__toString']);
-        } else {
-            $dummy = $this->createPartialMock(DummyTest::class, ['__toString']);
-        }
+        $dummy = $this->createPartialMock(DummyTest::class, ['__toString']);
         $dummy->expects($this->atLeastOnce())
             ->method('__toString')
             ->willReturn('DUMMY');

src/Symfony/Component/Messenger/Middleware/RouterContextMiddleware.php

@@ -30,8 +30,9 @@ public function __construct(
 
     public function handle(Envelope $envelope, StackInterface $stack): Envelope
     {
+        $context = $this->router->getContext();
+
         if (!$envelope->last(ConsumedByWorkerStamp::class) || !$contextStamp = $envelope->last(RouterContextStamp::class)) {
-            $context = $this->router->getContext();
             $envelope = $envelope->with(new RouterContextStamp(
                 $context->getBaseUrl(),
                 $context->getMethod(),
@@ -46,7 +47,6 @@ public function handle(Envelope $envelope, StackInterface $stack): Envelope
             return $stack->next()->handle($envelope, $stack);
         }
 
-        $context = $this->router->getContext();
         $currentBaseUrl = $context->getBaseUrl();
         $currentMethod = $context->getMethod();
         $currentHost = $context->getHost();