Merge remote-tracking branch 'upstream/master' into psr2-html

.travis.yml

@@ -3,17 +3,30 @@ matrix:
   fast_finish: true
   include:
   - php: 7.0
-    env: PHP_L=1
+    env:
+      PHP_L=1
+      EXECUTE_BUILD_DOCS=false
   - php: 5.3
-    env: PHP_L_OLD=1
+    env:
+      PHP_L_OLD=1
+      EXECUTE_BUILD_DOCS=false
   - php: 5.4
-    env: PHP_L_OLD=1
+    env:
+      PHP_L_OLD=1
+      EXECUTE_BUILD_DOCS=false
   - php: 5.5
-    env: PHP_L=1
+    env:
+      PHP_L=1
+      EXECUTE_BUILD_DOCS=false
   - php: 5.6
-    env: PHP_L=1 PHPCS=1
+    env:
+      PHP_L=1
+      PHPCS=1
+      EXECUTE_BUILD_DOCS=true
   - php: hhvm
-    env: PHP_L_OLD=1
+    env:
+      PHP_L_OLD=1
+      EXECUTE_BUILD_DOCS=false
 
   allow_failures:
   - php: 7.0
@@ -27,7 +40,11 @@ cache:
 before_script:
   - composer install --prefer-dist --no-interaction
 
+after_success:
+  - test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && test $EXECUTE_BUILD_DOCS == "true" && bash scripts/deploy-docs.sh
+
 script:
   - if [[ $PHP_L == 1 ]]; then find . -path './vendor' -prune -o -name "*.php" -print0 | xargs -0 -n1 -P8 php -l | grep -v '^No syntax errors detected' ; test $? -eq 1; fi
   - if [[ $PHP_L_OLD == 1 ]]; then find . -regextype posix-extended -regex "\./(lib/influxdb-php|vendor)" -prune -o -name "*.php" -print0 | xargs -0 -n1 -P8 php -l | grep -v '^No syntax errors detected' ; test $? -eq 1; fi
   - if [[ $PHP_CS == 1 ]]; then vendor/bin/phpcs -n -p --colors --extensions=php --standard=PSR2 --ignore=html/lib/* .; fi
+  - phpunit