Fix merge

nicolas-grekas · nicolas-grekas · commit 54f3618311c7 · 2023-02-21T17:15:44.000+01:00
diff --git a/src/Symfony/Bridge/Monolog/Tests/Handler/FirePHPHandlerTest.php b/src/Symfony/Bridge/Monolog/Tests/Handler/FirePHPHandlerTest.php
@@ -23,24 +23,6 @@
 
 class FirePHPHandlerTest extends TestCase
 {
-    public function testOnKernelResponseShouldNotTriggerDeprecation()
-    {
-        $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 FirePHPHandler();
-        $listener->onKernelResponse($event);
-        restore_error_handler();
-
-        $this->assertNull($error);
-    }
-
     public function testLogHandling()
     {
         $handler = $this->createHandler();
@@ -130,6 +112,22 @@ private function createHandler(): FirePHPHandler
         return $handler;
     }
 
+    public function testOnKernelResponseShouldNotTriggerDeprecation()
+    {
+        $handler = $this->createHandler();
+
+        $request = Request::create('/');
+        $request->headers->remove('User-Agent');
+
+        $error = null;
+        set_error_handler(function ($type, $message) use (&$error) { $error = $message; }, \E_DEPRECATED);
+
+        $this->dispatchResponseEvent($handler, $request);
+        restore_error_handler();
+
+        $this->assertNull($error);
+    }
+
     private function dispatchResponseEvent(FirePHPHandler $handler, Request $request): Response
     {
         $dispatcher = new EventDispatcher();
diff --git a/src/Symfony/Component/Cache/Tests/Messenger/EarlyExpirationHandlerTest.php b/src/Symfony/Component/Cache/Tests/Messenger/EarlyExpirationHandlerTest.php
@@ -39,7 +39,7 @@ public function testHandle()
         $item->set(234);
 
         $computationService = new class() implements CallbackInterface {
-            public function __invoke(CacheItemInterface $item, bool &$save)
+            public function __invoke(CacheItemInterface $item, bool &$save): mixed
             {
                 usleep(30000);
                 $item->expiresAfter(3600);
diff --git a/src/Symfony/Component/Validator/Constraints/EmailValidator.php b/src/Symfony/Component/Validator/Constraints/EmailValidator.php
@@ -44,7 +44,7 @@ public function __construct(string $defaultMode = Email::VALIDATION_MODE_LOOSE)
         }
 
         if (Email::VALIDATION_MODE_LOOSE === $defaultMode) {
-            trigger_deprecation('symfony/validator', '6.2', 'The "%s" mode is deprecated. The default mode will be changed to "%s" in 7.0.', Email::VALIDATION_MODE_LOOSE, Email::VALIDATION_MODE_HTML5);
+            trigger_deprecation('symfony/validator', '6.2', 'The "%s" mode is deprecated. It will be removed in 7.0 and the default mode will be changed to "%s".', Email::VALIDATION_MODE_LOOSE, Email::VALIDATION_MODE_HTML5);
         }
 
         $this->defaultMode = $defaultMode;
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/EmailValidatorTest.php
@@ -298,7 +298,7 @@ public function testModeHtml5AllowNoTld()
      */
     public function testModeLoose()
     {
-        $this->expectDeprecation('Since symfony/validator 6.2: The "loose" mode is deprecated. The default mode will be changed to "html5" in 7.0.');
+        $this->expectDeprecation('Since symfony/validator 6.2: The "loose" mode is deprecated. It will be removed in 7.0 and the default mode will be changed to "html5".');
 
         $constraint = new Email(['mode' => Email::VALIDATION_MODE_LOOSE]);
 

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function testHandle()`
`39`	`39`	`$item->set(234);`
`40`	`40`
`41`	`41`	`$computationService = new class() implements CallbackInterface {`
`42`		`- public function __invoke(CacheItemInterface $item, bool &$save)`
	`42`	`+ public function __invoke(CacheItemInterface $item, bool &$save): mixed`
`43`	`43`	`{`
`44`	`44`	`usleep(30000);`
`45`	`45`	`$item->expiresAfter(3600);`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function __construct(string $defaultMode = Email::VALIDATION_MODE_LOOSE)`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`if (Email::VALIDATION_MODE_LOOSE === $defaultMode) {`
`47`		`- trigger_deprecation('symfony/validator', '6.2', 'The "%s" mode is deprecated. The default mode will be changed to "%s" in 7.0.', Email::VALIDATION_MODE_LOOSE, Email::VALIDATION_MODE_HTML5);`
	`47`	`+ trigger_deprecation('symfony/validator', '6.2', 'The "%s" mode is deprecated. It will be removed in 7.0 and the default mode will be changed to "%s".', Email::VALIDATION_MODE_LOOSE, Email::VALIDATION_MODE_HTML5);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`$this->defaultMode = $defaultMode;`
Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ public function testModeHtml5AllowNoTld()`
`298`	`298`	`*/`
`299`	`299`	`public function testModeLoose()`
`300`	`300`	`{`
`301`		`- $this->expectDeprecation('Since symfony/validator 6.2: The "loose" mode is deprecated. The default mode will be changed to "html5" in 7.0.');`
	`301`	`+ $this->expectDeprecation('Since symfony/validator 6.2: The "loose" mode is deprecated. It will be removed in 7.0 and the default mode will be changed to "html5".');`
`302`	`302`
`303`	`303`	`$constraint = new Email(['mode' => Email::VALIDATION_MODE_LOOSE]);`
`304`	`304`