Skip to content

Commit 9a103ae

Browse files
committed
Sync with template
1 parent 139372a commit 9a103ae

File tree

18 files changed

+5716
-6683
lines changed

18 files changed

+5716
-6683
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
/.php-cs-fixer.dist.php export-ignore
77
/composer.lock export-ignore
88
/infection.json.dist export-ignore
9+
/phpstan.dist.neon export-ignore
910
/phpunit.xml.dist export-ignore
1011
/psalm.xml.dist export-ignore

.github/workflows/check.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,7 @@ jobs:
77
check:
88
uses: typhoon-php/.github/.github/workflows/check.yml@main
99
secrets: inherit
10+
with:
11+
infection: false
12+
phpstan: false
13+
psalm: true

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
/**/vendor/
1+
/tools/**/vendor/
22
/var/
3+
/vendor/
34
/.php-cs-fixer.php
45
/phpstan.neon
56
/phpunit.xml

composer.json

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,17 @@
1414
}
1515
],
1616
"require": {
17-
"php": "^8.1",
18-
"typhoon/declaration-id": "^0.4"
17+
"php": "^8.1"
1918
},
2019
"require-dev": {
2120
"bamarni/composer-bin-plugin": "^1.8.2",
22-
"dragon-code/benchmark": "^2.6",
23-
"ergebnis/composer-normalize": "^2.45.0",
24-
"friendsofphp/php-cs-fixer": "^3.65.0",
25-
"phpstan/phpstan": "^1.12.13",
26-
"phpunit/phpunit": "^10.5.40",
27-
"phpyh/coding-standard": "^2.6.2",
28-
"symfony/var-dumper": "^6.4.15 || ^7.1.3"
21+
"phpunit/phpunit": "^10.5.45",
22+
"symfony/var-dumper": "^6.4.18 || ^7.2.3"
2923
},
3024
"autoload": {
3125
"psr-4": {
32-
"Typhoon\\Type\\": "src/"
26+
"Typhoon\\Type\\": "src/",
27+
"Typhoon\\TypeSpec\\": "spec/"
3328
}
3429
},
3530
"autoload-dev": {
@@ -39,8 +34,7 @@
3934
},
4035
"config": {
4136
"allow-plugins": {
42-
"bamarni/composer-bin-plugin": true,
43-
"ergebnis/composer-normalize": true
37+
"bamarni/composer-bin-plugin": true
4438
},
4539
"bump-after-update": "dev",
4640
"platform": {
@@ -58,8 +52,10 @@
5852
"scripts": {
5953
"check-require": "tools/composer-require-checker/vendor/bin/composer-require-checker",
6054
"check-unused": "tools/composer-unused/vendor/bin/composer-unused",
61-
"fixcs": "php-cs-fixer fix --diff --verbose",
55+
"fixcs": "tools/php-cs-fixer/vendor/bin/php-cs-fixer fix --diff --verbose",
6256
"infection": "tools/infection/vendor/bin/infection --show-mutations",
57+
"normalize": "@composer bin composer-normalize normalize --diff ../../composer.json",
58+
"phpstan": "tools/phpstan/vendor/bin/phpstan analyze",
6359
"pre-command-run": "mkdir -p var",
6460
"psalm": "tools/psalm/vendor/bin/psalm --show-info --no-diff --no-cache",
6561
"test": "phpunit"

0 commit comments

Comments
 (0)