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

Update of GitHub file and dependencies #222

Merged
merged 5 commits into from
Mar 4, 2024
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
22 changes: 8 additions & 14 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,18 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ["8.0", "8.1"]
symfony: ["5.4.*", "6.0.*", "6.1.*"]
php: ["8.1", "8.2", "8.3"]
symfony: ["^5.4", "^6.4", "^7.0"]
twig: ["^2.12", "^3.3"]
exclude:
- php: "8.0"
symfony: "6.1.*"
- twig: "^2.12"
symfony: "^7.0"
- php: "8.1"
symfony: "^7.0"

steps:
-
uses: actions/checkout@v2
uses: actions/checkout@v4

-
name: Setup PHP
Expand Down Expand Up @@ -57,15 +59,7 @@ jobs:
(cd src/Component && composer update ${{ matrix.composer-flags }} --no-scripts)

-
name: Run analysis with Symfony 5
if: matrix.symfony == '5.4.*'
run: |
composer analyse-symfony5
(cd src/Component && composer validate --strict)

-
name: Run analysis with Symfony 6
if: matrix.symfony != '5.4.*'
name: Run analysis
run: |
composer analyse
(cd src/Component && composer validate --strict)
Expand Down
32 changes: 12 additions & 20 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,34 +24,33 @@
}
],
"require": {
"php": "^8.0",
"php": "^8.1",
"sylius-labs/polyfill-symfony-event-dispatcher": "^1.0",
"symfony/config": "^5.4 || ^6.0",
"symfony/config": "^5.4 || ^6.4 || ^7.0",
"symfony/deprecation-contracts": "^2.1 || ^3.0",
"symfony/dependency-injection": "^5.4 || ^6.0",
"symfony/framework-bundle": "^5.4 || ^6.0",
"symfony/http-kernel": "^5.4 || ^6.0",
"symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0",
"symfony/framework-bundle": "^5.4 || ^6.4 || ^7.0",
"symfony/http-kernel": "^5.4 || ^6.4 || ^7.0",
"twig/twig": "^2.12 || ^3.3",
"webmozart/assert": "^1.9"
},
"replace": {
"sylius/mailer": "self.version"
},
"require-dev": {
"matthiasnoback/symfony-dependency-injection-test": "^4.2",
"matthiasnoback/symfony-dependency-injection-test": "^5.0",
"phpspec/phpspec": "^7.0",
"phpstan/phpstan": "1.8.5",
"phpstan/phpstan-phpunit": "1.1.1",
"phpstan/phpstan-webmozart-assert": "1.2.0",
"phpunit/phpunit": "^9.4",
"rector/rector": "^0.13.6",
"sylius-labs/coding-standard": "^4.0",
"symfony/console": "^5.4 || ^6.0",
"symfony/dotenv": "^5.4 || ^6.0",
"symfony/event-dispatcher": "^5.4 || ^6.0",
"symfony/mailer": "^5.4 || ^6.0",
"symfony/twig-bundle": "^5.4 || ^6.0",
"vimeo/psalm": "^4.22"
"symfony/console": "^5.4 || ^6.4 || ^7.0",
"symfony/dotenv": "^5.4 || ^6.4 || ^7.0",
"symfony/event-dispatcher": "^5.4 || ^6.4 || ^7.0",
"symfony/mailer": "^5.4 || ^6.4 || ^7.0",
"symfony/twig-bundle": "^5.4 || ^6.4 || ^7.0"
},
"extra": {
"branch-alias": {
Expand Down Expand Up @@ -85,14 +84,7 @@
"analyse": [
"@composer validate --strict",
"vendor/bin/ecs check src",
"vendor/bin/phpstan analyse --ansi -c phpstan.neon -l max src",
"vendor/bin/psalm src"
],
"analyse-symfony5": [
"@composer validate --strict",
"vendor/bin/ecs check src",
"vendor/bin/phpstan analyse --ansi -c phpstan.symfony5.neon -l max src",
"vendor/bin/psalm -c psalm.symfony5.xml src"
"vendor/bin/phpstan analyse --ansi -c phpstan.neon -l max src"
],
"fix": [
"vendor/bin/ecs check src --fix"
Expand Down
21 changes: 0 additions & 21 deletions phpstan.symfony5.neon

This file was deleted.

52 changes: 0 additions & 52 deletions psalm.symfony5.xml

This file was deleted.

52 changes: 0 additions & 52 deletions psalm.xml

This file was deleted.