Commit 8e3159b3 authored by Marco Pivetta's avatar Marco Pivetta Committed by GitHub

Merge pull request #2750 from lcobucci/require-php71

Require PHP 7.1
parents 03e17189 ff2b494d
...@@ -7,7 +7,6 @@ cache: ...@@ -7,7 +7,6 @@ cache:
- $HOME/.composer/cache - $HOME/.composer/cache
php: php:
- 7.0
- 7.1 - 7.1
- nightly - nightly
...@@ -19,10 +18,6 @@ env: ...@@ -19,10 +18,6 @@ env:
matrix: matrix:
fast_finish: true fast_finish: true
include: include:
- php: 7.0
env: DB=mariadb MARIADB_VERSION=10.0
addons:
mariadb: 10.0
- php: 7.1 - php: 7.1
env: DB=mariadb MARIADB_VERSION=10.0 env: DB=mariadb MARIADB_VERSION=10.0
addons: addons:
...@@ -32,10 +27,6 @@ matrix: ...@@ -32,10 +27,6 @@ matrix:
addons: addons:
mariadb: 10.0 mariadb: 10.0
- php: 7.0
env: DB=mariadb MARIADB_VERSION=10.1
addons:
mariadb: 10.1
- php: 7.1 - php: 7.1
env: DB=mariadb MARIADB_VERSION=10.1 env: DB=mariadb MARIADB_VERSION=10.1
addons: addons:
...@@ -45,12 +36,6 @@ matrix: ...@@ -45,12 +36,6 @@ matrix:
addons: addons:
mariadb: 10.1 mariadb: 10.1
- php: 7.0
addons:
postgresql: "9.2"
services:
- postgresql
env: DB=pgsql POSTGRESQL_VERSION=9.2
- php: 7.1 - php: 7.1
addons: addons:
postgresql: "9.2" postgresql: "9.2"
...@@ -64,12 +49,6 @@ matrix: ...@@ -64,12 +49,6 @@ matrix:
- postgresql - postgresql
env: DB=pgsql POSTGRESQL_VERSION=9.2 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 - php: 7.1
addons: addons:
postgresql: "9.3" postgresql: "9.3"
...@@ -83,12 +62,6 @@ matrix: ...@@ -83,12 +62,6 @@ matrix:
- postgresql - postgresql
env: DB=pgsql POSTGRESQL_VERSION=9.3 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 - php: 7.1
addons: addons:
postgresql: "9.4" postgresql: "9.4"
...@@ -102,14 +75,6 @@ matrix: ...@@ -102,14 +75,6 @@ matrix:
- postgresql - postgresql
env: DB=pgsql POSTGRESQL_VERSION=9.4 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 - php: 7.1
sudo: false sudo: false
dist: trusty dist: trusty
...@@ -127,14 +92,6 @@ matrix: ...@@ -127,14 +92,6 @@ matrix:
- postgresql - postgresql
env: DB=pgsql POSTGRESQL_VERSION=9.5 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 - php: 7.1
sudo: false sudo: false
dist: trusty dist: trusty
...@@ -152,102 +109,9 @@ matrix: ...@@ -152,102 +109,9 @@ matrix:
- postgresql - postgresql
env: DB=pgsql POSTGRESQL_VERSION=9.6 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: allow_failures:
- php: hhvm
- php: nightly - 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: install:
- travis_retry composer install - travis_retry composer install
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
{"name": "Jonathan Wage", "email": "jonwage@gmail.com"} {"name": "Jonathan Wage", "email": "jonwage@gmail.com"}
], ],
"require": { "require": {
"php": "^7.0", "php": "^7.1",
"ext-pdo": "*", "ext-pdo": "*",
"doctrine/common": "^2.7.1" "doctrine/common": "^2.7.1"
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment