Merge branch '5.4' into 6.2

* 5.4:
  CS fix
  Fix test provider

Author: nicolas-grekas

EventListener/RouterListener.php

@@ -17,7 +17,6 @@
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Event\ExceptionEvent;
-use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
 use Symfony\Component\HttpKernel\Event\RequestEvent;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException;

HttpCache/Store.php

@@ -193,7 +193,7 @@ public function write(Request $request, Response $response): string
             if ($this->getPath($digest) !== $response->headers->get('X-Body-File')) {
                 throw new \RuntimeException('X-Body-File and X-Content-Digest do not match.');
             }
-            // Everything seems ok, omit writing content to disk
+        // Everything seems ok, omit writing content to disk
         } else {
             $digest = $this->generateContentDigest($response);
             $response->headers->set('X-Content-Digest', $digest);

Tests/Controller/ArgumentResolver/BackedEnumValueResolverTest.php

@@ -24,6 +24,7 @@ class BackedEnumValueResolverTest extends TestCase
      * In Symfony 7, keep this test case but remove the call to supports().
      *
      * @group legacy
+     *
      * @dataProvider provideTestSupportsData
      */
     public function testSupports(Request $request, ArgumentMetadata $metadata, bool $expectedSupport)

Tests/Controller/ArgumentResolver/UidValueResolverTest.php

@@ -25,9 +25,10 @@
 class UidValueResolverTest extends TestCase
 {
     /**
-     * In Symfony 7, keep this test case but remove the call to supports()
+     * In Symfony 7, keep this test case but remove the call to supports().
      *
      * @group legacy
+     *
      * @dataProvider provideSupports
      */
     public function testSupports(bool $expected, Request $request, ArgumentMetadata $argument)

Tests/HttpCache/ResponseCacheStrategyTest.php

@@ -258,6 +258,7 @@ public function testResponseIsExpirableButNotValidateableWhenMainResponseCombine
 
     /**
      * @group time-sensitive
+     *
      * @dataProvider cacheControlMergingProvider
      */
     public function testCacheControlMerging(array $expects, array $master, array $surrogates)

Tests/HttpCache/SsiTest.php

@@ -107,7 +107,7 @@ public function testProcess()
         $response = new Response('foo <!--#include virtual="foo\'" -->');
         $ssi->process($request, $response);
 
-        $this->assertEquals("foo <?php echo \$this->surrogate->handle(\$this, 'foo\\'', '', false) ?>"."\n", $response->getContent());
+        $this->assertEquals("foo <?php echo \$this->surrogate->handle(\$this, 'foo\\'', '', false) ?>\n", $response->getContent());
     }
 
     public function testProcessEscapesPhpTags()