From a115c2dc43957cd62beac01640df9555929a3257 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Sun, 21 Dec 2025 16:51:38 +0300 Subject: [PATCH 1/2] Cleanup --- src/Reader/Cache/CachedCollection.php | 4 ++- src/Reader/EntityReader.php | 25 ++++++++++--------- src/Reader/FilterHandler/AllHandler.php | 5 ++-- src/Reader/FilterHandler/AndXHandler.php | 5 ++-- src/Reader/FilterHandler/BetweenHandler.php | 5 ++-- src/Reader/FilterHandler/EqualsHandler.php | 5 ++-- .../FilterHandler/EqualsNullHandler.php | 5 ++-- .../FilterHandler/GreaterThanHandler.php | 5 ++-- .../GreaterThanOrEqualHandler.php | 5 ++-- src/Reader/FilterHandler/InHandler.php | 5 ++-- src/Reader/FilterHandler/LessThanHandler.php | 5 ++-- .../FilterHandler/LessThanOrEqualHandler.php | 5 ++-- .../LikeHandler/BaseLikeHandler.php | 3 ++- .../LikeHandler/MysqlLikeHandler.php | 3 ++- .../LikeHandler/PostgresLikeHandler.php | 3 ++- .../LikeHandler/SqlServerLikeHandler.php | 3 ++- .../LikeHandler/SqliteLikeHandler.php | 3 ++- src/Reader/FilterHandler/NoneHandler.php | 5 ++-- src/Reader/FilterHandler/NotHandler.php | 5 ++-- src/Reader/FilterHandler/OrXHandler.php | 5 ++-- src/Writer/EntityWriter.php | 9 ++++--- .../BaseReaderWithAllTestCase.php | 4 +-- .../BaseReaderWithOrXTestCase.php | 4 +-- .../Base/Writer/BaseEntityWriterTestCase.php | 6 +++-- tests/Feature/DataTrait.php | 5 ++-- .../SqlServerLikeHandlerTest.php | 2 +- .../Reader/Cache/CachedCollectionTest.php | 9 ++++--- tests/Unit/Reader/Cache/CachedCountTest.php | 3 ++- tests/Unit/Reader/EntityReaderTest.php | 3 ++- .../FilterHandler/SqliteLikeHandlerTest.php | 2 +- 30 files changed, 93 insertions(+), 63 deletions(-) diff --git a/src/Reader/Cache/CachedCollection.php b/src/Reader/Cache/CachedCollection.php index 0add230..e283957 100644 --- a/src/Reader/Cache/CachedCollection.php +++ b/src/Reader/Cache/CachedCollection.php @@ -4,6 +4,8 @@ namespace Yiisoft\Data\Cycle\Reader\Cache; +use Generator; + final class CachedCollection { private ?iterable $collection = null; @@ -26,7 +28,7 @@ public function getCollection(): ?iterable return $this->collection; } - public function getGenerator(): \Generator + public function getGenerator(): Generator { if ($this->collection !== null) { yield from $this->collection; diff --git a/src/Reader/EntityReader.php b/src/Reader/EntityReader.php index a20b938..60177b2 100644 --- a/src/Reader/EntityReader.php +++ b/src/Reader/EntityReader.php @@ -10,6 +10,7 @@ use Cycle\ORM\Select\QueryBuilder; use Generator; use InvalidArgumentException; +use Override; use Yiisoft\Data\Cycle\Exception\NotSupportedFilterException; use Yiisoft\Data\Cycle\Reader\FilterHandler\LikeHandler\LikeHandlerFactory; use Yiisoft\Data\Reader\DataReaderInterface; @@ -78,7 +79,7 @@ public function __construct(Select|SelectQuery $query, array $extraFilterHandler $this->filter = new All(); } - #[\Override] + #[Override] public function getSort(): ?Sort { return $this->sorting; @@ -87,7 +88,7 @@ public function getSort(): ?Sort /** * @psalm-mutation-free */ - #[\Override] + #[Override] public function withLimit(?int $limit): static { /** @psalm-suppress DocblockTypeContradiction */ @@ -105,7 +106,7 @@ public function withLimit(?int $limit): static /** * @psalm-mutation-free */ - #[\Override] + #[Override] public function withOffset(int $offset): static { $new = clone $this; @@ -119,7 +120,7 @@ public function withOffset(int $offset): static /** * @psalm-mutation-free */ - #[\Override] + #[Override] public function withSort(?Sort $sort): static { $new = clone $this; @@ -134,7 +135,7 @@ public function withSort(?Sort $sort): static /** * @psalm-mutation-free */ - #[\Override] + #[Override] public function withFilter(FilterInterface $filter): static { $new = clone $this; @@ -148,13 +149,13 @@ public function withFilter(FilterInterface $filter): static return $new; } - #[\Override] + #[Override] public function count(): int { return $this->countCache->getCount(); } - #[\Override] + #[Override] public function read(): iterable { if ($this->itemsCache->getCollection() === null) { @@ -164,7 +165,7 @@ public function read(): iterable return $this->itemsCache->getCollection(); } - #[\Override] + #[Override] public function readOne(): null|array|object { if (!$this->oneItemCache->isCollected()) { @@ -182,7 +183,7 @@ public function readOne(): null|array|object /** * Get Iterator without caching */ - #[\Override] + #[Override] public function getIterator(): Generator { yield from $this->itemsCache->getCollection() ?? $this->buildSelectQuery()->getIterator(); @@ -255,19 +256,19 @@ private function normalizeSortingCriteria(array $criteria): array return $criteria; } - #[\Override] + #[Override] public function getFilter(): FilterInterface { return $this->filter; } - #[\Override] + #[Override] public function getLimit(): ?int { return $this->limit; } - #[\Override] + #[Override] public function getOffset(): int { return $this->offset; diff --git a/src/Reader/FilterHandler/AllHandler.php b/src/Reader/FilterHandler/AllHandler.php index 6a3af5b..e7e51ed 100644 --- a/src/Reader/FilterHandler/AllHandler.php +++ b/src/Reader/FilterHandler/AllHandler.php @@ -7,19 +7,20 @@ use Cycle\Database\Injection\Expression; use Cycle\Database\Query\SelectQuery; use Cycle\ORM\Select\QueryBuilder; +use Override; use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler; use Yiisoft\Data\Reader\Filter\All; use Yiisoft\Data\Reader\FilterInterface; final class AllHandler implements QueryBuilderFilterHandler { - #[\Override] + #[Override] public function getFilterClass(): string { return All::class; } - #[\Override] + #[Override] public function getAsWhereArguments(FilterInterface $filter, array $handlers): array { /** @var All $filter */ diff --git a/src/Reader/FilterHandler/AndXHandler.php b/src/Reader/FilterHandler/AndXHandler.php index 029d8b2..a4337b7 100644 --- a/src/Reader/FilterHandler/AndXHandler.php +++ b/src/Reader/FilterHandler/AndXHandler.php @@ -6,6 +6,7 @@ use Cycle\Database\Query\SelectQuery; use Cycle\ORM\Select\QueryBuilder; +use Override; use Yiisoft\Data\Cycle\Exception\NotSupportedFilterException; use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler; use Yiisoft\Data\Reader\Filter\AndX; @@ -13,13 +14,13 @@ final class AndXHandler implements QueryBuilderFilterHandler { - #[\Override] + #[Override] public function getFilterClass(): string { return AndX::class; } - #[\Override] + #[Override] public function getAsWhereArguments(FilterInterface $filter, array $handlers): array { /** @var AndX $filter */ diff --git a/src/Reader/FilterHandler/BetweenHandler.php b/src/Reader/FilterHandler/BetweenHandler.php index 07124dd..df0b01a 100644 --- a/src/Reader/FilterHandler/BetweenHandler.php +++ b/src/Reader/FilterHandler/BetweenHandler.php @@ -4,19 +4,20 @@ namespace Yiisoft\Data\Cycle\Reader\FilterHandler; +use Override; use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler; use Yiisoft\Data\Reader\Filter\Between; use Yiisoft\Data\Reader\FilterInterface; final class BetweenHandler implements QueryBuilderFilterHandler { - #[\Override] + #[Override] public function getFilterClass(): string { return Between::class; } - #[\Override] + #[Override] public function getAsWhereArguments(FilterInterface $filter, array $handlers): array { /** @var Between $filter */ diff --git a/src/Reader/FilterHandler/EqualsHandler.php b/src/Reader/FilterHandler/EqualsHandler.php index 501b492..65e66c9 100644 --- a/src/Reader/FilterHandler/EqualsHandler.php +++ b/src/Reader/FilterHandler/EqualsHandler.php @@ -4,19 +4,20 @@ namespace Yiisoft\Data\Cycle\Reader\FilterHandler; +use Override; use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler; use Yiisoft\Data\Reader\Filter\Equals; use Yiisoft\Data\Reader\FilterInterface; final class EqualsHandler implements QueryBuilderFilterHandler { - #[\Override] + #[Override] public function getFilterClass(): string { return Equals::class; } - #[\Override] + #[Override] public function getAsWhereArguments(FilterInterface $filter, array $handlers): array { /** @var Equals $filter */ diff --git a/src/Reader/FilterHandler/EqualsNullHandler.php b/src/Reader/FilterHandler/EqualsNullHandler.php index 1769616..215d7ba 100644 --- a/src/Reader/FilterHandler/EqualsNullHandler.php +++ b/src/Reader/FilterHandler/EqualsNullHandler.php @@ -4,19 +4,20 @@ namespace Yiisoft\Data\Cycle\Reader\FilterHandler; +use Override; use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler; use Yiisoft\Data\Reader\Filter\EqualsNull; use Yiisoft\Data\Reader\FilterInterface; final class EqualsNullHandler implements QueryBuilderFilterHandler { - #[\Override] + #[Override] public function getFilterClass(): string { return EqualsNull::class; } - #[\Override] + #[Override] public function getAsWhereArguments(FilterInterface $filter, array $handlers): array { /** @var EqualsNull $filter */ diff --git a/src/Reader/FilterHandler/GreaterThanHandler.php b/src/Reader/FilterHandler/GreaterThanHandler.php index ce240ad..cefdf13 100644 --- a/src/Reader/FilterHandler/GreaterThanHandler.php +++ b/src/Reader/FilterHandler/GreaterThanHandler.php @@ -4,19 +4,20 @@ namespace Yiisoft\Data\Cycle\Reader\FilterHandler; +use Override; use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler; use Yiisoft\Data\Reader\Filter\GreaterThan; use Yiisoft\Data\Reader\FilterInterface; final class GreaterThanHandler implements QueryBuilderFilterHandler { - #[\Override] + #[Override] public function getFilterClass(): string { return GreaterThan::class; } - #[\Override] + #[Override] public function getAsWhereArguments(FilterInterface $filter, array $handlers): array { /** @var GreaterThan $filter */ diff --git a/src/Reader/FilterHandler/GreaterThanOrEqualHandler.php b/src/Reader/FilterHandler/GreaterThanOrEqualHandler.php index 1c5cf17..b64855e 100644 --- a/src/Reader/FilterHandler/GreaterThanOrEqualHandler.php +++ b/src/Reader/FilterHandler/GreaterThanOrEqualHandler.php @@ -4,19 +4,20 @@ namespace Yiisoft\Data\Cycle\Reader\FilterHandler; +use Override; use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler; use Yiisoft\Data\Reader\Filter\GreaterThanOrEqual; use Yiisoft\Data\Reader\FilterInterface; final class GreaterThanOrEqualHandler implements QueryBuilderFilterHandler { - #[\Override] + #[Override] public function getFilterClass(): string { return GreaterThanOrEqual::class; } - #[\Override] + #[Override] public function getAsWhereArguments(FilterInterface $filter, array $handlers): array { /** @var GreaterThanOrEqual $filter */ diff --git a/src/Reader/FilterHandler/InHandler.php b/src/Reader/FilterHandler/InHandler.php index e198d71..18b7b70 100644 --- a/src/Reader/FilterHandler/InHandler.php +++ b/src/Reader/FilterHandler/InHandler.php @@ -5,19 +5,20 @@ namespace Yiisoft\Data\Cycle\Reader\FilterHandler; use Cycle\Database\Injection\Parameter; +use Override; use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler; use Yiisoft\Data\Reader\Filter\In; use Yiisoft\Data\Reader\FilterInterface; final class InHandler implements QueryBuilderFilterHandler { - #[\Override] + #[Override] public function getFilterClass(): string { return In::class; } - #[\Override] + #[Override] public function getAsWhereArguments(FilterInterface $filter, array $handlers): array { /** @var In $filter */ diff --git a/src/Reader/FilterHandler/LessThanHandler.php b/src/Reader/FilterHandler/LessThanHandler.php index b428744..851c8ff 100644 --- a/src/Reader/FilterHandler/LessThanHandler.php +++ b/src/Reader/FilterHandler/LessThanHandler.php @@ -4,19 +4,20 @@ namespace Yiisoft\Data\Cycle\Reader\FilterHandler; +use Override; use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler; use Yiisoft\Data\Reader\Filter\LessThan; use Yiisoft\Data\Reader\FilterInterface; final class LessThanHandler implements QueryBuilderFilterHandler { - #[\Override] + #[Override] public function getFilterClass(): string { return LessThan::class; } - #[\Override] + #[Override] public function getAsWhereArguments(FilterInterface $filter, array $handlers): array { /** @var LessThan $filter */ diff --git a/src/Reader/FilterHandler/LessThanOrEqualHandler.php b/src/Reader/FilterHandler/LessThanOrEqualHandler.php index 4041af9..702e07c 100644 --- a/src/Reader/FilterHandler/LessThanOrEqualHandler.php +++ b/src/Reader/FilterHandler/LessThanOrEqualHandler.php @@ -4,19 +4,20 @@ namespace Yiisoft\Data\Cycle\Reader\FilterHandler; +use Override; use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler; use Yiisoft\Data\Reader\Filter\LessThanOrEqual; use Yiisoft\Data\Reader\FilterInterface; final class LessThanOrEqualHandler implements QueryBuilderFilterHandler { - #[\Override] + #[Override] public function getFilterClass(): string { return LessThanOrEqual::class; } - #[\Override] + #[Override] public function getAsWhereArguments(FilterInterface $filter, array $handlers): array { /** @var LessThanOrEqual $filter */ diff --git a/src/Reader/FilterHandler/LikeHandler/BaseLikeHandler.php b/src/Reader/FilterHandler/LikeHandler/BaseLikeHandler.php index 6ad5d2a..2eb713f 100644 --- a/src/Reader/FilterHandler/LikeHandler/BaseLikeHandler.php +++ b/src/Reader/FilterHandler/LikeHandler/BaseLikeHandler.php @@ -4,6 +4,7 @@ namespace Yiisoft\Data\Cycle\Reader\FilterHandler\LikeHandler; +use Override; use Stringable; use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler; use Yiisoft\Data\Reader\Filter\Like; @@ -17,7 +18,7 @@ abstract class BaseLikeHandler implements QueryBuilderFilterHandler '\\' => '\\\\', ]; - #[\Override] + #[Override] public function getFilterClass(): string { return Like::class; diff --git a/src/Reader/FilterHandler/LikeHandler/MysqlLikeHandler.php b/src/Reader/FilterHandler/LikeHandler/MysqlLikeHandler.php index fd64ad8..fef69b6 100644 --- a/src/Reader/FilterHandler/LikeHandler/MysqlLikeHandler.php +++ b/src/Reader/FilterHandler/LikeHandler/MysqlLikeHandler.php @@ -4,12 +4,13 @@ namespace Yiisoft\Data\Cycle\Reader\FilterHandler\LikeHandler; +use Override; use Yiisoft\Data\Reader\Filter\Like; use Yiisoft\Data\Reader\FilterInterface; final class MysqlLikeHandler extends BaseLikeHandler { - #[\Override] + #[Override] public function getAsWhereArguments(FilterInterface $filter, array $handlers): array { /** @var Like $filter */ diff --git a/src/Reader/FilterHandler/LikeHandler/PostgresLikeHandler.php b/src/Reader/FilterHandler/LikeHandler/PostgresLikeHandler.php index a140873..46657b5 100644 --- a/src/Reader/FilterHandler/LikeHandler/PostgresLikeHandler.php +++ b/src/Reader/FilterHandler/LikeHandler/PostgresLikeHandler.php @@ -4,12 +4,13 @@ namespace Yiisoft\Data\Cycle\Reader\FilterHandler\LikeHandler; +use Override; use Yiisoft\Data\Reader\Filter\Like; use Yiisoft\Data\Reader\FilterInterface; final class PostgresLikeHandler extends BaseLikeHandler { - #[\Override] + #[Override] public function getAsWhereArguments(FilterInterface $filter, array $handlers): array { /** @var Like $filter */ diff --git a/src/Reader/FilterHandler/LikeHandler/SqlServerLikeHandler.php b/src/Reader/FilterHandler/LikeHandler/SqlServerLikeHandler.php index 2199e8a..9e7331b 100644 --- a/src/Reader/FilterHandler/LikeHandler/SqlServerLikeHandler.php +++ b/src/Reader/FilterHandler/LikeHandler/SqlServerLikeHandler.php @@ -4,6 +4,7 @@ namespace Yiisoft\Data\Cycle\Reader\FilterHandler\LikeHandler; +use Override; use Yiisoft\Data\Cycle\Exception\NotSupportedFilterOptionException; use Yiisoft\Data\Reader\Filter\Like; use Yiisoft\Data\Reader\FilterInterface; @@ -15,7 +16,7 @@ public function __construct() unset($this->escapingReplacements['\\']); } - #[\Override] + #[Override] public function getAsWhereArguments(FilterInterface $filter, array $handlers): array { /** @var Like $filter */ diff --git a/src/Reader/FilterHandler/LikeHandler/SqliteLikeHandler.php b/src/Reader/FilterHandler/LikeHandler/SqliteLikeHandler.php index c363557..e65bccd 100644 --- a/src/Reader/FilterHandler/LikeHandler/SqliteLikeHandler.php +++ b/src/Reader/FilterHandler/LikeHandler/SqliteLikeHandler.php @@ -4,6 +4,7 @@ namespace Yiisoft\Data\Cycle\Reader\FilterHandler\LikeHandler; +use Override; use Yiisoft\Data\Cycle\Exception\NotSupportedFilterOptionException; use Yiisoft\Data\Reader\Filter\Like; use Yiisoft\Data\Reader\FilterInterface; @@ -15,7 +16,7 @@ public function __construct() unset($this->escapingReplacements['\\']); } - #[\Override] + #[Override] public function getAsWhereArguments(FilterInterface $filter, array $handlers): array { /** @var Like $filter */ diff --git a/src/Reader/FilterHandler/NoneHandler.php b/src/Reader/FilterHandler/NoneHandler.php index 8260b75..deaf342 100644 --- a/src/Reader/FilterHandler/NoneHandler.php +++ b/src/Reader/FilterHandler/NoneHandler.php @@ -7,19 +7,20 @@ use Cycle\Database\Injection\Expression; use Cycle\Database\Query\SelectQuery; use Cycle\ORM\Select\QueryBuilder; +use Override; use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler; use Yiisoft\Data\Reader\Filter\None; use Yiisoft\Data\Reader\FilterInterface; final class NoneHandler implements QueryBuilderFilterHandler { - #[\Override] + #[Override] public function getFilterClass(): string { return None::class; } - #[\Override] + #[Override] public function getAsWhereArguments(FilterInterface $filter, array $handlers): array { /** @var None $filter */ diff --git a/src/Reader/FilterHandler/NotHandler.php b/src/Reader/FilterHandler/NotHandler.php index 65cb483..196d485 100644 --- a/src/Reader/FilterHandler/NotHandler.php +++ b/src/Reader/FilterHandler/NotHandler.php @@ -4,6 +4,7 @@ namespace Yiisoft\Data\Cycle\Reader\FilterHandler; +use Override; use Yiisoft\Data\Cycle\Exception\NotSupportedFilterException; use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler; use Yiisoft\Data\Reader\Filter\AndX; @@ -22,13 +23,13 @@ final class NotHandler implements QueryBuilderFilterHandler { - #[\Override] + #[Override] public function getFilterClass(): string { return Not::class; } - #[\Override] + #[Override] public function getAsWhereArguments(FilterInterface $filter, array $handlers): array { /** @var Not $filter */ diff --git a/src/Reader/FilterHandler/OrXHandler.php b/src/Reader/FilterHandler/OrXHandler.php index f063ce7..44d5792 100644 --- a/src/Reader/FilterHandler/OrXHandler.php +++ b/src/Reader/FilterHandler/OrXHandler.php @@ -6,6 +6,7 @@ use Cycle\Database\Query\SelectQuery; use Cycle\ORM\Select\QueryBuilder; +use Override; use Yiisoft\Data\Cycle\Exception\NotSupportedFilterException; use Yiisoft\Data\Cycle\Reader\QueryBuilderFilterHandler; use Yiisoft\Data\Reader\Filter\OrX; @@ -13,13 +14,13 @@ final class OrXHandler implements QueryBuilderFilterHandler { - #[\Override] + #[Override] public function getFilterClass(): string { return OrX::class; } - #[\Override] + #[Override] public function getAsWhereArguments(FilterInterface $filter, array $handlers): array { /** @var OrX $filter */ diff --git a/src/Writer/EntityWriter.php b/src/Writer/EntityWriter.php index 5c0575c..064564c 100644 --- a/src/Writer/EntityWriter.php +++ b/src/Writer/EntityWriter.php @@ -5,19 +5,22 @@ namespace Yiisoft\Data\Cycle\Writer; use Cycle\ORM\EntityManagerInterface; +use Override; use Throwable; use Yiisoft\Data\Writer\DataWriterInterface; final class EntityWriter implements DataWriterInterface { - public function __construct(private EntityManagerInterface $entityManager) + public function __construct( + private readonly EntityManagerInterface $entityManager + ) { } /** * @throws Throwable */ - #[\Override] + #[Override] public function write(iterable $items): void { foreach ($items as $entity) { @@ -26,7 +29,7 @@ public function write(iterable $items): void $this->entityManager->run(); } - #[\Override] + #[Override] public function delete(iterable $items): void { foreach ($items as $entity) { diff --git a/tests/Feature/Base/Reader/ReaderWithFilter/BaseReaderWithAllTestCase.php b/tests/Feature/Base/Reader/ReaderWithFilter/BaseReaderWithAllTestCase.php index d964e1e..80df644 100644 --- a/tests/Feature/Base/Reader/ReaderWithFilter/BaseReaderWithAllTestCase.php +++ b/tests/Feature/Base/Reader/ReaderWithFilter/BaseReaderWithAllTestCase.php @@ -41,7 +41,7 @@ public function testWithReader(): void foreach ($expectedResult as $expectedItem) { $id = $expectedItem['id']; - $this->assertArrayHasKey($id, $actualResultsById, "Результат с ID {$id} не найден."); + $this->assertArrayHasKey($id, $actualResultsById, "Результат с ID $id не найден."); $actualItem = $actualResultsById[$id]; $this->assertEquals($expectedItem['id'], $actualItem['id']); @@ -50,7 +50,7 @@ public function testWithReader(): void $expectedItem['number'], $actualItem['number'], 0.01, - "The balance for user ID {$id} is not as expected." + "The balance for user ID $id is not as expected." ); } } diff --git a/tests/Feature/Base/Reader/ReaderWithFilter/BaseReaderWithOrXTestCase.php b/tests/Feature/Base/Reader/ReaderWithFilter/BaseReaderWithOrXTestCase.php index f14481d..5c0ccb4 100644 --- a/tests/Feature/Base/Reader/ReaderWithFilter/BaseReaderWithOrXTestCase.php +++ b/tests/Feature/Base/Reader/ReaderWithFilter/BaseReaderWithOrXTestCase.php @@ -49,7 +49,7 @@ public function testFilterSupportSelectQuery(): void foreach ($expectedResult as $expectedItem) { $id = $expectedItem['id']; - $this->assertArrayHasKey($id, $actualResultsById, "Результат с ID {$id} не найден."); + $this->assertArrayHasKey($id, $actualResultsById, "Результат с ID $id не найден."); $actualItem = $actualResultsById[$id]; $this->assertEquals($expectedItem['id'], $actualItem['id']); @@ -58,7 +58,7 @@ public function testFilterSupportSelectQuery(): void $expectedItem['balance'], $actualItem['balance'], 0.01, - "The balance for user ID {$id} is not as expected." + "The balance for user ID $id is not as expected." ); } } diff --git a/tests/Feature/Base/Writer/BaseEntityWriterTestCase.php b/tests/Feature/Base/Writer/BaseEntityWriterTestCase.php index b12285f..79cd671 100644 --- a/tests/Feature/Base/Writer/BaseEntityWriterTestCase.php +++ b/tests/Feature/Base/Writer/BaseEntityWriterTestCase.php @@ -10,6 +10,8 @@ use Yiisoft\Data\Cycle\Writer\EntityWriter; use Yiisoft\Data\Tests\Common\FixtureTrait; +use function iterator_to_array; + abstract class BaseEntityWriterTestCase extends TestCase { use DataTrait; @@ -38,11 +40,11 @@ public function testDelete(): void $writer = new EntityWriter($this->createEntityManager()); $reader = new EntityReader($this->select('user')->where('number', 'in', [1, 2, 3])); // Iterator doesn't use cache - $entities = \iterator_to_array($reader->getIterator()); + $entities = iterator_to_array($reader->getIterator()); $writer->delete($entities); $this->assertCount(3, $entities); - $this->assertEquals([], \iterator_to_array($reader->getIterator())); + $this->assertEquals([], iterator_to_array($reader->getIterator())); } } diff --git a/tests/Feature/DataTrait.php b/tests/Feature/DataTrait.php index a318630..512b8f8 100644 --- a/tests/Feature/DataTrait.php +++ b/tests/Feature/DataTrait.php @@ -18,6 +18,7 @@ use Cycle\Database\DatabaseManager; use Cycle\Database\DatabaseProviderInterface; use Cycle\Database\Driver\Handler; +use Cycle\Database\Driver\HandlerInterface; use Cycle\ORM\EntityManager; use Cycle\ORM\EntityManagerInterface; use Cycle\ORM\Factory; @@ -32,7 +33,7 @@ trait DataTrait { - public static $DRIVER = null; + public static ?string $DRIVER = null; // cache private ?ORMInterface $orm = null; @@ -124,7 +125,7 @@ protected function dropDatabase(): void $schema->dropForeignKey($foreign->getColumns()); } - $schema->save(Handler::DROP_FOREIGN_KEYS); + $schema->save(HandlerInterface::DROP_FOREIGN_KEYS); } foreach ($this->dbal->database()->getTables() as $table) { diff --git a/tests/Unit/Mssql/Reader/FilterHandler/SqlServerLikeHandlerTest.php b/tests/Unit/Mssql/Reader/FilterHandler/SqlServerLikeHandlerTest.php index 4e049bc..da0164e 100644 --- a/tests/Unit/Mssql/Reader/FilterHandler/SqlServerLikeHandlerTest.php +++ b/tests/Unit/Mssql/Reader/FilterHandler/SqlServerLikeHandlerTest.php @@ -11,7 +11,7 @@ final class SqlServerLikeHandlerTest extends TestCase { - public static $DRIVER = 'mssql'; + public static ?string $DRIVER = 'mssql'; public function testNotSupportedFilterOptionException(): void { diff --git a/tests/Unit/Reader/Cache/CachedCollectionTest.php b/tests/Unit/Reader/Cache/CachedCollectionTest.php index 2d5b847..8d9f694 100644 --- a/tests/Unit/Reader/Cache/CachedCollectionTest.php +++ b/tests/Unit/Reader/Cache/CachedCollectionTest.php @@ -4,6 +4,8 @@ namespace Yiisoft\Data\Cycle\Tests\Unit\Reader\Cache; +use ArrayIterator; +use Generator; use PHPUnit\Framework\TestCase; use Yiisoft\Data\Cycle\Reader\Cache\CachedCollection; @@ -11,7 +13,7 @@ final class CachedCollectionTest extends TestCase { public function testCollection(): void { - $collection = new \ArrayIterator(['foo']); + $collection = new ArrayIterator(['foo']); $cachedCollection = new CachedCollection(); @@ -28,20 +30,19 @@ public function testIsCollected(): void $this->assertFalse($cachedCollection->isCollected()); - $cachedCollection->setCollection(new \ArrayIterator()); + $cachedCollection->setCollection(new ArrayIterator()); $this->assertTrue($cachedCollection->isCollected()); } public function testGetGenerator(): void { - $collection = new \ArrayIterator(['foo']); + $collection = new ArrayIterator(['foo']); $cachedCollection = new CachedCollection(); $cachedCollection->setCollection($collection); - $this->assertInstanceOf(\Generator::class, $cachedCollection->getGenerator()); $this->assertSame(['foo'], iterator_to_array($cachedCollection->getGenerator())); } } diff --git a/tests/Unit/Reader/Cache/CachedCountTest.php b/tests/Unit/Reader/Cache/CachedCountTest.php index 0812bc6..00da060 100644 --- a/tests/Unit/Reader/Cache/CachedCountTest.php +++ b/tests/Unit/Reader/Cache/CachedCountTest.php @@ -4,6 +4,7 @@ namespace Yiisoft\Data\Cycle\Tests\Unit\Reader\Cache; +use Countable; use PHPUnit\Framework\TestCase; use Yiisoft\Data\Cycle\Reader\Cache\CachedCount; @@ -11,7 +12,7 @@ final class CachedCountTest extends TestCase { public function testGetCount(): void { - $collection = $this->createMock(\Countable::class); + $collection = $this->createMock(Countable::class); $collection->expects($this->once())->method('count')->willReturn(2); $cached = new CachedCount($collection); diff --git a/tests/Unit/Reader/EntityReaderTest.php b/tests/Unit/Reader/EntityReaderTest.php index ae0c831..50a2472 100644 --- a/tests/Unit/Reader/EntityReaderTest.php +++ b/tests/Unit/Reader/EntityReaderTest.php @@ -6,6 +6,7 @@ use Cycle\Database\Query\SelectQuery; use PHPUnit\Framework\TestCase; +use ReflectionMethod; use Yiisoft\Data\Cycle\Reader\EntityReader; use Yiisoft\Data\Reader\Sort; @@ -15,7 +16,7 @@ public function testNormalizeSortingCriteria(): void { $reader = new EntityReader($this->createMock(SelectQuery::class)); - $ref = new \ReflectionMethod($reader, 'normalizeSortingCriteria'); + $ref = new ReflectionMethod($reader, 'normalizeSortingCriteria'); $this->assertSame( ['number' => 'ASC', 'name' => 'DESC', 'email' => 'ASC'], diff --git a/tests/Unit/Sqlite/Reader/FilterHandler/SqliteLikeHandlerTest.php b/tests/Unit/Sqlite/Reader/FilterHandler/SqliteLikeHandlerTest.php index d32348f..9f08c01 100644 --- a/tests/Unit/Sqlite/Reader/FilterHandler/SqliteLikeHandlerTest.php +++ b/tests/Unit/Sqlite/Reader/FilterHandler/SqliteLikeHandlerTest.php @@ -11,7 +11,7 @@ final class SqliteLikeHandlerTest extends TestCase { - public static $DRIVER = 'sqlite'; + public static ?string $DRIVER = 'sqlite'; public function testNotSupportedFilterOptionException(): void { From 5e86dc1f95b61e142f6d97adf32aa36794b4aee7 Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Sun, 21 Dec 2025 13:52:01 +0000 Subject: [PATCH 2/2] Apply fixes from StyleCI --- src/Writer/EntityWriter.php | 3 +-- tests/Feature/DataTrait.php | 1 - tests/Unit/Reader/Cache/CachedCollectionTest.php | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Writer/EntityWriter.php b/src/Writer/EntityWriter.php index 064564c..f53bd85 100644 --- a/src/Writer/EntityWriter.php +++ b/src/Writer/EntityWriter.php @@ -13,8 +13,7 @@ final class EntityWriter implements DataWriterInterface { public function __construct( private readonly EntityManagerInterface $entityManager - ) - { + ) { } /** diff --git a/tests/Feature/DataTrait.php b/tests/Feature/DataTrait.php index 512b8f8..0e39cb6 100644 --- a/tests/Feature/DataTrait.php +++ b/tests/Feature/DataTrait.php @@ -17,7 +17,6 @@ use Cycle\Database\DatabaseInterface; use Cycle\Database\DatabaseManager; use Cycle\Database\DatabaseProviderInterface; -use Cycle\Database\Driver\Handler; use Cycle\Database\Driver\HandlerInterface; use Cycle\ORM\EntityManager; use Cycle\ORM\EntityManagerInterface; diff --git a/tests/Unit/Reader/Cache/CachedCollectionTest.php b/tests/Unit/Reader/Cache/CachedCollectionTest.php index 8d9f694..f501db6 100644 --- a/tests/Unit/Reader/Cache/CachedCollectionTest.php +++ b/tests/Unit/Reader/Cache/CachedCollectionTest.php @@ -5,7 +5,6 @@ namespace Yiisoft\Data\Cycle\Tests\Unit\Reader\Cache; use ArrayIterator; -use Generator; use PHPUnit\Framework\TestCase; use Yiisoft\Data\Cycle\Reader\Cache\CachedCollection;