Skip to content

Commit 72bc655

Browse files
Merge pull request #106 from DaveLiddament/feature/add-symfony-6-dependency
UPDATE dependencies to allow Symfony 6 components
2 parents 3078203 + b2169de commit 72bc655

File tree

4 files changed

+194
-145
lines changed

4 files changed

+194
-145
lines changed

.github/workflows/full-checks.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,7 @@ jobs:
6464
run: "composer update --no-interaction --no-progress"
6565

6666
- name: "Full CI"
67-
run: |
68-
export PHP_CS_FIXER_IGNORE_ENV=true
69-
composer ci
67+
run: "composer ci-${{ matrix.php-version }}"
7068

7169

7270
one-version-only:

composer.json

+46-8
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
},
1616
"require": {
1717
"php": ">=7.3 <8.2",
18-
"symfony/config": "^3.4 || ^4.0 || ^5.0",
19-
"symfony/console": "^3.4 || ^4.0 || ^5.0",
20-
"symfony/dependency-injection": "^3.4 || ^4.0 || ^5.0",
21-
"symfony/process": "^3.4 || ^4.0 || ^5.0",
22-
"symfony/yaml": "^3.4 || ^4.0 || ^5.0",
18+
"symfony/config": "^3.4 || ^4.0 || ^5.0 || ^6.0",
19+
"symfony/console": "^3.4 || ^4.0 || ^5.0 || ^6.0",
20+
"symfony/dependency-injection": "^3.4 || ^4.0 || ^5.0 || ^6.0",
21+
"symfony/process": "^3.4 || ^4.0 || ^5.0 || ^6.0",
22+
"symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0",
2323
"webmozart/assert": "^1.3",
2424
"webmozart/path-util": "^2.3"
2525
},
@@ -48,21 +48,59 @@
4848
}
4949
},
5050
"scripts": {
51-
"ci" : [
51+
"ci-7.3" : [
5252
"@composer-validate",
5353
"@lint",
5454
"@var-dump-checker",
5555
"@cs",
5656
"@test",
5757
"@psalm",
58-
"@phpstan"
58+
"@phpstan",
59+
"@psalm-7.3"
60+
],
61+
"ci-7.4" : [
62+
"@composer-validate",
63+
"@lint",
64+
"@var-dump-checker",
65+
"@cs",
66+
"@test",
67+
"@psalm",
68+
"@phpstan",
69+
"@psalm-7.4"
70+
],
71+
"ci-8.0" : [
72+
"@composer-validate",
73+
"@lint",
74+
"@var-dump-checker",
75+
"@cs",
76+
"@test",
77+
"@psalm",
78+
"@phpstan",
79+
"@psalm-8.0"
80+
],
81+
"ci-8.1" : [
82+
"@composer-validate",
83+
"@lint",
84+
"@var-dump-checker",
85+
"@cs-8.1",
86+
"@test",
87+
"@psalm",
88+
"@phpstan",
89+
"@psalm-8.1"
5990
],
6091
"composer-validate" : "@composer validate --no-check-all --strict",
6192
"lint" : "parallel-lint src tests",
6293
"var-dump-checker" : "var-dump-check --ladybug --no-colors src",
6394
"cs" : "php-cs-fixer fix -v --dry-run",
6495
"cs-fix" : "php-cs-fixer fix -v",
65-
"psalm" : "psalm --shepherd",
96+
"cs-fix-8.1" : [
97+
"@putenv PHP_CS_FIXER_IGNORE_ENV=true",
98+
"php-cs-fixer fix -v"
99+
],
100+
"psalm-7.3" : "psalm --php-version=7.3",
101+
"psalm-7.4" : "psalm --php-version=7.4",
102+
"psalm-8.0" : "psalm --php-version=8.0",
103+
"psalm-8.1" : "psalm --php-version=8.1 --shepherd",
66104
"phpstan" : "phpstan -n --no-progress analyse",
67105
"deptrac" : "deptrac",
68106
"test" : [

0 commit comments

Comments
 (0)