Merge pull request 'Use updated PHP-CS-Fixer in standard location' (#16) from toddy/friendica-docker-ci:php-cs-fixer into stable
Reviewed-on: #16
This commit is contained in:
commit
b018eaa33f
|
@ -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}
|
||||||
|
|
Loading…
Reference in a new issue