Skip to content

Commit 26cc2f0

Browse files
authored
Test PHP 8.4 (#344)
1 parent 54d57a5 commit 26cc2f0

11 files changed

+27
-20
lines changed

.github/workflows/bc.yml_

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ jobs:
2020
os: >-
2121
['ubuntu-latest']
2222
php: >-
23-
['8.1']
23+
['8.4']

.github/workflows/build.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,19 @@ jobs:
3434
- 8.1
3535
- 8.2
3636
- 8.3
37+
- 8.4
3738

3839
mssql:
3940
- server: 2022-latest
4041
odbc-version: 18
4142
flag: "-C"
4243

4344
include:
44-
- php: 8.3
45+
- php: 8.4
4546
mssql:
4647
server: 2017-latest
4748
os: ubuntu-20.04
48-
- php: 8.3
49+
- php: 8.4
4950
mssql:
5051
server: 2019-latest
5152
odbc-version: 18

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

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
- 8.1
3333
- 8.2
3434
- 8.3
35+
- 8.4
3536

3637
steps:
3738
- name: Checkout.

.github/workflows/mutation.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- ubuntu-latest
3131

3232
php:
33-
- 8.3
33+
- 8.4
3434

3535
services:
3636
mssql:

.github/workflows/rector.yml_

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ jobs:
1515
os: >-
1616
['ubuntu-latest']
1717
php: >-
18-
['8.3']
18+
['8.4']

.github/workflows/static.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@ jobs:
3131
- ubuntu-latest
3232

3333
php:
34-
- '8.1'
35-
- '8.2'
36-
- '8.3'
34+
- 8.1
35+
- 8.2
36+
- 8.3
37+
- 8.4
3738

3839
steps:
3940
- name: Checkout.

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
- New #339: Add `IndexType` and `IndexMethod` classes (@Tigrov)
2929
- Bug #343: Explicitly mark nullable parameters (@vjik)
3030
- New #342: Support JSON type (@Tigrov)
31+
- Chg #344: Change supported PHP versions to `8.1 - 8.4` (@Tigrov)
32+
- Chg #344: Change return type of `Command::insertWithReturningPks()` method to `array|false` (@Tigrov)
3133
- New #345: Add parameters `$ifExists` and `$cascade` to `CommandInterface::dropTable()` and
3234
`DDLQueryBuilderInterface::dropTable()` methods (@vjik)
3335

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ have access to a SQL Server database and the necessary credentials to connect to
3333

3434
| PHP | MSSQL Version | CI-Actions |
3535
|---------------|---------------|------------|
36-
| **8.1 - 8.3** | **2017 - 2022**| [![Build status](https://github.com/yiisoft/db-mssql/actions/workflows/build.yml/badge.svg)](https://github.com/yiisoft/db-mssql/actions/workflows/build.yml)
36+
| **8.1 - 8.4** | **2017 - 2022**| [![Build status](https://github.com/yiisoft/db-mssql/actions/workflows/build.yml/badge.svg)](https://github.com/yiisoft/db-mssql/actions/workflows/build.yml)
3737

3838
## Installation
3939

composer.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,21 @@
3131
}
3232
],
3333
"require": {
34-
"php": "^8.1",
34+
"php": "8.1 - 8.4",
3535
"ext-pdo": "*",
3636
"yiisoft/db": "dev-master"
3737
},
3838
"require-dev": {
39-
"maglnet/composer-require-checker": "^4.2",
40-
"phpunit/phpunit": "^10.0",
41-
"rector/rector": "^2.0",
42-
"roave/infection-static-analysis-plugin": "^1.16",
43-
"spatie/phpunit-watcher": "^1.23",
44-
"vimeo/psalm": "^5.25",
45-
"vlucas/phpdotenv": "^5.6",
39+
"maglnet/composer-require-checker": "^4.7.1",
40+
"phpunit/phpunit": "^10.5.45",
41+
"rector/rector": "^2.0.10",
42+
"roave/infection-static-analysis-plugin": "^1.35",
43+
"spatie/phpunit-watcher": "^1.24",
44+
"vimeo/psalm": "^5.26.1 || ^6.8.8",
45+
"vlucas/phpdotenv": "^5.6.1",
4646
"yiisoft/aliases": "^2.0",
47-
"yiisoft/cache-file": "^3.1",
48-
"yiisoft/var-dumper": "^1.5"
47+
"yiisoft/cache-file": "^3.2",
48+
"yiisoft/var-dumper": "^1.7"
4949
},
5050
"autoload": {
5151
"psr-4": {

psalm.xml

+2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<?xml version="1.0"?>
22
<psalm
33
errorLevel="1"
4+
ensureOverrideAttribute="false"
45
findUnusedBaselineEntry="true"
56
findUnusedCode="false"
67
resolveFromConfigFile="true"
8+
strictBinaryOperands="false"
79
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
810
xmlns="https://getpsalm.org/schema/config"
911
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"

src/Command.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*/
1313
final class Command extends AbstractPdoCommand
1414
{
15-
public function insertWithReturningPks(string $table, array $columns): bool|array
15+
public function insertWithReturningPks(string $table, array $columns): array|false
1616
{
1717
if (empty($this->db->getSchema()->getTableSchema($table)?->getPrimaryKey())) {
1818
if ($this->insert($table, $columns)->execute() === 0) {

0 commit comments

Comments
 (0)