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.

Sign up for GitHub

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

Support Psalm v6, add PHP 8.4 in CI #1205

Merged
merged 10 commits into from
Jan 31, 2025
Merged

Support Psalm v6, add PHP 8.4 in CI #1205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9951703
Add php 8.4 to github actions
msmakouz Jan 20, 2025
5436021
Use nikic/php-parser v5 in the Prototype component
roxblnfk Jan 27, 2025
93f26ff
Bump `nette/php-generator`
roxblnfk Jan 27, 2025
2bcc517
Fix psalm issues
roxblnfk Jan 27, 2025
fbf8fa0
Bump phpunit; fix rector issues
roxblnfk Jan 27, 2025
6549826
Bump all dev deps
roxblnfk Jan 27, 2025
ec7c097
Bump symfony packages
roxblnfk Jan 27, 2025
511cd0c
Turn off fail on deprecation
roxblnfk Jan 27, 2025
a0854d4
Fix LazyPipeline::withAddedMiddleware doc
roxblnfk Jan 31, 2025
629c964
Exclude php8.4 lowest from CI
roxblnfk Jan 31, 2025
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
9 changes: 6 additions & 3 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ['8.3'] # Note: This workflow requires only the LATEST version of PHP
php: ['8.4'] # Note: This workflow requires only the LATEST version of PHP
os: [ubuntu-latest]

steps:
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ['8.3'] # Note: This workflow requires only the LATEST version of PHP
php: ['8.4'] # Note: This workflow requires only the LATEST version of PHP
os: [ubuntu-latest]

steps:
Expand Down Expand Up @@ -127,9 +127,12 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ['8.1', '8.2', '8.3']
php: ['8.1', '8.2', '8.3', '8.4']
os: [ubuntu-latest]
stability: [prefer-lowest, prefer-stable]
exclude:
- php: 8.4
stability: prefer-lowest

steps:
# General Steps
Expand Down
48 changes: 24 additions & 24 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
"league/flysystem": "^2.3.1 || ^3.0",
"monolog/monolog": "^2.9.2 || ^3.5",
"myclabs/deep-copy": "^1.9",
"nette/php-generator": "^4.1.2",
"nikic/php-parser": "^4.15.5",
"nette/php-generator": "^4.1.7",
"nikic/php-parser": "^5.4",
"psr/container": "^1.1|^2.0",
"psr/event-dispatcher": "^1.0",
"psr/http-factory": "^1.0",
Expand All @@ -55,12 +55,12 @@
"psr/log": "1 - 3",
"psr/simple-cache": "2 - 3",
"ramsey/uuid": "^4.7",
"spiral/attributes": "^2.8|^3.0",
"spiral/attributes": "^3.1.8",
"spiral/composer-publish-plugin": "^1.0",
"symfony/console": "^6.1 || ^7.0",
"symfony/finder": "^5.3.7 || ^6.0 || ^7.0",
"symfony/mailer": "^5.1 || ^6.0 || ^7.0",
"symfony/translation": "^5.1 || ^6.0 || ^7.0",
"symfony/console": "^6.4.17 || ^7.2",
"symfony/finder": "^5.4.45 || ^6.4.17 || ^7.2",
"symfony/mailer": "^5.4.45 || ^6.4.17 || ^7.2",
"symfony/translation": "^5.4.45 || ^6.4.17 || ^7.2",
"vlucas/phpdotenv": "^5.4"
},
"autoload": {
Expand Down Expand Up @@ -130,25 +130,25 @@
}
},
"require-dev": {
"aws/aws-sdk-php": "^3.270",
"buggregator/trap": "^1.10",
"doctrine/annotations": "^2.0",
"google/protobuf": "^3.25",
"guzzlehttp/psr7": "^1.7|^2.0",
"jetbrains/phpstorm-attributes": "^1.0",
"league/flysystem-async-aws-s3": "^2.0 || ^3.0",
"league/flysystem-aws-s3-v3": "^2.0 || ^3.0",
"mikey179/vfsstream": "^1.6",
"mockery/mockery": "^1.6",
"phpunit/phpunit": "^10.5",
"ramsey/collection": "^1.2",
"rector/rector": "~2.0.0",
"aws/aws-sdk-php": "^3.338",
"buggregator/trap": "^1.13.3",
"doctrine/annotations": "^2.0.2",
"google/protobuf": "^3.25|^4.29",
"guzzlehttp/psr7": "^1.7|^2.7",
"jetbrains/phpstorm-attributes": "^1.2",
"league/flysystem-async-aws-s3": "^2.5 || ^3.29",
"league/flysystem-aws-s3-v3": "^2.5 || ^3.29",
"mikey179/vfsstream": "^1.6.12",
"mockery/mockery": "^1.6.12",
"phpunit/phpunit": "^10.5.41",
"ramsey/collection": "^1.3",
"rector/rector": "~2.0.7",
"spiral/code-style": "^2.2.2",
"spiral/nyholm-bridge": "^1.3",
"spiral/testing": "^2.8",
"spiral/validator": "^1.3",
"symplify/monorepo-builder": "^10.2.7",
"vimeo/psalm": "^5.9"
"spiral/testing": "^2.8.3",
"spiral/validator": "^1.5.4",
"symplify/monorepo-builder": "^10.3.3",
"vimeo/psalm": "^6.0"
},
"autoload-dev": {
"psr-4": {
Expand Down
8 changes: 4 additions & 4 deletions monorepo-builder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@
],
],
'require-dev' => [
'phpunit/phpunit' => '^10.5',
'mockery/mockery' => '^1.6',
'phpunit/phpunit' => '^10.5.41',
'mockery/mockery' => '^1.6.12',
'spiral/code-style' => '^2.2.2',
'symplify/monorepo-builder' => '^10.2.7',
'vimeo/psalm' => '^5.9',
'symplify/monorepo-builder' => '^10.3.3',
'vimeo/psalm' => '^6.0',
],
'conflict' => [
"spiral/roadrunner-bridge" => "<3.7",
Expand Down
11 changes: 8 additions & 3 deletions phpunit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,20 @@
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
bootstrap="vendor/autoload.php"
cacheDirectory="runtime/phpunit"
backupGlobals="false"
colors="true"
processIsolation="false"
failOnRisky="false"
stopOnFailure="false"
stopOnError="false"
stderr="true"
cacheDirectory=".phpunit.cache"
backupStaticProperties="false">
backupStaticProperties="false"
failOnDeprecation="false"
failOnPhpunitDeprecation="false"
displayDetailsOnPhpunitDeprecations="true"
displayDetailsOnTestsThatTriggerDeprecations="true"
>
<coverage>
<report>
<html outputDirectory="build/coverage"/>
Expand All @@ -33,7 +38,7 @@
</testsuite>
</testsuites>
<php>
<ini name="error_reporting" value="-1"/>
<ini name="error_reporting" value="8191"/>
<ini name="memory_limit" value="-1"/>
</php>
<source>
Expand Down
6 changes: 0 additions & 6 deletions psalm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,6 @@
<UnusedClosureParam errorLevel="suppress" />
<UnusedPsalmSuppress errorLevel="suppress" />
<UnsupportedPropertyReferenceUsage errorLevel="suppress" />
<InvalidThrow>
<errorLevel type="suppress">
<referencedClass name="Psr\Container\NotFoundExceptionInterface"/>
<referencedClass name="Psr\Container\ContainerExceptionInterface"/>
</errorLevel>
</InvalidThrow>
<RedundantCast>
<errorLevel type="suppress">
<file name="src/Core/src/Internal/Proxy/ProxyClassRenderer.php"/>
Expand Down
8 changes: 4 additions & 4 deletions src/AnnotatedRoutes/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@
}
},
"require-dev": {
"mockery/mockery": "^1.6",
"phpunit/phpunit": "^10.5",
"mockery/mockery": "^1.6.12",
"phpunit/phpunit": "^10.5.41",
"spiral/framework": "^3.1",
"spiral/testing": "^2.8",
"spiral/testing": "^2.8.3",
"spiral/nyholm-bridge": "^1.3",
"vimeo/psalm": "^5.9"
"vimeo/psalm": "^6.0"
},
"autoload-dev": {
"psr-4": {
Expand Down
4 changes: 2 additions & 2 deletions src/Auth/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"psr/event-dispatcher": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "^10.5",
"vimeo/psalm": "^5.9"
"phpunit/phpunit": "^10.5.41",
"vimeo/psalm": "^6.0"
},
"autoload": {
"psr-4": {
Expand Down
4 changes: 2 additions & 2 deletions src/AuthHttp/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@
"psr/event-dispatcher": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "^10.5",
"phpunit/phpunit": "^10.5.41",
"spiral/cookies": "^3.16",
"spiral/http": "^3.16",
"spiral/debug": "^3.16",
"nyholm/psr7": "^1.8",
"vimeo/psalm": "^5.9"
"vimeo/psalm": "^6.0"
},
"autoload": {
"psr-4": {
Expand Down
6 changes: 3 additions & 3 deletions src/Boot/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
"spiral/events": "^3.16"
},
"require-dev": {
"phpunit/phpunit": "^10.5",
"mockery/mockery": "^1.6",
"vimeo/psalm": "^5.9"
"phpunit/phpunit": "^10.5.41",
"mockery/mockery": "^1.6.12",
"vimeo/psalm": "^6.0"
},
"autoload": {
"files": [
Expand Down
6 changes: 3 additions & 3 deletions src/Bridge/Dotenv/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
"vlucas/phpdotenv": "^5.4"
},
"require-dev": {
"mockery/mockery": "^1.6",
"phpunit/phpunit": "^10.5",
"mockery/mockery": "^1.6.12",
"phpunit/phpunit": "^10.5.41",
"spiral/boot": "^3.16",
"vimeo/psalm": "^5.9"
"vimeo/psalm": "^6.0"
},
"autoload": {
"psr-4": {
Expand Down
6 changes: 3 additions & 3 deletions src/Bridge/Monolog/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
},
"require-dev": {
"spiral/boot": "^3.16",
"phpunit/phpunit": "^10.5",
"mockery/mockery": "^1.6",
"vimeo/psalm": "^5.9"
"phpunit/phpunit": "^10.5.41",
"mockery/mockery": "^1.6.12",
"vimeo/psalm": "^6.0"
},
"autoload": {
"psr-4": {
Expand Down
8 changes: 4 additions & 4 deletions src/Bridge/Stempler/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
"spiral/core": "^3.16"
},
"require-dev": {
"phpunit/phpunit": "^10.5",
"phpunit/phpunit": "^10.5.41",
"spiral/boot": "^3.16",
"spiral/testing": "^2.8",
"mockery/mockery": "^1.6",
"vimeo/psalm": "^5.9"
"spiral/testing": "^2.8.3",
"mockery/mockery": "^1.6.12",
"vimeo/psalm": "^6.0"
},
"autoload": {
"psr-4": {
Expand Down
6 changes: 3 additions & 3 deletions src/Broadcasting/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,10 @@
}
},
"require-dev": {
"mockery/mockery": "^1.6",
"phpunit/phpunit": "^10.5",
"mockery/mockery": "^1.6.12",
"phpunit/phpunit": "^10.5.41",
"spiral/boot": "^3.16",
"vimeo/psalm": "^5.9"
"vimeo/psalm": "^6.0"
},
"autoload-dev": {
"psr-4": {
Expand Down
6 changes: 3 additions & 3 deletions src/Cache/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
},
"require-dev": {
"spiral/boot": "^3.16",
"mockery/mockery": "^1.6",
"phpunit/phpunit": "^10.5",
"vimeo/psalm": "^5.9"
"mockery/mockery": "^1.6.12",
"phpunit/phpunit": "^10.5.41",
"vimeo/psalm": "^6.0"
},
"autoload-dev": {
"psr-4": {
Expand Down
6 changes: 3 additions & 3 deletions src/Config/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
"spiral/core": "^3.16"
},
"require-dev": {
"phpunit/phpunit": "^10.5",
"mockery/mockery": "^1.6",
"vimeo/psalm": "^5.9"
"phpunit/phpunit": "^10.5.41",
"mockery/mockery": "^1.6.12",
"vimeo/psalm": "^6.0"
},
"autoload": {
"psr-4": {
Expand Down
8 changes: 4 additions & 4 deletions src/Console/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
"spiral/events": "^3.16",
"spiral/hmvc": "^3.16",
"spiral/tokenizer": "^3.16",
"symfony/console": "^6.1 || ^7.0"
"symfony/console": "^6.4.17 || ^7.2"
},
"require-dev": {
"spiral/boot": "^3.16",
"phpunit/phpunit": "^10.5",
"mockery/mockery": "^1.6",
"vimeo/psalm": "^5.9"
"phpunit/phpunit": "^10.5.41",
"mockery/mockery": "^1.6.12",
"vimeo/psalm": "^6.0"
},
"autoload": {
"psr-4": {
Expand Down
6 changes: 3 additions & 3 deletions src/Cookies/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
"psr/http-server-middleware": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "^10.5",
"mockery/mockery": "^1.6",
"phpunit/phpunit": "^10.5.41",
"mockery/mockery": "^1.6.12",
"spiral/http": "^3.16",
"nyholm/psr7": "^1.8",
"vimeo/psalm": "^5.9"
"vimeo/psalm": "^6.0"
},
"autoload": {
"psr-4": {
Expand Down
6 changes: 3 additions & 3 deletions src/Core/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
"spiral/security": "^3.16"
},
"require-dev": {
"mockery/mockery": "^1.6",
"phpunit/phpunit": "^10.5",
"vimeo/psalm": "^5.9"
"mockery/mockery": "^1.6.12",
"phpunit/phpunit": "^10.5.41",
"vimeo/psalm": "^6.0"
},
"autoload": {
"psr-4": {
Expand Down
6 changes: 3 additions & 3 deletions src/Csrf/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@
"psr/http-server-middleware": "^1.0"
},
"require-dev": {
"phpunit/phpunit": "^10.5",
"mockery/mockery": "^1.6",
"phpunit/phpunit": "^10.5.41",
"mockery/mockery": "^1.6.12",
"spiral/http": "^3.16",
"nyholm/psr7": "^1.8",
"vimeo/psalm": "^5.9"
"vimeo/psalm": "^6.0"
},
"autoload": {
"psr-4": {
Expand Down
4 changes: 2 additions & 2 deletions src/Debug/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
"spiral/logger": "^3.16"
},
"require-dev": {
"phpunit/phpunit": "^10.5",
"vimeo/psalm": "^5.9"
"phpunit/phpunit": "^10.5.41",
"vimeo/psalm": "^6.0"
},
"autoload": {
"psr-4": {
Expand Down
Loading
Loading