Skip to content

Commit e13afe9

Browse files
authored
Drop support for PHP 7.0 and PHP 7.1 (End of life) (#1068)
* Drop support for PHP < 7.2 in composer.json * Update .travis.yml Drop PHP 7.0 abd 7.1 Add PHP 7.4 * Normalize composer.json files Using composer-normalize * Normalize composer.json files (1) Using composer-normalize * Fix TomTom testReverseError400 - Will return JSON instead of XML ; - If API error, returns empty address collection ; * Apply fixes from StyleCI * Upgrade to PHPUnit 7 + Upgrade `nyholm/psr7` * Normalize providers Travis config
1 parent af4fee1 commit e13afe9

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

.travis.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@ sudo: false
44
php: 7.2
55

66
install:
7-
- composer update --prefer-stable --prefer-dist
7+
- composer update --prefer-stable --prefer-dist
88

99
script:
1010
- composer test-ci
1111

1212
after_success:
1313
- wget https://scrutinizer-ci.com/ocular.phar
1414
- php ocular.phar code-coverage:upload --format=php-clover build/coverage.xml
15-

composer.json

+16-14
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,34 @@
1212
}
1313
],
1414
"require": {
15-
"php": "^7.0",
15+
"php": "^7.2",
1616
"geoip/geoip": "^1.17",
1717
"willdurand/geocoder": "^4.0"
1818
},
19-
"require-dev": {
20-
"phpunit/phpunit": "^7.5",
21-
"geocoder-php/provider-integration-tests": "^1.0.1"
22-
},
2319
"provide": {
2420
"geocoder-php/provider-implementation": "1.0"
2521
},
22+
"require-dev": {
23+
"geocoder-php/provider-integration-tests": "^1.0.1",
24+
"phpunit/phpunit": "^7.5"
25+
},
26+
"extra": {
27+
"branch-alias": {
28+
"dev-master": "4.0-dev"
29+
}
30+
},
2631
"autoload": {
27-
"psr-4": { "Geocoder\\Provider\\MaxMindBinary\\": "" },
32+
"psr-4": {
33+
"Geocoder\\Provider\\MaxMindBinary\\": ""
34+
},
2835
"exclude-from-classmap": [
2936
"/Tests/"
3037
]
3138
},
39+
"minimum-stability": "dev",
40+
"prefer-stable": true,
3241
"scripts": {
3342
"test": "vendor/bin/phpunit",
3443
"test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml"
35-
},
36-
"minimum-stability": "dev",
37-
"prefer-stable": true,
38-
"extra": {
39-
"branch-alias": {
40-
"dev-master": "4.0-dev"
41-
}
4244
}
43-
}
45+
}

0 commit comments

Comments
 (0)