Skip to content

Commit fd391ce

Browse files
authored
Merge pull request #26 from facile-it/composer-check
Composer checks
2 parents 719371e + e5a4744 commit fd391ce

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ jobs:
6060
strategy:
6161
matrix:
6262
include:
63-
- description: Validate composer.json
64-
script: composer validate
63+
- description: Composer checks
64+
script: vendor/bin/composer-dependency-analyser && composer validate
6565
- description: Code style
6666
script: vendor/bin/php-cs-fixer fix --ansi --verbose --dry-run
6767
- description: Rector

Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pre-commit-check: cs-fix psalm phpstan tests
1+
pre-commit-check: cs-fix psalm phpstan tests composer-check composer-validate
22

33
cs-fix:
44
vendor/bin/php-cs-fixer fix --verbose --ansi
@@ -15,4 +15,10 @@ phpstan:
1515
tests:
1616
vendor/bin/phpunit
1717

18+
composer-check:
19+
vendor/bin/composer-dependency-analyser
20+
21+
composer-validate:
22+
composer validate --strict
23+
1824
.PHONY: tests

composer.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,22 @@
3131
},
3232
"require": {
3333
"php": "^8.2",
34-
"symfony/console": "^6.4 | ^7.0"
34+
"ext-pcntl": "*",
35+
"symfony/console": "^6.4 || ^7.0"
3536
},
3637
"require-dev": {
3738
"facile-it/facile-coding-standard": "^1.2",
3839
"jangregor/phpstan-prophecy": "2.2.0",
40+
"phpspec/prophecy": "^1.18",
3941
"phpspec/prophecy-phpunit": "^2.0",
4042
"phpstan/extension-installer": "^1.4",
4143
"phpstan/phpstan": "2.1.17",
4244
"phpstan/phpstan-phpunit": "2.0.6",
4345
"phpunit/phpunit": "^10 || ^11 || ^12",
4446
"rector/rector": "2.0.17",
47+
"shipmonk/composer-dependency-analyser": "^1.8",
4548
"symfony/phpunit-bridge": "^6.4 || ^7.0",
49+
"symfony/process": "^6.4 || ^7.0",
4650
"vimeo/psalm": "^6"
4751
}
4852
}

0 commit comments

Comments
 (0)