From 92bd9ec4b76abf8a90fbe0d226adbc7e5191c53d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Deruss=C3=A9?= Date: Mon, 5 Aug 2019 16:11:35 +0200 Subject: [PATCH 1/2] Use Phpunit FQDN in tests comments --- .../ChoiceList/DoctrineChoiceLoaderTest.php | 11 +++++----- .../Tests/Form/Type/EntityTypeTest.php | 3 ++- .../AnnotationsCacheWarmerTest.php | 3 ++- .../Tests/Command/CachePruneCommandTest.php | 5 +++-- .../Cache/Tests/Adapter/ChainAdapterTest.php | 7 ++++--- .../Tests/Adapter/TagAwareAdapterTest.php | 7 ++++--- .../Cache/Tests/Simple/ChainCacheTest.php | 7 ++++--- .../ContainerAwareEventDispatcher.php | 3 ++- .../Tests/ImmutableEventDispatcherTest.php | 3 ++- .../Component/Form/Tests/AbstractFormTest.php | 7 ++++--- .../Factory/CachingFactoryDecoratorTest.php | 3 ++- .../Factory/PropertyAccessDecoratorTest.php | 3 ++- .../Tests/ChoiceList/LazyChoiceListTest.php | 5 +++-- .../Csrf/Type/FormTypeCsrfExtensionTest.php | 5 +++-- .../DataCollectorExtensionTest.php | 3 ++- .../DataCollector/FormDataCollectorTest.php | 9 ++++---- .../DataCollector/FormDataExtractorTest.php | 5 +++-- .../Type/DataCollectorTypeExtensionTest.php | 3 ++- .../Component/Form/Tests/FormFactoryTest.php | 9 ++++---- .../Component/Form/Tests/FormRegistryTest.php | 7 ++++--- .../Form/Tests/ResolvedFormTypeTest.php | 21 ++++++++++--------- .../Handler/MongoDbSessionHandlerTest.php | 3 ++- .../Bundle/Reader/BundleEntryReaderTest.php | 3 ++- .../Component/Ldap/Tests/LdapClientTest.php | 3 ++- src/Symfony/Component/Ldap/Tests/LdapTest.php | 3 ++- .../Lock/Tests/Store/CombinedStoreTest.php | 7 ++++--- .../Tests/Encoder/XmlEncoderTest.php | 3 ++- .../Normalizer/AbstractNormalizerTest.php | 3 ++- .../Normalizer/ArrayDenormalizerTest.php | 3 ++- .../JsonSerializableNormalizerTest.php | 3 ++- .../Translation/Tests/TranslatorCacheTest.php | 3 ++- 31 files changed, 97 insertions(+), 66 deletions(-) diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php index 325ef31e2b..05657d6e52 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php @@ -14,6 +14,7 @@ namespace Symfony\Bridge\Doctrine\Tests\Form\ChoiceList; use Doctrine\Common\Persistence\ObjectManager; use Doctrine\Common\Persistence\ObjectRepository; use Doctrine\ORM\Mapping\ClassMetadata; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Symfony\Bridge\Doctrine\Form\ChoiceList\DoctrineChoiceLoader; use Symfony\Bridge\Doctrine\Form\ChoiceList\EntityLoaderInterface; @@ -27,17 +28,17 @@ use Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface; class DoctrineChoiceLoaderTest extends TestCase { /** - * @var ChoiceListFactoryInterface|\PHPUnit_Framework_MockObject_MockObject + * @var ChoiceListFactoryInterface|MockObject */ private $factory; /** - * @var ObjectManager|\PHPUnit_Framework_MockObject_MockObject + * @var ObjectManager|MockObject */ private $om; /** - * @var ObjectRepository|\PHPUnit_Framework_MockObject_MockObject + * @var ObjectRepository|MockObject */ private $repository; @@ -47,12 +48,12 @@ class DoctrineChoiceLoaderTest extends TestCase private $class; /** - * @var IdReader|\PHPUnit_Framework_MockObject_MockObject + * @var IdReader|MockObject */ private $idReader; /** - * @var EntityLoaderInterface|\PHPUnit_Framework_MockObject_MockObject + * @var EntityLoaderInterface|MockObject */ private $objectLoader; diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php index d6ef1f41d5..1feabd1a45 100644 --- a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php +++ b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php @@ -16,6 +16,7 @@ use Doctrine\Common\Persistence\ManagerRegistry; use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityRepository; use Doctrine\ORM\Tools\SchemaTool; +use PHPUnit\Framework\MockObject\MockObject; use Symfony\Bridge\Doctrine\Form\DoctrineOrmExtension; use Symfony\Bridge\Doctrine\Form\DoctrineOrmTypeGuesser; use Symfony\Bridge\Doctrine\Form\Type\EntityType; @@ -53,7 +54,7 @@ class EntityTypeTest extends BaseTypeTest private $em; /** - * @var \PHPUnit_Framework_MockObject_MockObject|ManagerRegistry + * @var MockObject|ManagerRegistry */ private $emRegistry; diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php index 9cc3bfa2d2..9a5b40ee36 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php @@ -5,6 +5,7 @@ namespace Symfony\Bundle\FrameworkBundle\Tests\CacheWarmer; use Doctrine\Common\Annotations\AnnotationReader; use Doctrine\Common\Annotations\CachedReader; use Doctrine\Common\Annotations\Reader; +use PHPUnit\Framework\MockObject\MockObject; use Symfony\Bundle\FrameworkBundle\CacheWarmer\AnnotationsCacheWarmer; use Symfony\Bundle\FrameworkBundle\Tests\TestCase; use Symfony\Component\Cache\Adapter\ArrayAdapter; @@ -86,7 +87,7 @@ class AnnotationsCacheWarmerTest extends TestCase } /** - * @return \PHPUnit_Framework_MockObject_MockObject|Reader + * @return MockObject|Reader */ private function getReadOnlyReader() { diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CachePruneCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CachePruneCommandTest.php index 3a603122e0..7ce554b3ed 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CachePruneCommandTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/CachePruneCommandTest.php @@ -11,6 +11,7 @@ namespace Symfony\Bundle\FrameworkBundle\Tests\Command; +use PHPUnit\Framework\MockObject\MockObject; use Symfony\Bundle\FrameworkBundle\Command\CachePoolPruneCommand; use Symfony\Bundle\FrameworkBundle\Console\Application; use Symfony\Bundle\FrameworkBundle\Tests\TestCase; @@ -55,7 +56,7 @@ class CachePruneCommandTest extends TestCase } /** - * @return \PHPUnit_Framework_MockObject_MockObject|KernelInterface + * @return MockObject|KernelInterface */ private function getKernel() { @@ -81,7 +82,7 @@ class CachePruneCommandTest extends TestCase } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PruneableInterface + * @return MockObject|PruneableInterface */ private function getPruneableInterfaceMock() { diff --git a/src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php index 5da7fa4017..5e48930dd1 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Cache\Tests\Adapter; +use PHPUnit\Framework\MockObject\MockObject; use Symfony\Component\Cache\Adapter\AdapterInterface; use Symfony\Component\Cache\Adapter\ArrayAdapter; use Symfony\Component\Cache\Adapter\ChainAdapter; @@ -65,7 +66,7 @@ class ChainAdapterTest extends AdapterTestCase } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface + * @return MockObject|PruneableCacheInterface */ private function getPruneableMock() { @@ -82,7 +83,7 @@ class ChainAdapterTest extends AdapterTestCase } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface + * @return MockObject|PruneableCacheInterface */ private function getFailingPruneableMock() { @@ -99,7 +100,7 @@ class ChainAdapterTest extends AdapterTestCase } /** - * @return \PHPUnit_Framework_MockObject_MockObject|AdapterInterface + * @return MockObject|AdapterInterface */ private function getNonPruneableMock() { diff --git a/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php index a28624402a..5bd2ffc287 100644 --- a/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php +++ b/src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Cache\Tests\Adapter; +use PHPUnit\Framework\MockObject\MockObject; use Symfony\Component\Cache\Adapter\AdapterInterface; use Symfony\Component\Cache\Adapter\FilesystemAdapter; use Symfony\Component\Cache\Adapter\TagAwareAdapter; @@ -160,7 +161,7 @@ class TagAwareAdapterTest extends AdapterTestCase } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface + * @return MockObject|PruneableCacheInterface */ private function getPruneableMock() { @@ -177,7 +178,7 @@ class TagAwareAdapterTest extends AdapterTestCase } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface + * @return MockObject|PruneableCacheInterface */ private function getFailingPruneableMock() { @@ -194,7 +195,7 @@ class TagAwareAdapterTest extends AdapterTestCase } /** - * @return \PHPUnit_Framework_MockObject_MockObject|AdapterInterface + * @return MockObject|AdapterInterface */ private function getNonPruneableMock() { diff --git a/src/Symfony/Component/Cache/Tests/Simple/ChainCacheTest.php b/src/Symfony/Component/Cache/Tests/Simple/ChainCacheTest.php index bb469fad5b..f216bc1f3c 100644 --- a/src/Symfony/Component/Cache/Tests/Simple/ChainCacheTest.php +++ b/src/Symfony/Component/Cache/Tests/Simple/ChainCacheTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Cache\Tests\Simple; +use PHPUnit\Framework\MockObject\MockObject; use Psr\SimpleCache\CacheInterface; use Symfony\Component\Cache\PruneableInterface; use Symfony\Component\Cache\Simple\ArrayCache; @@ -63,7 +64,7 @@ class ChainCacheTest extends CacheTestCase } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface + * @return MockObject|PruneableCacheInterface */ private function getPruneableMock() { @@ -80,7 +81,7 @@ class ChainCacheTest extends CacheTestCase } /** - * @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface + * @return MockObject|PruneableCacheInterface */ private function getFailingPruneableMock() { @@ -97,7 +98,7 @@ class ChainCacheTest extends CacheTestCase } /** - * @return \PHPUnit_Framework_MockObject_MockObject|CacheInterface + * @return MockObject|CacheInterface */ private function getNonPruneableMock() { diff --git a/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php b/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php index aeafd9ec29..1b33e1cab3 100644 --- a/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php +++ b/src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php @@ -11,6 +11,7 @@ namespace Symfony\Component\EventDispatcher; +use PHPUnit\Framework\MockObject\MockObject; use Symfony\Component\DependencyInjection\ContainerInterface; /** @@ -42,7 +43,7 @@ class ContainerAwareEventDispatcher extends EventDispatcher $this->container = $container; $class = \get_class($this); - if ($this instanceof \PHPUnit_Framework_MockObject_MockObject || $this instanceof \Prophecy\Doubler\DoubleInterface) { + if ($this instanceof \PHPUnit_Framework_MockObject_MockObject || $this instanceof MockObject || $this instanceof \Prophecy\Doubler\DoubleInterface) { $class = get_parent_class($class); } if (__CLASS__ !== $class) { diff --git a/src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php b/src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php index c1ac749b9b..03e0f4e454 100644 --- a/src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php +++ b/src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\EventDispatcher\Tests; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Symfony\Component\EventDispatcher\Event; use Symfony\Component\EventDispatcher\ImmutableEventDispatcher; @@ -21,7 +22,7 @@ use Symfony\Component\EventDispatcher\ImmutableEventDispatcher; class ImmutableEventDispatcherTest extends TestCase { /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ private $innerDispatcher; diff --git a/src/Symfony/Component/Form/Tests/AbstractFormTest.php b/src/Symfony/Component/Form/Tests/AbstractFormTest.php index 00d9e0fbd4..4dc84e84e2 100644 --- a/src/Symfony/Component/Form/Tests/AbstractFormTest.php +++ b/src/Symfony/Component/Form/Tests/AbstractFormTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Form\Tests; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Symfony\Component\EventDispatcher\EventDispatcher; use Symfony\Component\EventDispatcher\EventDispatcherInterface; @@ -66,7 +67,7 @@ abstract class AbstractFormTest extends TestCase } /** - * @return \PHPUnit_Framework_MockObject_MockObject + * @return MockObject */ protected function getDataMapper() { @@ -74,7 +75,7 @@ abstract class AbstractFormTest extends TestCase } /** - * @return \PHPUnit_Framework_MockObject_MockObject + * @return MockObject */ protected function getDataTransformer() { @@ -82,7 +83,7 @@ abstract class AbstractFormTest extends TestCase } /** - * @return \PHPUnit_Framework_MockObject_MockObject + * @return MockObject */ protected function getFormValidator() { diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php index 7277d49780..b194d65eee 100644 --- a/src/Symfony/Component/Form/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php +++ b/src/Symfony/Component/Form/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Form\Tests\ChoiceList\Factory; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Symfony\Component\Form\ChoiceList\Factory\CachingFactoryDecorator; @@ -20,7 +21,7 @@ use Symfony\Component\Form\ChoiceList\Factory\CachingFactoryDecorator; class CachingFactoryDecoratorTest extends TestCase { /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ private $decoratedFactory; diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/Factory/PropertyAccessDecoratorTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/Factory/PropertyAccessDecoratorTest.php index 42893696db..725a09df08 100644 --- a/src/Symfony/Component/Form/Tests/ChoiceList/Factory/PropertyAccessDecoratorTest.php +++ b/src/Symfony/Component/Form/Tests/ChoiceList/Factory/PropertyAccessDecoratorTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Form\Tests\ChoiceList\Factory; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Symfony\Component\Form\ChoiceList\Factory\PropertyAccessDecorator; use Symfony\Component\PropertyAccess\PropertyPath; @@ -21,7 +22,7 @@ use Symfony\Component\PropertyAccess\PropertyPath; class PropertyAccessDecoratorTest extends TestCase { /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ private $decoratedFactory; diff --git a/src/Symfony/Component/Form/Tests/ChoiceList/LazyChoiceListTest.php b/src/Symfony/Component/Form/Tests/ChoiceList/LazyChoiceListTest.php index 6854c43ef7..5888038370 100644 --- a/src/Symfony/Component/Form/Tests/ChoiceList/LazyChoiceListTest.php +++ b/src/Symfony/Component/Form/Tests/ChoiceList/LazyChoiceListTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Form\Tests\ChoiceList; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Symfony\Component\Form\ChoiceList\ArrayChoiceList; use Symfony\Component\Form\ChoiceList\LazyChoiceList; @@ -26,12 +27,12 @@ class LazyChoiceListTest extends TestCase private $list; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ private $loadedList; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ private $loader; diff --git a/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php index 665b700479..232fd52b46 100644 --- a/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Form\Tests\Extension\Csrf\Type; +use PHPUnit\Framework\MockObject\MockObject; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Csrf\CsrfExtension; use Symfony\Component\Form\FormBuilderInterface; @@ -31,12 +32,12 @@ class FormTypeCsrfExtensionTest_ChildType extends AbstractType class FormTypeCsrfExtensionTest extends TypeTestCase { /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ protected $tokenManager; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ protected $translator; diff --git a/src/Symfony/Component/Form/Tests/Extension/DataCollector/DataCollectorExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/DataCollector/DataCollectorExtensionTest.php index 6bdde2d92d..d125d463cb 100644 --- a/src/Symfony/Component/Form/Tests/Extension/DataCollector/DataCollectorExtensionTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/DataCollector/DataCollectorExtensionTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Form\Tests\Extension\DataCollector; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Symfony\Component\Form\Extension\DataCollector\DataCollectorExtension; @@ -22,7 +23,7 @@ class DataCollectorExtensionTest extends TestCase private $extension; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ private $dataCollector; diff --git a/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php b/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php index 83d44167d5..16aea8dfc4 100644 --- a/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Form\Tests\Extension\DataCollector; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Symfony\Component\Form\Extension\DataCollector\FormDataCollector; use Symfony\Component\Form\Form; @@ -20,7 +21,7 @@ use Symfony\Component\Form\FormView; class FormDataCollectorTest extends TestCase { /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ private $dataExtractor; @@ -30,17 +31,17 @@ class FormDataCollectorTest extends TestCase private $dataCollector; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ private $dispatcher; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ private $factory; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ private $dataMapper; diff --git a/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php b/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php index 860a96abcd..7ae1636ca1 100644 --- a/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Form\Tests\Extension\DataCollector; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Symfony\Component\Form\CallbackTransformer; use Symfony\Component\Form\Exception\TransformationFailedException; @@ -35,12 +36,12 @@ class FormDataExtractorTest extends TestCase private $dataExtractor; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ private $dispatcher; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ private $factory; diff --git a/src/Symfony/Component/Form/Tests/Extension/DataCollector/Type/DataCollectorTypeExtensionTest.php b/src/Symfony/Component/Form/Tests/Extension/DataCollector/Type/DataCollectorTypeExtensionTest.php index 35f38fc53a..75f3264da3 100644 --- a/src/Symfony/Component/Form/Tests/Extension/DataCollector/Type/DataCollectorTypeExtensionTest.php +++ b/src/Symfony/Component/Form/Tests/Extension/DataCollector/Type/DataCollectorTypeExtensionTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Form\Tests\Extension\DataCollector\Type; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Symfony\Component\Form\Extension\DataCollector\Type\DataCollectorTypeExtension; @@ -22,7 +23,7 @@ class DataCollectorTypeExtensionTest extends TestCase private $extension; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ private $dataCollector; diff --git a/src/Symfony/Component/Form/Tests/FormFactoryTest.php b/src/Symfony/Component/Form/Tests/FormFactoryTest.php index a1cba0d2de..ddd5b4bb72 100644 --- a/src/Symfony/Component/Form/Tests/FormFactoryTest.php +++ b/src/Symfony/Component/Form/Tests/FormFactoryTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Form\Tests; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Symfony\Component\Form\FormFactory; use Symfony\Component\Form\FormTypeGuesserChain; @@ -24,22 +25,22 @@ use Symfony\Component\Form\Guess\ValueGuess; class FormFactoryTest extends TestCase { /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ private $guesser1; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ private $guesser2; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ private $registry; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ private $builder; diff --git a/src/Symfony/Component/Form/Tests/FormRegistryTest.php b/src/Symfony/Component/Form/Tests/FormRegistryTest.php index cdc1ab7799..d027a56440 100644 --- a/src/Symfony/Component/Form/Tests/FormRegistryTest.php +++ b/src/Symfony/Component/Form/Tests/FormRegistryTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Form\Tests; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Symfony\Component\Form\FormRegistry; use Symfony\Component\Form\FormTypeGuesserChain; @@ -37,17 +38,17 @@ class FormRegistryTest extends TestCase private $registry; /** - * @var \PHPUnit_Framework_MockObject_MockObject|ResolvedFormTypeFactoryInterface + * @var MockObject|ResolvedFormTypeFactoryInterface */ private $resolvedTypeFactory; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ private $guesser1; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ private $guesser2; diff --git a/src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php b/src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php index ba078ad1fd..19b15e0c9f 100644 --- a/src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php +++ b/src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Form\Tests; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Symfony\Component\Form\Form; use Symfony\Component\Form\FormConfigInterface; @@ -25,37 +26,37 @@ use Symfony\Component\OptionsResolver\OptionsResolver; class ResolvedFormTypeTest extends TestCase { /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ private $dispatcher; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ private $factory; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ private $dataMapper; /** - * @var \PHPUnit_Framework_MockObject_MockObject|FormTypeInterface + * @var MockObject|FormTypeInterface */ private $parentType; /** - * @var \PHPUnit_Framework_MockObject_MockObject|FormTypeInterface + * @var MockObject|FormTypeInterface */ private $type; /** - * @var \PHPUnit_Framework_MockObject_MockObject|FormTypeExtensionInterface + * @var MockObject|FormTypeExtensionInterface */ private $extension1; /** - * @var \PHPUnit_Framework_MockObject_MockObject|FormTypeExtensionInterface + * @var MockObject|FormTypeExtensionInterface */ private $extension2; @@ -359,7 +360,7 @@ class ResolvedFormTypeTest extends TestCase } /** - * @return \PHPUnit_Framework_MockObject_MockObject + * @return MockObject */ private function getMockFormType($typeClass = 'Symfony\Component\Form\AbstractType') { @@ -367,7 +368,7 @@ class ResolvedFormTypeTest extends TestCase } /** - * @return \PHPUnit_Framework_MockObject_MockObject + * @return MockObject */ private function getMockFormTypeExtension() { @@ -375,7 +376,7 @@ class ResolvedFormTypeTest extends TestCase } /** - * @return \PHPUnit_Framework_MockObject_MockObject + * @return MockObject */ private function getMockFormFactory() { diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php index 7bc84f8767..f0f43d05b4 100644 --- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php +++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Symfony\Component\HttpFoundation\Session\Storage\Handler\MongoDbSessionHandler; @@ -22,7 +23,7 @@ use Symfony\Component\HttpFoundation\Session\Storage\Handler\MongoDbSessionHandl class MongoDbSessionHandlerTest extends TestCase { /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ private $mongo; private $storage; diff --git a/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php b/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php index 883b7ec6e3..faabdde931 100644 --- a/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php +++ b/src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Intl\Tests\Data\Bundle\Reader; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Symfony\Component\Intl\Data\Bundle\Reader\BundleEntryReader; use Symfony\Component\Intl\Exception\ResourceBundleNotFoundException; @@ -28,7 +29,7 @@ class BundleEntryReaderTest extends TestCase private $reader; /** - * @var \PHPUnit_Framework_MockObject_MockObject + * @var MockObject */ private $readerImpl; diff --git a/src/Symfony/Component/Ldap/Tests/LdapClientTest.php b/src/Symfony/Component/Ldap/Tests/LdapClientTest.php index 95373e92b1..07338d3e76 100644 --- a/src/Symfony/Component/Ldap/Tests/LdapClientTest.php +++ b/src/Symfony/Component/Ldap/Tests/LdapClientTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Ldap\Tests; +use PHPUnit\Framework\MockObject\MockObject; use Symfony\Component\Ldap\Adapter\CollectionInterface; use Symfony\Component\Ldap\Adapter\QueryInterface; use Symfony\Component\Ldap\Entry; @@ -24,7 +25,7 @@ class LdapClientTest extends LdapTestCase { /** @var LdapClient */ private $client; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var MockObject */ private $ldap; protected function setUp() diff --git a/src/Symfony/Component/Ldap/Tests/LdapTest.php b/src/Symfony/Component/Ldap/Tests/LdapTest.php index 1b893c28d9..42826ab521 100644 --- a/src/Symfony/Component/Ldap/Tests/LdapTest.php +++ b/src/Symfony/Component/Ldap/Tests/LdapTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Ldap\Tests; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Symfony\Component\Ldap\Adapter\AdapterInterface; use Symfony\Component\Ldap\Adapter\ConnectionInterface; @@ -19,7 +20,7 @@ use Symfony\Component\Ldap\Ldap; class LdapTest extends TestCase { - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var MockObject */ private $adapter; /** @var Ldap */ diff --git a/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php b/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php index c8645dcc9a..7344e000af 100644 --- a/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php +++ b/src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Lock\Tests\Store; +use PHPUnit\Framework\MockObject\MockObject; use Symfony\Component\Lock\Exception\LockConflictedException; use Symfony\Component\Lock\Key; use Symfony\Component\Lock\Store\CombinedStore; @@ -49,11 +50,11 @@ class CombinedStoreTest extends AbstractStoreTest return new CombinedStore([new RedisStore($redis)], new UnanimousStrategy()); } - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var MockObject */ private $strategy; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var MockObject */ private $store1; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var MockObject */ private $store2; /** @var CombinedStore */ private $store; diff --git a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php index a164d517da..4f83bf3a58 100644 --- a/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php +++ b/src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Serializer\Tests\Encoder; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Symfony\Component\Serializer\Encoder\XmlEncoder; use Symfony\Component\Serializer\Normalizer\CustomNormalizer; @@ -691,7 +692,7 @@ XML; } /** - * @return \PHPUnit_Framework_MockObject_MockObject|NormalizerInterface + * @return MockObject|NormalizerInterface */ private function createMockDateTimeNormalizer() { diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php index cce383075a..b9af165a5e 100644 --- a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php +++ b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php @@ -2,6 +2,7 @@ namespace Symfony\Component\Serializer\Tests\Normalizer; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Symfony\Component\Serializer\Mapping\AttributeMetadata; use Symfony\Component\Serializer\Mapping\ClassMetadata; @@ -31,7 +32,7 @@ class AbstractNormalizerTest extends TestCase private $normalizer; /** - * @var ClassMetadataFactoryInterface|\PHPUnit_Framework_MockObject_MockObject + * @var ClassMetadataFactoryInterface|MockObject */ private $classMetadata; diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/ArrayDenormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/ArrayDenormalizerTest.php index 132f3c0806..27bd361d3a 100644 --- a/src/Symfony/Component/Serializer/Tests/Normalizer/ArrayDenormalizerTest.php +++ b/src/Symfony/Component/Serializer/Tests/Normalizer/ArrayDenormalizerTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Serializer\Tests\Normalizer; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Symfony\Component\Serializer\Normalizer\ArrayDenormalizer; use Symfony\Component\Serializer\SerializerInterface; @@ -23,7 +24,7 @@ class ArrayDenormalizerTest extends TestCase private $denormalizer; /** - * @var SerializerInterface|\PHPUnit_Framework_MockObject_MockObject + * @var SerializerInterface|MockObject */ private $serializer; diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/JsonSerializableNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/JsonSerializableNormalizerTest.php index 520ddc1c4c..a46a4cf995 100644 --- a/src/Symfony/Component/Serializer/Tests/Normalizer/JsonSerializableNormalizerTest.php +++ b/src/Symfony/Component/Serializer/Tests/Normalizer/JsonSerializableNormalizerTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Serializer\Tests\Normalizer; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Symfony\Component\Serializer\Normalizer\JsonSerializableNormalizer; use Symfony\Component\Serializer\Normalizer\NormalizerInterface; @@ -28,7 +29,7 @@ class JsonSerializableNormalizerTest extends TestCase private $normalizer; /** - * @var \PHPUnit_Framework_MockObject_MockObject|SerializerInterface + * @var MockObject|SerializerInterface */ private $serializer; diff --git a/src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php b/src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php index 0213e22254..6b23a9f1e9 100644 --- a/src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php +++ b/src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Translation\Tests; +use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\TestCase; use Symfony\Component\Config\Resource\SelfCheckingResourceInterface; use Symfony\Component\Translation\Loader\ArrayLoader; @@ -95,7 +96,7 @@ class TranslatorCacheTest extends TestCase $catalogue = new MessageCatalogue($locale, []); $catalogue->addResource(new StaleResource()); // better use a helper class than a mock, because it gets serialized in the cache and re-loaded - /** @var LoaderInterface|\PHPUnit_Framework_MockObject_MockObject $loader */ + /** @var LoaderInterface|MockObject $loader */ $loader = $this->getMockBuilder('Symfony\Component\Translation\Loader\LoaderInterface')->getMock(); $loader ->expects($this->exactly(2)) From 360711ce4e3b83251e7fe9dac958dc4f4246c0b6 Mon Sep 17 00:00:00 2001 From: Valentin Udaltsov Date: Mon, 5 Aug 2019 13:00:54 +0300 Subject: [PATCH 2/2] [Form] Fix inconsistencies --- .../Component/Form/ChoiceList/ArrayChoiceList.php | 14 +++++++------- .../Factory/ChoiceListFactoryInterface.php | 8 ++------ .../Component/Form/ChoiceList/View/ChoiceView.php | 8 ++++---- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php b/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php index e7ebc7200b..94c9422eec 100644 --- a/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php +++ b/src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php @@ -172,13 +172,13 @@ class ArrayChoiceList implements ChoiceListInterface /** * Flattens an array into the given output variables. * - * @param array $choices The array to flatten - * @param callable $value The callable for generating choice values - * @param array $choicesByValues The flattened choices indexed by the - * corresponding values - * @param array $keysByValues The original keys indexed by the - * corresponding values - * @param array $structuredValues The values indexed by the original keys + * @param array $choices The array to flatten + * @param callable $value The callable for generating choice values + * @param array|null $choicesByValues The flattened choices indexed by the + * corresponding values + * @param array|null $keysByValues The original keys indexed by the + * corresponding values + * @param array|null $structuredValues The values indexed by the original keys * * @internal */ diff --git a/src/Symfony/Component/Form/ChoiceList/Factory/ChoiceListFactoryInterface.php b/src/Symfony/Component/Form/ChoiceList/Factory/ChoiceListFactoryInterface.php index 41a22586cc..ac6c3bcfa3 100644 --- a/src/Symfony/Component/Form/ChoiceList/Factory/ChoiceListFactoryInterface.php +++ b/src/Symfony/Component/Form/ChoiceList/Factory/ChoiceListFactoryInterface.php @@ -32,8 +32,7 @@ interface ChoiceListFactoryInterface * Null may be passed when the choice list contains the empty value. * * @param iterable $choices The choices - * @param callable|null $value The callable generating the choice - * values + * @param callable|null $value The callable generating the choice values * * @return ChoiceListInterface The choice list */ @@ -46,9 +45,7 @@ interface ChoiceListFactoryInterface * The callable receives the choice as only argument. * Null may be passed when the choice list contains the empty value. * - * @param ChoiceLoaderInterface $loader The choice loader - * @param callable|null $value The callable generating the choice - * values + * @param callable|null $value The callable generating the choice values * * @return ChoiceListInterface The choice list */ @@ -80,7 +77,6 @@ interface ChoiceListFactoryInterface * match the keys of the choices. The values should be arrays of HTML * attributes that should be added to the respective choice. * - * @param ChoiceListInterface $list The choice list * @param array|callable|null $preferredChoices The preferred choices * @param callable|null $label The callable generating the * choice labels diff --git a/src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php b/src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php index 83326a7ac1..9eb2f7c3cb 100644 --- a/src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php +++ b/src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php @@ -30,10 +30,10 @@ class ChoiceView /** * Creates a new choice view. * - * @param mixed $data The original choice - * @param string $value The view representation of the choice - * @param string $label The label displayed to humans - * @param array $attr Additional attributes for the HTML tag + * @param mixed $data The original choice + * @param string $value The view representation of the choice + * @param string|false $label The label displayed to humans; pass false to discard the label + * @param array $attr Additional attributes for the HTML tag */ public function __construct($data, $value, $label, array $attr = []) {