Merge branch '5.2' into 5.3

* 5.2:
  [FrameworkBundle] Fix broken mock

Author: derrabus

Tests/Controller/AbstractControllerTest.php

@@ -567,7 +567,11 @@ public function testCreateNotFoundException()
 
     public function testCreateForm()
     {
-        $form = new Form($this->createMock(FormConfigInterface::class));
+        $config = $this->createMock(FormConfigInterface::class);
+        $config->method('getInheritData')->willReturn(false);
+        $config->method('getName')->willReturn('');
+
+        $form = new Form($config);
 
         $formFactory = $this->createMock(FormFactoryInterface::class);
         $formFactory->expects($this->once())->method('create')->willReturn($form);