Skip to content

Commit 6fa904d

Browse files
authored
Merge pull request #44 from wiz-develop:endou-mame/issue43
wiz-develop/php-cs-fixer-config 8.3 to 8,4
2 parents 9882788 + ba7af81 commit 6fa904d

File tree

3 files changed

+86
-68
lines changed

3 files changed

+86
-68
lines changed

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
// php-cs-fixer settings
99
"php-cs-fixer.config": ".php-cs-fixer.dist.php",
10-
"php-cs-fixer.executablePath": "${extensionPath}/php-cs-fixer.phar",
10+
"php-cs-fixer.executablePath": "${workspaceFolder}/vendor/friendsofphp/php-cs-fixer/php-cs-fixer",
1111
// HACK: PHP8.4 に PHP-CS-Fixer が対応していないが強制的に実行するための設定
1212
// TODO: PHP-CS-Fixer が PHP8.4 に対応したら削除すること!!!!
1313
"php-cs-fixer.ignorePHPVersion": true,

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
],
2727
"minimum-stability": "stable",
2828
"require-dev": {
29-
"wiz-develop/php-cs-fixer-config": "^8.3",
29+
"wiz-develop/php-cs-fixer-config": "^8.4",
3030
"phpunit/php-code-coverage": "^11.0",
3131
"phpunit/phpunit": "^11.3",
3232
"phpstan/phpstan": "^2.1",

composer.lock

Lines changed: 84 additions & 66 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)