Merge branch '4.4' into 5.0

nicolas-grekas · nicolas-grekas · commit c8c6c9212904 · 2020-01-21T11:12:04.000+01:00
* 4.4:
  Add link to messenger documentation in its README
  [HttpKernel] restore compat with clock mocking
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/DisallowRobotsIndexingListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/DisallowRobotsIndexingListenerTest.php
@@ -24,8 +24,9 @@ class DisallowRobotsIndexingListenerTest extends TestCase
     /**
      * @dataProvider provideResponses
      */
-    public function testInvoke(?string $expected, Response $response): void
+    public function testInvoke(?string $expected, array $responseArgs)
     {
+        $response = new Response(...$responseArgs);
         $listener = new DisallowRobotsIndexingListener();
 
         $event = new ResponseEvent($this->createMock(HttpKernelInterface::class), $this->createMock(Request::class), KernelInterface::MASTER_REQUEST, $response);
@@ -37,11 +38,11 @@ public function testInvoke(?string $expected, Response $response): void
 
     public function provideResponses(): iterable
     {
-        yield 'No header' => ['noindex', new Response()];
+        yield 'No header' => ['noindex', []];
 
         yield 'Header already set' => [
             'something else',
-            new Response('', 204, ['X-Robots-Tag' => 'something else']),
+            ['', 204, ['X-Robots-Tag' => 'something else']],
         ];
     }
 }
diff --git a/src/Symfony/Component/Messenger/README.md b/src/Symfony/Component/Messenger/README.md
@@ -7,6 +7,7 @@ message queues.
 Resources
 ---------
 
+  * [Documentation](https://symfony.com/doc/current/components/messenger.html)
   * [Contributing](https://symfony.com/doc/current/contributing/index.html)
   * [Report issues](https://github.com/symfony/symfony/issues) and
     [send Pull Requests](https://github.com/symfony/symfony/pulls)

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,9 @@ class DisallowRobotsIndexingListenerTest extends TestCase`
`24`	`24`	`/**`
`25`	`25`	`* @dataProvider provideResponses`
`26`	`26`	`*/`
`27`		`- public function testInvoke(?string $expected, Response $response): void`
	`27`	`+ public function testInvoke(?string $expected, array $responseArgs)`
`28`	`28`	`{`
	`29`	`+ $response = new Response(...$responseArgs);`
`29`	`30`	`$listener = new DisallowRobotsIndexingListener();`
`30`	`31`
`31`	`32`	`$event = new ResponseEvent($this->createMock(HttpKernelInterface::class), $this->createMock(Request::class), KernelInterface::MASTER_REQUEST, $response);`
`@@ -37,11 +38,11 @@ public function testInvoke(?string $expected, Response $response): void`
`37`	`38`
`38`	`39`	`public function provideResponses(): iterable`
`39`	`40`	`{`
`40`		`- yield 'No header' => ['noindex', new Response()];`
	`41`	`+ yield 'No header' => ['noindex', []];`
`41`	`42`
`42`	`43`	`yield 'Header already set' => [`
`43`	`44`	`'something else',`
`44`		`- new Response('', 204, ['X-Robots-Tag' => 'something else']),`
	`45`	`+ ['', 204, ['X-Robots-Tag' => 'something else']],`
`45`	`46`	`];`
`46`	`47`	`}`
`47`	`48`	`}`