From 52bf47d4efa439a7c309bd5510545901cb05a4c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonathan=20Beli=C3=ABn?= Date: Sat, 4 Jul 2020 10:05:10 +0200 Subject: [PATCH] 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 --- .travis.yml | 4 +--- composer.json | 34 ++++++++++++++++++---------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index d8482b4..7e91c31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,8 @@ sudo: false php: 7.2 - install: - - composer update --prefer-stable --prefer-dist + - composer update --prefer-stable --prefer-dist script: - composer test-ci @@ -13,4 +12,3 @@ script: after_success: - wget https://scrutinizer-ci.com/ocular.phar - php ocular.phar code-coverage:upload --format=php-clover build/coverage.xml - diff --git a/composer.json b/composer.json index 90b8a84..6c46737 100644 --- a/composer.json +++ b/composer.json @@ -12,35 +12,37 @@ } ], "require": { - "php": "^7.0", - "willdurand/geocoder": "^4.1", - "igorw/get-in": "^1.0" + "php": "^7.2", + "igorw/get-in": "^1.0", + "willdurand/geocoder": "^4.1" + }, + "provide": { + "geocoder-php/provider-implementation": "1.0" }, "require-dev": { - "phpunit/phpunit": "^6.5 || ^7.5", "geocoder-php/common-http": "^4.0", "geocoder-php/provider-integration-tests": "^1.0", + "php-http/curl-client": "^1.7", "php-http/message": "^1.0", - "php-http/curl-client": "^1.7" + "phpunit/phpunit": "^7.5" }, - "provide": { - "geocoder-php/provider-implementation": "1.0" + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } }, "autoload": { - "psr-4": { "Geocoder\\Provider\\MaxMind\\": "" }, + "psr-4": { + "Geocoder\\Provider\\MaxMind\\": "" + }, "exclude-from-classmap": [ "/Tests/" ] }, + "minimum-stability": "dev", + "prefer-stable": true, "scripts": { "test": "vendor/bin/phpunit", "test-ci": "vendor/bin/phpunit --coverage-text --coverage-clover=build/coverage.xml" - }, - "minimum-stability": "dev", - "prefer-stable": true, - "extra": { - "branch-alias": { - "dev-master": "4.0-dev" - } } -} +} \ No newline at end of file