Use createMock() and use import instead of FQCN

Author: OskarStark

Test/Traits/ValidatorExtensionTrait.php

@@ -37,7 +37,7 @@ protected function getValidatorExtension()
             throw new \Exception(sprintf('The trait "ValidatorExtensionTrait" can only be added to a class that extends "%s".', TypeTestCase::class));
         }
 
-        $this->validator = $this->getMockBuilder(ValidatorInterface::class)->getMock();
+        $this->validator = $this->createMock(ValidatorInterface::class);
         $metadata = $this->getMockBuilder(ClassMetadata::class)->setConstructorArgs([''])->setMethods(['addPropertyConstraint'])->getMock();
         $this->validator->expects($this->any())->method('getMetadataFor')->will($this->returnValue($metadata));
         $this->validator->expects($this->any())->method('validate')->will($this->returnValue(new ConstraintViolationList()));

Test/TypeTestCase.php

@@ -33,7 +33,7 @@ private function doSetUp()
     {
         parent::setUp();
 
-        $this->dispatcher = $this->getMockBuilder(EventDispatcherInterface::class)->getMock();
+        $this->dispatcher = $this->createMock(EventDispatcherInterface::class);
         $this->builder = new FormBuilder('', null, $this->dispatcher, $this->factory);
     }
 

Tests/AbstractFormTest.php

@@ -15,8 +15,12 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Form\DataMapperInterface;
+use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\FormInterface;
+use Symfony\Component\Form\FormValidatorInterface;
 
 abstract class AbstractFormTest extends TestCase
 {
@@ -26,7 +30,7 @@ abstract class AbstractFormTest extends TestCase
     protected $dispatcher;
 
     /**
-     * @var \Symfony\Component\Form\FormFactoryInterface
+     * @var FormFactoryInterface
      */
     protected $factory;
 
@@ -38,7 +42,7 @@ abstract class AbstractFormTest extends TestCase
     protected function setUp(): void
     {
         $this->dispatcher = new EventDispatcher();
-        $this->factory = $this->getMockBuilder(\Symfony\Component\Form\FormFactoryInterface::class)->getMock();
+        $this->factory = $this->createMock(FormFactoryInterface::class);
         $this->form = $this->createForm();
     }
 
@@ -58,16 +62,16 @@ protected function getBuilder(?string $name = 'name', EventDispatcherInterface $
 
     protected function getDataMapper(): MockObject
     {
-        return $this->getMockBuilder(\Symfony\Component\Form\DataMapperInterface::class)->getMock();
+        return $this->createMock(DataMapperInterface::class);
     }
 
     protected function getDataTransformer(): MockObject
     {
-        return $this->getMockBuilder(\Symfony\Component\Form\DataTransformerInterface::class)->getMock();
+        return $this->createMock(DataTransformerInterface::class);
     }
 
     protected function getFormValidator(): MockObject
     {
-        return $this->getMockBuilder(\Symfony\Component\Form\FormValidatorInterface::class)->getMock();
+        return $this->createMock(FormValidatorInterface::class);
     }
 }

Tests/AbstractLayoutTest.php

@@ -18,6 +18,7 @@
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormView;
 use Symfony\Component\Form\Test\FormIntegrationTestCase;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 
 abstract class AbstractLayoutTest extends FormIntegrationTestCase
 {
@@ -34,7 +35,7 @@ protected function setUp(): void
 
         \Locale::setDefault('en');
 
-        $this->csrfTokenManager = $this->getMockBuilder(\Symfony\Component\Security\Csrf\CsrfTokenManagerInterface::class)->getMock();
+        $this->csrfTokenManager = $this->createMock(CsrfTokenManagerInterface::class);
 
         parent::setUp();
     }

Tests/AbstractRequestHandlerTest.php

@@ -18,8 +18,10 @@
 use Symfony\Component\Form\FormBuilder;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\Form\FormFactory;
+use Symfony\Component\Form\FormFactoryInterface;
 use Symfony\Component\Form\Forms;
 use Symfony\Component\Form\RequestHandlerInterface;
+use Symfony\Component\Form\Util\ServerParams;
 
 /**
  * @author Bernhard Schussek <[email protected]>
@@ -42,7 +44,7 @@ abstract class AbstractRequestHandlerTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->serverParams = $this->getMockBuilder(\Symfony\Component\Form\Util\ServerParams::class)->setMethods(['getNormalizedIniPostMaxSize', 'getContentLength'])->getMock();
+        $this->serverParams = $this->getMockBuilder(ServerParams::class)->setMethods(['getNormalizedIniPostMaxSize', 'getContentLength'])->getMock();
         $this->requestHandler = $this->getRequestHandler();
         $this->factory = Forms::createFormFactoryBuilder()->getFormFactory();
         $this->request = null;
@@ -405,7 +407,7 @@ protected function createForm($name, $method = null, $compound = false)
 
     protected function createBuilder($name, $compound = false, array $options = [])
     {
-        $builder = new FormBuilder($name, null, new EventDispatcher(), $this->getMockBuilder(\Symfony\Component\Form\FormFactoryInterface::class)->getMock(), $options);
+        $builder = new FormBuilder($name, null, new EventDispatcher(), $this->createMock(FormFactoryInterface::class), $options);
         $builder->setCompound($compound);
 
         if ($compound) {

Tests/AbstractTypeExtensionTest.php

@@ -12,6 +12,7 @@
 namespace Symfony\Component\Form\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Form\Exception\LogicException;
 use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
 
 class AbstractTypeExtensionTest extends TestCase
@@ -21,7 +22,7 @@ class AbstractTypeExtensionTest extends TestCase
      */
     public function testImplementingNeitherGetExtendedTypeNorExtendsTypeThrowsException()
     {
-        $this->expectException(\Symfony\Component\Form\Exception\LogicException::class);
+        $this->expectException(LogicException::class);
         $this->expectExceptionMessage('You need to implement the static getExtendedTypes() method when implementing the "Symfony\Component\Form\FormTypeExtensionInterface" in "Symfony\Component\Form\Tests\TypeExtensionWithoutExtendedTypes".');
         $extension = new TypeExtensionWithoutExtendedTypes();
         $extension->getExtendedType();

Tests/ButtonTest.php

@@ -12,8 +12,11 @@
 namespace Symfony\Component\Form\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Form\ButtonBuilder;
+use Symfony\Component\Form\Exception\AlreadySubmittedException;
 use Symfony\Component\Form\FormBuilder;
+use Symfony\Component\Form\FormFactoryInterface;
 
 /**
  * @author Bernhard Schussek <[email protected]>
@@ -26,13 +29,13 @@ class ButtonTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->dispatcher = $this->getMockBuilder(\Symfony\Component\EventDispatcher\EventDispatcherInterface::class)->getMock();
-        $this->factory = $this->getMockBuilder(\Symfony\Component\Form\FormFactoryInterface::class)->getMock();
+        $this->dispatcher = $this->createMock(EventDispatcherInterface::class);
+        $this->factory = $this->createMock(FormFactoryInterface::class);
     }
 
     public function testSetParentOnSubmittedButton()
     {
-        $this->expectException(\Symfony\Component\Form\Exception\AlreadySubmittedException::class);
+        $this->expectException(AlreadySubmittedException::class);
         $button = $this->getButtonBuilder('button')
             ->getForm()
         ;

Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php

@@ -14,7 +14,10 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
+use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
 use Symfony\Component\Form\ChoiceList\Factory\CachingFactoryDecorator;
+use Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface;
+use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
 use Symfony\Component\Form\ChoiceList\View\ChoiceListView;
 
 /**
@@ -34,7 +37,7 @@ class CachingFactoryDecoratorTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->decoratedFactory = $this->getMockBuilder(\Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface::class)->getMock();
+        $this->decoratedFactory = $this->createMock(ChoiceListFactoryInterface::class);
         $this->factory = new CachingFactoryDecorator($this->decoratedFactory);
     }
 
@@ -163,7 +166,7 @@ public function testCreateFromChoicesDifferentValueClosure()
 
     public function testCreateFromLoaderSameLoader()
     {
-        $loader = $this->getMockBuilder(\Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface::class)->getMock();
+        $loader = $this->createMock(ChoiceLoaderInterface::class);
         $list = new ArrayChoiceList([]);
 
         $this->decoratedFactory->expects($this->once())
@@ -177,8 +180,8 @@ public function testCreateFromLoaderSameLoader()
 
     public function testCreateFromLoaderDifferentLoader()
     {
-        $loader1 = $this->getMockBuilder(\Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface::class)->getMock();
-        $loader2 = $this->getMockBuilder(\Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface::class)->getMock();
+        $loader1 = $this->createMock(ChoiceLoaderInterface::class);
+        $loader2 = $this->createMock(ChoiceLoaderInterface::class);
         $list1 = new ArrayChoiceList([]);
         $list2 = new ArrayChoiceList([]);
 
@@ -196,7 +199,7 @@ public function testCreateFromLoaderDifferentLoader()
 
     public function testCreateFromLoaderSameValueClosure()
     {
-        $loader = $this->getMockBuilder(\Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface::class)->getMock();
+        $loader = $this->createMock(ChoiceLoaderInterface::class);
         $list = new ArrayChoiceList([]);
         $closure = function () {};
 
@@ -211,7 +214,7 @@ public function testCreateFromLoaderSameValueClosure()
 
     public function testCreateFromLoaderDifferentValueClosure()
     {
-        $loader = $this->getMockBuilder(\Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface::class)->getMock();
+        $loader = $this->createMock(ChoiceLoaderInterface::class);
         $list1 = new ArrayChoiceList([]);
         $list2 = new ArrayChoiceList([]);
         $closure1 = function () {};
@@ -232,7 +235,7 @@ public function testCreateFromLoaderDifferentValueClosure()
     public function testCreateViewSamePreferredChoices()
     {
         $preferred = ['a'];
-        $list = $this->getMockBuilder(\Symfony\Component\Form\ChoiceList\ChoiceListInterface::class)->getMock();
+        $list = $this->createMock(ChoiceListInterface::class);
         $view = new ChoiceListView();
 
         $this->decoratedFactory->expects($this->once())
@@ -248,7 +251,7 @@ public function testCreateViewDifferentPreferredChoices()
     {
         $preferred1 = ['a'];
         $preferred2 = ['b'];
-        $list = $this->getMockBuilder(\Symfony\Component\Form\ChoiceList\ChoiceListInterface::class)->getMock();
+        $list = $this->createMock(ChoiceListInterface::class);
         $view1 = new ChoiceListView();
         $view2 = new ChoiceListView();
 
@@ -267,7 +270,7 @@ public function testCreateViewDifferentPreferredChoices()
     public function testCreateViewSamePreferredChoicesClosure()
     {
         $preferred = function () {};
-        $list = $this->getMockBuilder(\Symfony\Component\Form\ChoiceList\ChoiceListInterface::class)->getMock();
+        $list = $this->createMock(ChoiceListInterface::class);
         $view = new ChoiceListView();
 
         $this->decoratedFactory->expects($this->once())
@@ -283,7 +286,7 @@ public function testCreateViewDifferentPreferredChoicesClosure()
     {
         $preferred1 = function () {};
         $preferred2 = function () {};
-        $list = $this->getMockBuilder(\Symfony\Component\Form\ChoiceList\ChoiceListInterface::class)->getMock();
+        $list = $this->createMock(ChoiceListInterface::class);
         $view1 = new ChoiceListView();
         $view2 = new ChoiceListView();
 
@@ -302,7 +305,7 @@ public function testCreateViewDifferentPreferredChoicesClosure()
     public function testCreateViewSameLabelClosure()
     {
         $labels = function () {};
-        $list = $this->getMockBuilder(\Symfony\Component\Form\ChoiceList\ChoiceListInterface::class)->getMock();
+        $list = $this->createMock(ChoiceListInterface::class);
         $view = new ChoiceListView();
 
         $this->decoratedFactory->expects($this->once())
@@ -318,7 +321,7 @@ public function testCreateViewDifferentLabelClosure()
     {
         $labels1 = function () {};
         $labels2 = function () {};
-        $list = $this->getMockBuilder(\Symfony\Component\Form\ChoiceList\ChoiceListInterface::class)->getMock();
+        $list = $this->createMock(ChoiceListInterface::class);
         $view1 = new ChoiceListView();
         $view2 = new ChoiceListView();
 
@@ -337,7 +340,7 @@ public function testCreateViewDifferentLabelClosure()
     public function testCreateViewSameIndexClosure()
     {
         $index = function () {};
-        $list = $this->getMockBuilder(\Symfony\Component\Form\ChoiceList\ChoiceListInterface::class)->getMock();
+        $list = $this->createMock(ChoiceListInterface::class);
         $view = new ChoiceListView();
 
         $this->decoratedFactory->expects($this->once())
@@ -353,7 +356,7 @@ public function testCreateViewDifferentIndexClosure()
     {
         $index1 = function () {};
         $index2 = function () {};
-        $list = $this->getMockBuilder(\Symfony\Component\Form\ChoiceList\ChoiceListInterface::class)->getMock();
+        $list = $this->createMock(ChoiceListInterface::class);
         $view1 = new ChoiceListView();
         $view2 = new ChoiceListView();
 
@@ -372,7 +375,7 @@ public function testCreateViewDifferentIndexClosure()
     public function testCreateViewSameGroupByClosure()
     {
         $groupBy = function () {};
-        $list = $this->getMockBuilder(\Symfony\Component\Form\ChoiceList\ChoiceListInterface::class)->getMock();
+        $list = $this->createMock(ChoiceListInterface::class);
         $view = new ChoiceListView();
 
         $this->decoratedFactory->expects($this->once())
@@ -388,7 +391,7 @@ public function testCreateViewDifferentGroupByClosure()
     {
         $groupBy1 = function () {};
         $groupBy2 = function () {};
-        $list = $this->getMockBuilder(\Symfony\Component\Form\ChoiceList\ChoiceListInterface::class)->getMock();
+        $list = $this->createMock(ChoiceListInterface::class);
         $view1 = new ChoiceListView();
         $view2 = new ChoiceListView();
 
@@ -407,7 +410,7 @@ public function testCreateViewDifferentGroupByClosure()
     public function testCreateViewSameAttributes()
     {
         $attr = ['class' => 'foobar'];
-        $list = $this->getMockBuilder(\Symfony\Component\Form\ChoiceList\ChoiceListInterface::class)->getMock();
+        $list = $this->createMock(ChoiceListInterface::class);
         $view = new ChoiceListView();
 
         $this->decoratedFactory->expects($this->once())
@@ -423,7 +426,7 @@ public function testCreateViewDifferentAttributes()
     {
         $attr1 = ['class' => 'foobar1'];
         $attr2 = ['class' => 'foobar2'];
-        $list = $this->getMockBuilder(\Symfony\Component\Form\ChoiceList\ChoiceListInterface::class)->getMock();
+        $list = $this->createMock(ChoiceListInterface::class);
         $view1 = new ChoiceListView();
         $view2 = new ChoiceListView();
 
@@ -442,7 +445,7 @@ public function testCreateViewDifferentAttributes()
     public function testCreateViewSameAttributesClosure()
     {
         $attr = function () {};
-        $list = $this->getMockBuilder(\Symfony\Component\Form\ChoiceList\ChoiceListInterface::class)->getMock();
+        $list = $this->createMock(ChoiceListInterface::class);
         $view = new ChoiceListView();
 
         $this->decoratedFactory->expects($this->once())
@@ -458,7 +461,7 @@ public function testCreateViewDifferentAttributesClosure()
     {
         $attr1 = function () {};
         $attr2 = function () {};
-        $list = $this->getMockBuilder(\Symfony\Component\Form\ChoiceList\ChoiceListInterface::class)->getMock();
+        $list = $this->createMock(ChoiceListInterface::class);
         $view1 = new ChoiceListView();
         $view2 = new ChoiceListView();
 

Tests/ChoiceList/Factory/DefaultChoiceListFactoryTest.php

@@ -16,6 +16,7 @@
 use Symfony\Component\Form\ChoiceList\ChoiceListInterface;
 use Symfony\Component\Form\ChoiceList\Factory\DefaultChoiceListFactory;
 use Symfony\Component\Form\ChoiceList\LazyChoiceList;
+use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
 use Symfony\Component\Form\ChoiceList\View\ChoiceGroupView;
 use Symfony\Component\Form\ChoiceList\View\ChoiceListView;
 use Symfony\Component\Form\ChoiceList\View\ChoiceView;
@@ -193,7 +194,7 @@ function ($object) { return $object->value; }
 
     public function testCreateFromLoader()
     {
-        $loader = $this->getMockBuilder(\Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface::class)->getMock();
+        $loader = $this->createMock(ChoiceLoaderInterface::class);
 
         $list = $this->factory->createListFromLoader($loader);
 
@@ -202,7 +203,7 @@ public function testCreateFromLoader()
 
     public function testCreateFromLoaderWithValues()
     {
-        $loader = $this->getMockBuilder(\Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface::class)->getMock();
+        $loader = $this->createMock(ChoiceLoaderInterface::class);
 
         $value = function () {};
         $list = $this->factory->createListFromLoader($loader, $value);