Skip to content

Commit a735f82

Browse files
roxblnfkroxblnfk
authored
Merge pull request #1205: Support Psalm v6, add PHP 8.4 in CI
2 parents a6853fe + 629c964 commit a735f82

File tree

75 files changed

+309
-246
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+309
-246
lines changed

‎.github/workflows/main.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
php: ['8.3'] # Note: This workflow requires only the LATEST version of PHP
21+
php: ['8.4'] # Note: This workflow requires only the LATEST version of PHP
2222
os: [ubuntu-latest]
2323

2424
steps:
@@ -70,7 +70,7 @@ jobs:
7070
strategy:
7171
fail-fast: false
7272
matrix:
73-
php: ['8.3'] # Note: This workflow requires only the LATEST version of PHP
73+
php: ['8.4'] # Note: This workflow requires only the LATEST version of PHP
7474
os: [ubuntu-latest]
7575

7676
steps:
@@ -127,9 +127,12 @@ jobs:
127127
strategy:
128128
fail-fast: false
129129
matrix:
130-
php: ['8.1', '8.2', '8.3']
130+
php: ['8.1', '8.2', '8.3', '8.4']
131131
os: [ubuntu-latest]
132132
stability: [prefer-lowest, prefer-stable]
133+
exclude:
134+
- php: 8.4
135+
stability: prefer-lowest
133136

134137
steps:
135138
# General Steps

‎composer.json‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
"league/flysystem": "^2.3.1 || ^3.0",
4545
"monolog/monolog": "^2.9.2 || ^3.5",
4646
"myclabs/deep-copy": "^1.9",
47-
"nette/php-generator": "^4.1.2",
48-
"nikic/php-parser": "^4.15.5",
47+
"nette/php-generator": "^4.1.7",
48+
"nikic/php-parser": "^5.4",
4949
"psr/container": "^1.1|^2.0",
5050
"psr/event-dispatcher": "^1.0",
5151
"psr/http-factory": "^1.0",
@@ -55,12 +55,12 @@
5555
"psr/log": "1 - 3",
5656
"psr/simple-cache": "2 - 3",
5757
"ramsey/uuid": "^4.7",
58-
"spiral/attributes": "^2.8|^3.0",
58+
"spiral/attributes": "^3.1.8",
5959
"spiral/composer-publish-plugin": "^1.0",
60-
"symfony/console": "^6.1 || ^7.0",
61-
"symfony/finder": "^5.3.7 || ^6.0 || ^7.0",
62-
"symfony/mailer": "^5.1 || ^6.0 || ^7.0",
63-
"symfony/translation": "^5.1 || ^6.0 || ^7.0",
60+
"symfony/console": "^6.4.17 || ^7.2",
61+
"symfony/finder": "^5.4.45 || ^6.4.17 || ^7.2",
62+
"symfony/mailer": "^5.4.45 || ^6.4.17 || ^7.2",
63+
"symfony/translation": "^5.4.45 || ^6.4.17 || ^7.2",
6464
"vlucas/phpdotenv": "^5.4"
6565
},
6666
"autoload": {
@@ -130,25 +130,25 @@
130130
}
131131
},
132132
"require-dev": {
133-
"aws/aws-sdk-php": "^3.270",
134-
"buggregator/trap": "^1.10",
135-
"doctrine/annotations": "^2.0",
136-
"google/protobuf": "^3.25",
137-
"guzzlehttp/psr7": "^1.7|^2.0",
138-
"jetbrains/phpstorm-attributes": "^1.0",
139-
"league/flysystem-async-aws-s3": "^2.0 || ^3.0",
140-
"league/flysystem-aws-s3-v3": "^2.0 || ^3.0",
141-
"mikey179/vfsstream": "^1.6",
142-
"mockery/mockery": "^1.6",
143-
"phpunit/phpunit": "^10.5",
144-
"ramsey/collection": "^1.2",
145-
"rector/rector": "~2.0.0",
133+
"aws/aws-sdk-php": "^3.338",
134+
"buggregator/trap": "^1.13.3",
135+
"doctrine/annotations": "^2.0.2",
136+
"google/protobuf": "^3.25|^4.29",
137+
"guzzlehttp/psr7": "^1.7|^2.7",
138+
"jetbrains/phpstorm-attributes": "^1.2",
139+
"league/flysystem-async-aws-s3": "^2.5 || ^3.29",
140+
"league/flysystem-aws-s3-v3": "^2.5 || ^3.29",
141+
"mikey179/vfsstream": "^1.6.12",
142+
"mockery/mockery": "^1.6.12",
143+
"phpunit/phpunit": "^10.5.41",
144+
"ramsey/collection": "^1.3",
145+
"rector/rector": "~2.0.7",
146146
"spiral/code-style": "^2.2.2",
147147
"spiral/nyholm-bridge": "^1.3",
148-
"spiral/testing": "^2.8",
149-
"spiral/validator": "^1.3",
150-
"symplify/monorepo-builder": "^10.2.7",
151-
"vimeo/psalm": "^5.9"
148+
"spiral/testing": "^2.8.3",
149+
"spiral/validator": "^1.5.4",
150+
"symplify/monorepo-builder": "^10.3.3",
151+
"vimeo/psalm": "^6.0"
152152
},
153153
"autoload-dev": {
154154
"psr-4": {

‎monorepo-builder.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,11 @@
104104
],
105105
],
106106
'require-dev' => [
107-
'phpunit/phpunit' => '^10.5',
108-
'mockery/mockery' => '^1.6',
107+
'phpunit/phpunit' => '^10.5.41',
108+
'mockery/mockery' => '^1.6.12',
109109
'spiral/code-style' => '^2.2.2',
110-
'symplify/monorepo-builder' => '^10.2.7',
111-
'vimeo/psalm' => '^5.9',
110+
'symplify/monorepo-builder' => '^10.3.3',
111+
'vimeo/psalm' => '^6.0',
112112
],
113113
'conflict' => [
114114
"spiral/roadrunner-bridge" => "<3.7",

‎phpunit.xml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,20 @@
22
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
44
bootstrap="vendor/autoload.php"
5+
cacheDirectory="runtime/phpunit"
56
backupGlobals="false"
67
colors="true"
78
processIsolation="false"
89
failOnRisky="false"
910
stopOnFailure="false"
1011
stopOnError="false"
1112
stderr="true"
12-
cacheDirectory=".phpunit.cache"
13-
backupStaticProperties="false">
13+
backupStaticProperties="false"
14+
failOnDeprecation="false"
15+
failOnPhpunitDeprecation="false"
16+
displayDetailsOnPhpunitDeprecations="true"
17+
displayDetailsOnTestsThatTriggerDeprecations="true"
18+
>
1419
<coverage>
1520
<report>
1621
<html outputDirectory="build/coverage"/>
@@ -33,7 +38,7 @@
3338
</testsuite>
3439
</testsuites>
3540
<php>
36-
<ini name="error_reporting" value="-1"/>
41+
<ini name="error_reporting" value="8191"/>
3742
<ini name="memory_limit" value="-1"/>
3843
</php>
3944
<source>

‎psalm.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,6 @@
2525
<UnusedClosureParam errorLevel="suppress" />
2626
<UnusedPsalmSuppress errorLevel="suppress" />
2727
<UnsupportedPropertyReferenceUsage errorLevel="suppress" />
28-
<InvalidThrow>
29-
<errorLevel type="suppress">
30-
<referencedClass name="Psr\Container\NotFoundExceptionInterface"/>
31-
<referencedClass name="Psr\Container\ContainerExceptionInterface"/>
32-
</errorLevel>
33-
</InvalidThrow>
3428
<RedundantCast>
3529
<errorLevel type="suppress">
3630
<file name="src/Core/src/Internal/Proxy/ProxyClassRenderer.php"/>

‎src/AnnotatedRoutes/composer.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@
4343
}
4444
},
4545
"require-dev": {
46-
"mockery/mockery": "^1.6",
47-
"phpunit/phpunit": "^10.5",
46+
"mockery/mockery": "^1.6.12",
47+
"phpunit/phpunit": "^10.5.41",
4848
"spiral/framework": "^3.1",
49-
"spiral/testing": "^2.8",
49+
"spiral/testing": "^2.8.3",
5050
"spiral/nyholm-bridge": "^1.3",
51-
"vimeo/psalm": "^5.9"
51+
"vimeo/psalm": "^6.0"
5252
},
5353
"autoload-dev": {
5454
"psr-4": {

‎src/Auth/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
"psr/event-dispatcher": "^1.0"
3838
},
3939
"require-dev": {
40-
"phpunit/phpunit": "^10.5",
41-
"vimeo/psalm": "^5.9"
40+
"phpunit/phpunit": "^10.5.41",
41+
"vimeo/psalm": "^6.0"
4242
},
4343
"autoload": {
4444
"psr-4": {

‎src/AuthHttp/composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@
4040
"psr/event-dispatcher": "^1.0"
4141
},
4242
"require-dev": {
43-
"phpunit/phpunit": "^10.5",
43+
"phpunit/phpunit": "^10.5.41",
4444
"spiral/cookies": "^3.16",
4545
"spiral/http": "^3.16",
4646
"spiral/debug": "^3.16",
4747
"nyholm/psr7": "^1.8",
48-
"vimeo/psalm": "^5.9"
48+
"vimeo/psalm": "^6.0"
4949
},
5050
"autoload": {
5151
"psr-4": {

‎src/Boot/composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
"spiral/events": "^3.16"
4444
},
4545
"require-dev": {
46-
"phpunit/phpunit": "^10.5",
47-
"mockery/mockery": "^1.6",
48-
"vimeo/psalm": "^5.9"
46+
"phpunit/phpunit": "^10.5.41",
47+
"mockery/mockery": "^1.6.12",
48+
"vimeo/psalm": "^6.0"
4949
},
5050
"autoload": {
5151
"files": [

‎src/Bridge/Dotenv/composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
"vlucas/phpdotenv": "^5.4"
3838
},
3939
"require-dev": {
40-
"mockery/mockery": "^1.6",
41-
"phpunit/phpunit": "^10.5",
40+
"mockery/mockery": "^1.6.12",
41+
"phpunit/phpunit": "^10.5.41",
4242
"spiral/boot": "^3.16",
43-
"vimeo/psalm": "^5.9"
43+
"vimeo/psalm": "^6.0"
4444
},
4545
"autoload": {
4646
"psr-4": {

0 commit comments

Comments
 (0)