Leverage First-class callable syntax

Author: tigitz

Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php

@@ -35,7 +35,7 @@ protected function setUp(): void
 
     public function testSignature1()
     {
-        $arguments = $this->factory->createArgumentMetadata([$this, 'signature1']);
+        $arguments = $this->factory->createArgumentMetadata($this->signature1(...));
 
         $this->assertEquals([
             new ArgumentMetadata('foo', self::class, false, false, null),
@@ -46,7 +46,7 @@ public function testSignature1()
 
     public function testSignature2()
     {
-        $arguments = $this->factory->createArgumentMetadata([$this, 'signature2']);
+        $arguments = $this->factory->createArgumentMetadata($this->signature2(...));
 
         $this->assertEquals([
             new ArgumentMetadata('foo', self::class, false, true, null, true),
@@ -57,7 +57,7 @@ public function testSignature2()
 
     public function testSignature3()
     {
-        $arguments = $this->factory->createArgumentMetadata([$this, 'signature3']);
+        $arguments = $this->factory->createArgumentMetadata($this->signature3(...));
 
         $this->assertEquals([
             new ArgumentMetadata('bar', FakeClassThatDoesNotExist::class, false, false, null),
@@ -67,7 +67,7 @@ public function testSignature3()
 
     public function testSignature4()
     {
-        $arguments = $this->factory->createArgumentMetadata([$this, 'signature4']);
+        $arguments = $this->factory->createArgumentMetadata($this->signature4(...));
 
         $this->assertEquals([
             new ArgumentMetadata('foo', null, false, true, 'default'),
@@ -78,7 +78,7 @@ public function testSignature4()
 
     public function testSignature5()
     {
-        $arguments = $this->factory->createArgumentMetadata([$this, 'signature5']);
+        $arguments = $this->factory->createArgumentMetadata($this->signature5(...));
 
         $this->assertEquals([
             new ArgumentMetadata('foo', 'array', false, true, null, true),

Tests/DataCollector/RequestDataCollectorTest.php

@@ -122,6 +122,17 @@ function () { return 'foo'; },
                 ],
             ],
 
+            [
+                'First-class callable closure',
+                $this->testControllerInspection(...),
+                [
+                    'class' => self::class,
+                    'method' => 'testControllerInspection',
+                    'file' => __FILE__,
+                    'line' => $r1->getStartLine(),
+                ],
+            ],
+
             [
                 'Static callback as string',
                 __NAMESPACE__.'\RequestDataCollectorTest::staticControllerMethod',

Tests/EventListener/ResponseListenerTest.php

@@ -30,7 +30,7 @@ protected function setUp(): void
     {
         $this->dispatcher = new EventDispatcher();
         $listener = new ResponseListener('UTF-8');
-        $this->dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'onKernelResponse']);
+        $this->dispatcher->addListener(KernelEvents::RESPONSE, $listener->onKernelResponse(...));
 
         $this->kernel = $this->createMock(HttpKernelInterface::class);
     }
@@ -54,7 +54,7 @@ public function testFilterDoesNothingForSubRequests()
     public function testFilterSetsNonDefaultCharsetIfNotOverridden()
     {
         $listener = new ResponseListener('ISO-8859-15');
-        $this->dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'onKernelResponse'], 1);
+        $this->dispatcher->addListener(KernelEvents::RESPONSE, $listener->onKernelResponse(...), 1);
 
         $response = new Response('foo');
 
@@ -67,7 +67,7 @@ public function testFilterSetsNonDefaultCharsetIfNotOverridden()
     public function testFilterDoesNothingIfCharsetIsOverridden()
     {
         $listener = new ResponseListener('ISO-8859-15');
-        $this->dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'onKernelResponse'], 1);
+        $this->dispatcher->addListener(KernelEvents::RESPONSE, $listener->onKernelResponse(...), 1);
 
         $response = new Response('foo');
         $response->setCharset('ISO-8859-1');
@@ -81,7 +81,7 @@ public function testFilterDoesNothingIfCharsetIsOverridden()
     public function testFiltersSetsNonDefaultCharsetIfNotOverriddenOnNonTextContentType()
     {
         $listener = new ResponseListener('ISO-8859-15');
-        $this->dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'onKernelResponse'], 1);
+        $this->dispatcher->addListener(KernelEvents::RESPONSE, $listener->onKernelResponse(...), 1);
 
         $response = new Response('foo');
         $request = Request::create('/');
@@ -96,7 +96,7 @@ public function testFiltersSetsNonDefaultCharsetIfNotOverriddenOnNonTextContentT
     public function testSetContentLanguageHeaderWhenEmptyAndAtLeast2EnabledLocalesAreConfigured()
     {
         $listener = new ResponseListener('ISO-8859-15', true, ['fr', 'en']);
-        $this->dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'onKernelResponse'], 1);
+        $this->dispatcher->addListener(KernelEvents::RESPONSE, $listener->onKernelResponse(...), 1);
 
         $response = new Response('content');
         $request = Request::create('/');
@@ -111,7 +111,7 @@ public function testSetContentLanguageHeaderWhenEmptyAndAtLeast2EnabledLocalesAr
     public function testNotOverrideContentLanguageHeaderWhenNotEmpty()
     {
         $listener = new ResponseListener('ISO-8859-15', true, ['de']);
-        $this->dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'onKernelResponse'], 1);
+        $this->dispatcher->addListener(KernelEvents::RESPONSE, $listener->onKernelResponse(...), 1);
 
         $response = new Response('content');
         $response->headers->set('Content-Language', 'mi, en');
@@ -127,7 +127,7 @@ public function testNotOverrideContentLanguageHeaderWhenNotEmpty()
     public function testNotSetContentLanguageHeaderWhenDisabled()
     {
         $listener = new ResponseListener('ISO-8859-15', false);
-        $this->dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'onKernelResponse'], 1);
+        $this->dispatcher->addListener(KernelEvents::RESPONSE, $listener->onKernelResponse(...), 1);
 
         $response = new Response('content');
         $request = Request::create('/');

Tests/EventListener/SurrogateListenerTest.php

@@ -30,7 +30,7 @@ public function testFilterDoesNothingForSubRequests()
         $response = new Response('foo <esi:include src="" />');
         $listener = new SurrogateListener(new Esi());
 
-        $dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'onKernelResponse']);
+        $dispatcher->addListener(KernelEvents::RESPONSE, $listener->onKernelResponse(...));
         $event = new ResponseEvent($kernel, new Request(), HttpKernelInterface::SUB_REQUEST, $response);
         $dispatcher->dispatch($event, KernelEvents::RESPONSE);
 
@@ -44,7 +44,7 @@ public function testFilterWhenThereIsSomeEsiIncludes()
         $response = new Response('foo <esi:include src="" />');
         $listener = new SurrogateListener(new Esi());
 
-        $dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'onKernelResponse']);
+        $dispatcher->addListener(KernelEvents::RESPONSE, $listener->onKernelResponse(...));
         $event = new ResponseEvent($kernel, new Request(), HttpKernelInterface::MAIN_REQUEST, $response);
         $dispatcher->dispatch($event, KernelEvents::RESPONSE);
 
@@ -58,7 +58,7 @@ public function testFilterWhenThereIsNoEsiIncludes()
         $response = new Response('foo');
         $listener = new SurrogateListener(new Esi());
 
-        $dispatcher->addListener(KernelEvents::RESPONSE, [$listener, 'onKernelResponse']);
+        $dispatcher->addListener(KernelEvents::RESPONSE, $listener->onKernelResponse(...));
         $event = new ResponseEvent($kernel, new Request(), HttpKernelInterface::MAIN_REQUEST, $response);
         $dispatcher->dispatch($event, KernelEvents::RESPONSE);