diff --git a/phing/tasks/validate.xml b/phing/tasks/validate.xml index aa95105dc..a00b09e33 100644 --- a/phing/tasks/validate.xml +++ b/phing/tasks/validate.xml @@ -90,9 +90,4 @@ - - - - - diff --git a/scripts/git-hooks/pre-commit b/scripts/git-hooks/pre-commit index 20a27b930..fa32734c9 100755 --- a/scripts/git-hooks/pre-commit +++ b/scripts/git-hooks/pre-commit @@ -12,10 +12,11 @@ fi echo "Sniffing staged files via PHP Code Sniffer..." ${ROOT_DIR}/vendor/bin/blt validate:phpcs:files -Dfiles="$LIST" -silent -emacs || exit 1; -echo "Linting staged twig files..." -${ROOT_DIR}/vendor/bin/blt validate:twig:files -Dfiles="$LIST" -silent -emacs || exit 1; +echo "Linting custom twig files..." +${ROOT_DIR}/vendor/bin/blt validate:twig -silent -emacs || exit 1; echo "Validating composer.json..." -composer validate -q || echo 'composer.json is not valid. Run `composer validate` for more information.' && exit 1; +composer validate -q || (echo 'composer.json is not valid. Run `composer validate` for more information.' && exit 1;) +echo "Ok!" # Return the status of the last run command. exit $?