Reduce common control flows

Author: alexandre-daubois

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'] ?? '');

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');