From 503548a642bb9170db02309186e141281fcfd8ab Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Thu, 4 Aug 2022 01:11:52 +0200 Subject: [PATCH] Use intersection types in tests --- .../Tests/ORM/Cache/CacheLoggerChainTest.php | 4 +--- .../Tests/ORM/Cache/DefaultCacheFactoryTest.php | 4 +--- .../Collection/CollectionPersisterTestCase.php | 13 +++---------- .../ReadWriteCachedCollectionPersisterTest.php | 5 +---- .../Entity/EntityPersisterTestCase.php | 13 +++---------- .../ReadWriteCachedEntityPersisterTest.php | 3 ++- .../Tests/ORM/Functional/SQLFilterTest.php | 17 +++-------------- .../ORM/Hydration/AbstractHydratorTest.php | 15 ++++----------- .../Internal/HydrationCompleteHandlerTest.php | 8 ++------ .../Tests/ORM/LazyCriteriaCollectionTest.php | 5 +---- .../Repository/DefaultRepositoryFactoryTest.php | 16 ++++------------ .../ORM/Tools/Pagination/PaginatorTest.php | 9 +++------ tests/Doctrine/Tests/ORM/UnitOfWorkTest.php | 7 ++----- 13 files changed, 30 insertions(+), 89 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Cache/CacheLoggerChainTest.php b/tests/Doctrine/Tests/ORM/Cache/CacheLoggerChainTest.php index aa3f83949ba..2ba9bb1b7b9 100644 --- a/tests/Doctrine/Tests/ORM/Cache/CacheLoggerChainTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/CacheLoggerChainTest.php @@ -19,9 +19,7 @@ class CacheLoggerChainTest extends DoctrineTestCase { private CacheLoggerChain $logger; - - /** @var CacheLogger&MockObject */ - private CacheLogger $mock; + private CacheLogger&MockObject $mock; protected function setUp(): void { diff --git a/tests/Doctrine/Tests/ORM/Cache/DefaultCacheFactoryTest.php b/tests/Doctrine/Tests/ORM/Cache/DefaultCacheFactoryTest.php index 7437aab925d..e988fe7f65c 100644 --- a/tests/Doctrine/Tests/ORM/Cache/DefaultCacheFactoryTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/DefaultCacheFactoryTest.php @@ -36,9 +36,7 @@ */ class DefaultCacheFactoryTest extends OrmTestCase { - /** @var CacheFactory&MockObject */ - private CacheFactory $factory; - + private CacheFactory&MockObject $factory; private EntityManagerMock $em; private RegionsConfiguration $regionsConfig; diff --git a/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/CollectionPersisterTestCase.php b/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/CollectionPersisterTestCase.php index 19c0c1c3ff0..1f7447fb4dc 100644 --- a/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/CollectionPersisterTestCase.php +++ b/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/CollectionPersisterTestCase.php @@ -22,12 +22,8 @@ */ abstract class CollectionPersisterTestCase extends OrmTestCase { - /** @var Region&MockObject */ - protected Region $region; - - /** @var CollectionPersister&MockObject */ - protected CollectionPersister $collectionPersister; - + protected Region&MockObject $region; + protected CollectionPersister&MockObject $collectionPersister; protected EntityManagerMock $em; abstract protected function createPersister(EntityManagerInterface $em, CollectionPersister $persister, Region $region, array $mapping): AbstractCollectionPersister; @@ -43,10 +39,7 @@ protected function setUp(): void $this->collectionPersister = $this->createMock(CollectionPersister::class); } - /** - * @return Region&MockObject - */ - protected function createRegion(): Region + protected function createRegion(): Region&MockObject { return $this->createMock(Region::class); } diff --git a/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/ReadWriteCachedCollectionPersisterTest.php b/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/ReadWriteCachedCollectionPersisterTest.php index cbc9c0b509d..c5395d87a47 100644 --- a/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/ReadWriteCachedCollectionPersisterTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/Persister/Collection/ReadWriteCachedCollectionPersisterTest.php @@ -26,10 +26,7 @@ protected function createPersister(EntityManagerInterface $em, CollectionPersist return new ReadWriteCachedCollectionPersister($persister, $region, $em, $mapping); } - /** - * @return ConcurrentRegion&MockObject - */ - protected function createRegion(): ConcurrentRegion + protected function createRegion(): ConcurrentRegion&MockObject { return $this->createMock(ConcurrentRegion::class); } diff --git a/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/EntityPersisterTestCase.php b/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/EntityPersisterTestCase.php index ae3d7655a57..8b264a5f6e2 100644 --- a/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/EntityPersisterTestCase.php +++ b/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/EntityPersisterTestCase.php @@ -25,12 +25,8 @@ */ abstract class EntityPersisterTestCase extends OrmTestCase { - /** @var Region&MockObject */ - protected Region $region; - - /** @var EntityPersister&MockObject */ - protected EntityPersister $entityPersister; - + protected Region&MockObject $region; + protected EntityPersister&MockObject $entityPersister; protected EntityManagerMock $em; abstract protected function createPersister(EntityManagerInterface $em, EntityPersister $persister, Region $region, ClassMetadata $metadata): AbstractEntityPersister; @@ -46,10 +42,7 @@ protected function setUp(): void $this->entityPersister = $this->createMock(EntityPersister::class); } - /** - * @return Region&MockObject - */ - protected function createRegion(): Region + protected function createRegion(): Region&MockObject { return $this->createMock(Region::class); } diff --git a/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersisterTest.php b/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersisterTest.php index 7bc17860d5a..9d742ca0616 100644 --- a/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersisterTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/Persister/Entity/ReadWriteCachedEntityPersisterTest.php @@ -14,6 +14,7 @@ use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Persisters\Entity\EntityPersister; use Doctrine\Tests\Models\Cache\Country; +use PHPUnit\Framework\MockObject\MockObject; use ReflectionProperty; /** @@ -26,7 +27,7 @@ protected function createPersister(EntityManagerInterface $em, EntityPersister $ return new ReadWriteCachedEntityPersister($persister, $region, $em, $metadata); } - protected function createRegion(): Region + protected function createRegion(): ConcurrentRegion&MockObject { return $this->createMock(ConcurrentRegion::class); } diff --git a/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php b/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php index 73278d04794..7c34497ed82 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SQLFilterTest.php @@ -204,10 +204,7 @@ private function configureFilters(EntityManagerInterface $em): void $config->addFilter('soft_delete', '\Doctrine\Tests\ORM\Functional\MySoftDeleteFilter'); } - /** - * @return Connection&MockObject - */ - private function getMockConnection(): Connection + private function getMockConnection(): Connection&MockObject { $connection = $this->createMock(Connection::class); $connection->method('getEventManager') @@ -216,20 +213,12 @@ private function getMockConnection(): Connection return $connection; } - /** - * @return EntityManagerInterface&MockObject - */ - private function getMockEntityManager(): EntityManagerInterface + private function getMockEntityManager(): EntityManagerInterface&MockObject { return $this->createMock(EntityManagerInterface::class); } - /** - * @psalm-param EntityManagerInterface&MockObject $em - * - * @return FilterCollection&MockObject - */ - private function addMockFilterCollection(EntityManagerInterface $em): FilterCollection + private function addMockFilterCollection(EntityManagerInterface&MockObject $em): FilterCollection&MockObject { $filterCollection = $this->createMock(FilterCollection::class); diff --git a/tests/Doctrine/Tests/ORM/Hydration/AbstractHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/AbstractHydratorTest.php index 1be4b5788d3..fe60af19275 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/AbstractHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/AbstractHydratorTest.php @@ -23,17 +23,10 @@ */ class AbstractHydratorTest extends OrmFunctionalTestCase { - /** @var EventManager&MockObject */ - private EventManager $mockEventManager; - - /** @var Result&MockObject */ - private Result $mockResult; - - /** @var ResultSetMapping&MockObject */ - private ResultSetMapping $mockResultMapping; - - /** @var AbstractHydrator&MockObject */ - private AbstractHydrator $hydrator; + private EventManager&MockObject $mockEventManager; + private Result&MockObject $mockResult; + private ResultSetMapping&MockObject $mockResultMapping; + private AbstractHydrator&MockObject $hydrator; protected function setUp(): void { diff --git a/tests/Doctrine/Tests/ORM/Internal/HydrationCompleteHandlerTest.php b/tests/Doctrine/Tests/ORM/Internal/HydrationCompleteHandlerTest.php index 1fa1ee5d9f0..69124ac83ea 100644 --- a/tests/Doctrine/Tests/ORM/Internal/HydrationCompleteHandlerTest.php +++ b/tests/Doctrine/Tests/ORM/Internal/HydrationCompleteHandlerTest.php @@ -24,12 +24,8 @@ */ class HydrationCompleteHandlerTest extends TestCase { - /** @var ListenersInvoker&MockObject */ - private $listenersInvoker; - - /** @var EntityManagerInterface&MockObject */ - private $entityManager; - + private ListenersInvoker&MockObject $listenersInvoker; + private EntityManagerInterface&MockObject $entityManager; private HydrationCompleteHandler $handler; protected function setUp(): void diff --git a/tests/Doctrine/Tests/ORM/LazyCriteriaCollectionTest.php b/tests/Doctrine/Tests/ORM/LazyCriteriaCollectionTest.php index 50a8703e8e5..a64fd7221f5 100644 --- a/tests/Doctrine/Tests/ORM/LazyCriteriaCollectionTest.php +++ b/tests/Doctrine/Tests/ORM/LazyCriteriaCollectionTest.php @@ -17,11 +17,8 @@ */ class LazyCriteriaCollectionTest extends TestCase { - /** @var EntityPersister&MockObject */ - private $persister; - + private EntityPersister&MockObject $persister; private Criteria $criteria; - private LazyCriteriaCollection $lazyCriteriaCollection; protected function setUp(): void diff --git a/tests/Doctrine/Tests/ORM/Repository/DefaultRepositoryFactoryTest.php b/tests/Doctrine/Tests/ORM/Repository/DefaultRepositoryFactoryTest.php index 5b55d407ac8..5522edf3c64 100644 --- a/tests/Doctrine/Tests/ORM/Repository/DefaultRepositoryFactoryTest.php +++ b/tests/Doctrine/Tests/ORM/Repository/DefaultRepositoryFactoryTest.php @@ -22,12 +22,8 @@ */ class DefaultRepositoryFactoryTest extends TestCase { - /** @var EntityManagerInterface&MockObject */ - private EntityManagerInterface $entityManager; - - /** @var Configuration&MockObject */ - private Configuration $configuration; - + private EntityManagerInterface&MockObject $entityManager; + private Configuration&MockObject $configuration; private DefaultRepositoryFactory $repositoryFactory; protected function setUp(): void @@ -109,12 +105,11 @@ public function testCachesDistinctRepositoriesPerDistinctEntityManager(): void /** * @psalm-param class-string $className * - * @return ClassMetadata&MockObject * @psalm-return ClassMetadata&MockObject * * @template TEntity of object */ - private function buildClassMetadata(string $className): ClassMetadata + private function buildClassMetadata(string $className): ClassMetadata&MockObject { $metadata = $this->createMock(ClassMetadata::class); $metadata->method('getName')->will(self::returnValue($className)); @@ -125,10 +120,7 @@ private function buildClassMetadata(string $className): ClassMetadata return $metadata; } - /** - * @return EntityManagerInterface&MockObject - */ - private function createEntityManager(): EntityManagerInterface + private function createEntityManager(): EntityManagerInterface&MockObject { $entityManager = $this->createMock(EntityManagerInterface::class); $entityManager->method('getConfiguration')->willReturn($this->configuration); diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/PaginatorTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/PaginatorTest.php index 29903fda23a..dd5a21c0ece 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Pagination/PaginatorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/PaginatorTest.php @@ -18,12 +18,9 @@ class PaginatorTest extends OrmTestCase { - /** @var Connection&MockObject */ - private $connection; - /** @var EntityManagerInterface&MockObject */ - private $em; - /** @var AbstractHydrator&MockObject */ - private $hydrator; + private Connection&MockObject $connection; + private EntityManagerInterface&MockObject $em; + private AbstractHydrator&MockObject $hydrator; protected function setUp(): void { diff --git a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php index 0df86f09cb9..5cf0bc2ee42 100644 --- a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php +++ b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php @@ -52,18 +52,15 @@ class UnitOfWorkTest extends OrmTestCase /** * Provides a sequence mock to the UnitOfWork - * - * @var Connection&MockObject */ - private $connection; + private Connection $connection; /** * The EntityManager mock that provides the mock persisters */ private EntityManagerMock $_emMock; - /** @var EventManager&MockObject */ - private $eventManager; + private EventManager&MockObject $eventManager; protected function setUp(): void {