Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test PHP 8.4 #344

Merged
merged 5 commits into from
Mar 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/bc.yml_
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ jobs:
os: >-
['ubuntu-latest']
php: >-
['8.1']
['8.4']
5 changes: 3 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/composer-require-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ jobs:
- 8.1
- 8.2
- 8.3
- 8.4

steps:
- name: Checkout.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mutation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- ubuntu-latest

php:
- 8.3
- 8.4

services:
mssql:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rector.yml_
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ jobs:
os: >-
['ubuntu-latest']
php: >-
['8.3']
['8.4']
7 changes: 4 additions & 3 deletions .github/workflows/static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@ jobs:
- ubuntu-latest

php:
- '8.1'
- '8.2'
- '8.3'
- 8.1
- 8.2
- 8.3
- 8.4

steps:
- name: Checkout.
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
- New #339: Add `IndexType` and `IndexMethod` classes (@Tigrov)
- Bug #343: Explicitly mark nullable parameters (@vjik)
- New #342: Support JSON type (@Tigrov)
- Chg #344: Change supported PHP versions to `8.1 - 8.4` (@Tigrov)
- Chg #344: Change return type of `Command::insertWithReturningPks()` method to `array|false` (@Tigrov)
- New #345: Add parameters `$ifExists` and `$cascade` to `CommandInterface::dropTable()` and
`DDLQueryBuilderInterface::dropTable()` methods (@vjik)

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ have access to a SQL Server database and the necessary credentials to connect to

| PHP | MSSQL Version | CI-Actions |
|---------------|---------------|------------|
| **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)
| **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)

## Installation

Expand Down
20 changes: 10 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,21 @@
}
],
"require": {
"php": "^8.1",
"php": "8.1 - 8.4",
"ext-pdo": "*",
"yiisoft/db": "dev-master"
},
"require-dev": {
"maglnet/composer-require-checker": "^4.2",
"phpunit/phpunit": "^10.0",
"rector/rector": "^2.0",
"roave/infection-static-analysis-plugin": "^1.16",
"spatie/phpunit-watcher": "^1.23",
"vimeo/psalm": "^5.25",
"vlucas/phpdotenv": "^5.6",
"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",
"vlucas/phpdotenv": "^5.6.1",
"yiisoft/aliases": "^2.0",
"yiisoft/cache-file": "^3.1",
"yiisoft/var-dumper": "^1.5"
"yiisoft/cache-file": "^3.2",
"yiisoft/var-dumper": "^1.7"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 2 additions & 0 deletions psalm.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<?xml version="1.0"?>
<psalm
errorLevel="1"
ensureOverrideAttribute="false"
findUnusedBaselineEntry="true"
findUnusedCode="false"
resolveFromConfigFile="true"
strictBinaryOperands="false"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="https://getpsalm.org/schema/config"
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
Expand Down
2 changes: 1 addition & 1 deletion src/Command.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
final class Command extends AbstractPdoCommand
{
public function insertWithReturningPks(string $table, array $columns): bool|array
public function insertWithReturningPks(string $table, array $columns): array|false
{
if (empty($this->db->getSchema()->getTableSchema($table)?->getPrimaryKey())) {
if ($this->insert($table, $columns)->execute() === 0) {
Expand Down
Loading