Merge branch '6.2' into 6.3

nicolas-grekas · nicolas-grekas · commit 0383b067e947 · 2023-02-02T09:33:11.000+01:00
* 6.2:
  [HttpKernel] fix merge (bis)
  [HttpKernel] fix merge
diff --git a/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php b/src/Symfony/Component/HttpKernel/Tests/DataCollector/RequestDataCollectorTest.php
@@ -109,7 +109,7 @@ public static function provideControllerCallables(): array
                 [
                     'class' => DummyController::class,
                     'method' => 'regularCallable',
-                    'file' => $r3->getFileName(),
+                    'file' => $r1->getFileName(),
                     'line' => $r1->getStartLine(),
                 ],
             ],
@@ -127,11 +127,11 @@ public static function provideControllerCallables(): array
 
             [
                 'First-class callable closure',
-                $this->testControllerInspection(...),
+                $controller->regularCallable(...),
                 [
-                    'class' => self::class,
-                    'method' => 'testControllerInspection',
-                    'file' => __FILE__,
+                    'class' => DummyController::class,
+                    'method' => 'regularCallable',
+                    'file' => $r1->getFileName(),
                     'line' => $r1->getStartLine(),
                 ],
             ],
@@ -142,7 +142,7 @@ public static function provideControllerCallables(): array
                 [
                     'class' => DummyController::class,
                     'method' => 'staticControllerMethod',
-                    'file' => $r3->getFileName(),
+                    'file' => $r2->getFileName(),
                     'line' => $r2->getStartLine(),
                 ],
             ],
@@ -153,7 +153,7 @@ public static function provideControllerCallables(): array
                 [
                     'class' => DummyController::class,
                     'method' => 'staticControllerMethod',
-                    'file' => $r3->getFileName(),
+                    'file' => $r2->getFileName(),
                     'line' => $r2->getStartLine(),
                 ],
             ],
@@ -164,7 +164,7 @@ public static function provideControllerCallables(): array
                 [
                     'class' => DummyController::class,
                     'method' => 'staticControllerMethod',
-                    'file' => $r3->getFileName(),
+                    'file' => $r2->getFileName(),
                     'line' => $r2->getStartLine(),
                 ],
             ],
