Correct HHVM version to 3.15.2+

- fixes version of HHVM being tested
- drops mariadb 5.5
- adds POSTGRESQL_VERSION=9.5 (only available with sudo enabled trusty)

.travis.yml

@@ -10,7 +10,8 @@ cache:
 php:
   - 5.6
   - 7.0
-  - hhvm
+  - 7.1
+  - nightly
 
 env:
   - DB=mysql
@@ -21,42 +22,32 @@ env:
   - DB=sqlite
   - DB=mysqli
 
-install:
-  - travis_retry composer install
-
-before_script:
-  - if [ '$DB' = 'pgsql' ]; then sudo service postgresql stop; sudo service postgresql start $POSTGRESQL_VERSION; fi
-
-script: ./vendor/bin/phpunit --configuration tests/travis/$DB.travis.xml
-
 matrix:
   fast_finish: true
   include:
     - php: 5.6
       env: DB=mariadb
       addons:
-        mariadb: 5.5
+        mariadb: 10.0
     - php: 7.0
       env: DB=mariadb
       addons:
-        mariadb: 5.5
-    - php: hhvm
-      env: DB=mariadb
-      addons:
-        mariadb: 5.5
-
-    - php: 5.6
+        mariadb: 10.0
+    - php: 7.1
       env: DB=mariadb
       addons:
         mariadb: 10.0
-    - php: 7.0
+    - php: nightly
       env: DB=mariadb
       addons:
         mariadb: 10.0
     - php: hhvm
-      env: DB=mariadb
+      sudo: true
+      dist: trusty
+      group: edge # until the next Trusty update
       addons:
         mariadb: 10.0
+      env: DB=mariadb
 
     - php: 5.6
       env: DB=mariadb
@@ -66,21 +57,146 @@ matrix:
       env: DB=mariadb
       addons:
         mariadb: 10.1
-    - php: hhvm
+    - php: 7.1
+      env: DB=mariadb
+      addons:
+        mariadb: 10.1
+    - php: nightly
       env: DB=mariadb
       addons:
         mariadb: 10.1
-  allow_failures:
     - php: hhvm
-  exclude:
+      sudo: true
+      dist: trusty
+      group: edge # until the next Trusty update
+      addons:
+        mariadb: 10.1
+      env: DB=mariadb
+
+    - php: 5.6
+      sudo: true
+      dist: trusty
+      group: edge # until the next update
+      addons:
+        postgresql: "9.5"
+      services:
+        - postgresql
+      env: DB=pgsql POSTGRESQL_VERSION=9.5
+    - php: 7.0
+      sudo: true
+      dist: trusty
+      group: edge # until the next update
+      addons:
+        postgresql: "9.5"
+      services:
+        - postgresql
+      env: DB=pgsql POSTGRESQL_VERSION=9.5
+    - php: 7.1
+      sudo: true
+      dist: trusty
+      group: edge # until the next update
+      addons:
+        postgresql: "9.5"
+      services:
+        - postgresql
+      env: DB=pgsql POSTGRESQL_VERSION=9.5
+    - php: nightly
+      sudo: true
+      dist: trusty
+      group: edge # until the next update
+      addons:
+        postgresql: "9.5"
+      services:
+        - postgresql
+      env: DB=pgsql POSTGRESQL_VERSION=9.5
+
+    - php: hhvm
+      sudo: true
+      dist: trusty
+      group: edge # until the next update
+      addons:
+        apt:
+          packages:
+            - mysql-server-5.6
+            - mysql-client-core-5.6
+            - mysql-client-5.6
+      services:
+        - mysql
+      env: DB=mysql
     - php: hhvm
-      env: DB=pgsql POSTGRESQL_VERSION=9.1 # driver currently unsupported by HHVM
+      sudo: true
+      dist: trusty
+      group: edge # until the next update
+      addons:
+        apt:
+          packages:
+            - mysql-server-5.6
+            - mysql-client-core-5.6
+            - mysql-client-5.6
+      services:
+        - mysql
+      env: DB=mysqli
     - php: hhvm
-      env: DB=pgsql POSTGRESQL_VERSION=9.2 # driver currently unsupported by HHVM
+      sudo: true
+      dist: trusty
+      group: edge # until the next update
+      addons:
+        postgresql: "9.1"
+      services:
+        - postgresql
+      env: DB=pgsql POSTGRESQL_VERSION=9.1
     - php: hhvm
-      env: DB=pgsql POSTGRESQL_VERSION=9.3 # driver currently unsupported by HHVM
+      sudo: true
+      dist: trusty
+      group: edge # until the next update
+      addons:
+        postgresql: "9.2"
+      services:
+        - postgresql
+      env: DB=pgsql POSTGRESQL_VERSION=9.2
     - php: hhvm
-      env: DB=pgsql POSTGRESQL_VERSION=9.4 # driver currently unsupported by HHVM
+      sudo: true
+      dist: trusty
+      group: edge # until the next update
+      addons:
+        postgresql: "9.3"
+      services:
+        - postgresql
+      env: DB=pgsql POSTGRESQL_VERSION=9.3
+    - php: hhvm
+      sudo: true
+      dist: trusty
+      group: edge # until the next update
+      addons:
+        postgresql: "9.4"
+      services:
+        - postgresql
+      env: DB=pgsql POSTGRESQL_VERSION=9.4
+    - php: hhvm
+      sudo: true
+      dist: trusty
+      group: edge # until the next update
+      addons:
+        postgresql: "9.5"
+      services:
+        - postgresql
+      env: DB=pgsql POSTGRESQL_VERSION=9.5
+    - php: hhvm
+      sudo: true
+      dist: trusty
+      group: edge # until the next update
+      env: DB=sqlite
+  allow_failures:
+    - php: hhvm
+    - php: nightly
 
 addons:
   postgresql: '9.4'
+
+install:
+  - travis_retry composer install
+
+before_script:
+  - if [ '$DB' = 'pgsql' ]; then sudo service postgresql stop; sudo service postgresql start $POSTGRESQL_VERSION; fi
+
+script: ./vendor/bin/phpunit --configuration tests/travis/$DB.travis.xml