Merge pull request #70 from edmondscommerce/PreCommitReAddStaged

Pre commit re add staged

Author: edmondscommerce

docs/tools/phpunit.md

@@ -92,6 +92,13 @@ phpUnitCoverage=1 bin/qa
 
 You might decide to do this if you are running these tests on travis, as you can see in [./travis.yml](./../../.travis.yml)
 
+#### Config Changes When Generating Coverage
+
+Generating coverage can cause a dramatic speed degradation. For this reason
+
+* PHPUnit will fail on the first error rather than run the full suite
+* We will not enforce any time limits for `@small` `@medium` `@large`
+
 ### Speed Impact of Enabling Coverage
 
 If coverage is enabled, then the tests have to be run with Xdebug enabled. This on it's own has a dramatic impact on the speed of PHP execution.

gitHooks/pre-commit.bash

@@ -13,10 +13,15 @@ readonly projectRoot="$DIR/../../"
 
 cd $projectRoot
 
+# check for stupid
 ./bin/qa -t lint
 
+# fix some ugly
 ./bin/qa -t bf
 
+# re add the staged files so that any CS fixes are applied
+git add $(git diff --name-only --cached)
+
 echo "
 ===========================================
 PHPQA Pre Commit Hook COMPLETED

includes/generic/phpunit.inc.bash

@@ -23,22 +23,25 @@ phpunitLogFilePath="$varDir/phpunit_logs/phpunit.junit.xml"
 while (( phpunitExitCode > 0 ))
 do
     extraConfigs=(" ")
-    if [[ "1" != "$phpUnitCoverage" ]]
-    then
-        extraConfigs+=( --no-coverage )
-    fi
     if [[ "1" == "$phpUnitIterativeMode" ]]
     then
+        # Uniterate mode - order by defects, stop on first error, no coverage and enforce time limits
         echo
         echo "Uniterate Mode - Iterative Testing with Fast Failure"
         echo "----------------------------------------------------"
         echo
         extraConfigs+=( --order-by=depends,defects )
         extraConfigs+=( --stop-on-failure --stop-on-error --stop-on-defect --stop-on-warning )
         extraConfigs+=( --no-coverage )
-    else
-        #Only enforce time limit if we are not in iterative mode, otherwise it kills Xdebug sessions
         extraConfigs+=( --enforce-time-limit )
+    elif [[ "1" != "$phpUnitCoverage" ]]
+    then
+        # No Coverage mode - do not generate coverage, do enforce time limits
+        extraConfigs+=( --no-coverage )
+        extraConfigs+=( --enforce-time-limit )
+    else
+        # Coverage generation mode (slow) - stop on first error, do not enforce time limits
+        extraConfigs+=( --stop-on-failure --stop-on-error --stop-on-defect --stop-on-warning )
     fi
     set +e
     set -x