Merge branch '4.4' into 5.2

* 4.4:
  Use createMock() instead of a getter
  [ErrorHandler] Fix strpos error when trying to call a method without a name
  use proper keys to not override appended files
  Fix console logger according to PSR-3

Author: jderusse

Tests/CacheClearer/ChainCacheClearerTest.php

@@ -31,17 +31,12 @@ public static function tearDownAfterClass(): void
 
     public function testInjectClearersInConstructor()
     {
-        $clearer = $this->getMockClearer();
+        $clearer = $this->createMock(CacheClearerInterface::class);
         $clearer
             ->expects($this->once())
             ->method('clear');
 
         $chainClearer = new ChainCacheClearer([$clearer]);
         $chainClearer->clear(self::$cacheDir);
     }
-
-    protected function getMockClearer()
-    {
-        return $this->createMock(CacheClearerInterface::class);
-    }
 }

Tests/EventListener/AddRequestFormatsListenerTest.php

@@ -19,8 +19,6 @@
 use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
- * Test AddRequestFormatsListener class.
- *
  * @author Gildas Quemener <gildas.quemener@gmail.com>
  */
 class AddRequestFormatsListenerTest extends TestCase
@@ -47,15 +45,15 @@ public function testIsAnEventSubscriber()
 
     public function testRegisteredEvent()
     {
-        $this->assertEquals(
+        $this->assertSame(
             [KernelEvents::REQUEST => ['onKernelRequest', 100]],
             AddRequestFormatsListener::getSubscribedEvents()
         );
     }
 
     public function testSetAdditionalFormats()
     {
-        $request = $this->getRequestMock();
+        $request = $this->createMock(Request::class);
         $event = $this->getRequestEventMock($request);
 
         $request->expects($this->once())
@@ -65,11 +63,6 @@ public function testSetAdditionalFormats()
         $this->listener->onKernelRequest($event);
     }
 
-    protected function getRequestMock()
-    {
-        return $this->createMock(Request::class);
-    }
-
     protected function getRequestEventMock(Request $request)
     {
         $event = $this->createMock(RequestEvent::class);

Tests/EventListener/LocaleAwareListenerTest.php

@@ -40,7 +40,7 @@ public function testLocaleIsSetInOnKernelRequest()
             ->method('setLocale')
             ->with($this->equalTo('fr'));
 
-        $event = new RequestEvent($this->createHttpKernel(), $this->createRequest('fr'), HttpKernelInterface::MASTER_REQUEST);
+        $event = new RequestEvent($this->createMock(HttpKernelInterface::class), $this->createRequest('fr'), HttpKernelInterface::MASTER_REQUEST);
         $this->listener->onKernelRequest($event);
     }
 
@@ -57,7 +57,7 @@ public function testDefaultLocaleIsUsedOnExceptionsInOnKernelRequest()
                 $this->throwException(new \InvalidArgumentException())
             );
 
-        $event = new RequestEvent($this->createHttpKernel(), $this->createRequest('fr'), HttpKernelInterface::MASTER_REQUEST);
+        $event = new RequestEvent($this->createMock(HttpKernelInterface::class), $this->createRequest('fr'), HttpKernelInterface::MASTER_REQUEST);
         $this->listener->onKernelRequest($event);
     }
 
@@ -71,7 +71,7 @@ public function testLocaleIsSetInOnKernelFinishRequestWhenParentRequestExists()
         $this->requestStack->push($this->createRequest('fr'));
         $this->requestStack->push($subRequest = $this->createRequest('de'));
 
-        $event = new FinishRequestEvent($this->createHttpKernel(), $subRequest, HttpKernelInterface::SUB_REQUEST);
+        $event = new FinishRequestEvent($this->createMock(HttpKernelInterface::class), $subRequest, HttpKernelInterface::SUB_REQUEST);
         $this->listener->onKernelFinishRequest($event);
     }
 
@@ -84,7 +84,7 @@ public function testLocaleIsSetToDefaultOnKernelFinishRequestWhenParentRequestDo
 
         $this->requestStack->push($subRequest = $this->createRequest('de'));
 
-        $event = new FinishRequestEvent($this->createHttpKernel(), $subRequest, HttpKernelInterface::SUB_REQUEST);
+        $event = new FinishRequestEvent($this->createMock(HttpKernelInterface::class), $subRequest, HttpKernelInterface::SUB_REQUEST);
         $this->listener->onKernelFinishRequest($event);
     }
 
@@ -104,15 +104,10 @@ public function testDefaultLocaleIsUsedOnExceptionsInOnKernelFinishRequest()
         $this->requestStack->push($this->createRequest('fr'));
         $this->requestStack->push($subRequest = $this->createRequest('de'));
 
-        $event = new FinishRequestEvent($this->createHttpKernel(), $subRequest, HttpKernelInterface::SUB_REQUEST);
+        $event = new FinishRequestEvent($this->createMock(HttpKernelInterface::class), $subRequest, HttpKernelInterface::SUB_REQUEST);
         $this->listener->onKernelFinishRequest($event);
     }
 
-    private function createHttpKernel()
-    {
-        return $this->createMock(HttpKernelInterface::class);
-    }
-
     private function createRequest($locale)
     {
         $request = new Request();