10000 Use typed properties in tests as much as possible · symfony/symfony@4b35a53 · GitHub
[go: up one dir, main page]
Skip to content

Commit 4b35a53

Browse files
nicolas-grekasnicolas-grekas
committed
Use typed properties in tests as much as possible
1 parent 32d4dfa commit 4b35a53

File tree

469 files changed

+996
-2125
lines changed

Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ class ContainerAwareEventManagerTest extends TestCase
2121
{
2222
use ExpectDeprecationTrait;
2323

24-
private $container;
25-
private $evm;
24+
private Container $container;
25+
private ContainerAwareEventManager $evm;
2626

2727
protected function setUp(): void
2828
{
@@ -299,8 +299,8 @@ public function testRemoveEventListenerAfterDispatchEvent()
299299

300300
class MyListener
301301
{
302-
public $calledByInvokeCount = 0;
303< 10000 span class="diff-text-marker">-
public $calledByEventNameCount = 0;
302+
public int $calledByInvokeCount = 0;
303+
public int $calledByEventNameCount = 0;
304304

305305
public function __invoke()
306306
{
@@ -315,8 +315,8 @@ public function foo()
315315

316316
class MySubscriber extends MyListener implements EventSubscriber
317317
{
318-
public $calledSubscribedEventsCount = 0;
319-
private $listenedEvents;
318+
public int $calledSubscribedEventsCount = 0;
319+
private array $listenedEvents;
320320

321321
public function __construct(array $listenedEvents)
322322
{
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Bridge\Doctrine\Tests\DependencyInjection;
1313

14+
use PHPUnit\Framework\MockObject\MockObject;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\Bridge\Doctrine\DependencyInjection\AbstractDoctrineExtension;
1617
use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -23,10 +24,7 @@
2324
*/
2425
class DoctrineExtensionTest extends TestCase
2526
{
26-
/**
27-
* @var AbstractDoctrineExtension
28-
*/
29-
private $extension;
27+
private MockObject&AbstractDoctrineExtension $extension;
3028

3129
protected function setUp(): void
3230
{
Original file line numberDiff line numberDiff line change
@@ -20,62 +20,24 @@
2020
use Symfony\Bridge\Doctrine\Form\ChoiceList\EntityLoaderInterface;
2121
use Symfony\Bridge\Doctrine\Form\ChoiceList\IdReader;
2222
use Symfony\Component\Form\ChoiceList\ArrayChoiceList;
23-
use Symfony\Component\Form\ChoiceList\Factory\ChoiceListFactoryInterface;
2423
use Symfony\Component\Form\Exception\LogicException;
2524

2625
/**
2726
* @author Bernhard Schussek <bschussek@gmail.com>
2827
*/
2928
class DoctrineChoiceLoaderTest extends TestCase
3029
{
31-
/**
32-
* @var MockObject&ChoiceListFactoryInterface
33-
*/
34-
private $factory;
35-
36-
/**
37-
* @var MockObject&ObjectManager
38-
*/
39-
private $om;
40-
41-
/**
42-
* @var MockObject&ObjectRepository
43-
*/
44-
private $repository;
45-
46-
/**
47-
* @var string
48-
*/
49-
private $class;
50-
51-
/**
52-
* @var MockObject&IdReader
53-
*/
54-
private $idReader;
55-
56-
/**
57-
* @var MockObject&EntityLoaderInterface
58-
*/
59-
private $objectLoader;
60-
61-
/**
62-
* @var \stdClass
63-
*/
64-
private $obj1;
65-
66-
/**
67-
* @var \stdClass
68-
*/
69-
private $obj2;
70-
71-
/**
72-
* @var \stdClass
73-
*/
74-
private $obj3;
30+
private MockObject&ObjectManager $om;
31+
private MockObject&ObjectRepository $repository;
32+
private string $class;
33+
private MockObject&IdReader $idReader;
34+
private MockObject&EntityLoaderInterface $objectLoader;
35+
private \stdClass $obj1;
36+
private \stdClass $obj2;
37+
private \stdClass $obj3;
7538

7639
protected function setUp(): void
7740
{
78-
$this->factory = $this->createMock(ChoiceListFactoryInterface::class);
7941
$this->om = $this->createMock(ObjectManager::class);
8042
$this->repository = $this->createMock(ObjectRepository::class);
8143
$this->class = 'stdClass';
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,7 @@
2121
*/
2222
class CollectionToArrayTransformerTest extends TestCase
2323
{
24-
/**
25-
* @var CollectionToArrayTransformer
26-
*/
27-
private $transformer;
24+
private CollectionToArrayTransformer $transformer;
2825

2926
protected function setUp(): void
3027
{
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Bridge\Doctrine\Tests\Form\EventListener;
1313

1414
use Doctrine\Common\Collections\ArrayCollection;
15+
use PHPUnit\Framework\MockObject\MockObject;
1516
use PHPUnit\Framework\TestCase;
1617
use Symfony\Bridge\Doctrine\Form\EventListener\MergeDoctrineCollectionListener;
1718
use Symfony\Component\EventDispatcher\EventDispatcher;
@@ -22,28 +23,15 @@
2223

2324
class MergeDoctrineCollectionListenerTest extends TestCase
2425
{
25-
/** @var \Doctrine\Common\Collections\ArrayCollection */
26-
private $collection;
27-
/** @var \Symfony\Component\EventDispatcher\EventDispatcher */
28-
private $dispatcher;
29-
private $factory;
30-
private $form;
26+
private ArrayCollection $collection;
27+
private EventDispatcher $dispatcher;
28+
private MockObject&FormFactoryInterface $factory;
3129

3230
protected function setUp(): void
3331
{
3432
$this->collection = new ArrayCollection(['test']);
3533
$this->dispatcher = new EventDispatcher();
3634
$this->factory = $this->createMock(FormFactoryInterface::class);
37-
$this->form = $this->getBuilder()
38-
->getForm();
39-
}
40-
41-
protected function tearDown(): void
42-
{
43-
$this->collection = null;
44-
$this->dispatcher = null;
45-
$this->factory = null;
46-
$this->form = null;
4735
}
4836

4937
protected function getBuilder()
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Bridge\Doctrine\Tests\Form\Type;
1313

14+
use Doctrine\ORM\EntityManager;
1415
use Doctrine\ORM\Tools\SchemaTool;
1516
use Doctrine\Persistence\ManagerRegistry;
1617
use Symfony\Bridge\Doctrine\Form\DoctrineOrmExtension;
@@ -26,10 +27,7 @@ class EntityTypePerformanceTest extends FormPerformanceTestCase
2627
{
2728
private const ENTITY_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\SingleIntIdEntity';
2829

29-
/**
30-
* @var \Doctrine\ORM\EntityManager
31-
*/
32-
private $em;
30+
private EntityManager $em;
3331

3432
protected function getExtensions()
3533
{
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,8 @@ class EntityTypeTest extends BaseTypeTestCase
5353
private const COMPOSITE_IDENT_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeIntIdEntity';
5454
private const COMPOSITE_STRING_IDENT_CLASS = 'Symfony\Bridge\Doctrine\Tests\Fixtures\CompositeStringIdEntity';
5555

56-
/**
57-
* @var EntityManager
58-
*/
59-
private $em;
60-
61-
/**
62-
* @var MockObject&ManagerRegistry
63-
*/
64-
private $emRegistry;
56+
private EntityManager $em;
57+
private MockObject&ManagerRegistry $emRegistry;
6558

6659
protected function setUp(): void
6760
{
@@ -93,14 +86,6 @@ protected function setUp(): void
9386
}
9487
}
9588

96-
protected function tearDown(): void
97-
{
98-
parent::tearDown();
99-
100-
$this->em = null;
101-
$this->emRegistry = null;
102-
}
103-
10489
protected function getExtensions()
10590
{
10691
return array_merge(parent::getExtensions(), [
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Doctrine\DBAL\Connection;
1515
use Doctrine\ORM\EntityManagerInterface;
1616
use Doctrine\Persistence\ManagerRegistry;
17+
use PHPUnit\Framework\MockObject\MockObject;
1718
use Symfony\Bridge\Doctrine\Messenger\DoctrineCloseConnectionMiddleware;
1819
use Symfony\Component\Messenger\Envelope;
1920
use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
@@ -22,11 +23,11 @@
2223

2324
class DoctrineCloseConnectionMiddlewareTest extends MiddlewareTestCase
2425
{
25-
private $connection;
26-
private $entityManager;
27-
private $managerRegistry;
28-
private $middleware;
29-
private $entityManagerName = 'default';
26+
private MockObject&Connection $connection;
27+
private MockObject&EntityManagerInterface $entityManager;
28+
private MockObject&ManagerRegistry $managerRegistry;
29+
private DoctrineCloseConnectionMiddleware $middleware;
30+
private string $entityManagerName = 'default';
3031

3132
protected function setUp(): void
3233
{
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,23 @@
1414
use Doctrine\DBAL\Connection;
1515
use Doctrine\ORM\EntityManagerInterface;
1616
use Doctrine\Persistence\ManagerRegistry;
17+
use PHPUnit\Framework\MockObject\MockObject;
1718
use Psr\Log\AbstractLogger;
1819
use Symfony\Bridge\Doctrine\Messenger\DoctrineOpenTransactionLoggerMiddleware;
1920
use Symfony\Component\Messenger\Envelope;
2021
use Symfony\Component\Messenger\Test\Middleware\MiddlewareTestCase;
2122

2223
class DoctrineOpenTransactionLoggerMiddlewareTest extends MiddlewareTestCase
2324
{
24-
private $logger;
25-
private $connection;
26-
private $entityManager;
27-
private $middleware;
25+
private AbstractLogger $logger;
26+
private MockObject&Connection $connection;
27+
private MockObject&EntityManagerInterface $entityManager;
28+
private DoctrineOpenTransactionLoggerMiddleware $middleware;
2829

2930
protected function setUp(): void
3031
{
3132
$this->logger = new class() extends AbstractLogger {
32-
public $logs = [];
33+
public array $logs = [];
3334

3435
public function log($level, $message, $context = []): void
3536
{
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Doctrine\DBAL\Exception as DBALException;
1616
use Doctrine\ORM\EntityManagerInterface;
1717
use Doctrine\Persistence\ManagerRegistry;
18+
use PHPUnit\Framework\MockObject\MockObject;
1819
use Symfony\Bridge\Doctrine\Messenger\DoctrinePingConnectionMiddleware;
1920
use Symfony\Component\Messenger\Envelope;
2021
use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
@@ -23,11 +24,11 @@
2324

2425
class DoctrinePingConnectionMiddlewareTest extends MiddlewareTestCase
2526
{
26-
private $connection;
27-
private $entityManager;
28-
private $managerRegistry;
29-
private $middleware;
30-
private $entityManagerName = 'default';
27+
private MockObject&Connection $connection;
28+
private MockObject&EntityManagerInterface $entityManager;
29+
private MockObject&ManagerRegistry $managerRegistry;
30+
private DoctrinePingConnectionMiddleware $middleware;
31+
private string $entityManagerName = 'default';
3132

3233
protected function setUp(): void
3334
{
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,17 @@
1414
use Doctrine\DBAL\Connection;
1515
use Doctrine\ORM\EntityManagerInterface;
1616
use Doctrine\Persistence\ManagerRegistry;
17+
use PHPUnit\Framework\MockObject\MockObject;
1718
use Symfony\Bridge\Doctrine\Messenger\DoctrineTransactionMiddleware;
1819
use Symfony\Component\Messenger\Envelope;
1920
use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
2021
use Symfony\Component\Messenger\Test\Middleware\MiddlewareTestCase;
2122

2223
class DoctrineTransactionMiddlewareTest extends MiddlewareTestCase
2324
{
24-
private $connection;
25-
private $entityManager;
26-
private $middleware;
25+
private MockObject&Connection $connection;
26+
private MockObject&EntityManagerInterface $entityManager;
27+
private DoctrineTransactionMiddleware $middleware;
2728

2829
protected function setUp(): void
2930
{
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,13 @@
2424
use Symfony\Component\Uid\Ulid;
2525

2626
// DBAL 2 compatibility
27-
class_exists('Doctrine\DBAL\Platforms\PostgreSqlPlatform');
27+
class_exists(\Doctrine\DBAL\Platforms\PostgreSqlPlatform::class);
2828

2929
final class UlidTypeTest extends TestCase
3030
{
3131
private const DUMMY_ULID = '01EEDQEK6ZAZE93J8KG5B4MBJC';
3232

33-
/** @var UlidType */
34-
private $type;
33+
private UlidType $type;
3534

3635
public static function setUpBeforeClass(): void
3736
{
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,14 @@
2424
use Symfony\Component\Uid\Uuid;
2525

2626
// DBAL 2 compatibility
27-
class_exists('Doctrine\DBAL\Platforms\MySqlPlatform');
28-
class_exists('Doctrine\DBAL\Platforms\PostgreSqlPlatform');
27+
class_exists(\Doctrine\DBAL\Platforms\MySqlPlatform::class);
28+
class_exists(\Doctrine\DBAL\Platforms\PostgreSqlPlatform::class);
2929

3030
final class UuidTypeTest extends TestCase
3131
{
3232
private const DUMMY_UUID = '9f755235-5a2d-4aba-9605-e9962b312e50';
3333

34-
/** @var UuidType */
35-
private $type;
34+
private UuidType $type;
3635

3736
public static function setUpBeforeClass(): void
3837
{
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,10 @@ class UniqueEntityValidatorTest extends ConstraintValidatorTestCase
4848
{
4949
private const EM_NAME = 'foo';
5050

51-
/**
52-
* @var ObjectManager
53-
*/
54-
protected $em;
55-
56-
/**
57-
* @var ManagerRegistry
58-
*/
59-
protected $registry;
60-
61-
/**
62-
* @var MockObject&EntityRepository
63-
*/
64-
protected $repository;
65-
66-
protected $repositoryFactory;
51+
protected ?ObjectManager $em;
52+
protected ManagerRegistry $registry;
53+
protected MockObject&EntityRepository $repository;
54+
protected TestRepositoryFactory $repositoryFactory;
6755

6856
protected function setUp(): void
6957
{