Skip to content

Commit 279daed

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 8f7682e commit 279daed

File tree

2 files changed

+23
-20
lines changed

2 files changed

+23
-20
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
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

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
"name": "geocoder-php/common-http",
33
"type": "library",
44
"description": "Common files for HTTP based Geocoders",
5-
"keywords": ["http geocoder"],
5+
"keywords": [
6+
"http geocoder"
7+
],
68
"homepage": "http://geocoder-php.org",
79
"license": "MIT",
810
"authors": [
@@ -12,37 +14,39 @@
1214
}
1315
],
1416
"require": {
15-
"php": "^7.0",
16-
"willdurand/geocoder": "^4.0",
17+
"php": "^7.2",
18+
"php-http/client-implementation": "^1.0",
19+
"php-http/discovery": "^1.6",
1720
"php-http/httplug": "^1.0 || ^2.0",
18-
"psr/http-message": "^1.0",
1921
"php-http/message-factory": "^1.0.2",
22+
"psr/http-message": "^1.0",
2023
"psr/http-message-implementation": "^1.0",
21-
"php-http/client-implementation": "^1.0",
22-
"php-http/discovery": "^1.6"
24+
"willdurand/geocoder": "^4.0"
2325
},
2426
"require-dev": {
25-
"phpunit/phpunit": "^6.5 || ^7.5",
26-
"symfony/stopwatch": "~2.5",
27+
"nyholm/psr7": "^1.0",
2728
"php-http/message": "^1.0",
2829
"php-http/mock-client": "^1.0",
29-
"nyholm/psr7": "^1.0"
30+
"phpunit/phpunit": "^7.5",
31+
"symfony/stopwatch": "~2.5"
32+
},
33+
"extra": {
34+
"branch-alias": {
35+
"dev-master": "4.0-dev"
36+
}
3037
},
3138
"autoload": {
32-
"psr-4": { "Geocoder\\Http\\": "" },
39+
"psr-4": {
40+
"Geocoder\\Http\\": ""
41+
},
3342
"exclude-from-classmap": [
3443
"/Tests/"
3544
]
3645
},
46+
"minimum-stability": "dev",
47+
"prefer-stable": true,
3748
"scripts": {
3849
"test": "vendor/bin/phpunit",
3950
"test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml"
40-
},
41-
"minimum-stability": "dev",
42-
"prefer-stable": true,
43-
"extra": {
44-
"branch-alias": {
45-
"dev-master": "4.0-dev"
46-
}
4751
}
48-
}
52+
}

0 commit comments

Comments
 (0)