Skip to content

Commit 82fdc59

Browse files
committed
Did some housekeeping chores here including:
* Add PHP 8.5 support * Add Symfony 8 support * Drop Psalm internally * Use phpstan for infection
1 parent 6116127 commit 82fdc59

43 files changed

Lines changed: 767 additions & 3076 deletions

Some content is hidden

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

.github/workflows/mutation-tests-diff.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ jobs:
3939
dependency-versions: ${{ matrix.dependencies }}
4040

4141
- name: "Infection"
42-
run: "vendor/bin/roave-infection-static-analysis-plugin --threads=max --git-diff-lines --git-diff-base=origin/$GITHUB_BASE_REF --ignore-msi-with-no-mutations --only-covered --min-msi=80 --min-covered-msi=95"
42+
run: "vendor/bin/infection --threads=max --git-diff-lines --git-diff-base=origin/$GITHUB_BASE_REF --ignore-msi-with-no-mutations --with-uncovered --min-msi=90 --min-covered-msi=95"

.github/workflows/mutation-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ jobs:
4141
dependency-versions: ${{ matrix.dependencies }}
4242

4343
- name: "Infection"
44-
run: "vendor/bin/roave-infection-static-analysis-plugin --threads=max"
44+
run: "vendor/bin/infection --threads=max"
4545
env:
4646
STRYKER_DASHBOARD_API_KEY: ${{ secrets.STRYKER_DASHBOARD_API_KEY }}

.github/workflows/psalm.yml

Lines changed: 0 additions & 44 deletions
This file was deleted.

Makefile

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,6 @@ phpstan: vendor
2424
phpstan-baseline: vendor ## run phpstan static code analyser
2525
php -d memory_limit=312M vendor/bin/phpstan analyse --generate-baseline
2626

27-
.PHONY: psalm
28-
psalm: vendor ## run psalm static code analyser
29-
vendor/bin/psalm
30-
31-
.PHONY: psalm-baseline
32-
psalm-baseline: vendor ## run psalm static code analyser
33-
vendor/bin/psalm --update-baseline --set-baseline=baseline.xml
34-
3527
.PHONY: phpunit
3628
phpunit: vendor phpunit-unit phpunit-integration ## run phpunit tests
3729

@@ -53,11 +45,11 @@ phpunit-unit: vendor ## run phpu
5345

5446
.PHONY: infection
5547
infection: vendor ## run infection
56-
php -d memory_limit=312M vendor/bin/roave-infection-static-analysis-plugin --threads=max
48+
php -d memory_limit=312M vendor/bin/infection --threads=5
5749

5850
.PHONY: infection-diff
5951
infection-diff: vendor ## run infection on differences
60-
php -d memory_limit=312M vendor/bin/roave-infection-static-analysis-plugin --threads=max --git-diff-lines --git-diff-base=origin/HEAD --ignore-msi-with-no-mutations --only-covered --min-msi=80 --min-covered-msi=95
52+
php -d memory_limit=312M vendor/bin/infection --threads=max --git-diff-lines --git-diff-base=origin/HEAD --ignore-msi-with-no-mutations --only-covered --min-msi=80 --min-covered-msi=95
6153

6254
.PHONY: deptrac
6355
deptrac: vendor-tools ## run deptrac
@@ -68,7 +60,7 @@ deptrac-baseline: vendor-tools #
6860
cd tools && ./vendor/bin/deptrac -c ../deptrac.yaml --formatter=baseline --output=../deptrac-baseline.yaml
6961

7062
.PHONY: static
71-
static: psalm phpstan cs ## run static analyser
63+
static: phpstan cs ## run static analyser
7264

7365
test: phpunit ## run tests
7466

baseline.xml

Lines changed: 0 additions & 251 deletions
This file was deleted.

composer.json

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
}
2020
],
2121
"require": {
22-
"php": "~8.2.0 || ~8.3.0 || ~8.4.0",
22+
"php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
2323
"doctrine/dbal": "^4.0.0",
2424
"doctrine/migrations": "^3.3.2",
2525
"patchlevel/hydrator": "^1.8.0",
@@ -31,26 +31,23 @@
3131
"psr/log": "^2.0.0 || ^3.0.0",
3232
"psr/simple-cache": "^2.0.0 || ^3.0.0",
3333
"ramsey/uuid": "^4.7.0",
34-
"symfony/console": "^5.4.32 || ^6.4.1 || ^7.0.1",
35-
"symfony/finder": "^5.4.27 || ^6.4.0 || ^7.0.0",
36-
"symfony/type-info": "^7.2.0"
34+
"symfony/console": "^5.4.32 || ^6.4.1 || ^7.0.1 || ^8.0.0",
35+
"symfony/finder": "^5.4.27 || ^6.4.0 || ^7.0.0 || ^8.0.0",
36+
"symfony/type-info": "^7.2.0 || ^8.0.0"
3737
},
3838
"require-dev": {
39-
"ext-pdo_sqlite": "~8.2.0 || ~8.3.0 || ~8.4.0",
39+
"ext-pdo_sqlite": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
4040
"doctrine/orm": "^2.18.0 || ^3.0.0",
41-
"infection/infection": "^0.29.12",
41+
"infection/infection": "^0.31.9",
4242
"league/commonmark": "^2.6.1",
4343
"patchlevel/coding-standard": "^1.3.0",
44-
"patchlevel/event-sourcing-psalm-plugin": "^3.1.0",
4544
"phpat/phpat": "^0.12.0",
4645
"phpbench/phpbench": "^1.4.1",
4746
"phpstan/phpstan": "^2.1.11",
4847
"phpstan/phpstan-phpunit": "^2.0",
4948
"phpunit/phpunit": "^11.5.15",
50-
"roave/infection-static-analysis-plugin": "^1.37.0",
51-
"symfony/messenger": "^5.4.31 || ^6.4.0 || ^7.0.1",
52-
"symfony/var-dumper": "^5.4.29 || ^6.4.0 || ^7.0.0",
53-
"vimeo/psalm": "^6.9.4",
49+
"symfony/messenger": "^5.4.31 || ^6.4.0 || ^7.0.1 || ^8.0.0",
50+
"symfony/var-dumper": "^5.4.29 || ^6.4.0 || ^7.0.0 || ^8.0.0",
5451
"wnx/commonmark-markdown-renderer": "^1.5.0"
5552
},
5653
"suggest": {

0 commit comments

Comments
 (0)