[HttpKernel] fix merge

Author: nicolas-grekas

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(),
                 ],
             ],
@@ -125,13 +125,24 @@ function () { return 'foo'; },
                 ],
             ],
 
+            [
+                'First-class callable closure',
+                $controller->regularCallable(...),
+                [
+                    'class' => DummyController::class,
+                    'method' => 'regularCallable',
+                    'file' => $r1->getFileName(),
+                    'line' => $r1->getStartLine(),
+                ],
+            ],
+
             [
                 'Static callback as string',
                 DummyController::class.'::staticControllerMethod',
                 [
                     'class' => DummyController::class,
                     'method' => 'staticControllerMethod',
-                    'file' => $r3->getFileName(),
+                    'file' => $r2->getFileName(),
                     'line' => $r2->getStartLine(),
                 ],
             ],
@@ -142,7 +153,7 @@ function () { return 'foo'; },
                 [
                     'class' => DummyController::class,
                     'method' => 'staticControllerMethod',
-                    'file' => $r3->getFileName(),
+                    'file' => $r2->getFileName(),
                     'line' => $r2->getStartLine(),
                 ],
             ],
@@ -153,7 +164,7 @@ function () { return 'foo'; },
                 [
                     'class' => DummyController::class,
                     'method' => 'staticControllerMethod',
-                    'file' => $r3->getFileName(),
+                    'file' => $r2->getFileName(),
                     'line' => $r2->getStartLine(),
                 ],
             ],