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/FormFactoryTest.php

@@ -76,7 +76,7 @@ public function testCreateNamedBuilderWithTypeName()
     {
         $options = ['a' => '1', 'b' => '2'];
         $resolvedOptions = ['a' => '2', 'b' => '3'];
-        $resolvedType = $this->getMockResolvedType();
+        $resolvedType = $this->createMock(ResolvedFormTypeInterface::class);
 
         $this->registry->expects($this->once())
             ->method('getType')
@@ -104,7 +104,7 @@ public function testCreateNamedBuilderFillsDataOption()
         $givenOptions = ['a' => '1', 'b' => '2'];
         $expectedOptions = array_merge($givenOptions, ['data' => 'DATA']);
         $resolvedOptions = ['a' => '2', 'b' => '3', 'data' => 'DATA'];
-        $resolvedType = $this->getMockResolvedType();
+        $resolvedType = $this->createMock(ResolvedFormTypeInterface::class);
 
         $this->registry->expects($this->once())
             ->method('getType')
@@ -131,7 +131,7 @@ public function testCreateNamedBuilderDoesNotOverrideExistingDataOption()
     {
         $options = ['a' => '1', 'b' => '2', 'data' => 'CUSTOM'];
         $resolvedOptions = ['a' => '2', 'b' => '3', 'data' => 'CUSTOM'];
-        $resolvedType = $this->getMockResolvedType();
+        $resolvedType = $this->createMock(ResolvedFormTypeInterface::class);
 
         $this->registry->expects($this->once())
             ->method('getType')
@@ -196,7 +196,7 @@ public function testCreateNamed()
     {
         $options = ['a' => '1', 'b' => '2'];
         $resolvedOptions = ['a' => '2', 'b' => '3'];
-        $resolvedType = $this->getMockResolvedType();
+        $resolvedType = $this->createMock(ResolvedFormTypeInterface::class);
 
         $this->registry->expects($this->once())
             ->method('getType')
@@ -470,9 +470,4 @@ private function getMockFactory(array $methods = [])
             ->setConstructorArgs([$this->registry])
             ->getMock();
     }
-
-    private function getMockResolvedType()
-    {
-        return $this->createMock(ResolvedFormTypeInterface::class);
-    }
 }