From 1dfdc1d1eede1c9ce5847963296d578625923ede Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Mon, 27 Dec 2021 22:39:37 +0100 Subject: [PATCH] Enable PHPCS rules for PHP 8.0 --- phpcs.xml.dist | 3 ++- .../Doctrine/StaticAnalysis/get-metadata.php | 3 +-- tests/Doctrine/Tests/DoctrineTestCase.php | 8 ++---- .../Doctrine/Tests/Mocks/CacheRegionMock.php | 10 ++------ tests/Doctrine/Tests/Mocks/ConnectionMock.php | 7 +----- .../Tests/Mocks/EntityPersisterMock.php | 5 +--- .../Tests/Models/DDC3711/DDC3711EntityA.php | 20 +++------------ .../Models/ECommerce/ECommerceShipping.php | 10 ++------ .../Doctrine/Tests/ORM/EntityManagerTest.php | 4 +-- .../ORM/Functional/Ticket/DDC2895Test.php | 10 ++------ .../ORM/Functional/Ticket/DDC5684Test.php | 3 +-- .../ORM/Functional/Ticket/DDC6303Test.php | 5 +--- .../ORM/Functional/Ticket/GH5762Test.php | 5 +--- .../Hydration/SingleScalarHydratorTest.php | 6 ++--- .../ORM/ORMInvalidArgumentExceptionTest.php | 4 +-- .../ORM/Query/ParameterTypeInfererTest.php | 5 +--- .../ORM/Query/QueryExpressionVisitorTest.php | 4 +-- .../Tools/Pagination/WhereInWalkerTest.php | 3 +-- tests/Doctrine/Tests/ORM/UnitOfWorkTest.php | 25 ++++--------------- tests/Doctrine/Tests/OrmTestCase.php | 7 ++---- 20 files changed, 34 insertions(+), 113 deletions(-) diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 052f96c4d50..bdd7b650631 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -9,7 +9,7 @@ - + lib tests @@ -26,6 +26,7 @@ + diff --git a/tests/Doctrine/StaticAnalysis/get-metadata.php b/tests/Doctrine/StaticAnalysis/get-metadata.php index c9b11036155..86e0cc92a16 100644 --- a/tests/Doctrine/StaticAnalysis/get-metadata.php +++ b/tests/Doctrine/StaticAnalysis/get-metadata.php @@ -16,10 +16,9 @@ abstract class GetMetadata { /** - * @param string|object $class * @psalm-param class-string|object $class */ - abstract public function getEntityManager($class): EntityManagerInterface; + abstract public function getEntityManager(string|object $class): EntityManagerInterface; /** * @psalm-param class-string $class diff --git a/tests/Doctrine/Tests/DoctrineTestCase.php b/tests/Doctrine/Tests/DoctrineTestCase.php index 3c286b7e6bd..1a7a1badcfd 100644 --- a/tests/Doctrine/Tests/DoctrineTestCase.php +++ b/tests/Doctrine/Tests/DoctrineTestCase.php @@ -25,10 +25,8 @@ abstract class DoctrineTestCase extends TestCase /** * @param array $arguments - * - * @return mixed */ - public static function __callStatic(string $method, array $arguments) + public static function __callStatic(string $method, array $arguments): mixed { if (isset(self::$phpunitMethodRenames[$method])) { $method = self::$phpunitMethodRenames[$method]; @@ -41,10 +39,8 @@ public static function __callStatic(string $method, array $arguments) /** * @param array $arguments - * - * @return mixed */ - public function __call(string $method, array $arguments) + public function __call(string $method, array $arguments): mixed { if ($method === 'createStub') { return $this->getMockBuilder(...$arguments) diff --git a/tests/Doctrine/Tests/Mocks/CacheRegionMock.php b/tests/Doctrine/Tests/Mocks/CacheRegionMock.php index 781d4d9cf65..ab0af22e54d 100644 --- a/tests/Doctrine/Tests/Mocks/CacheRegionMock.php +++ b/tests/Doctrine/Tests/Mocks/CacheRegionMock.php @@ -28,22 +28,16 @@ class CacheRegionMock implements Region /** * Queue a return value for a specific method invocation - * - * @param mixed $value */ - public function addReturn(string $method, $value): void + public function addReturn(string $method, mixed $value): void { $this->returns[$method][] = $value; } /** * Dequeue a value for a specific method invocation - * - * @param mixed $default - * - * @return mixed */ - private function getReturn(string $method, $default) + private function getReturn(string $method, mixed $default): mixed { if (isset($this->returns[$method]) && ! empty($this->returns[$method])) { return array_shift($this->returns[$method]); diff --git a/tests/Doctrine/Tests/Mocks/ConnectionMock.php b/tests/Doctrine/Tests/Mocks/ConnectionMock.php index 7757607df6d..fad5e28626f 100644 --- a/tests/Doctrine/Tests/Mocks/ConnectionMock.php +++ b/tests/Doctrine/Tests/Mocks/ConnectionMock.php @@ -145,12 +145,7 @@ public function quote($input, $type = null) return $input; } - /* Mock API */ - - /** - * @param mixed $fetchOneResult - */ - public function setFetchOneResult($fetchOneResult): void + public function setFetchOneResult(mixed $fetchOneResult): void { $this->_fetchOneResult = $fetchOneResult; } diff --git a/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php b/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php index a8402356a89..c3addc3a8f3 100644 --- a/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php +++ b/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php @@ -34,10 +34,7 @@ class EntityPersisterMock extends BasicEntityPersister /** @var bool */ private $existsCalled = false; - /** - * @return mixed - */ - public function addInsert($entity) + public function addInsert($entity): mixed { $this->inserts[] = $entity; if ( diff --git a/tests/Doctrine/Tests/Models/DDC3711/DDC3711EntityA.php b/tests/Doctrine/Tests/Models/DDC3711/DDC3711EntityA.php index 984c40591a3..4ec4d05ece9 100644 --- a/tests/Doctrine/Tests/Models/DDC3711/DDC3711EntityA.php +++ b/tests/Doctrine/Tests/Models/DDC3711/DDC3711EntityA.php @@ -17,34 +17,22 @@ class DDC3711EntityA /** @var ArrayCollection */ private $entityB; - /** - * @return mixed - */ - public function getId1() + public function getId1(): mixed { return $this->id1; } - /** - * @param mixed $id1 - */ - public function setId1($id1): void + public function setId1(mixed $id1): void { $this->id1 = $id1; } - /** - * @return mixed - */ - public function getId2() + public function getId2(): mixed { return $this->id2; } - /** - * @param mixed $id2 - */ - public function setId2($id2): void + public function setId2(mixed $id2): void { $this->id2 = $id2; } diff --git a/tests/Doctrine/Tests/Models/ECommerce/ECommerceShipping.php b/tests/Doctrine/Tests/Models/ECommerce/ECommerceShipping.php index 122daf5f477..70a571dff28 100644 --- a/tests/Doctrine/Tests/Models/ECommerce/ECommerceShipping.php +++ b/tests/Doctrine/Tests/Models/ECommerce/ECommerceShipping.php @@ -38,18 +38,12 @@ public function getId(): int return $this->id; } - /** - * @return int|string - */ - public function getDays() + public function getDays(): int|string { return $this->days; } - /** - * @param int|string $days - */ - public function setDays($days): void + public function setDays(int|string $days): void { $this->days = $days; } diff --git a/tests/Doctrine/Tests/ORM/EntityManagerTest.php b/tests/Doctrine/Tests/ORM/EntityManagerTest.php index 3acc3855f59..715510a8a13 100644 --- a/tests/Doctrine/Tests/ORM/EntityManagerTest.php +++ b/tests/Doctrine/Tests/ORM/EntityManagerTest.php @@ -223,12 +223,10 @@ public function dataToBeReturnedByWrapInTransaction(): Generator } /** - * @param mixed $expectedValue - * * @dataProvider dataToBeReturnedByWrapInTransaction * @group DDC-1125 */ - public function testWrapInTransactionAcceptsReturn($expectedValue): void + public function testWrapInTransactionAcceptsReturn(mixed $expectedValue): void { $return = $this->entityManager->wrapInTransaction( /** @return mixed */ diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2895Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2895Test.php index e6c3d0a296e..a30711956a5 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2895Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2895Test.php @@ -105,18 +105,12 @@ class DDC2895 extends AbstractDDC2895 */ public $id; - /** - * @param mixed $id - */ - public function setId($id): void + public function setId(mixed $id): void { $this->id = $id; } - /** - * @return mixed - */ - public function getId() + public function getId(): mixed { return $this->id; } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC5684Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC5684Test.php index 08493f32f2f..eb8d789b424 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC5684Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC5684Test.php @@ -106,8 +106,7 @@ class DDC5684ObjectId /** @var mixed */ public $value; - /** @param mixed $value */ - public function __construct($value) + public function __construct(mixed $value) { $this->value = $value; } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC6303Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC6303Test.php index 504edfa261f..dadce53c32e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC6303Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC6303Test.php @@ -126,10 +126,7 @@ class DDC6303ChildA extends DDC6303BaseClass */ private $originalData; - /** - * @param mixed $originalData - */ - public function __construct(string $id, $originalData) + public function __construct(string $id, mixed $originalData) { $this->id = $id; $this->originalData = $originalData; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH5762Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH5762Test.php index c59a0c44c83..7a9771de416 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH5762Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH5762Test.php @@ -61,10 +61,7 @@ public function testIssue(): void self::assertContains('Volvo', $cars); } - /** - * @return mixed - */ - private function fetchData() + private function fetchData(): mixed { $this->createData(); diff --git a/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php index 91adbccb75b..b093839af09 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php @@ -52,11 +52,10 @@ public static function validResultSetProvider(): Generator /** * @param list> $resultSet - * @param mixed $expectedResult * * @dataProvider validResultSetProvider */ - public function testHydrateSingleScalarFromFieldMappingWithValidResultSet(array $resultSet, $expectedResult): void + public function testHydrateSingleScalarFromFieldMappingWithValidResultSet(array $resultSet, mixed $expectedResult): void { $rsm = new ResultSetMapping(); $rsm->addEntityResult(CmsUser::class, 'u'); @@ -72,11 +71,10 @@ public function testHydrateSingleScalarFromFieldMappingWithValidResultSet(array /** * @param list> $resultSet - * @param mixed $expectedResult * * @dataProvider validResultSetProvider */ - public function testHydrateSingleScalarFromScalarMappingWithValidResultSet(array $resultSet, $expectedResult): void + public function testHydrateSingleScalarFromScalarMappingWithValidResultSet(array $resultSet, mixed $expectedResult): void { $rsm = new ResultSetMapping(); $rsm->addScalarResult('u__id', 'id', 'string'); diff --git a/tests/Doctrine/Tests/ORM/ORMInvalidArgumentExceptionTest.php b/tests/Doctrine/Tests/ORM/ORMInvalidArgumentExceptionTest.php index 2b55c3fc6e7..45fe31adec3 100644 --- a/tests/Doctrine/Tests/ORM/ORMInvalidArgumentExceptionTest.php +++ b/tests/Doctrine/Tests/ORM/ORMInvalidArgumentExceptionTest.php @@ -17,11 +17,9 @@ class ORMInvalidArgumentExceptionTest extends TestCase { /** - * @param mixed $value - * * @dataProvider invalidEntityNames */ - public function testInvalidEntityName($value, string $expectedMessage): void + public function testInvalidEntityName(mixed $value, string $expectedMessage): void { $exception = ORMInvalidArgumentException::invalidEntityName($value); diff --git a/tests/Doctrine/Tests/ORM/Query/ParameterTypeInfererTest.php b/tests/Doctrine/Tests/ORM/Query/ParameterTypeInfererTest.php index d3acdd827f7..71486da597b 100644 --- a/tests/Doctrine/Tests/ORM/Query/ParameterTypeInfererTest.php +++ b/tests/Doctrine/Tests/ORM/Query/ParameterTypeInfererTest.php @@ -34,12 +34,9 @@ public function providerParameterTypeInferer(): array } /** - * @param mixed $value - * @param int|string $expected - * * @dataProvider providerParameterTypeInferer */ - public function testParameterTypeInferer($value, $expected): void + public function testParameterTypeInferer(mixed $value, int|string $expected): void { self::assertEquals($expected, ParameterTypeInferer::inferType($value)); } diff --git a/tests/Doctrine/Tests/ORM/Query/QueryExpressionVisitorTest.php b/tests/Doctrine/Tests/ORM/Query/QueryExpressionVisitorTest.php index 054adcacede..9d0f5be158b 100644 --- a/tests/Doctrine/Tests/ORM/Query/QueryExpressionVisitorTest.php +++ b/tests/Doctrine/Tests/ORM/Query/QueryExpressionVisitorTest.php @@ -27,11 +27,9 @@ protected function setUp(): void } /** - * @param QueryBuilder\Comparison|QueryBuilder\Func|string $queryExpr - * * @dataProvider comparisonData */ - public function testWalkComparison(CriteriaComparison $criteriaExpr, $queryExpr, ?Parameter $parameter = null): void + public function testWalkComparison(CriteriaComparison $criteriaExpr, QueryBuilder\Comparison|QueryBuilder\Func|string $queryExpr, ?Parameter $parameter = null): void { self::assertEquals($queryExpr, $this->visitor->walkComparison($criteriaExpr)); if ($parameter) { diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php index 23e6d717607..76e39afb8b6 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/WhereInWalkerTest.php @@ -266,8 +266,7 @@ public function testWillReplaceBoundQueryIdentifiersWithConvertedTypesAsPerAssoc ); } - /** @param mixed $parameter */ - private function assertPaginatorWhereInParameterToBe(Query $query, $parameter): void + private function assertPaginatorWhereInParameterToBe(Query $query, mixed $parameter): void { $query->getSQL(); // forces walker to process the query diff --git a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php index 446bd79c3d8..f4e3bc1107a 100644 --- a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php +++ b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php @@ -308,12 +308,10 @@ public function testNoUndefinedIndexNoticeOnScheduleForUpdateWithoutChanges(): v } /** - * @param mixed $invalidValue - * * @group DDC-3490 * @dataProvider invalidAssociationValuesDataProvider */ - public function testRejectsPersistenceOfObjectsWithInvalidAssociationValue($invalidValue): void + public function testRejectsPersistenceOfObjectsWithInvalidAssociationValue(mixed $invalidValue): void { $this->_unitOfWork->setEntityPersister( ForumUser::class, @@ -333,12 +331,10 @@ public function testRejectsPersistenceOfObjectsWithInvalidAssociationValue($inva } /** - * @param mixed $invalidValue - * * @group DDC-3490 * @dataProvider invalidAssociationValuesDataProvider */ - public function testRejectsChangeSetComputationForObjectsWithInvalidAssociationValue($invalidValue): void + public function testRejectsChangeSetComputationForObjectsWithInvalidAssociationValue(mixed $invalidValue): void { $metadata = $this->_emMock->getClassMetadata(ForumUser::class); @@ -880,18 +876,12 @@ public function setTransient($value): void } } - /** - * @return mixed - */ - public function getData() + public function getData(): mixed { return $this->data; } - /** - * @param mixed $data - */ - public function setData($data): void + public function setData(mixed $data): void { if ($data !== $this->data) { $this->onPropertyChanged('data', $this->data, $data); @@ -904,12 +894,7 @@ public function addPropertyChangedListener(PropertyChangedListener $listener): v $this->_listeners[] = $listener; } - /** - * @param mixed $propName - * @param mixed $oldValue - * @param mixed $newValue - */ - protected function onPropertyChanged($propName, $oldValue, $newValue): void + protected function onPropertyChanged(mixed $propName, mixed $oldValue, mixed $newValue): void { if ($this->_listeners) { foreach ($this->_listeners as $listener) { diff --git a/tests/Doctrine/Tests/OrmTestCase.php b/tests/Doctrine/Tests/OrmTestCase.php index a63afcfee59..b89a69e05d0 100644 --- a/tests/Doctrine/Tests/OrmTestCase.php +++ b/tests/Doctrine/Tests/OrmTestCase.php @@ -72,13 +72,10 @@ protected function createAnnotationDriver(array $paths = []): AnnotationDriver * mocked out using a DriverMock, ConnectionMock, etc. These mocks can then * be configured in the tests to simulate the DBAL behavior that is desired * for a particular test, - * - * @param Connection|array $conn - * @param mixed $conf */ protected function getTestEntityManager( - $conn = null, - $conf = null, + Connection|array|null $conn = null, + mixed $conf = null, ?EventManager $eventManager = null, bool $withSharedMetadata = true ): EntityManagerMock {