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/Mapping/Loader/FilesLoaderTest.php

@@ -21,13 +21,13 @@ class FilesLoaderTest extends TestCase
 {
     public function testCallsGetFileLoaderInstanceForeachPath()
     {
-        $loader = $this->getFilesLoader($this->getFileLoader());
+        $loader = $this->getFilesLoader($this->createMock(LoaderInterface::class));
         $this->assertEquals(4, $loader->getTimesCalled());
     }
 
     public function testCallsActualFileLoaderForMetadata()
     {
-        $fileLoader = $this->getFileLoader();
+        $fileLoader = $this->createMock(LoaderInterface::class);
         $fileLoader->expects($this->exactly(4))
             ->method('loadClassMetadata');
         $loader = $this->getFilesLoader($fileLoader);
@@ -43,9 +43,4 @@ public function getFilesLoader(LoaderInterface $loader)
             __DIR__.'/constraint-mapping.txt',
         ], $loader]);
     }
-
-    public function getFileLoader()
-    {
-        return $this->createMock(LoaderInterface::class);
-    }
 }