Raise minimal PHP version to 8.1

.github/workflows/build.yml

@@ -10,6 +10,8 @@ on:
       - 'psalm.xml'
 
   push:
+    branches:
+      - master
     paths-ignore:
       - 'docs/**'
       - 'README.md'
@@ -29,4 +31,4 @@ jobs:
       os: >-
         ['ubuntu-latest', 'windows-latest']
       php: >-
-        ['8.0', '8.1', '8.2']
+        ['8.1', '8.2', '8.3']

.github/workflows/composer-require-checker.yml

@@ -11,6 +11,8 @@ on:
       - 'psalm.xml'
 
   push:
+    branches:
+      - master
     paths-ignore:
       - 'docs/**'
       - 'README.md'
@@ -30,4 +32,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0', '8.1']
+        ['8.1', '8.2', '8.3']

.github/workflows/mutation.yml

@@ -9,6 +9,8 @@ on:
       - 'psalm.xml'
 
   push:
+    branches:
+      - master
     paths-ignore:
       - 'docs/**'
       - 'README.md'
@@ -26,6 +28,6 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.2']
+        ['8.3']
     secrets:
       STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}

.github/workflows/rector.yml

@@ -20,4 +20,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.2']
+        ['8.3']

.github/workflows/static.yml

@@ -10,6 +10,8 @@ on:
       - 'phpunit.xml.dist'
 
   push:
+    branches:
+      - master
     paths-ignore:
       - 'docs/**'
       - 'README.md'
@@ -28,4 +30,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.0', '8.1', '8.2']
+        ['8.1', '8.2', '8.3']

.scrutinizer.yml

@@ -10,7 +10,7 @@ build:
 
   environment:
     php:
-      version: 8.0.18
+      version: 8.1.25
       ini:
         xdebug.mode: coverage
 

README.md

@@ -19,14 +19,14 @@ The package provides `Yiisoft\Db\Query\Query` bindings for generic data abstract
 
 ## Requirements
 
-- PHP 7.4 or higher.
+- PHP 8.1 or higher.
 
 ## Installation
 
 The package could be installed with composer:
 
 ```shell
-composer require yiisoft/data-db --prefer-dist
+composer require yiisoft/data-db
 ```
 
 ## General usage

composer.json

@@ -30,17 +30,17 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "yiisoft/db": "^1.0",
         "yiisoft/data": "dev-master"
     },
     "require-dev": {
         "maglnet/composer-require-checker": "^4.2",
-        "phpunit/phpunit": "^9.5",
-        "rector/rector": "^0.19.0",
+        "phpunit/phpunit": "^9.6",
+        "rector/rector": "^1.0",
         "roave/infection-static-analysis-plugin": "^1.16",
         "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^4.30|^5.14"
+        "vimeo/psalm": "^5.21"
     },
     "autoload": {
         "psr-4": {

psalm.xml

@@ -15,6 +15,7 @@
     </projectFiles>
     <issueHandlers>
         <MixedAssignment errorLevel="suppress" />
+        <RiskyTruthyFalsyComparison errorLevel="suppress" />
         <PropertyNotSetInConstructor>
             <errorLevel type="suppress">
                 <file name="src/Filter/*.php" />

rector.php

@@ -6,6 +6,7 @@
 use Rector\Config\RectorConfig;
 use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
 use Rector\Php74\Rector\Closure\ClosureToArrowFunctionRector;
+use Rector\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector;
 use Rector\Set\ValueObject\LevelSetList;
 
 return static function (RectorConfig $rectorConfig): void {
@@ -19,11 +20,12 @@
 
     // define sets of rules
     $rectorConfig->sets([
-        LevelSetList::UP_TO_PHP_80,
+        LevelSetList::UP_TO_PHP_81,
     ]);
 
     $rectorConfig->skip([
         ClosureToArrowFunctionRector::class,
         JsonThrowOnErrorRector::class,
+        NullToStrictStringFuncCallArgRector::class,
     ]);
 };

src/AbstractQueryDataReader.php

@@ -49,6 +49,10 @@
     private ?FilterInterface $having = null;
     private int $limit = 0;
     private int $offset = 0;
+
+    /**
+     * @psalm-var non-negative-int|null
+     */
     private ?int $count = null;
 
     /**
@@ -125,15 +129,16 @@
         if ($this->count === null) {
             $q = $this->countParam ?? '*';
 
             if ($q === '*' && is_array($this->data) && !$this->limit && !$this->offset) {
                 $this->count = count($this->data);
             } else {
                 $query = $this->getPreparedQuery();
                 $query->offset(null);
                 $query->limit(null);
                 $query->orderBy('');
 
+                /** @psalm-var non-negative-int */
                 $this->count = (int) $query->count($q);
             }
         }
 
@@ -142,15 +147,15 @@
 
     public function getPreparedQuery(): QueryInterface
     {
         $query = $this->applyFilter(clone $this->query);
         $query = $this->applyHaving($query);
 
         if ($this->limit) {
             $query->limit($this->limit);
         }
 
         if ($this->offset) {
             $query->offset($this->offset);
         }
 
         if ($criteria = $this->sort?->getCriteria()) {

src/Filter/CompareFilter.php

@@ -18,11 +18,6 @@ abstract class CompareFilter implements FilterInterface
     protected bool $ignoreNull = false;
     protected ?string $dateTimeFormat = null;
 
-    /**
-     * @param ExpressionInterface|string $column
-     * @param mixed $value
-     * @param string|null $table
-     */
     public function __construct(string|ExpressionInterface $column, protected mixed $value, ?string $table = null)
     {
         $this->setColumn($column, $table);
@@ -44,9 +39,6 @@ public function withDateTimeFormat(?string $format): static
         return $new;
     }
 
-    /**
-     * @return mixed
-     */
     protected function formatValue(mixed $value): mixed
     {
         $format = $this->dateTimeFormat ?? static::$mainDateTimeFormat;
@@ -60,7 +52,7 @@ protected function formatValue(mixed $value): mixed
 
     protected function formatValues(array $values): array
     {
-        return array_map([$this, 'formatValue'], $values);
+        return array_map($this->formatValue(...), $values);
     }
 
     public function toCriteriaArray(): array

src/Filter/Exists.php

@@ -9,7 +9,7 @@
 
 final class Exists implements FilterInterface
 {
-    public function __construct(private QueryInterface $query)
+    public function __construct(private readonly QueryInterface $query)
     {
     }