fix code style

src/Filter/FilterCollection.php

@@ -20,13 +20,15 @@
  *
  * This class represents a collection of filters and provides methods to manage and interact with them.
  *
+ * @implements \IteratorAggregate<string, \CakeDC\SearchFilter\Filter\FilterInterface>
+ * @psalm-suppress TooManyTemplateParams
  */
 class FilterCollection implements IteratorAggregate, Countable
 {
     /**
      * Filter list
      *
-     * @var array<\CakeDC\SearchFilter\Filter\FilterInterface>
+     * @var array<string, \CakeDC\SearchFilter\Filter\FilterInterface>
      */
     protected array $filters = [];
 
@@ -92,7 +94,8 @@ public function remove(string $name)
     /**
      * Implementation of IteratorAggregate.
      *
-     * @return \Traversable
+     * @return \Traversable<string, \CakeDC\SearchFilter\Filter\FilterInterface>
+     * @psalm-suppress TooManyTemplateParams
      */
     public function getIterator(): Traversable
     {

src/Manager.php

@@ -101,7 +101,7 @@ public function __construct(ServerRequest $request, ?array $filters = null)
         }
 
         $this->loadFilters();
-		$this->_criteriaBuilder = new CriteriaBuilder();
+        $this->_criteriaBuilder = new CriteriaBuilder();
     }
 
     /**

src/Model/Filter/CriteriaFilter.php

@@ -47,9 +47,11 @@ public function __construct(FilterRegistry $registry, array $config = [])
      *
      * @param \Cake\ORM\Query\SelectQuery<\Cake\Datasource\EntityInterface> $query Query.
      * @param string $field Field name.
-     * @param mixed $value Field value.
+     * @param string|array $value Field value.
      * @param array<string, mixed> $data Filters values.
      * @return \Cake\ORM\Query\SelectQuery<\Cake\Datasource\EntityInterface>
+     * @phpcsSuppress SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingNativeTypeHint
+     * @phpstan-param array<string, array{condition: string, value: mixed}>|string $value
      */
     protected function _buildQuery(SelectQuery $query, string $field, $value, array $data = []): SelectQuery
     {

src/Model/Filter/Criterion/BaseCriterion.php

@@ -8,9 +8,9 @@
 
 namespace CakeDC\SearchFilter\Model\Filter\Criterion;
 
-use Cake\Database\ExpressionInterface;
 use Cake\Database\Expression\ComparisonExpression;
 use Cake\Database\Expression\QueryExpression;
+use Cake\Database\ExpressionInterface;
 use Cake\I18n\Date;
 use Cake\I18n\DateTime;
 use Cake\Utility\Hash;
@@ -21,7 +21,7 @@ abstract class BaseCriterion implements CriterionInterface
     /**
      * Field name used for searching
      *
-     * @var string|ExpressionInterface
+     * @var string|\Cake\Database\ExpressionInterface
      */
     protected string|ExpressionInterface $field;
 

src/Model/Filter/Criterion/DateCriterion.php

@@ -14,9 +14,9 @@
 use Cake\Database\ExpressionInterface;
 use Cake\Database\FunctionsBuilder;
 use Cake\I18n\Date;
+use Cake\I18n\DateTime;
 use Cake\ORM\Query\SelectQuery;
 use CakeDC\SearchFilter\Filter\AbstractFilter;
-use DateInterface;
 
 class DateCriterion extends BaseCriterion
 {
@@ -181,9 +181,9 @@ protected function buildYearWeekExpression(string|ExpressionInterface $value): F
      * Create a date/time object from a string
      *
      * @param string $dateStr
-     * @return Date
+     * @return \Cake\I18n\Date|\Cake\I18n\DateTime
      */
-    protected function prepareTime(string $dateStr)
+    protected function prepareTime(string $dateStr): DateTime|Date
     {
         return Date::createFromFormat($this->format, $dateStr);
     }

src/Model/Filter/Criterion/DateTimeCriterion.php

@@ -9,8 +9,8 @@
 namespace CakeDC\SearchFilter\Model\Filter\Criterion;
 
 use Cake\Database\ExpressionInterface;
+use Cake\I18n\Date;
 use Cake\I18n\DateTime;
-use DateTimeInterface;
 
 class DateTimeCriterion extends DateCriterion
 {
@@ -31,9 +31,9 @@ public function __construct(string|ExpressionInterface $field, string $format =
      * Create a date/time object from a string
      *
      * @param string $dateStr
-     * @return \DateTimeInterface
+     * @return \Cake\I18n\Date|\Cake\I18n\DateTime
      */
-    protected function prepareTime(string $dateStr): DateTimeInterface
+    protected function prepareTime(string $dateStr): DateTime|Date
     {
         return DateTime::createFromFormat($this->format, $dateStr);
     }

src/Plugin.php

@@ -9,7 +9,6 @@
 namespace CakeDC\SearchFilter;
 
 use Cake\Core\BasePlugin;
-use Cake\Core\PluginApplicationInterface;
 
 /**
  * Plugin for SearchFilter

tests/TestCase/Filter/BooleanFilterTest.php

@@ -22,7 +22,7 @@ class BooleanFilterTest extends TestCase
     public function setUp(): void
     {
         parent::setUp();
-        $this->booleanFilter = new BooleanFilter('test_field');
+        $this->booleanFilter = new BooleanFilter();
     }
 
     public function tearDown(): void

tests/TestCase/Filter/DateFilterTest.php

@@ -30,7 +30,7 @@ class DateFilterTest extends TestCase
     public function setUp(): void
     {
         parent::setUp();
-        $this->dateFilter = new DateFilter('test_date');
+        $this->dateFilter = new DateFilter();
     }
 
     /**

tests/TestCase/Filter/DateTimeFilterTest.php

@@ -22,7 +22,7 @@ class DateTimeFilterTest extends TestCase
     public function setUp(): void
     {
         parent::setUp();
-        $this->dateTimeFilter = new DateTimeFilter('test_field');
+        $this->dateTimeFilter = new DateTimeFilter();
     }
 
     public function tearDown(): void

tests/TestCase/Filter/FilterCollectionTest.php

@@ -82,8 +82,8 @@ public function testGetCriteria(): void
         $stringFilter = new StringFilter();
         $numericFilter = new NumericFilter();
 
-        $stringCriterion = new StringCriterion('test', 'like', 'value');
-        $numericCriterion = new NumericCriterion('test2', '>', 10);
+        $stringCriterion = new StringCriterion('test');
+        $numericCriterion = new NumericCriterion('test2');
 
         $stringFilter->setCriterion($stringCriterion);
         $numericFilter->setCriterion($numericCriterion);

tests/TestCase/Filter/LookupFilterTest.php

@@ -39,7 +39,7 @@ public function setUp(): void
             $routes->connect('/authors/autocomplete', ['controller' => 'Authors', 'action' => 'autocomplete']);
         });
 
-        $this->lookupFilter = new LookupFilter('test_lookup');
+        $this->lookupFilter = new LookupFilter();
         $this->lookupFilter->setAutocompleteRoute([
             'controller' => 'Authors',
             'action' => 'autocomplete',

tests/TestCase/Filter/MultipleFilterTest.php

@@ -22,7 +22,7 @@ class MultipleFilterTest extends TestCase
     public function setUp(): void
     {
         parent::setUp();
-        $this->multipleFilter = new MultipleFilter('test_field');
+        $this->multipleFilter = new MultipleFilter();
     }
 
     public function tearDown(): void

tests/TestCase/Filter/NumericFilterTest.php

@@ -30,7 +30,7 @@ class NumericFilterTest extends TestCase
     public function setUp(): void
     {
         parent::setUp();
-        $this->numericFilter = new NumericFilter('test_field');
+        $this->numericFilter = new NumericFilter();
     }
 
     /**

tests/TestCase/Filter/SelectFilterTest.php

@@ -28,7 +28,7 @@ class SelectFilterTest extends TestCase
     public function setUp(): void
     {
         parent::setUp();
-        $this->selectFilter = new SelectFilter('test_field');
+        $this->selectFilter = new SelectFilter();
     }
 
     /**

tests/TestCase/Filter/StringFilterTest.php

@@ -30,7 +30,7 @@ class StringFilterTest extends TestCase
     public function setUp(): void
     {
         parent::setUp();
-        $this->stringFilter = new StringFilter('test_field');
+        $this->stringFilter = new StringFilter();
     }
 
     /**

tests/bootstrap.php

@@ -42,9 +42,9 @@
 use Cake\Core\Configure;
 use Cake\Datasource\ConnectionManager;
 use Cake\Error\ErrorTrap;
+use Cake\TestSuite\Fixture\SchemaLoader;
 
 Configure::write('App', ['namespace' => 'CakeDC\SearchFilter\Test\App']);
-// Cake\Core\Configure::write('Error', ['errorLevel' => E_ALL ^ E_USER_DEPRECATED]);
 Configure::write('debug', true);
 
 @mkdir(TMP . 'cache/models', 0777);
@@ -89,8 +89,6 @@
 ]);
 
 // Create test database schema
-use Cake\TestSuite\Fixture\SchemaLoader;
-
 if (env('FIXTURE_SCHEMA_METADATA')) {
     $loader = new SchemaLoader();
     $loader->loadInternalFile(env('FIXTURE_SCHEMA_METADATA'));