8000 Use Phpunit FQDN in tests comments · symfony/symfony@92bd9ec · GitHub
[go: up one dir, main page]

Skip to content

Commit 92bd9ec

Browse files
committed
Use Phpunit FQDN in tests comments
1 parent b131278 commit 92bd9ec

31 files changed

+97
-66
lines changed

src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/DoctrineChoiceLoaderTest.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Doctrine\Common\Persistence\ObjectManager;
1515
use Doctrine\Common\Persistence\ObjectRepository;
1616
use Doctrine\ORM\Mapping\ClassMetadata;
17+
use PHPUnit\Framework\MockObject\MockObject;
1718
use PHPUnit\Framework\TestCase;
1819
use Symfony\Bridge\Doctrine\Form\ChoiceList\DoctrineChoiceLoader;
1920
use Symfony\Bridge\Doctrine\Form\ChoiceList\EntityLoaderInterface;
@@ -27,17 +28,17 @@
2728
class DoctrineChoiceLoaderTest extends TestCase
2829
{
2930
/**
30-
* @var ChoiceListFactoryInterface|\PHPUnit_Framework_MockObject_MockObject
31+
* @var ChoiceListFactoryInterface|MockObject
3132
*/
3233
private $factory;
3334

3435
/**
35-
* @var ObjectManager|\PHPUnit_Framework_MockObject_MockObject
36+
* @var ObjectManager|MockObject
3637
*/
3738
private $om;
3839

3940
/**
40-
* @var ObjectRepository|\PHPUnit_Framework_MockObject_MockObject
41+
* @var ObjectRepository|MockObject
4142
*/
4243
private $repository;
4344

@@ -47,12 +48,12 @@ class DoctrineChoiceLoaderTest extends TestCase
4748
private $class;
4849

4950
/**
50-
* @var IdReader|\PHPUnit_Framework_MockObject_MockObject
51+
* @var IdReader|MockObject
5152
*/
5253
private $idReader;
5354

5455
/**
55-
* @var EntityLoaderInterface|\PHPUnit_Framework_MockObject_MockObject
56+
* @var EntityLoaderInterface|MockObject
5657
*/
5758
private $objectLoader;
5859

src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Doctrine\ORM\EntityManager;
1717
use Doctrine\ORM\EntityRepository;
1818
use Doctrine\ORM\Tools\SchemaTool;
19+
use PHPUnit\Framework\MockObject\MockObject;
1920
use Symfony\Bridge\Doctrine\Form\DoctrineOrmExtension;
2021
use Symfony\Bridge\Doctrine\Form\DoctrineOrmTypeGuesser;
2122
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
@@ -53,7 +54,7 @@ class EntityTypeTest extends BaseTypeTest
5354
private $em;
5455

5556
/**
56-
* @var \PHPUnit_Framework_MockObject_MockObject|ManagerRegistry
57+
* @var MockObject|ManagerRegistry
5758
*/
5859
private $emRegistry;
5960

src/Symfony/Bundle/FrameworkBundle/Tests/CacheWarmer/AnnotationsCacheWarmerTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Doctrine\Common\Annotations\AnnotationReader;
66
use Doctrine\Common\Annotations\CachedReader;
77
use Doctrine\Common\Annotations\Reader;
8+
use PHPUnit\Framework\MockObject\MockObject;
89
use Symfony\Bundle\FrameworkBundle\CacheWarmer\AnnotationsCacheWarmer;
910
use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
1011
use Symfony\Component\Cache\Adapter\ArrayAdapter;
@@ -86,7 +87,7 @@ public function testAnnotationsCacheWarmerWithDebugEnabled()
8687
}
8788

8889
/**
89-
* @return \PHPUnit_Framework_MockObject_MockObject|Reader
90+
* @return MockObject|Reader
9091
*/
9192
private function getReadOnlyReader()
9293
{

src/Symfony/Bundle/FrameworkBundle/Tests/Command/CachePruneCommandTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Bundle\FrameworkBundle\Tests\Command;
1313

14+
use PHPUnit\Framework\MockObject\MockObject;
1415
use Symfony\Bundle\FrameworkBundle\Command\CachePoolPruneCo F438 mmand;
1516
use Symfony\Bundle\FrameworkBundle\Console\Application;
1617
use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
@@ -55,7 +56,7 @@ private function getEmptyRewindableGenerator()
5556
}
5657

5758
/**
58-
* @return \PHPUnit_Framework_MockObject_MockObject|KernelInterface
59+
* @return MockObject|KernelInterface
5960
*/
6061
private function getKernel()
6162
{
@@ -81,7 +82,7 @@ private function getKernel()
8182
}
8283

8384
/**
84-
* @return \PHPUnit_Framework_MockObject_MockObject|PruneableInterface
85+
* @return MockObject|PruneableInterface
8586
*/
8687
private function getPruneableInterfaceMock()
8788
{

src/Symfony/Component/Cache/Tests/Adapter/ChainAdapterTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\Cache\Tests\Adapter;
1313

14+
use PHPUnit\Framework\MockObject\MockObject;
1415
use Symfony\Component\Cache\Adapter\AdapterInterface;
1516
use Symfony\Component\Cache\Adapter\ArrayAdapter;
1617
use Symfony\Component\Cache\Adapter\ChainAdapter;
@@ -65,7 +66,7 @@ public function testPrune()
6566
}
6667

6768
/**
68-
* @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface
69+
* @return MockObject|PruneableCacheInterface
6970
*/
7071
private function getPruneableMock()
7172
{
@@ -82,7 +83,7 @@ private function getPruneableMock()
8283
}
8384

8485
/**
85-
* @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface
86+
* @return MockObject|PruneableCacheInterface
8687
*/
8788
private function getFailingPruneableMock()
8889
{
@@ -99,7 +100,7 @@ private function getFailingPruneableMock()
99100
}
100101

101102
/**
102-
* @return \PHPUnit_Framework_MockObject_MockObject|AdapterInterface
103+
* @return MockObject|AdapterInterface
103104
*/
104105
private function getNonPruneableMock()
105106
{

src/Symfony/Component/Cache/Tests/Adapter/TagAwareAdapterTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\Cache\Tests\Adapter;
1313

14+
use PHPUnit\Framework\MockObject\MockObject;
1415
use Symfony\Component\Cache\Adapter\AdapterInterface;
1516
use Symfony\Component\Cache\Adapter\FilesystemAdapter;
1617
use Symfony\Component\Cache\Adapter\TagAwareAdapter;
@@ -160,7 +161,7 @@ public function testPrune()
160161
}
161162

162163
/**
163-
* @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface
164+
* @return MockObject|PruneableCacheInterface
164165
*/
165166
private function getPruneableMock()
166167
{
@@ -177,7 +178,7 @@ private function getPruneableMock()
177178
}
178179

179180
/**
180-
* @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface
181+
* @return MockObject|PruneableCacheInterface
181182
*/
182183
private function getFailingPruneableMock()
183184
{
@@ -194,7 +195,7 @@ private function getFailingPruneableMock()
194195
}
195196

196197
/**
197-
* @return \PHPUnit_Framework_MockObject_MockObject|AdapterInterface
198+
* @return MockObject|AdapterInterface
198199
*/
199200
private function getNonPruneableMock()
200201
{

src/Symfony/Component/Cache/Tests/Simple/ChainCacheTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\Cache\Tests\Simple;
1313

14+
use PHPUnit\Framework\MockObject\MockObject;
1415
use Psr\SimpleCache\CacheInterface;
1516
use Symfony\Component\Cache\PruneableInterface;
1617
use Symfony\Component\Cache\Simple\ArrayCache;
@@ -63,7 +64,7 @@ public function testPrune()
6364
}
6465

6566
/**
66-
* @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface
67+
* @return MockObject|PruneableCacheInterface
6768
*/
6869
private function getPruneableMock()
6970
{
@@ -80,7 +81,7 @@ private function getPruneableMock()
8081
}
8182

8283
/**
83-
* @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface
84+
* @return MockObject|PruneableCacheInterface
8485
*/
8586
private function getFailingPruneableMock()
8687
{
@@ -97,7 +98,7 @@ private function getFailingPruneableMock()
9798
}
9899

99100
/**
100-
* @return \PHPUnit_Framework_MockObject_MockObject|CacheInterface
101+
* @return MockObject|CacheInterface
101102
*/
102103
private function getNonPruneableMock()
103104
{

src/Symfony/Component/EventDispatcher/ContainerAwareEventDispatcher.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\EventDispatcher;
1313

14+
use PHPUnit\Framework\MockObject\MockObject;
1415
use Symfony\Component\DependencyInjection\ContainerInterface;
1516

1617
/**
@@ -42,7 +43,7 @@ public function __construct(ContainerInterface $container)
4243
$this->container = $container;
4344

4445
$class = \get_class($this);
45-
if ($this instanceof \PHPUnit_Framework_MockObject_MockObject || $this instanceof \Prophecy\Doubler\DoubleInterface) {
46+
if ($this instanceof \PHPUnit_Framework_MockObject_MockObject || $this instanceof MockObject || $this instanceof \Prophecy\Doubler\DoubleInterface) {
4647
$class = get_parent_class($class);
4748
}
4849
if (__CLASS__ !== $class) {

src/Symfony/Component/EventDispatcher/Tests/ImmutableEventDispatcherTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\EventDispatcher\Tests;
1313

14+
use PHPUnit\Framework\MockObject\MockObject;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\EventDispatcher\Event;
1617
use Symfony\Component\EventDispatcher\ImmutableEventDispatcher;
@@ -21,7 +22,7 @@
2122
class ImmutableEventDispatcherTest extends TestCase
2223
{
2324
/**
24-
* @var \PHPUnit_Framework_MockObject_MockObject
25+
* @var MockObject
2526
*/
2627
private $innerDispatcher;
2728

src/Symfony/Component/Form/Tests/AbstractFormTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\Form\Tests;
1313

14+
use PHPUnit\Framework\MockObject\MockObject;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\EventDispatcher\EventDispatcher;
1617
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -66,23 +67,23 @@ protected function getBuilder($name = 'name', EventDispatcherInterface $dispatch
6667
}
6768

6869
/**
69-
* @return \PHPUnit_Framework_MockObject_MockObject
70+
* @return MockObject
7071
*/
7172
protected function getDataMapper()
7273
{
7374
return $this->getMockBuilder('Symfony\Component\Form\DataMapperInterface')->getMock();
7475
}
7576

7677
/**
77-
* @return \PHPUnit_Framework_MockObject_MockObject
78+
* @return MockObject
7879
*/
7980
protected function getDataTransformer()
8081
{
8182
return $this->getMockBuilder('Symfony\Component\Form\DataTransformerInterface')->getMock();
8283
}
8384

8485
/**
85-
* @return \PHPUnit_Framework_MockObject_MockObject
86+
* @return MockObject
8687
*/
8788
protected function getFormValidator()
8889
{

src/Symfony/Component/Form/Tests/ChoiceList/Factory/CachingFactoryDecoratorTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\Form\Tests\ChoiceList\Factory;
1313

14+
use PHPUnit\Framework\MockObject\MockObject;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\Form\ChoiceList\Factory\CachingFactoryDecorator;
1617

@@ -20,7 +21,7 @@
2021
class CachingFactoryDecoratorTest extends TestCase
2122
{
2223
/**
23-
* @var \PHPUnit_Framework_MockObject_MockObject
24+
* @var MockObject
2425
*/
2526
private $decoratedFactory;
2627

src/Symfony/Component/Form/Tests/ChoiceList/Factory/PropertyAccessDecoratorTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\Form\Tests\ChoiceList\Factory;
1313

14+
use PHPUnit\Framework\MockObject\MockObject;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\Form\ChoiceList\Factory\PropertyAccessDecorator;
1617
use Symfony\Component\PropertyAccess\PropertyPath;
@@ -21,7 +22,7 @@
2122
class PropertyAccessDecoratorTest extends TestCase
2223
{
2324
/**
24-
* @var \PHPUnit_Framework_MockObject_MockObject
25+
* @var MockObject
2526
*/
2627
private $decoratedFactory;
2728

src/Symfony/Component/Form/Tests/ChoiceList/LazyChoiceListTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\Form\Tests\ChoiceList;
1313

14+
use PHPUnit\Framework\MockObject\MockObject;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
1617
use Symfony\Component\Form\ChoiceList\LazyChoiceList;
@@ -26,12 +27,12 @@ class LazyChoiceListTest extends TestCase
2627
private $list;
2728

2829
/**
29-
* @var \PHPUnit_Framework_MockObject_MockObject
30+
* @var MockObject
3031
*/
3132
private $loadedList;
3233

3334
/**
34-
* @var \PHPUnit_Framework_MockObject_MockObject
35+
* @var MockObject
3536
*/
3637
private $loader;
3738

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\Form\Tests\Extension\Csrf\Type;
1313

14+
use PHPUnit\Framework\MockObject\MockObject;
1415
use Symfony\Component\Form\AbstractType;
1516
use Symfony\Component\Form\Extension\Csrf\CsrfExtension;
1617
use Symfony\Component\Form\FormBuilderInterface;
@@ -31,12 +32,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
3132
class FormTypeCsrfExtensionTest extends TypeTestCase
3233
{
3334
/**
34-
* @var \PHPUnit_Framework_MockObject_MockObject
35+
* @var MockObject
3536
*/
3637
protected $tokenManager;
3738

3839
/**
39-
* @var \PHPUnit_Framework_MockObject_MockObject
40+
* @var MockObject
40 BF8E 41
*/
4142
protected $translator;
4243

src/Symfony/Component/Form/Tests/Extension/DataCollector/DataCollectorExtensionTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\Form\Tests\Extension\DataCollector;
1313

14+
use PHPUnit\Framework\MockObject\MockObject;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\Form\Extension\DataCollector\DataCollectorExtension;
1617

@@ -22,7 +23,7 @@ class DataCollectorExtensionTest extends TestCase
2223
private $extension;
2324

2425
/**
25-
* @var \PHPUnit_Framework_MockObject_MockObject
26+
* @var MockObject
2627
*/
2728
private $dataCollector;
2829

0 commit comments

Comments
 (0)
0