Merge branch 'refs/heads/master' into add-column-factory

.github/workflows/build.yml

@@ -34,7 +34,6 @@ jobs:
           - windows-latest
 
         php:
-          - 8.0
           - 8.1
           - 8.2
           - 8.3

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

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

.github/workflows/db-mariadb.yml

@@ -44,8 +44,6 @@ jobs:
           - mariadb:latest
 
         include:
-          - php: 8.0
-            mariadb: mariadb:latest
           - php: 8.1
             mariadb: mariadb:latest
           - php: 8.2

.github/workflows/db-mssql.yml

@@ -32,7 +32,6 @@ jobs:
     strategy:
       matrix:
         php:
-          - 8.0
           - 8.1
           - 8.2
           - 8.3

.github/workflows/db-mysql.yml

@@ -39,8 +39,6 @@ jobs:
           - mysql:latest
 
         include:
-          - php: 8.0
-            mysql: mysql:latest
           - php: 8.1
             mysql: mysql:latest
           - php: 8.2

.github/workflows/db-oracle.yml

@@ -39,8 +39,6 @@ jobs:
           - 21
 
         include:
-          - php: 8.0
-            oracle: 21
           - php: 8.1
             oracle: 21
           - php: 8.2

.github/workflows/db-pgsql.yml

@@ -45,8 +45,6 @@ jobs:
           - 16
 
         include:
-          - php: 8.0
-            pgsql: 16
           - php: 8.1
             pgsql: 16
           - php: 8.2

.github/workflows/db-sqlite.yml

@@ -36,7 +36,6 @@ jobs:
           - windows-latest
 
         php:
-          - 8.0
           - 8.1
           - 8.2
           - 8.3

CHANGELOG.md

@@ -32,6 +32,8 @@
 - Enh #855: Add array and JSON overlaps conditions (@Tigrov)
 - Enh #860: Add `bit` abstract type (@Tigrov)
 - Enh #862: Refactor PHP type of `ColumnSchemaInterface` instances (@Tigrov)
+- Enh #865: Raise minimum PHP version to `^8.1` with minor refactoring (@Tigrov, @vjik)
+- Enh #798: Allow `QueryInterface::one()` and `QueryInterface::all()` to return objects (@darkdef, @Tigrov)
 
 ## 1.3.0 March 21, 2024
 

README.md

@@ -5,9 +5,9 @@
     <h1 align="center">Yii Database</h1>
 </p>
 
-[![Latest Stable Version](https://poser.pugx.org/yiisoft/db/v/stable.png)](https://packagist.org/packages/yiisoft/db)
-[![Total Downloads](https://poser.pugx.org/yiisoft/db/downloads.png)](https://packagist.org/packages/yiisoft/db)
-[![Build status](https://github.com/yiisoft/db/workflows/build/badge.svg)](https://github.com/yiisoft/db/actions?query=workflow%3Abuild)
+[![Latest Stable Version](https://poser.pugx.org/yiisoft/db/v)](https://packagist.org/packages/yiisoft/db)
+[![Total Downloads](https://poser.pugx.org/yiisoft/db/downloads)](https://packagist.org/packages/yiisoft/db)
+[![Build status](https://github.com/yiisoft/db/actions/workflows/build.yml/badge.svg)](https://github.com/yiisoft/db/actions/workflows/build.yml)
 [![codecov](https://codecov.io/gh/yiisoft/db/branch/master/graph/badge.svg?token=pRr4gci2qj)](https://codecov.io/gh/yiisoft/db)
 [![static analysis](https://github.com/yiisoft/db/actions/workflows/static.yml/badge.svg?branch=dev)](https://github.com/yiisoft/db/actions/workflows/static.yml)
 [![type-coverage](https://shepherd.dev/github/yiisoft/db/coverage.svg)](https://shepherd.dev/github/yiisoft/db)
@@ -36,7 +36,7 @@ similar to the way you would use ORM (Object-Relational Mapping) frameworks like
 
 ## Requirements
 
-- PHP 8.0 or higher.
+- PHP 8.1 or higher.
 
 ## Documentation
 

UPGRADE.md

@@ -126,4 +126,6 @@ Each table column has its own class in the `Yiisoft\Db\Schema\Column` namespace
 
 ### Other changes
 
-- Allow `ExpressionInterface` for `$alias` parameter of `QueryPartsInterface::withQuery()` method
+- Allow `ExpressionInterface` for `$alias` parameter of `QueryPartsInterface::withQuery()` method;
+- Allow `QueryInterface::one()` to return an object;
+- Allow `QueryInterface::all()` to return array of objects;

composer.json

@@ -30,7 +30,7 @@
         }
     ],
     "require": {
-        "php": "^8.0",
+        "php": "^8.1",
         "ext-ctype": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
@@ -40,19 +40,19 @@
     },
     "require-dev": {
         "maglnet/composer-require-checker": "^4.2",
-        "phpunit/phpunit": "^9.6|^10.0",
+        "phpunit/phpunit": "^10.0",
         "rector/rector": "^1.1.1",
         "roave/infection-static-analysis-plugin": "^1.16",
         "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^4.30|^5.24",
+        "vimeo/psalm": "^5.25",
         "yiisoft/aliases": "^3.0",
         "yiisoft/cache-file": "^3.1",
         "yiisoft/di": "^1.0",
         "yiisoft/event-dispatcher": "^1.0",
         "yiisoft/json": "^1.0",
         "yiisoft/log": "^2.0",
         "yiisoft/var-dumper": "^1.5",
-        "yiisoft/yii-debug": "dev-master|dev-php80"
+        "yiisoft/yii-debug": "dev-master"
     },
     "autoload": {
         "psr-4": {

rector.php

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

src/Command/CommandInterface.php

@@ -623,7 +623,7 @@ public function query(): DataReaderInterface;
      * @throws Exception
      * @throws Throwable If execution failed.
      *
-     * @return array[] All rows of the query result. Each array element is an array representing a row of data.
+     * @return array[] All rows of the query result. Each array element is an `array` representing a row of data.
      * Empty array if the query results in nothing.
      */
     public function queryAll(): array;
@@ -649,8 +649,7 @@ public function queryColumn(): array;
      * @throws Exception
      * @throws Throwable If execution failed.
      *
-     * @return array|null The first row (in terms of an array) of the query result. Null if the query
-     * results in nothing.
+     * @return array|null The first row as an `array` of the query result. `null` if the query results in nothing.
      */
     public function queryOne(): array|null;