Skip to content

Commit 4adca54

Browse files
authored
Merge pull request #2966 from Majkl578/php-7.2
Require PHP 7.2, drop <7.2 in Composer & on CI
2 parents 7a2e2c6 + fe62d34 commit 4adca54

File tree

3 files changed

+4
-82
lines changed

3 files changed

+4
-82
lines changed

.scrutinizer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ build:
33
analysis:
44
environment:
55
php:
6-
version: 7.1
6+
version: 7.2
77
cache:
88
disabled: false
99
directories:

.travis.yml

Lines changed: 2 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ cache:
88
- $HOME/.composer/cache
99

1010
php:
11-
- 7.1
1211
- 7.2
1312
- nightly
1413

@@ -33,12 +32,6 @@ jobs:
3332
- php: nightly
3433

3534
include:
36-
- stage: Test
37-
php: 7.1
38-
env: DB=mysql MYSQL_VERSION=5.7
39-
sudo: required
40-
before_script:
41-
- bash ./tests/travis/install-mysql-5.7.sh
4235
- stage: Test
4336
php: 7.2
4437
env: DB=mysql MYSQL_VERSION=5.7
@@ -52,12 +45,6 @@ jobs:
5245
before_script:
5346
- bash ./tests/travis/install-mysql-5.7.sh
5447

55-
- stage: Test
56-
php: 7.1
57-
env: DB=mysqli MYSQL_VERSION=5.7
58-
sudo: required
59-
before_script:
60-
- bash ./tests/travis/install-mysql-5.7.sh
6148
- stage: Test
6249
php: 7.2
6350
env: DB=mysqli MYSQL_VERSION=5.7
@@ -71,11 +58,6 @@ jobs:
7158
before_script:
7259
- bash ./tests/travis/install-mysql-5.7.sh
7360

74-
- stage: Test
75-
php: 7.1
76-
env: DB=mariadb MARIADB_VERSION=10.0
77-
addons:
78-
mariadb: 10.0
7961
- stage: Test
8062
php: 7.2
8163
env: DB=mariadb MARIADB_VERSION=10.0
@@ -87,11 +69,6 @@ jobs:
8769
addons:
8870
mariadb: 10.0
8971

90-
- stage: Test
91-
php: 7.1
92-
env: DB=mariadb MARIADB_VERSION=10.1
93-
addons:
94-
mariadb: 10.1
9572
- stage: Test
9673
php: 7.2
9774
env: DB=mariadb MARIADB_VERSION=10.1
@@ -103,11 +80,6 @@ jobs:
10380
addons:
10481
mariadb: 10.1
10582

106-
- stage: Test
107-
php: 7.1
108-
env: DB=mariadb MARIADB_VERSION=10.2
109-
addons:
110-
mariadb: 10.2
11183
- stage: Test
11284
php: 7.2
11385
env: DB=mariadb MARIADB_VERSION=10.2
@@ -119,11 +91,6 @@ jobs:
11991
addons:
12092
mariadb: 10.2
12193

122-
- stage: Test
123-
php: 7.1
124-
env: DB=mariadb.mysqli MARIADB_VERSION=10.2
125-
addons:
126-
mariadb: 10.2
12794
- stage: Test
12895
php: 7.2
12996
env: DB=mariadb.mysqli MARIADB_VERSION=10.2
@@ -135,13 +102,6 @@ jobs:
135102
addons:
136103
mariadb: 10.2
137104

138-
- stage: Test
139-
php: 7.1
140-
env: DB=pgsql POSTGRESQL_VERSION=9.2
141-
services:
142-
- postgresql
143-
addons:
144-
postgresql: "9.2"
145105
- stage: Test
146106
php: 7.2
147107
env: DB=pgsql POSTGRESQL_VERSION=9.2
@@ -157,13 +117,6 @@ jobs:
157117
addons:
158118
postgresql: "9.2"
159119

160-
- stage: Test
161-
php: 7.1
162-
env: DB=pgsql POSTGRESQL_VERSION=9.3
163-
services:
164-
- postgresql
165-
addons:
166-
postgresql: "9.3"
167120
- stage: Test
168121
php: 7.2
169122
env: DB=pgsql POSTGRESQL_VERSION=9.3
@@ -179,13 +132,6 @@ jobs:
179132
addons:
180133
postgresql: "9.3"
181134

182-
- stage: Test
183-
php: 7.1
184-
env: DB=pgsql POSTGRESQL_VERSION=9.4
185-
services:
186-
- postgresql
187-
addons:
188-
postgresql: "9.4"
189135
- stage: Test
190136
php: 7.2
191137
env: DB=pgsql POSTGRESQL_VERSION=9.4
@@ -201,13 +147,6 @@ jobs:
201147
addons:
202148
postgresql: "9.4"
203149

204-
- stage: Test
205-
php: 7.1
206-
env: DB=pgsql POSTGRESQL_VERSION=9.5
207-
services:
208-
- postgresql
209-
addons:
210-
postgresql: "9.5"
211150
- stage: Test
212151
php: 7.2
213152
env: DB=pgsql POSTGRESQL_VERSION=9.5
@@ -223,13 +162,6 @@ jobs:
223162
addons:
224163
postgresql: "9.5"
225164

226-
- stage: Test
227-
php: 7.1
228-
env: DB=pgsql POSTGRESQL_VERSION=9.6
229-
services:
230-
- postgresql
231-
addons:
232-
postgresql: "9.6"
233165
- stage: Test
234166
php: 7.2
235167
env: DB=pgsql POSTGRESQL_VERSION=9.6
@@ -245,16 +177,6 @@ jobs:
245177
addons:
246178
postgresql: "9.6"
247179

248-
- stage: Test
249-
php: 7.1
250-
env: DB=pgsql POSTGRESQL_VERSION=10.0
251-
sudo: required
252-
services:
253-
- postgresql
254-
addons:
255-
postgresql: "9.6"
256-
before_script:
257-
- bash ./tests/travis/install-postgres-10.sh
258180
- stage: Test
259181
php: 7.2
260182
env: DB=pgsql POSTGRESQL_VERSION=10.0
@@ -277,7 +199,7 @@ jobs:
277199
- bash ./tests/travis/install-postgres-10.sh
278200

279201
- stage: Test
280-
php: 7.1
202+
php: 7.2
281203
env: DB=sqlite DEPENDENCIES=low
282204
install:
283205
- travis_retry composer update --prefer-dist --prefer-lowest
@@ -291,7 +213,7 @@ jobs:
291213
- travis_retry composer update --prefer-dist
292214

293215
- stage: Coverage
294-
php: 7.1
216+
php: 7.2
295217
env: DB=sqlite
296218
before_script:
297219
- mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{.disabled,}

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
{"name": "Jonathan Wage", "email": "[email protected]"}
1313
],
1414
"require": {
15-
"php": "^7.1",
15+
"php": "^7.2",
1616
"ext-pdo": "*",
1717
"doctrine/common": "^2.7.1"
1818
},

0 commit comments

Comments
 (0)