Merge pull request #2750 from lcobucci/require-php71

Require PHP 7.1
doctrine · Jun 28, 2017 · 8e3159b · 8e3159b
2 parents 03e1718 + ff2b494
commit 8e3159b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 137 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,6 @@ cache:
         - $HOME/.composer/cache
 
 php:
-  - 7.0
   - 7.1
   - nightly
 
@@ -19,10 +18,6 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: 7.0
-      env: DB=mariadb MARIADB_VERSION=10.0
-      addons:
-        mariadb: 10.0
     - php: 7.1
       env: DB=mariadb MARIADB_VERSION=10.0
       addons:
@@ -32,10 +27,6 @@ matrix:
       addons:
         mariadb: 10.0
 
-    - php: 7.0
-      env: DB=mariadb MARIADB_VERSION=10.1
-      addons:
-        mariadb: 10.1
     - php: 7.1
       env: DB=mariadb MARIADB_VERSION=10.1
       addons:
@@ -45,12 +36,6 @@ matrix:
       addons:
         mariadb: 10.1
 
-    - php: 7.0
-      addons:
-        postgresql: "9.2"
-      services:
-        - postgresql
-      env: DB=pgsql POSTGRESQL_VERSION=9.2
     - php: 7.1
       addons:
         postgresql: "9.2"
@@ -64,12 +49,6 @@ matrix:
         - postgresql
       env: DB=pgsql POSTGRESQL_VERSION=9.2
 
-    - php: 7.0
-      addons:
-        postgresql: "9.3"
-      services:
-        - postgresql
-      env: DB=pgsql POSTGRESQL_VERSION=9.3
     - php: 7.1
       addons:
         postgresql: "9.3"
@@ -83,12 +62,6 @@ matrix:
         - postgresql
       env: DB=pgsql POSTGRESQL_VERSION=9.3
 
-    - php: 7.0
-      addons:
-        postgresql: "9.4"
-      services:
-        - postgresql
-      env: DB=pgsql POSTGRESQL_VERSION=9.4
     - php: 7.1
       addons:
         postgresql: "9.4"
@@ -102,14 +75,6 @@ matrix:
         - postgresql
       env: DB=pgsql POSTGRESQL_VERSION=9.4
 
-    - php: 7.0
-      sudo: false
-      dist: trusty
-      addons:
-        postgresql: "9.5"
-      services:
-        - postgresql
-      env: DB=pgsql POSTGRESQL_VERSION=9.5
     - php: 7.1
       sudo: false
       dist: trusty
@@ -127,14 +92,6 @@ matrix:
         - postgresql
       env: DB=pgsql POSTGRESQL_VERSION=9.5
 
-    - php: 7.0
-      sudo: false
-      dist: trusty
-      addons:
-        postgresql: "9.6"
-      services:
-        - postgresql
-      env: DB=pgsql POSTGRESQL_VERSION=9.6
     - php: 7.1
       sudo: false
       dist: trusty
@@ -152,102 +109,9 @@ matrix:
         - postgresql
       env: DB=pgsql POSTGRESQL_VERSION=9.6
 
-    - php: hhvm
-      sudo: true
-      dist: trusty
-      group: edge # until the next Trusty update
-      addons:
-        mariadb: 10.0
-      env: DB=mariadb MARIADB_VERSION=10.0
-    - php: hhvm
-      sudo: true
-      dist: trusty
-      group: edge # until the next Trusty update
-      addons:
-        mariadb: 10.1
-      env: DB=mariadb MARIADB_VERSION=10.1
-    - 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
-      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
-      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
-      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
-      addons:
-        postgresql: "9.5"
-      services:
-        - postgresql
-      env: DB=pgsql POSTGRESQL_VERSION=9.5
-    - php: hhvm
-      sudo: true
-      dist: trusty
-      addons:
-        postgresql: "9.6"
-      services:
-        - postgresql
-      env: DB=pgsql POSTGRESQL_VERSION=9.6
-    - php: hhvm
-      sudo: true
-      dist: trusty
-      group: edge # until the next update
-      env: DB=sqlite
   allow_failures:
-    - php: hhvm
     - php: nightly
 
-before_install:
-  # Force hhvm PHP 7 mode
-  - if [[ $TRAVIS_PHP_VERSION = hhv* ]]; then echo hhvm.php7.all=1 >> /etc/hhvm/php.ini; fi
-
 install:
   - travis_retry composer install
 

diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
         {"name": "Jonathan Wage", "email": "jonwage@gmail.com"}
     ],
     "require": {
-        "php": "^7.0",
+        "php": "^7.1",
         "ext-pdo": "*",
         "doctrine/common": "^2.7.1"
     },