Resolves #676: Twig validation hook fails. (#680)

Author: grasmash

phing/tasks/validate.xml

@@ -90,9 +90,4 @@
     <exec dir="${repo.root}" command="${composer.bin}/blt-console lint:twig ${repo.root} ${docroot}/modules/custom ${docroot}/themes/custom" logoutput="true" checkreturn="true" passthru="true"  level="${blt.exec_level}" />
   </target>
 
-  <target name="validate:twig:files" description="Validates twig syntax on custom twig files.">
-    <fail unless="files" message="Missing files parameter."/>
-    <exec dir="${repo.root}" command="${composer.bin}/blt-console lint:twig ${repo.root} ${files}" logoutput="true" checkreturn="true" passthru="true"  level="${blt.exec_level}" />
-  </target>
-
 </project>

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 $?