friendica/friendica-docker-ci
6
0
Fork 3
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use updated PHP-CS-Fixer in standard location #16

Merged
MrPetovan merged 2 commits from toddy/friendica-docker-ci:php-cs-fixer into stable 2024-01-15 15:38:37 +01:00
Conversation 2 Commits 2 Files changed 1 +2 -2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
php-cs/check-php-cs.sh
View file

@ -2,10 +2,10 @@
# #
# Checks the PHP CS syntax # Checks the PHP CS syntax
# #
if ! echo "${CHANGED_FILES}" | grep -qE "^(\\.php_cs(\\.dist)?|composer\\.lock)$"; then if ! echo "${CHANGED_FILES}" | grep -qE "^(\\.php-cs-fixer(\\.dist)?\\.php|composer\\.lock)$"; then
EXTRA_ARGS=$(printf -- '--path-mode=intersection\n--\n%s' "${CHANGED_FILES}"); EXTRA_ARGS=$(printf -- '--path-mode=intersection\n--\n%s' "${CHANGED_FILES}");
else else
EXTRA_ARGS=''; EXTRA_ARGS='';
fi fi
./bin/dev/php-cs-fixer/vendor/bin/php-cs-fixer fix --config=.php_cs.dist -v --diff --diff-format=udiff --dry-run --using-cache=no ${EXTRA_ARGS} ./vendor/bin/php-cs-fixer fix -v --diff --dry-run --stop-on-violation --using-cache=no ${EXTRA_ARGS}
MrPetovan commented 2024-01-15 14:44:13 +01:00
Outdated
Review
Copy link

The previous call used the --dry-run flag, I’m not sure we should remove it.

The previous call used the `--dry-run` flag, I’m not sure we should remove it.
toddy commented 2024-01-15 14:53:03 +01:00
Outdated
Review
Copy link

I've changed the command from fix --dry-run to check, so I think it's safe to omit the --dry-run flag. If you prefer, I can add it again.

I've changed the command from `fix --dry-run` to `check`, so I think it's safe to omit the --dry-run flag. If you prefer, I can add it again.
toddy commented 2024-01-15 15:11:46 +01:00
Outdated
Review
Copy link

I've now adopted the suggestion from the php-cs-fixer documentation for running it on CI.

I've now adopted the suggestion from the php-cs-fixer documentation for running it on CI.