fix intersection types in tests

Author: Tobion

Tests/AbstractFormTest.php

@@ -20,7 +20,6 @@
 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
 {
@@ -30,7 +29,7 @@ abstract class AbstractFormTest extends TestCase
     protected $dispatcher;
 
     /**
-     * @var FormFactoryInterface
+     * @var MockObject&FormFactoryInterface
      */
     protected $factory;
 
@@ -60,18 +59,19 @@ protected function getBuilder(?string $name = 'name', EventDispatcherInterface $
         return new FormBuilder($name, $dataClass, $dispatcher ?: $this->dispatcher, $this->factory, $options);
     }
 
-    protected function getDataMapper(): MockObject
+    /**
+     * @return MockObject&DataMapperInterface
+     */
+    protected function getDataMapper(): DataMapperInterface
     {
         return $this->createMock(DataMapperInterface::class);
     }
 
-    protected function getDataTransformer(): MockObject
+    /**
+     * @return MockObject&DataTransformerInterface
+     */
+    protected function getDataTransformer(): DataTransformerInterface
     {
         return $this->createMock(DataTransformerInterface::class);
     }
-
-    protected function getFormValidator(): MockObject
-    {
-        return $this->createMock(FormValidatorInterface::class);
-    }
 }

Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php

@@ -26,7 +26,7 @@
 class CachingFactoryDecoratorTest extends TestCase
 {
     /**
-     * @var MockObject
+     * @var MockObject&ChoiceListFactoryInterface
      */
     private $decoratedFactory;
 

Tests/ChoiceList/Factory/PropertyAccessDecoratorTest.php

@@ -27,7 +27,7 @@
 class PropertyAccessDecoratorTest extends TestCase
 {
     /**
-     * @var MockObject
+     * @var MockObject&ChoiceListFactoryInterface
      */
     private $decoratedFactory;
 

Tests/ChoiceList/LazyChoiceListTest.php

@@ -28,15 +28,18 @@ class LazyChoiceListTest extends TestCase
     private $list;
 
     /**
-     * @var MockObject
+     * @var MockObject&ChoiceListInterface
      */
     private $loadedList;
 
     /**
-     * @var MockObject
+     * @var MockObject&ChoiceLoaderInterface
      */
     private $loader;
 
+    /**
+     * @var \Closure
+     */
     private $value;
 
     protected function setUp(): void

Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php

@@ -34,12 +34,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 class FormTypeCsrfExtensionTest extends TypeTestCase
 {
     /**
-     * @var MockObject
+     * @var MockObject&CsrfTokenManagerInterface
      */
     protected $tokenManager;
 
     /**
-     * @var MockObject
+     * @var MockObject&TranslatorInterface
      */
     protected $translator;
 

Tests/Extension/DataCollector/DataCollectorExtensionTest.php

@@ -25,7 +25,7 @@ class DataCollectorExtensionTest extends TestCase
     private $extension;
 
     /**
-     * @var MockObject
+     * @var MockObject&FormDataCollectorInterface
      */
     private $dataCollector;
 

Tests/Extension/DataCollector/FormDataCollectorTest.php

@@ -32,7 +32,7 @@
 class FormDataCollectorTest extends TestCase
 {
     /**
-     * @var MockObject
+     * @var MockObject&FormDataExtractorInterface
      */
     private $dataExtractor;
 
@@ -42,17 +42,17 @@ class FormDataCollectorTest extends TestCase
     private $dataCollector;
 
     /**
-     * @var MockObject
+     * @var EventDispatcher
      */
     private $dispatcher;
 
     /**
-     * @var MockObject
+     * @var FormFactory
      */
     private $factory;
 
     /**
-     * @var MockObject
+     * @var PropertyPathMapper
      */
     private $dataMapper;
 

Tests/Extension/DataCollector/FormDataExtractorTest.php

@@ -41,12 +41,12 @@ class FormDataExtractorTest extends TestCase
     private $dataExtractor;
 
     /**
-     * @var MockObject
+     * @var MockObject&EventDispatcherInterface
      */
     private $dispatcher;
 
     /**
-     * @var MockObject
+     * @var MockObject&FormFactoryInterface
      */
     private $factory;
 

Tests/Extension/DataCollector/Type/DataCollectorTypeExtensionTest.php

@@ -26,7 +26,7 @@ class DataCollectorTypeExtensionTest extends TestCase
     private $extension;
 
     /**
-     * @var MockObject
+     * @var MockObject&FormDataCollectorInterface
      */
     private $dataCollector;
 

Tests/FormFactoryTest.php

@@ -33,22 +33,22 @@
 class FormFactoryTest extends TestCase
 {
     /**
-     * @var MockObject
+     * @var MockObject&FormTypeGuesserInterface
      */
     private $guesser1;
 
     /**
-     * @var MockObject
+     * @var MockObject&FormTypeGuesserInterface
      */
     private $guesser2;
 
     /**
-     * @var MockObject
+     * @var MockObject&FormRegistryInterface
      */
     private $registry;
 
     /**
-     * @var MockObject
+     * @var MockObject&FormBuilderInterface
      */
     private $builder;