Merge pull request #6 from vanilla/feature/update-to-1dot2

Update htmLawed to 1.2
vanilla · Mar 28, 2017 · 282b1c9 · 282b1c9
2 parents 95c93cf + e69d782
commit 282b1c9
Show file tree

Hide file tree

Showing 2 changed files with 125 additions and 109 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,9 +15,20 @@ branches:
         - upstream
 
 install:
-    - composer install
+    - composer self-update
+    - composer install -o
+    - |
+      if [[ ${TRAVIS_PHP_VERSION:0:2} == "7." ]]; then
+          composer require "phpunit/phpunit=~5.7"
+      else
+          if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.6" ]]; then
+              composer require "phpunit/phpunit=~5"
+          else
+              composer require "phpunit/phpunit=~4.8"
+          fi
+      fi
 
-script: phpunit -c phpunit.xml.dist --coverage-clover=coverage.clover
+script: ./vendor/bin/phpunit -c phpunit.xml.dist --coverage-clover=coverage.clover
 
 after_script:
     - wget https://scrutinizer-ci.com/ocular.phar