Merge branch '2.1.x'

.travis.yml

@@ -1,14 +1,13 @@
-# Opt into fully virtualized infrastructure
-sudo: required
-
 language: php
+sudo: required
+dist: precise
 
 matrix:
   include:
     - php: 5.4
       env: DB=none;NOTESTS=1
     - php: 5.4
-      env: DB=mysqli
+      env: DB=mysqli # MyISAM
     - php: 5.4
       env: DB=mysql
     - php: 5.4
@@ -17,18 +16,23 @@ matrix:
       env: DB=postgres
     - php: 5.4
       env: DB=sqlite3
+    - php: 5.4
+      env: DB=mysqli;SLOWTESTS=1
     - php: 5.5
       env: DB=mysqli
     - php: 5.6
       env: DB=mysqli
-    - php: hhvm
-      env: DB=mysqli
     - php: 7.0
       env: DB=mysqli
     - php: 7.1
       env: DB=mysqli
+    - php: nightly
+      env: DB=mysqli
+    - php: hhvm
+      env: DB=mysqli
   allow_failures:
     - php: hhvm
+    - php: nightly
   fast_finish: true
 
 env: