More cleanups and fixes

Author: nicolas-grekas

Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php

@@ -239,7 +239,7 @@ public function testCreateFromChoicesDifferentFilterClosure()
 
     public function testCreateFromLoaderSameLoader()
     {
-        $loader = $this->getMockBuilder(ChoiceLoaderInterface::class)->getMock();
+        $loader = $this->createMock(ChoiceLoaderInterface::class);
         $list = new ArrayChoiceList([]);
         $list2 = new ArrayChoiceList([]);
 
@@ -270,8 +270,8 @@ public function testCreateFromLoaderSameLoaderUseCache()
 
     public function testCreateFromLoaderDifferentLoader()
     {
-        $loader1 = $this->getMockBuilder(ChoiceLoaderInterface::class)->getMock();
-        $loader2 = $this->getMockBuilder(ChoiceLoaderInterface::class)->getMock();
+        $loader1 = $this->createMock(ChoiceLoaderInterface::class);
+        $loader2 = $this->createMock(ChoiceLoaderInterface::class);
         $list1 = new ArrayChoiceList([]);
         $list2 = new ArrayChoiceList([]);
 
@@ -289,7 +289,7 @@ public function testCreateFromLoaderDifferentLoader()
 
     public function testCreateFromLoaderSameValueClosure()
     {
-        $loader = $this->getMockBuilder(ChoiceLoaderInterface::class)->getMock();
+        $loader = $this->createMock(ChoiceLoaderInterface::class);
         $type = $this->createMock(FormTypeInterface::class);
         $list = new ArrayChoiceList([]);
         $list2 = new ArrayChoiceList([]);
@@ -329,7 +329,7 @@ public function testCreateFromLoaderSameValueClosureUseCache()
 
     public function testCreateFromLoaderDifferentValueClosure()
     {
-        $loader = $this->getMockBuilder(ChoiceLoaderInterface::class)->getMock();
+        $loader = $this->createMock(ChoiceLoaderInterface::class);
         $type = $this->createMock(FormTypeInterface::class);
         $list1 = new ArrayChoiceList([]);
         $list2 = new ArrayChoiceList([]);
@@ -350,7 +350,7 @@ public function testCreateFromLoaderDifferentValueClosure()
 
     public function testCreateFromLoaderSameFilterClosure()
     {
-        $loader = $this->getMockBuilder(ChoiceLoaderInterface::class)->getMock();
+        $loader = $this->createMock(ChoiceLoaderInterface::class);
         $type = $this->createMock(FormTypeInterface::class);
         $list = new ArrayChoiceList([]);
         $list2 = new ArrayChoiceList([]);
@@ -392,7 +392,7 @@ public function testCreateFromLoaderSameFilterClosureUseCache()
 
     public function testCreateFromLoaderDifferentFilterClosure()
     {
-        $loader = $this->getMockBuilder(ChoiceLoaderInterface::class)->getMock();
+        $loader = $this->createMock(ChoiceLoaderInterface::class);
         $type = $this->createMock(FormTypeInterface::class);
         $list1 = new ArrayChoiceList([]);
         $list2 = new ArrayChoiceList([]);

Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php

@@ -267,7 +267,7 @@ public function testCreateFromLoaderWithValues()
 
     public function testCreateFromLoaderWithFilter()
     {
-        $loader = $this->getMockBuilder(\Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface::class)->getMock();
+        $loader = $this->createMock(ChoiceLoaderInterface::class);
         $filter = function () {};
 
         $list = $this->factory->createListFromLoader($loader, null, $filter);

Tests/ChoiceList/Factory/PropertyAccessDecoratorTest.php

@@ -127,7 +127,7 @@ public function testCreateFromLoaderPropertyPath()
 
     public function testCreateFromLoaderFilterPropertyPath()
     {
-        $loader = $this->getMockBuilder(\Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface::class)->getMock();
+        $loader = $this->createMock(ChoiceLoaderInterface::class);
         $filteredChoices = [
             'two' => (object) ['property' => 'value 2', 'filter' => true],
         ];

Tests/ChoiceList/Loader/FilterChoiceLoaderDecoratorTest.php

@@ -11,7 +11,7 @@ class FilterChoiceLoaderDecoratorTest extends TestCase
 {
     public function testLoadChoiceList()
     {
-        $decorated = $this->getMockBuilder(ChoiceLoaderInterface::class)->getMock();
+        $decorated = $this->createMock(ChoiceLoaderInterface::class);
         $decorated->expects($this->once())
             ->method('loadChoiceList')
             ->willReturn(new ArrayChoiceList(range(1, 4)))
@@ -28,7 +28,7 @@ public function testLoadChoiceList()
 
     public function testLoadChoiceListWithGroupedChoices()
     {
-        $decorated = $this->getMockBuilder(ChoiceLoaderInterface::class)->getMock();
+        $decorated = $this->createMock(ChoiceLoaderInterface::class);
         $decorated->expects($this->once())
             ->method('loadChoiceList')
             ->willReturn(new ArrayChoiceList(['units' => range(1, 9), 'tens' => range(10, 90, 10)]))
@@ -54,7 +54,7 @@ public function testLoadValuesForChoices()
     {
         $evenValues = [1 => '2', 3 => '4'];
 
-        $decorated = $this->getMockBuilder(ChoiceLoaderInterface::class)->getMock();
+        $decorated = $this->createMock(ChoiceLoaderInterface::class);
         $decorated->expects($this->never())
             ->method('loadChoiceList')
         ;
@@ -78,7 +78,7 @@ public function testLoadChoicesForValues()
         $evenChoices = [1 => 2, 3 => 4];
         $values = array_map('strval', range(1, 4));
 
-        $decorated = $this->getMockBuilder(ChoiceLoaderInterface::class)->getMock();
+        $decorated = $this->createMock(ChoiceLoaderInterface::class);
         $decorated->expects($this->never())
             ->method('loadChoiceList')
         ;

Tests/FormRendererTest.php

@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\FormRenderer;
+use Symfony\Component\Form\FormRendererEngineInterface;
 use Symfony\Component\Form\FormView;
 
 class FormRendererTest extends TestCase
@@ -38,7 +39,7 @@ public function testRenderARenderedField()
         $formView->vars['name'] = 'foo';
         $formView->setRendered();
 
-        $engine = $this->getMockBuilder(\Symfony\Component\Form\FormRendererEngineInterface::class)->getMock();
+        $engine = $this->createMock(FormRendererEngineInterface::class);
         $renderer = new FormRenderer($engine);
         $renderer->searchAndRenderBlock($formView, 'row');
     }