Skip to content

Commit b9e969f

Browse files
committed
chore(MSP-3092): Add support for PHP 8.5 and bump PHPUnit to v12
1 parent 0cb4287 commit b9e969f

File tree

8 files changed

+830
-593
lines changed

8 files changed

+830
-593
lines changed

.github/workflows/ci.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ jobs:
2424
- "highest"
2525
- "locked"
2626
php-version:
27-
- "8.2"
2827
- "8.3"
28+
- "8.4"
29+
- "8.5"
2930

3031
steps:
3132
- name: "Checkout"
@@ -34,7 +35,7 @@ jobs:
3435
show-progress: false
3536

3637
- name: "Install PHP"
37-
uses: "shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401" # v2
38+
uses: "shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1" # v2
3839
with:
3940
coverage: "none"
4041
php-version: "${{ matrix.php-version }}"
@@ -52,7 +53,7 @@ jobs:
5253
${{ runner.OS }}-${{ matrix.php-version }}-static-analysis-
5354
5455
- name: "Update Composer platform version"
55-
if: ${{ matrix.dependencies != 'locked' && matrix.php-version != '8.2' }}
56+
if: ${{ matrix.dependencies != 'locked' && matrix.php-version != '8.3' }}
5657
shell: bash
5758
run: "composer config platform.php ${{ matrix.php-version }}"
5859

@@ -71,7 +72,7 @@ jobs:
7172
run: "composer licenses:check"
7273

7374
- name: "Run coding style"
74-
if: ${{ matrix.dependencies == 'locked' && matrix.php-version == '8.1' }}
75+
if: ${{ matrix.dependencies == 'locked' && matrix.php-version == '8.3' }}
7576
run: "composer code-style:check"
7677

7778
- name: "Run PHPStan"

.php-cs-fixer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
return (new PhpCsFixer\Config())
99
->setRules([
10-
'@PER-CS2.0' => true,
11-
'@PER-CS2.0:risky' => true,
12-
'@PHP81Migration' => true,
10+
'@PER-CS' => true,
11+
'@PER-CS:risky' => true,
12+
'@PHP8x3Migration' => true,
1313
'@DoctrineAnnotation' => true,
1414
'align_multiline_comment' => true,
1515
'array_indentation' => true,

composer.json

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@
1010
}
1111
],
1212
"require": {
13-
"php": "^8.2",
14-
"phpunit/phpunit": "^11.1"
13+
"php": "^8.3",
14+
"phpunit/phpunit": "^12.5"
1515
},
1616
"require-dev": {
17-
"ergebnis/composer-normalize": "^2.43.0",
17+
"ergebnis/composer-normalize": "^2.45",
1818
"lendable/composer-license-checker": "^1.2.1",
19-
"php-cs-fixer/shim": "^3.59.3",
20-
"phpstan/phpstan": "^1.11.7",
21-
"phpstan/phpstan-deprecation-rules": "^1.2.0",
22-
"phpstan/phpstan-phpunit": "^1.4.0",
23-
"phpstan/phpstan-strict-rules": "^1.6.0",
24-
"rector/rector": "1.2.1"
19+
"php-cs-fixer/shim": "^3.92",
20+
"phpstan/phpstan": "^2.1",
21+
"phpstan/phpstan-deprecation-rules": "^2.0",
22+
"phpstan/phpstan-phpunit": "^2.0",
23+
"phpstan/phpstan-strict-rules": "^2.0",
24+
"rector/rector": "2.3.0"
2525
},
2626
"minimum-stability": "stable",
2727
"autoload": {
@@ -42,7 +42,7 @@
4242
"ergebnis/composer-normalize": true
4343
},
4444
"platform": {
45-
"php": "8.2.14"
45+
"php": "8.3.0"
4646
},
4747
"sort-packages": true
4848
},
@@ -63,6 +63,9 @@
6363
"phpstan": [
6464
"phpstan analyse --ansi --no-progress --memory-limit=-1"
6565
],
66+
"phpstan:baseline": [
67+
"phpstan analyse --ansi --no-progress --memory-limit=-1 --generate-baseline"
68+
],
6669
"phpunit:phpstan": [
6770
"phpunit --colors --testsuite=phpstan"
6871
],

0 commit comments

Comments
 (0)