Merge branch 'feature/155' into develop

Close #155

Author: weierophinney

.gitignore

@@ -12,6 +12,5 @@ vendor/
 zf-mkdoc-theme/
 
 clover.xml
-composer.lock
 coveralls-upload.json
 phpunit.xml

.travis.yml

@@ -33,14 +33,20 @@ matrix:
         - DEPS=lowest
     - php: 5.6
       env:
-        - DEPS=latest
+        - DEPS=locked
         - TEST_COVERAGE=true
-        - CS_CHECK=true
         - DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
         - PATH="$HOME/.local/bin:$PATH"
+    - php: 5.6
+      env:
+        - DEPS=latest
     - php: 7
       env:
         - DEPS=lowest
+    - php: 7
+      env:
+        - DEPS=locked
+        - CS_CHECK=true
     - php: 7
       env:
         - DEPS=latest
@@ -49,15 +55,10 @@ matrix:
         - DEPS=lowest
     - php: 7.1
       env:
-        - DEPS=latest
-    - php: hhvm
-      env:
-        - DEPS=lowest
-    - php: hhvm
+        - DEPS=locked
+    - php: 7.1
       env:
         - DEPS=latest
-  allow_failures:
-    - php: hhvm
 
 before_install:
   - travis_retry composer self-update