Fix not executing tests, rename (#30)

* Fix not executing tests, rename

* Apply fixes from StyleCI

* Fix

* WIP

* Fix Psalm

* Fix

* Sync

* Apply fixes from StyleCI

* Fix

* Apply fixes from StyleCI

* Adjust composer.json

* Fix

* Fix

* Fix 2

* Fix 3

---------

Co-authored-by: StyleCI Bot <[email protected]>

Author: arogachev

src/Reader/EntityReader.php

@@ -27,6 +27,9 @@
 final class EntityReader implements DataReaderInterface
 {
     private Select|SelectQuery $query;
+    /**
+     * @psalm-var non-negative-int|null
+     */
     private ?int $limit = null;
     private int $offset = 0;
     private ?Sort $sorting = null;
@@ -71,6 +74,7 @@ public function getSort(): ?Sort
      */
     public function withLimit(?int $limit): static
     {
+        /** @psalm-suppress DocblockTypeContradiction */
         if ($limit < 0) {
             throw new InvalidArgumentException('$limit must not be less than 0.');
         }

src/Reader/FilterHandler/LikeHandler.php

@@ -23,6 +23,6 @@ public function getAsWhereArguments(FilterInterface $filter, array $handlers): a
             throw new UnexpectedFilterException(Like::class, $filter::class);
         }
 
-        return [$filter->getField(), 'like', $filter->getValue()];
+        return [$filter->getField(), 'like', '%' . $filter->getValue() . '%'];
     }
 }

tests/Feature/Base/Reader/EntityReaderTestCase.php tests/Feature/Base/Reader/BaseEntityReaderTestCase.php

@@ -6,6 +6,7 @@
 
 use Cycle\Database\Exception\StatementException;
 use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
 use Yiisoft\Data\Cycle\Exception\NotSupportedFilterException;
 use Yiisoft\Data\Cycle\Reader\Cache\CachedCollection;
 use Yiisoft\Data\Cycle\Reader\EntityReader;
@@ -15,10 +16,14 @@
 use Yiisoft\Data\Cycle\Tests\Support\StubFilterHandler;
 use Yiisoft\Data\Reader\Filter\Equals;
 use Yiisoft\Data\Reader\Sort;
+use Yiisoft\Data\Tests\Common\FixtureTrait;
 
-abstract class EntityReaderTestCase extends BaseReaderTestCase
+abstract class BaseEntityReaderTestCase extends TestCase
 {
     use DataTrait;
+    use FixtureTrait {
+        DataTrait::assertFixtures insteadof FixtureTrait;
+    }
 
     public function testReadOne(): void
     {

tests/Feature/Base/Reader/BaseReaderTestCase.php

@@ -6,13 +6,12 @@
 
 use Yiisoft\Data\Cycle\Exception\NotSupportedFilterException;
 use Yiisoft\Data\Cycle\Reader\EntityReader;
-use Yiisoft\Data\Cycle\Tests\Feature\Base\Reader\BaseReaderTestCase;
 use Yiisoft\Data\Cycle\Tests\Feature\DataTrait;
 use Yiisoft\Data\Cycle\Tests\Support\NotSupportedFilter;
 use Yiisoft\Data\Reader\Filter\All;
 use Yiisoft\Data\Reader\Filter\Equals;
 
-abstract class AllHandlerTestCase extends BaseReaderTestCase
+abstract class BaseReaderWithAllTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithAllTestCase
 {
     use DataTrait;
 

tests/Feature/Base/Reader/ReaderWithFilter/AllHandlerTestCase.php tests/Feature/Base/Reader/ReaderWithFilter/BaseReaderWithAllTestCase.php

@@ -6,13 +6,12 @@
 
 use Yiisoft\Data\Cycle\Exception\NotSupportedFilterException;
 use Yiisoft\Data\Cycle\Reader\EntityReader;
-use Yiisoft\Data\Cycle\Tests\Feature\Base\Reader\BaseReaderTestCase;
 use Yiisoft\Data\Cycle\Tests\Feature\DataTrait;
 use Yiisoft\Data\Cycle\Tests\Support\NotSupportedFilter;
 use Yiisoft\Data\Reader\Filter\Any;
 use Yiisoft\Data\Reader\Filter\Equals;
 
-abstract class AnyHandlerTestCase extends BaseReaderTestCase
+abstract class BaseReaderWithAnyTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithAnyTestCase
 {
     use DataTrait;
 

tests/Feature/Base/Reader/ReaderWithFilter/AnyHandlerTestCase.php tests/Feature/Base/Reader/ReaderWithFilter/BaseReaderWithAnyTestCase.php

@@ -4,10 +4,9 @@
 
 namespace Yiisoft\Data\Cycle\Tests\Feature\Base\Reader\ReaderWithFilter;
 
-use Yiisoft\Data\Cycle\Tests\Feature\Base\Reader\BaseReaderTestCase;
 use Yiisoft\Data\Cycle\Tests\Feature\DataTrait;
 
-abstract class BetweenHandlerTestCase extends BaseReaderTestCase
+abstract class BaseReaderWithBetweenTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithBetweenTestCase
 {
     use DataTrait;
 }

tests/Feature/Base/Reader/ReaderWithFilter/BetweenHandlerTestCase.php tests/Feature/Base/Reader/ReaderWithFilter/BaseReaderWithBetweenTestCase.php

@@ -4,10 +4,9 @@
 
 namespace Yiisoft\Data\Cycle\Tests\Feature\Base\Reader\ReaderWithFilter;
 
-use Yiisoft\Data\Cycle\Tests\Feature\Base\Reader\BaseReaderTestCase;
 use Yiisoft\Data\Cycle\Tests\Feature\DataTrait;
 
-abstract class GreaterThanHandlerTestCase extends BaseReaderTestCase
+abstract class BaseReaderWithEqualsNullTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithEqualsNullTestCase
 {
     use DataTrait;
 }

tests/Feature/Base/Reader/ReaderWithFilter/GreaterThanHandlerTestCase.php tests/Feature/Base/Reader/ReaderWithFilter/BaseReaderWithEqualsNullTestCase.php

@@ -4,10 +4,9 @@
 
 namespace Yiisoft\Data\Cycle\Tests\Feature\Base\Reader\ReaderWithFilter;
 
-use Yiisoft\Data\Cycle\Tests\Feature\Base\Reader\BaseReaderTestCase;
 use Yiisoft\Data\Cycle\Tests\Feature\DataTrait;
 
-abstract class EqualsNullHandlerTestCase extends BaseReaderTestCase
+abstract class BaseReaderWithEqualsTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithEqualsTestCase
 {
     use DataTrait;
 }

tests/Feature/Base/Reader/ReaderWithFilter/EqualsNullHandlerTestCase.php tests/Feature/Base/Reader/ReaderWithFilter/BaseReaderWithEqualsTestCase.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Cycle\Tests\Feature\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Cycle\Tests\Feature\DataTrait;
+
+abstract class BaseReaderWithGreaterThanOrEqualTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithGreaterThanOrEqualTestCase
+{
+    use DataTrait;
+}

tests/Feature/Base/Reader/ReaderWithFilter/BaseReaderWithGreaterThanOrEqualTestCase.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Cycle\Tests\Feature\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Cycle\Tests\Feature\DataTrait;
+
+abstract class BaseReaderWithGreaterThanTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithGreaterThanTestCase
+{
+    use DataTrait;
+}

tests/Feature/Base/Reader/ReaderWithFilter/BaseReaderWithGreaterThanTestCase.php

@@ -4,10 +4,9 @@
 
 namespace Yiisoft\Data\Cycle\Tests\Feature\Base\Reader\ReaderWithFilter;
 
-use Yiisoft\Data\Cycle\Tests\Feature\Base\Reader\BaseReaderTestCase;
 use Yiisoft\Data\Cycle\Tests\Feature\DataTrait;
 
-abstract class InHandlerTestCase extends BaseReaderTestCase
+abstract class BaseReaderWithInTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithInTestCase
 {
     use DataTrait;
 }

tests/Feature/Base/Reader/ReaderWithFilter/InHandlerTestCase.php tests/Feature/Base/Reader/ReaderWithFilter/BaseReaderWithInTestCase.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Cycle\Tests\Feature\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Cycle\Tests\Feature\DataTrait;
+
+abstract class BaseReaderWithLessThanOrEqualTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithLessThanOrEqualTestCase
+{
+    use DataTrait;
+}

tests/Feature/Base/Reader/ReaderWithFilter/BaseReaderWithLessThanOrEqualTestCase.php

@@ -4,10 +4,9 @@
 
 namespace Yiisoft\Data\Cycle\Tests\Feature\Base\Reader\ReaderWithFilter;
 
-use Yiisoft\Data\Cycle\Tests\Feature\Base\Reader\BaseReaderTestCase;
 use Yiisoft\Data\Cycle\Tests\Feature\DataTrait;
 
-abstract class EqualsHandlerTestCase extends BaseReaderTestCase
+abstract class BaseReaderWithLessThanTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithLessThanTestCase
 {
     use DataTrait;
 }

tests/Feature/Base/Reader/ReaderWithFilter/EqualsHandlerTestCase.php tests/Feature/Base/Reader/ReaderWithFilter/BaseReaderWithLessThanTestCase.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Data\Cycle\Tests\Feature\Base\Reader\ReaderWithFilter;
+
+use Yiisoft\Data\Cycle\Tests\Feature\DataTrait;
+
+abstract class BaseReaderWithLikeTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithLikeTestCase
+{
+    use DataTrait;
+
+    public static function dataWithReader(): array
+    {
+        $data = parent::dataWithReader();
+        unset(
+            $data['search: contains, different case, case sensitive: false'],
+            $data['search: contains, different case, case sensitive: true'],
+            $data['wildcard is not supported'],
+        );
+
+        return $data;
+    }
+}

tests/Feature/Base/Reader/ReaderWithFilter/BaseReaderWithLikeTestCase.php

@@ -6,12 +6,11 @@
 
 use Yiisoft\Data\Cycle\Exception\NotSupportedFilterException;
 use Yiisoft\Data\Cycle\Reader\EntityReader;
-use Yiisoft\Data\Cycle\Tests\Feature\Base\Reader\BaseReaderTestCase;
 use Yiisoft\Data\Cycle\Tests\Feature\DataTrait;
 use Yiisoft\Data\Cycle\Tests\Support\NotSupportedFilter;
 use Yiisoft\Data\Reader\Filter\Not;
 
-abstract class NotHandlerTestCase extends BaseReaderTestCase
+abstract class BaseReaderWithNotTestCase extends \Yiisoft\Data\Tests\Common\Reader\ReaderWithFilter\BaseReaderWithNotTestCase
 {
     use DataTrait;
 

tests/Feature/Base/Reader/ReaderWithFilter/NotHandlerTestCase.php tests/Feature/Base/Reader/ReaderWithFilter/BaseReaderWithNotTestCase.php

@@ -10,10 +10,12 @@
 use Yiisoft\Data\Cycle\Writer\EntityWriter;
 use Yiisoft\Data\Tests\Common\FixtureTrait;
 
-abstract class EntityWriterTest extends TestCase
+abstract class BaseEntityWriterTestCase extends TestCase
 {
     use DataTrait;
-    use FixtureTrait;
+    use FixtureTrait {
+        DataTrait::assertFixtures insteadof FixtureTrait;
+    }
 
     public function testWrite(): void
     {

tests/Feature/Base/Reader/ReaderWithFilter/GreaterThanOrEqualHandlerTestCase.php

@@ -220,4 +220,27 @@ protected function getReader(): DataReaderInterface
     {
         return new EntityReader($this->select('user'));
     }
+
+    protected function assertFixtures(array $expectedFixtureIndexes, array $actualFixtures): void
+    {
+        $processedActualFixtures = [];
+        foreach ($actualFixtures as $fixture) {
+            if (is_object($fixture)) {
+                $fixture = json_decode(json_encode($fixture), associative: true);
+            }
+
+            unset($fixture['id']);
+            $fixture['number'] = (int) $fixture['number'];
+            $fixture['balance'] = (float) $fixture['balance'];
+
+            $processedActualFixtures[$fixture['number'] - 1] = $fixture;
+        }
+
+        $expectedFixtures = [];
+        foreach ($expectedFixtureIndexes as $index) {
+            $expectedFixtures[$index] = $this->getFixture($index);
+        }
+
+        $this->assertSame($expectedFixtures, $processedActualFixtures);
+    }
 }

tests/Feature/Base/Reader/ReaderWithFilter/LessThanHandlerTestCase.php

@@ -4,9 +4,9 @@
 
 namespace Yiisoft\Data\Cycle\Tests\Feature\Mssql\Reader;
 
-use Yiisoft\Data\Cycle\Tests\Feature\Base\Reader\EntityReaderTestCase as BaseEntityReaderTest;
+use Yiisoft\Data\Cycle\Tests\Feature\Base\Reader\BaseEntityReaderTestCase;
 
-final class EntityReaderTest extends BaseEntityReaderTest
+final class EntityReaderTest extends BaseEntityReaderTestCase
 {
     public static $DRIVER = 'mssql';