From 32e831817c64406bcf7acd62a033b9268a19f7c2 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Mon, 22 May 2017 17:09:21 +0200 Subject: [PATCH] Use PHPUnit 6 on all providers and remove symfony bridge --- src/Provider/ArcGISOnline/composer.json | 3 +-- src/Provider/BingMaps/composer.json | 3 +-- src/Provider/Chain/composer.json | 3 +-- src/Provider/FreeGeoIp/composer.json | 3 +-- src/Provider/GeoIP2/composer.json | 3 +-- src/Provider/GeoIPs/composer.json | 3 +-- src/Provider/GeoPlugin/composer.json | 3 +-- src/Provider/Geoip/composer.json | 3 +-- src/Provider/Geonames/composer.json | 3 +-- src/Provider/GoogleMaps/composer.json | 3 +-- src/Provider/HostIp/composer.json | 3 +-- src/Provider/IpInfoDb/composer.json | 3 +-- src/Provider/MapQuest/composer.json | 3 +-- src/Provider/Mapzen/composer.json | 3 +-- src/Provider/MaxMind/composer.json | 3 +-- src/Provider/MaxMindBinary/composer.json | 3 +-- src/Provider/Nominatim/composer.json | 3 +-- src/Provider/OpenCage/composer.json | 3 +-- src/Provider/TomTom/composer.json | 3 +-- src/Provider/Yandex/composer.json | 3 +-- 20 files changed, 20 insertions(+), 40 deletions(-) diff --git a/src/Provider/ArcGISOnline/composer.json b/src/Provider/ArcGISOnline/composer.json index 6e5ace2bd..0947e8ffb 100644 --- a/src/Provider/ArcGISOnline/composer.json +++ b/src/Provider/ArcGISOnline/composer.json @@ -16,10 +16,9 @@ "willdurand/geocoder": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^4.8", + "phpunit/phpunit": "^6.1", "php-http/message": "^1.0", "php-http/curl-client": "^1.7", - "symfony/phpunit-bridge": "^3.2", "nyholm/psr7": "^0.2.2" }, "autoload": { diff --git a/src/Provider/BingMaps/composer.json b/src/Provider/BingMaps/composer.json index e1b69554d..111050481 100644 --- a/src/Provider/BingMaps/composer.json +++ b/src/Provider/BingMaps/composer.json @@ -16,10 +16,9 @@ "willdurand/geocoder": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^4.8", + "phpunit/phpunit": "^6.1", "php-http/message": "^1.0", "php-http/curl-client": "^1.7", - "symfony/phpunit-bridge": "^3.2", "nyholm/psr7": "^0.2.2" }, "autoload": { diff --git a/src/Provider/Chain/composer.json b/src/Provider/Chain/composer.json index b5b0c63a6..8951d8677 100644 --- a/src/Provider/Chain/composer.json +++ b/src/Provider/Chain/composer.json @@ -16,10 +16,9 @@ "willdurand/geocoder": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^4.8", + "phpunit/phpunit": "^6.1", "php-http/message": "^1.0", "php-http/curl-client": "^1.7", - "symfony/phpunit-bridge": "^3.2", "nyholm/psr7": "^0.2.2" }, "autoload": { diff --git a/src/Provider/FreeGeoIp/composer.json b/src/Provider/FreeGeoIp/composer.json index 3cdcca54b..05230b12f 100644 --- a/src/Provider/FreeGeoIp/composer.json +++ b/src/Provider/FreeGeoIp/composer.json @@ -16,10 +16,9 @@ "willdurand/geocoder": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^4.8", + "phpunit/phpunit": "^6.1", "php-http/message": "^1.0", "php-http/curl-client": "^1.7", - "symfony/phpunit-bridge": "^3.2", "nyholm/psr7": "^0.2.2" }, "autoload": { diff --git a/src/Provider/GeoIP2/composer.json b/src/Provider/GeoIP2/composer.json index 8716843cc..94a6cfe52 100644 --- a/src/Provider/GeoIP2/composer.json +++ b/src/Provider/GeoIP2/composer.json @@ -16,10 +16,9 @@ "willdurand/geocoder": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^4.8", + "phpunit/phpunit": "^6.1", "php-http/message": "^1.0", "php-http/curl-client": "^1.7", - "symfony/phpunit-bridge": "^3.2", "nyholm/psr7": "^0.2.2" }, "autoload": { diff --git a/src/Provider/GeoIPs/composer.json b/src/Provider/GeoIPs/composer.json index a42d1b075..82395768c 100644 --- a/src/Provider/GeoIPs/composer.json +++ b/src/Provider/GeoIPs/composer.json @@ -16,10 +16,9 @@ "willdurand/geocoder": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^4.8", + "phpunit/phpunit": "^6.1", "php-http/message": "^1.0", "php-http/curl-client": "^1.7", - "symfony/phpunit-bridge": "^3.2", "nyholm/psr7": "^0.2.2" }, "autoload": { diff --git a/src/Provider/GeoPlugin/composer.json b/src/Provider/GeoPlugin/composer.json index d976e696f..c19ae7b32 100644 --- a/src/Provider/GeoPlugin/composer.json +++ b/src/Provider/GeoPlugin/composer.json @@ -17,10 +17,9 @@ "igorw/get-in": "^1.0" }, "require-dev": { - "phpunit/phpunit": "^4.8", + "phpunit/phpunit": "^6.1", "php-http/message": "^1.0", "php-http/curl-client": "^1.7", - "symfony/phpunit-bridge": "^3.2", "nyholm/psr7": "^0.2.2" }, "autoload": { diff --git a/src/Provider/Geoip/composer.json b/src/Provider/Geoip/composer.json index d4ba59c99..5ab32143a 100644 --- a/src/Provider/Geoip/composer.json +++ b/src/Provider/Geoip/composer.json @@ -16,10 +16,9 @@ "willdurand/geocoder": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^4.8", + "phpunit/phpunit": "^6.1", "php-http/message": "^1.0", "php-http/curl-client": "^1.7", - "symfony/phpunit-bridge": "^3.2", "nyholm/psr7": "^0.2.2" }, "autoload": { diff --git a/src/Provider/Geonames/composer.json b/src/Provider/Geonames/composer.json index b7ec5a94d..677f22f27 100644 --- a/src/Provider/Geonames/composer.json +++ b/src/Provider/Geonames/composer.json @@ -16,10 +16,9 @@ "willdurand/geocoder": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^4.8", + "phpunit/phpunit": "^6.1", "php-http/message": "^1.0", "php-http/curl-client": "^1.7", - "symfony/phpunit-bridge": "^3.2", "nyholm/psr7": "^0.2.2" }, "autoload": { diff --git a/src/Provider/GoogleMaps/composer.json b/src/Provider/GoogleMaps/composer.json index 216c0b59b..448adc56c 100644 --- a/src/Provider/GoogleMaps/composer.json +++ b/src/Provider/GoogleMaps/composer.json @@ -16,11 +16,10 @@ "willdurand/geocoder": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^4.8", + "phpunit/phpunit": "^6.1", "geocoder-php/provider-integration-tests": "dev-master", "php-http/message": "^1.0", "php-http/curl-client": "^1.7", - "symfony/phpunit-bridge": "^3.2", "nyholm/psr7": "^0.2.2" }, "autoload": { diff --git a/src/Provider/HostIp/composer.json b/src/Provider/HostIp/composer.json index 7d4a2a0d8..0b264f46c 100644 --- a/src/Provider/HostIp/composer.json +++ b/src/Provider/HostIp/composer.json @@ -16,10 +16,9 @@ "willdurand/geocoder": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^4.8", + "phpunit/phpunit": "^6.1", "php-http/message": "^1.0", "php-http/curl-client": "^1.7", - "symfony/phpunit-bridge": "^3.2", "nyholm/psr7": "^0.2.2" }, "autoload": { diff --git a/src/Provider/IpInfoDb/composer.json b/src/Provider/IpInfoDb/composer.json index 256d6f547..ce650b673 100644 --- a/src/Provider/IpInfoDb/composer.json +++ b/src/Provider/IpInfoDb/composer.json @@ -16,10 +16,9 @@ "willdurand/geocoder": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^4.8", + "phpunit/phpunit": "^6.1", "php-http/message": "^1.0", "php-http/curl-client": "^1.7", - "symfony/phpunit-bridge": "^3.2", "nyholm/psr7": "^0.2.2" }, "autoload": { diff --git a/src/Provider/MapQuest/composer.json b/src/Provider/MapQuest/composer.json index fb5a111e5..456348b7c 100644 --- a/src/Provider/MapQuest/composer.json +++ b/src/Provider/MapQuest/composer.json @@ -16,10 +16,9 @@ "willdurand/geocoder": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^4.8", + "phpunit/phpunit": "^6.1", "php-http/message": "^1.0", "php-http/curl-client": "^1.7", - "symfony/phpunit-bridge": "^3.2", "nyholm/psr7": "^0.2.2" }, "autoload": { diff --git a/src/Provider/Mapzen/composer.json b/src/Provider/Mapzen/composer.json index c442c4cc1..6d26658f6 100644 --- a/src/Provider/Mapzen/composer.json +++ b/src/Provider/Mapzen/composer.json @@ -16,10 +16,9 @@ "willdurand/geocoder": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^4.8", + "phpunit/phpunit": "^6.1", "php-http/message": "^1.0", "php-http/curl-client": "^1.7", - "symfony/phpunit-bridge": "^3.2", "nyholm/psr7": "^0.2.2" }, "autoload": { diff --git a/src/Provider/MaxMind/composer.json b/src/Provider/MaxMind/composer.json index 802db166f..ea72f716b 100644 --- a/src/Provider/MaxMind/composer.json +++ b/src/Provider/MaxMind/composer.json @@ -17,10 +17,9 @@ "igorw/get-in": "^1.0" }, "require-dev": { - "phpunit/phpunit": "^4.8", + "phpunit/phpunit": "^6.1", "php-http/message": "^1.0", "php-http/curl-client": "^1.7", - "symfony/phpunit-bridge": "^3.2", "nyholm/psr7": "^0.2.2" }, "autoload": { diff --git a/src/Provider/MaxMindBinary/composer.json b/src/Provider/MaxMindBinary/composer.json index dce58b40f..229e055ad 100644 --- a/src/Provider/MaxMindBinary/composer.json +++ b/src/Provider/MaxMindBinary/composer.json @@ -16,10 +16,9 @@ "willdurand/geocoder": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^4.8", + "phpunit/phpunit": "^6.1", "php-http/message": "^1.0", "php-http/curl-client": "^1.7", - "symfony/phpunit-bridge": "^3.2", "nyholm/psr7": "^0.2.2" }, "autoload": { diff --git a/src/Provider/Nominatim/composer.json b/src/Provider/Nominatim/composer.json index c25744487..d5b457a08 100644 --- a/src/Provider/Nominatim/composer.json +++ b/src/Provider/Nominatim/composer.json @@ -16,10 +16,9 @@ "willdurand/geocoder": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^4.8", + "phpunit/phpunit": "^6.1", "php-http/message": "^1.0", "php-http/curl-client": "^1.7", - "symfony/phpunit-bridge": "^3.2", "nyholm/psr7": "^0.2.2" }, "autoload": { diff --git a/src/Provider/OpenCage/composer.json b/src/Provider/OpenCage/composer.json index 1e7c94cc6..e228041e7 100644 --- a/src/Provider/OpenCage/composer.json +++ b/src/Provider/OpenCage/composer.json @@ -16,10 +16,9 @@ "willdurand/geocoder": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^4.8", + "phpunit/phpunit": "^6.1", "php-http/message": "^1.0", "php-http/curl-client": "^1.7", - "symfony/phpunit-bridge": "^3.2", "nyholm/psr7": "^0.2.2" }, "autoload": { diff --git a/src/Provider/TomTom/composer.json b/src/Provider/TomTom/composer.json index 8fc2e7d57..da0f8427c 100644 --- a/src/Provider/TomTom/composer.json +++ b/src/Provider/TomTom/composer.json @@ -16,10 +16,9 @@ "willdurand/geocoder": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^4.8", + "phpunit/phpunit": "^6.1", "php-http/message": "^1.0", "php-http/curl-client": "^1.7", - "symfony/phpunit-bridge": "^3.2", "nyholm/psr7": "^0.2.2" }, "autoload": { diff --git a/src/Provider/Yandex/composer.json b/src/Provider/Yandex/composer.json index 182a6d9fa..f1eb31a12 100644 --- a/src/Provider/Yandex/composer.json +++ b/src/Provider/Yandex/composer.json @@ -16,10 +16,9 @@ "willdurand/geocoder": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^4.8", + "phpunit/phpunit": "^6.1", "php-http/message": "^1.0", "php-http/curl-client": "^1.7", - "symfony/phpunit-bridge": "^3.2", "nyholm/psr7": "^0.2.2" }, "autoload": {