Test php84

.github/workflows/active-record.yml

@@ -20,7 +20,7 @@ jobs:
 
     env:
       COMPOSER_ROOT_VERSION: dev-master
-      PHP_VERSION: 8.3
+      PHP_VERSION: 8.4
       EXTENSIONS: pdo, pdo_mysql, pdo_oci, pdo_pgsql, pdo_sqlite, pdo_sqlsrv
 
     runs-on: ubuntu-latest

.github/workflows/build.yml

@@ -37,6 +37,7 @@ jobs:
           - 8.1
           - 8.2
           - 8.3
+          - 8.4
 
     steps:
       - name: Checkout.
@@ -49,7 +50,6 @@ jobs:
           extensions: ${{ env.extensions }}
           ini-values: date.timezone='UTC', zend.exception_ignore_args=0
           coverage: pcov
-          tools: composer:v2, pecl
 
       - name: Update composer.
         run: composer self-update
@@ -61,8 +61,8 @@ jobs:
         run: vendor/bin/phpunit --testsuite Db --coverage-clover=coverage.xml --colors=always --display-warnings --display-deprecations
 
       - name: Upload coverage to Codecov.
-        if: matrix.os == 'ubuntu-latest' && matrix.php == '8.3'
-        uses: codecov/codecov-action@v3
+        if: matrix.os == 'ubuntu-latest' && matrix.php == '8.4'
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ./coverage.xml

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

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

.github/workflows/db-mariadb.yml

@@ -32,7 +32,7 @@ jobs:
     strategy:
       matrix:
         php:
-          - 8.3
+          - 8.4
 
         mariadb:
           - mariadb:10.4
@@ -48,6 +48,8 @@ jobs:
             mariadb: mariadb:latest
           - php: 8.2
             mariadb: mariadb:latest
+          - php: 8.3
+            mariadb: mariadb:latest
 
     services:
       mysql:
@@ -62,7 +64,7 @@ jobs:
 
     steps:
       - name: Checkout.
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install PHP with extensions.
         uses: shivammathur/setup-php@v2
@@ -91,8 +93,8 @@ jobs:
         run: vendor/bin/phpunit --testsuite Mysql --coverage-clover=coverage.xml --colors=always --display-warnings --display-deprecations
 
       - name: Upload coverage to Codecov.
-        if: matrix.php == '8.3'
-        uses: codecov/codecov-action@v3
+        if: matrix.php == '8.4'
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ./coverage.xml

.github/workflows/db-migration.yml

@@ -20,7 +20,7 @@ jobs:
 
     env:
       COMPOSER_ROOT_VERSION: dev-master
-      PHP_VERSION: 8.3
+      PHP_VERSION: 8.4
       EXTENSIONS: pdo, pdo_mysql, pdo_oci, pdo_pgsql, pdo_sqlite, pdo_sqlsrv
 
     runs-on: ubuntu-latest

.github/workflows/db-mssql.yml

@@ -25,7 +25,7 @@ jobs:
     env:
       COMPOSER_ROOT_VERSION: dev-master
       CURRENT_PACKAGE: db-mssql
-      EXTENSIONS: pdo, pdo_sqlsrv-5.12
+      EXTENSIONS: pdo, pdo_sqlsrv
 
     runs-on: ${{ matrix.mssql.os || 'ubuntu-latest' }}
 
@@ -35,18 +35,19 @@ jobs:
           - 8.1
           - 8.2
           - 8.3
+          - 8.4
 
         mssql:
           - server: 2022-latest
             odbc-version: 18
             flag: "-C"
 
         include:
-          - php: 8.3
+          - php: 8.4
             mssql:
               server: 2017-latest
               os: ubuntu-20.04
-          - php: 8.3
+          - php: 8.4
             mssql:
               server: 2019-latest
               odbc-version: 18
@@ -70,7 +71,7 @@ jobs:
           sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18
 
       - name: Checkout.
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Create MS SQL Database.
         run: docker exec -i mssql /opt/mssql-tools${{ matrix.mssql.odbc-version }}/bin/sqlcmd ${{ matrix.mssql.flag }} -S localhost -U SA -P 'YourStrong!Passw0rd' -Q 'CREATE DATABASE yiitest'
@@ -82,7 +83,6 @@ jobs:
           extensions: ${{ env.EXTENSIONS }}
           ini-values: date.timezone='UTC'
           coverage: pcov
-          tools: composer:v2, pecl
         env:
           update: true
 
@@ -105,8 +105,8 @@ jobs:
         run: vendor/bin/phpunit --testsuite Mssql --coverage-clover=coverage.xml --colors=always --display-warnings --display-deprecations
 
       - name: Upload coverage to Codecov.
-        if: matrix.php == '8.3'
-        uses: codecov/codecov-action@v3
+        if: matrix.php == '8.4'
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ./coverage.xml

.github/workflows/db-mysql.yml

@@ -32,7 +32,7 @@ jobs:
     strategy:
       matrix:
         php:
-          - 8.3
+          - 8.4
 
         mysql:
           - mysql:5.7
@@ -43,6 +43,8 @@ jobs:
             mysql: mysql:latest
           - php: 8.2
             mysql: mysql:latest
+          - php: 8.3
+            mysql: mysql:latest
 
     services:
       mysql:
@@ -57,7 +59,7 @@ jobs:
 
     steps:
       - name: Checkout.
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install PHP with extensions.
         uses: shivammathur/setup-php@v2
@@ -86,8 +88,8 @@ jobs:
         run: vendor/bin/phpunit --testsuite Mysql --coverage-clover=coverage.xml --colors=always --display-warnings --display-deprecations
 
       - name: Upload coverage to Codecov.
-        if: matrix.php == '8.3'
-        uses: codecov/codecov-action@v3
+        if: matrix.php == '8.4'
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ./coverage.xml

.github/workflows/db-oracle.yml

@@ -32,7 +32,7 @@ jobs:
     strategy:
       matrix:
         php:
-          - 8.3
+          - 8.4
 
         oracle:
           - 18
@@ -43,6 +43,8 @@ jobs:
             oracle: 21
           - php: 8.2
             oracle: 21
+          - php: 8.3
+            oracle: 21
 
     services:
       oci:
@@ -93,7 +95,7 @@ jobs:
         run: vendor/bin/phpunit --testsuite Oracle --coverage-clover=coverage.xml --colors=always --display-warnings --display-deprecations
 
       - name: Upload coverage to Codecov.
-        if: matrix.php == '8.3'
+        if: matrix.php == '8.4'
         uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/db-pgsql.yml

@@ -32,7 +32,7 @@ jobs:
     strategy:
       matrix:
         php:
-          - 8.3
+          - 8.4
 
         pgsql:
           - 9
@@ -49,6 +49,8 @@ jobs:
             pgsql: 16
           - php: 8.2
             pgsql: 16
+          - php: 8.3
+            pgsql: 16
 
     services:
       postgres:
@@ -63,7 +65,7 @@ jobs:
 
     steps:
       - name: Checkout.
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install PHP with extensions.
         uses: shivammathur/setup-php@v2
@@ -92,8 +94,8 @@ jobs:
         run: vendor/bin/phpunit --testsuite Pgsql --coverage-clover=coverage.xml --colors=always --display-warnings --display-deprecations
 
       - name: Upload coverage to Codecov.
-        if: matrix.php == '8.3'
-        uses: codecov/codecov-action@v3
+        if: matrix.php == '8.4'
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ./coverage.xml

.github/workflows/db-sqlite.yml

@@ -39,10 +39,11 @@ jobs:
           - 8.1
           - 8.2
           - 8.3
+          - 8.4
 
     steps:
       - name: Checkout.
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install PHP with extensions.
         uses: shivammathur/setup-php@v2
@@ -51,7 +52,6 @@ jobs:
           extensions: ${{ env.EXTENSIONS }}
           ini-values: date.timezone='UTC'
           coverage: pcov
-          tools: composer:v2, pecl
 
       - name: Update composer.
         run: composer self-update
@@ -77,8 +77,8 @@ jobs:
         run: vendor/bin/phpunit --testsuite Sqlite --coverage-clover=coverage.xml --colors=always --display-warnings --display-deprecations
 
       - name: Upload coverage to Codecov.
-        if: matrix.os == 'ubuntu-latest' && matrix.php == '8.3'
-        uses: codecov/codecov-action@v3
+        if: matrix.os == 'ubuntu-latest' && matrix.php == '8.4'
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ./coverage.xml

.github/workflows/rector.yml

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

.github/workflows/static.yml

@@ -25,12 +25,4 @@ jobs:
       os: >-
         ['ubuntu-latest']
       php: >-
-        ['8.1', '8.2']
-  psalm83:
-    uses: yiisoft/actions/.github/workflows/psalm.yml@master
-    with:
-      psalm-config: psalm83.xml
-      os: >-
-        ['ubuntu-latest']
-      php: >-
-        ['8.3']
+        ['8.2', '8.3', '8.4']

CHANGELOG.md

@@ -63,6 +63,8 @@
 - Enh #929: Refactor array, structured and JSON column type expressions and expression builders (@Tigrov)
 - Enh #929: Implement lazy arrays for array, structured and JSON column types (@Tigrov)
 - Bug #933: Explicitly mark nullable parameters (@vjik)
+- Chg #911: Change supported PHP versions to `8.1 - 8.4` (@Tigrov)
+- Enh #911: Minor refactoring (@Tigrov)
 
 ## 1.3.0 March 21, 2024
 

README.md

@@ -36,7 +36,7 @@ similar to the way you would use ORM (Object-Relational Mapping) frameworks like
 
 ## Requirements
 
-- PHP 8.1 or higher.
+- PHP 8.1 - 8.4.
 
 ## Documentation
 

UPGRADE.md

@@ -172,3 +172,5 @@ Each table column has its own class in the `Yiisoft\Db\Schema\Column` namespace
 - Change `Quoter::quoteValue()` parameter type and return type from `mixed` to `string`;
 - Move `DataType` class to `Yiisoft\Db\Constant` namespace;
 - Change `DbArrayHelper::index()` parameter names and allow to accept `Closure` for `$indexBy` parameter; 
+- Change return type of `CommandInterface::insertWithReturningPks()` method to `array|false`;
+- Change return type of `AbstractCommand::insertWithReturningPks()` method to `array|false`;

composer.json

@@ -30,7 +30,7 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "8.1 - 8.4",
         "ext-ctype": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
@@ -39,19 +39,19 @@
         "psr/simple-cache": "^2.0|^3.0"
     },
     "require-dev": {
-        "maglnet/composer-require-checker": "^4.2",
-        "phpunit/phpunit": "^10.0",
-        "rector/rector": "^2.0.3",
-        "roave/infection-static-analysis-plugin": "^1.16",
-        "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^5.25",
+        "maglnet/composer-require-checker": "^4.7.1",
+        "phpunit/phpunit": "^10.5.45",
+        "rector/rector": "^2.0.10",
+        "roave/infection-static-analysis-plugin": "^1.35",
+        "spatie/phpunit-watcher": "^1.24",
+        "vimeo/psalm": "^5.26.1 || ^6.8.8",
         "yiisoft/aliases": "^3.0",
-        "yiisoft/cache-file": "^3.1",
-        "yiisoft/di": "^1.0",
-        "yiisoft/event-dispatcher": "^1.0",
+        "yiisoft/cache-file": "^3.2",
+        "yiisoft/di": "^1.3",
+        "yiisoft/event-dispatcher": "^1.1",
         "yiisoft/json": "^1.0",
-        "yiisoft/log": "^2.0",
-        "yiisoft/var-dumper": "^1.5",
+        "yiisoft/log": "^2.1",
+        "yiisoft/var-dumper": "^1.7",
         "yiisoft/yii-debug": "dev-master"
     },
     "autoload": {

psalm.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 <psalm
   errorLevel="1"
+  ensureOverrideAttribute="false"
   findUnusedBaselineEntry="true"
   findUnusedCode="false"
   findUnusedVariablesAndParams="true"
@@ -17,5 +18,7 @@
   <issueHandlers>
     <MixedAssignment errorLevel="suppress" />
     <RiskyTruthyFalsyComparison errorLevel="suppress" />
+    <MissingClassConstType errorLevel="suppress" />
+    <ClassMustBeFinal errorLevel="suppress" />
   </issueHandlers>
 </psalm>