Merge branch '6.4' into 7.1

xabbuh · xabbuh · commit eb07c5b35af1 · 2024-10-14T10:49:35.000+02:00
* 6.4:
  simplify test
diff --git a/src/Symfony/Bridge/Monolog/Tests/Handler/ChromePhpHandlerTest.php b/src/Symfony/Bridge/Monolog/Tests/Handler/ChromePhpHandlerTest.php
@@ -22,19 +22,15 @@ class ChromePhpHandlerTest extends TestCase
 {
     public function testOnKernelResponseShouldNotTriggerDeprecation()
     {
+        $this->expectNotToPerformAssertions();
+
         $request = Request::create('/');
         $request->headers->remove('User-Agent');
 
         $response = new Response('foo');
         $event = new ResponseEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST, $response);
 
-        $error = null;
-        set_error_handler(function ($type, $message) use (&$error) { $error = $message; }, \E_DEPRECATED);
-
         $listener = new ChromePhpHandler();
         $listener->onKernelResponse($event);
-        restore_error_handler();
-
-        $this->assertNull($error);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,19 +22,15 @@ class ChromePhpHandlerTest extends TestCase`
`22`	`22`	`{`
`23`	`23`	`public function testOnKernelResponseShouldNotTriggerDeprecation()`
`24`	`24`	`{`
	`25`	`+ $this->expectNotToPerformAssertions();`
	`26`	`+`
`25`	`27`	`$request = Request::create('/');`
`26`	`28`	`$request->headers->remove('User-Agent');`
`27`	`29`
`28`	`30`	`$response = new Response('foo');`
`29`	`31`	`$event = new ResponseEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST, $response);`
`30`	`32`
`31`		`- $error = null;`
`32`		`- set_error_handler(function ($type, $message) use (&$error) { $error = $message; }, \E_DEPRECATED);`
`33`		`-`
`34`	`33`	`$listener = new ChromePhpHandler();`
`35`	`34`	`$listener->onKernelResponse($event);`
`36`		`- restore_error_handler();`
`37`		`-`
`38`		`- $this->assertNull($error);`
`39`	`35`	`}`
`40`	`36`	`}`