Merge branch '4.2' into 4.3

* 4.2: Use willReturn() instead of will(returnValue()).
Merge branch '3.4' into 4.2
2026-03-25 01:32:09 +01:00 · 2019-05-30 18:10:05 +02:00 · 2019-05-30 18:06:08 +02:00 · 2019-05-30 17:47:52 +02:00
1 changed files with 5 additions and 5 deletions
--- a/Tests/ErrorHandlerTest.php
+++ b/Tests/ErrorHandlerTest.php
@@ -234,7 +234,7 @@ class ErrorHandlerTest extends TestCase
            $logger
                ->expects($this->once())
                ->method('log')
-                ->will($this->returnCallback($warnArgCheck))
+                ->willReturnCallback($warnArgCheck)
            ;

            $handler = ErrorHandler::register();
@@ -262,7 +262,7 @@ class ErrorHandlerTest extends TestCase
            $logger
                ->expects($this->once())
                ->method('log')
-                ->will($this->returnCallback($logArgCheck))
+                ->willReturnCallback($logArgCheck)
            ;

            $handler = ErrorHandler::register();
@@ -318,7 +318,7 @@ class ErrorHandlerTest extends TestCase
        $logger
            ->expects($this->once())
            ->method('log')
-            ->will($this->returnCallback($logArgCheck))
+            ->willReturnCallback($logArgCheck)
        ;

        $handler = new ErrorHandler();
@@ -346,7 +346,7 @@ class ErrorHandlerTest extends TestCase
            $logger
                ->expects($this->exactly(2))
                ->method('log')
-                ->will($this->returnCallback($logArgCheck))
+                ->willReturnCallback($logArgCheck)
            ;

            $handler->setDefaultLogger($logger, E_ERROR);
@@ -462,7 +462,7 @@ class ErrorHandlerTest extends TestCase
            $logger
                ->expects($this->once())
                ->method('log')
-                ->will($this->returnCallback($logArgCheck))
+                ->willReturnCallback($logArgCheck)
            ;

            $handler->setDefaultLogger($logger, E_PARSE);
Author	SHA1	Message	Date
Nicolas Grekas	4e025104f1	Merge branch '4.2' into 4.3 * 4.2: Use willReturn() instead of will(returnValue()).	2019-05-30 18:10:05 +02:00
Nicolas Grekas	ceed75ff0d	Merge branch '3.4' into 4.2 * 3.4: Use willReturn() instead of will(returnValue()).	2019-05-30 18:06:08 +02:00
Alexander M. Turek	e79bbe15d8	Use willReturn() instead of will(returnValue()).	2019-05-30 17:47:52 +02:00