diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.3' into 4.4

Browse Source 
* 4.3:
  [Form] Fix inconsistencies
  Use Phpunit FQDN in tests comments
This commit is contained in:
Nicolas Grekas 2019-08-05 16:24:36 +02:00
commit 38143c604f
33 changed files with 108 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php
View File

@ -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;
@ -28,17 +29,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;
@ -48,12 +49,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;

3
src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
View File

@ -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;

3
src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php
View File

@ -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\NullAdapter;
@ -72,7 +73,7 @@ class AnnotationsCacheWarmerTest extends TestCase
}
/**
* @return \PHPUnit_Framework_MockObject_MockObject|Reader
* @return MockObject|Reader
*/
private function getReadOnlyReader()
{

3
src/Symfony/Bundle/FrameworkBundle/Tests/Command/CachePoolDeleteCommandTest.php
View File

@ -11,6 +11,7 @@
namespace Symfony\Bundle\FrameworkBundle\Tests\Command;
use PHPUnit\Framework\MockObject\MockObject;
use Psr\Cache\CacheItemPoolInterface;
use Symfony\Bundle\FrameworkBundle\Command\CachePoolDeleteCommand;
use Symfony\Bundle\FrameworkBundle\Console\Application;
@ -83,7 +84,7 @@ class CachePoolDeleteCommandTest extends TestCase
}
/**
* @return \PHPUnit_Framework_MockObject_MockObject|KernelInterface
* @return MockObject|KernelInterface
*/
private function getKernel()
{

5
src/Symfony/Bundle/FrameworkBundle/Tests/Command/CachePruneCommandTest.php
View File

@ -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;
@ -49,7 +50,7 @@ class CachePruneCommandTest extends TestCase
}
/**
* @return \PHPUnit_Framework_MockObject_MockObject|KernelInterface
* @return MockObject|KernelInterface
*/
private function getKernel()
{
@ -75,7 +76,7 @@ class CachePruneCommandTest extends TestCase
}
/**
* @return \PHPUnit_Framework_MockObject_MockObject|PruneableInterface
* @return MockObject|PruneableInterface
*/
private function getPruneableInterfaceMock()
{

7
src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php
View File

@ -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;
@ -69,7 +70,7 @@ class ChainAdapterTest extends AdapterTestCase
}
/**
* @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface
* @return MockObject|PruneableCacheInterface
*/
private function getPruneableMock()
{
@ -86,7 +87,7 @@ class ChainAdapterTest extends AdapterTestCase
}
/**
* @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface
* @return MockObject|PruneableCacheInterface
*/
private function getFailingPruneableMock()
{
@ -103,7 +104,7 @@ class ChainAdapterTest extends AdapterTestCase
}
/**
* @return \PHPUnit_Framework_MockObject_MockObject|AdapterInterface
* @return MockObject|AdapterInterface
*/
private function getNonPruneableMock()
{

7
src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php
View File

@ -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;
@ -65,7 +66,7 @@ class TagAwareAdapterTest extends AdapterTestCase
}
/**
* @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface
* @return MockObject|PruneableCacheInterface
*/
private function getPruneableMock()
{
@ -82,7 +83,7 @@ class TagAwareAdapterTest extends AdapterTestCase
}
/**
* @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface
* @return MockObject|PruneableCacheInterface
*/
private function getFailingPruneableMock()
{
@ -99,7 +100,7 @@ class TagAwareAdapterTest extends AdapterTestCase
}
/**
* @return \PHPUnit_Framework_MockObject_MockObject|AdapterInterface
* @return MockObject|AdapterInterface
*/
private function getNonPruneableMock()
{

7
src/Symfony/Component/Cache/Tests/Simple/ChainCacheTest.php
View File

@ -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;
@ -64,7 +65,7 @@ class ChainCacheTest extends CacheTestCase
}
/**
* @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface
* @return MockObject|PruneableCacheInterface
*/
private function getPruneableMock()
{
@ -81,7 +82,7 @@ class ChainCacheTest extends CacheTestCase
}
/**
* @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface
* @return MockObject|PruneableCacheInterface
*/
private function getFailingPruneableMock()
{
@ -98,7 +99,7 @@ class ChainCacheTest extends CacheTestCase
}
/**
* @return \PHPUnit_Framework_MockObject_MockObject|CacheInterface
* @return MockObject|CacheInterface
*/
private function getNonPruneableMock()
{

3
src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php
View File

@ -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;

14
src/Symfony/Component/Form/ChoiceList/ArrayChoiceList.php
View File

@ -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
*/

8
src/Symfony/Component/Form/ChoiceList/Factory/ChoiceListFactoryInterface.php
View File

@ -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

8
src/Symfony/Component/Form/ChoiceList/View/ChoiceView.php
View File

@ -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, string $value, $label, array $attr = [])
{

7
src/Symfony/Component/Form/Tests/AbstractFormTest.php
View File

@ -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()
{

3
src/Symfony/Component/Form/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php
View File

@ -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;

3
src/Symfony/Component/Form/Tests/ChoiceList/Factory/PropertyAccessDecoratorTest.php
View File

@ -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;

5
src/Symfony/Component/Form/Tests/ChoiceList/LazyChoiceListTest.php
View File

@ -11,6 +11,7 @@
namespace Symfony\Component\Form\Tests\ChoiceList;
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Form\ChoiceList\LazyChoiceList;
@ -25,12 +26,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;

5
src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
View File

@ -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;
@ -33,12 +34,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;

3
src/Symfony/Component/Form/Tests/Extension/DataCollector/DataCollectorExtensionTest.php
View File

@ -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;

9
src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataCollectorTest.php
View File

@ -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;

5
src/Symfony/Component/Form/Tests/Extension/DataCollector/FormDataExtractorTest.php
View File

@ -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;

3
src/Symfony/Component/Form/Tests/Extension/DataCollector/Type/DataCollectorTypeExtensionTest.php
View File

@ -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;

9
src/Symfony/Component/Form/Tests/FormFactoryTest.php
View File

@ -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;

7
src/Symfony/Component/Form/Tests/FormRegistryTest.php
View File

@ -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;

21
src/Symfony/Component/Form/Tests/ResolvedFormTypeTest.php
View File

@ -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;
@ -384,7 +385,7 @@ class ResolvedFormTypeTest extends TestCase
}
/**
* @return \PHPUnit_Framework_MockObject_MockObject
* @return MockObject
*/
private function getMockFormType($typeClass = 'Symfony\Component\Form\AbstractType')
{
@ -392,7 +393,7 @@ class ResolvedFormTypeTest extends TestCase
}
/**
* @return \PHPUnit_Framework_MockObject_MockObject
* @return MockObject
*/
private function getMockFormTypeExtension()
{
@ -400,7 +401,7 @@ class ResolvedFormTypeTest extends TestCase
}
/**
* @return \PHPUnit_Framework_MockObject_MockObject
* @return MockObject
*/
private function getMockFormFactory()
{

3
src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
View File

@ -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;

3
src/Symfony/Component/Intl/Tests/Data/Bundle/Reader/BundleEntryReaderTest.php
View File

@ -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;

3
src/Symfony/Component/Ldap/Tests/LdapTest.php
View File

@ -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 */

7
src/Symfony/Component/Lock/Tests/Store/CombinedStoreTest.php
View File

@ -11,6 +11,7 @@
namespace Symfony\Component\Lock\Tests\Store;
use PHPUnit\Framework\MockObject\MockObject;
use Symfony\Component\Lock\BlockingStoreInterface;
use Symfony\Component\Lock\Exception\LockConflictedException;
use Symfony\Component\Lock\Key;
@ -50,11 +51,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;

3
src/Symfony/Component/Serializer/Tests/Encoder/XmlEncoderTest.php
View File

@ -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;
@ -879,7 +880,7 @@ XML;
}
/**
* @return \PHPUnit_Framework_MockObject_MockObject|NormalizerInterface
* @return MockObject|NormalizerInterface
*/
private function createMockDateTimeNormalizer()
{

3
src/Symfony/Component/Serializer/Tests/Normalizer/AbstractNormalizerTest.php
View File

@ -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;
@ -30,7 +31,7 @@ class AbstractNormalizerTest extends TestCase
private $normalizer;
/**
* @var ClassMetadataFactoryInterface|\PHPUnit_Framework_MockObject_MockObject
* @var ClassMetadataFactoryInterface|MockObject
*/
private $classMetadata;

3
src/Symfony/Component/Serializer/Tests/Normalizer/ArrayDenormalizerTest.php
View File

@ -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;

3
src/Symfony/Component/Serializer/Tests/Normalizer/JsonSerializableNormalizerTest.php
View File

@ -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;

3
src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php
View File

@ -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;
@ -99,7 +100,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))