Skip to content

Commit fe400e7

Browse files
committed
Merge branch '3.8.x' into 4.0.x
* 3.8.x: Bump doctrine/.github from 5.0.0 to 5.0.1 (doctrine#6391) PHPStan 1.10.67, PHPUnit 9.6.19, PHPCS 3.9.2 (doctrine#6387) Fix "Plugin 'mysql_native_password' is not loaded" (doctrine#6388) Run tests against MySQL 8.4 (doctrine#6386)
2 parents 7fb714b + 6f3a975 commit fe400e7

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

.github/workflows/coding-standards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ on:
2525
jobs:
2626
coding-standards:
2727
name: "Coding Standards"
28-
uses: "doctrine/.github/.github/workflows/[email protected].0"
28+
uses: "doctrine/.github/.github/workflows/[email protected].1"

.github/workflows/continuous-integration.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,6 @@ jobs:
353353
mysql-version:
354354
- "5.7"
355355
- "8.0"
356-
- "8.3"
357356
extension:
358357
- "mysqli"
359358
- "pdo_mysql"
@@ -370,6 +369,16 @@ jobs:
370369
- php-version: "8.3"
371370
mysql-version: "8.0"
372371
extension: "pdo_mysql"
372+
- php-version: "8.1"
373+
mysql-version: "8.4"
374+
extension: "mysqli"
375+
custom-entrypoint: >-
376+
--entrypoint sh mysql:8.4 -c "exec docker-entrypoint.sh mysqld --mysql-native-password=ON"
377+
- php-version: "8.1"
378+
mysql-version: "8.4"
379+
extension: "pdo_mysql"
380+
custom-entrypoint: >-
381+
--entrypoint sh mysql:8.4 -c "exec docker-entrypoint.sh mysqld --mysql-native-password=ON"
373382
374383
services:
375384
mysql:

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040
"doctrine/coding-standard": "12.0.0",
4141
"fig/log-test": "^1",
4242
"jetbrains/phpstorm-stubs": "2023.2",
43-
"phpstan/phpstan": "1.10.58",
44-
"phpstan/phpstan-phpunit": "1.3.15",
43+
"phpstan/phpstan": "1.10.67",
44+
"phpstan/phpstan-phpunit": "1.3.16",
4545
"phpstan/phpstan-strict-rules": "^1.5",
4646
"phpunit/phpunit": "10.5.9",
4747
"psalm/plugin-phpunit": "0.18.4",
4848
"slevomat/coding-standard": "8.13.1",
49-
"squizlabs/php_codesniffer": "3.9.0",
49+
"squizlabs/php_codesniffer": "3.9.2",
5050
"symfony/cache": "^6.3.8|^7.0",
5151
"symfony/console": "^5.4|^6.3|^7.0",
5252
"vimeo/psalm": "5.21.1"

0 commit comments

Comments
 (0)