Merge remote-tracking branch 'origin/master'

# Conflicts:
#	composer.json

Author: kylekatarnls

.gitattributes

@@ -5,13 +5,13 @@
 *.cs     diff=csharp
 
 # Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
+*.doc    diff=astextplain
+*.DOC    diff=astextplain
 *.docx   diff=astextplain
 *.DOCX   diff=astextplain
 *.dot    diff=astextplain
 *.DOT    diff=astextplain
 *.pdf    diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain
+*.PDF    diff=astextplain
+*.rtf    diff=astextplain
+*.RTF    diff=astextplain

.travis.yml

@@ -9,7 +9,12 @@ php:
     - 5.6
     - 7.0
     - 7.1
-    - hhvm
+
+matrix:
+    include:
+        - php: hhvm
+          dist: trusty
+          sudo: required
 
 after_script:
     - php bin/phug-dev code-style:check

composer.json

@@ -28,9 +28,9 @@
     "minimum-stability": "stable",
     "require": {
         "php": ">=5.5.0",
-        "phpunit/phpunit": ">=4.0 <6",
-        "phpunit/php-code-coverage": ">=2.2",
-        "squizlabs/php_codesniffer": "2.*",
+        "phpunit/phpunit": ">=4.8 <6.0",
+        "phpunit/php-code-coverage": ">=2.2 <4.0",
+        "squizlabs/php_codesniffer": "^2.8",
         "symfony/console": "^3.2",
         "codeclimate/php-test-reporter": "^0.4.0"
     },