Make sure we dont include multiple vendor folders (geocoder-php#934)

Nyholm · web-flow · commit 80da39e5b404 · 2019-02-06T13:18:09.000+01:00
* Make sure we dont include multiple vendor folders

* Require discovery 1.6
diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
         "php-http/promise": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "geocoder-php/provider-integration-tests": "^1.0",
         "geoip2/geoip2": "~2.0",
         "symfony/stopwatch": "~2.5",
diff --git a/phpunit b/phpunit
@@ -1,9 +1,18 @@
 #!/usr/bin/env php
 <?php
 
-if (!file_exists(__DIR__.'/vendor/phpunit/phpunit/phpunit')) {
+$found = false;
+$candidates = [\getcwd(), __DIR__];
+// Find a good path
+foreach ($candidates as $path) {
+    if (file_exists($path.'/vendor/phpunit/phpunit/phpunit')) {
+        require $path.'/vendor/phpunit/phpunit/phpunit';
+        $found = true;
+        break;
+    }
+}
+
+if (!$found) {
     echo "Unable to find the `PHPUnit` script in `vendor/phpunit/phpunit/`.\nPlease run `composer update` before running this command.\n";
     exit(1);
 }
-
-require __DIR__.'/vendor/phpunit/phpunit/phpunit';
diff --git a/src/Common/composer.json b/src/Common/composer.json
@@ -15,7 +15,7 @@
         "php": "^7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "symfony/stopwatch": "~2.5",
         "nyholm/nsa": "^1.1"
     },
diff --git a/src/Http/composer.json b/src/Http/composer.json
@@ -19,10 +19,10 @@
         "php-http/message-factory": "^1.0.2",
         "psr/http-message-implementation": "^1.0",
         "php-http/client-implementation": "^1.0",
-        "php-http/discovery": "^1.4"
+        "php-http/discovery": "^1.6"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "symfony/stopwatch": "~2.5",
         "php-http/message": "^1.0",
         "php-http/mock-client": "^1.0",
diff --git a/src/Plugin/composer.json b/src/Plugin/composer.json
@@ -19,7 +19,7 @@
         "php-http/promise": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "cache/void-adapter": "^1.0"
     },
     "autoload": {
diff --git a/src/Provider/AlgoliaPlaces/composer.json b/src/Provider/AlgoliaPlaces/composer.json
@@ -18,7 +18,7 @@
         "willdurand/geocoder": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "geocoder-php/provider-integration-tests": "^1.1",
         "php-http/message": "^1.0",
         "php-http/curl-client": "^1.7"
diff --git a/src/Provider/ArcGISOnline/composer.json b/src/Provider/ArcGISOnline/composer.json
@@ -17,7 +17,7 @@
         "willdurand/geocoder": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "geocoder-php/provider-integration-tests": "^1.0",
         "php-http/message": "^1.0",
         "php-http/curl-client": "^1.7"
diff --git a/src/Provider/BingMaps/composer.json b/src/Provider/BingMaps/composer.json
@@ -17,7 +17,7 @@
         "willdurand/geocoder": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "geocoder-php/provider-integration-tests": "^1.0",
         "php-http/message": "^1.0",
         "php-http/curl-client": "^1.7"
diff --git a/src/Provider/Chain/composer.json b/src/Provider/Chain/composer.json
@@ -17,7 +17,7 @@
         "willdurand/geocoder": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "php-http/message": "^1.0",
         "php-http/curl-client": "^1.7",
         "nyholm/nsa": "^1.1"
diff --git a/src/Provider/FreeGeoIp/composer.json b/src/Provider/FreeGeoIp/composer.json
@@ -17,7 +17,7 @@
         "willdurand/geocoder": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "geocoder-php/provider-integration-tests": "^1.0",
         "php-http/message": "^1.0",
         "php-http/curl-client": "^1.7"
diff --git a/src/Provider/GeoIP2/composer.json b/src/Provider/GeoIP2/composer.json
@@ -17,7 +17,7 @@
         "geoip2/geoip2": "~2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "geocoder-php/provider-integration-tests": "^1.0.1"
     },
     "provide": {
diff --git a/src/Provider/GeoIPs/composer.json b/src/Provider/GeoIPs/composer.json
@@ -17,7 +17,7 @@
         "willdurand/geocoder": "^4.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "geocoder-php/provider-integration-tests": "^1.0",
         "php-http/message": "^1.0",
         "php-http/curl-client": "^1.7"
diff --git a/src/Provider/GeoPlugin/composer.json b/src/Provider/GeoPlugin/composer.json
@@ -18,7 +18,7 @@
         "igorw/get-in": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "geocoder-php/provider-integration-tests": "^1.0",
         "php-http/message": "^1.0",
         "php-http/curl-client": "^1.7"
diff --git a/src/Provider/Geoip/composer.json b/src/Provider/Geoip/composer.json
@@ -17,7 +17,7 @@
         "willdurand/geocoder": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "geocoder-php/provider-integration-tests": "^1.0.1"
     },
     "provide": {
diff --git a/src/Provider/Geonames/composer.json b/src/Provider/Geonames/composer.json
@@ -17,7 +17,7 @@
         "willdurand/geocoder": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "geocoder-php/provider-integration-tests": "^1.0",
         "php-http/message": "^1.0",
         "php-http/curl-client": "^1.7"
diff --git a/src/Provider/GoogleMaps/composer.json b/src/Provider/GoogleMaps/composer.json
@@ -17,7 +17,7 @@
         "willdurand/geocoder": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "geocoder-php/provider-integration-tests": "^1.0",
         "php-http/message": "^1.0",
         "php-http/curl-client": "^1.7"
diff --git a/src/Provider/Here/composer.json b/src/Provider/Here/composer.json
@@ -17,7 +17,7 @@
         "willdurand/geocoder": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "geocoder-php/provider-integration-tests": "^1.1",
         "php-http/message": "^1.0",
         "php-http/curl-client": "^1.7"
diff --git a/src/Provider/HostIp/composer.json b/src/Provider/HostIp/composer.json
@@ -17,7 +17,7 @@
         "willdurand/geocoder": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "geocoder-php/provider-integration-tests": "^1.0",
         "php-http/message": "^1.0",
         "php-http/curl-client": "^1.7"
diff --git a/src/Provider/IpInfo/composer.json b/src/Provider/IpInfo/composer.json
@@ -17,7 +17,7 @@
         "willdurand/geocoder": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "geocoder-php/provider-integration-tests": "^1.0",
         "php-http/message": "^1.0",
         "php-http/curl-client": "^1.7"
diff --git a/src/Provider/IpInfoDb/composer.json b/src/Provider/IpInfoDb/composer.json
@@ -17,7 +17,7 @@
         "willdurand/geocoder": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "geocoder-php/provider-integration-tests": "^1.0",
         "php-http/message": "^1.0",
         "php-http/curl-client": "^1.7"
diff --git a/src/Provider/Ipstack/composer.json b/src/Provider/Ipstack/composer.json
@@ -17,7 +17,7 @@
         "willdurand/geocoder": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "geocoder-php/provider-integration-tests": "^1.0",
         "php-http/message": "^1.0",
         "php-http/curl-client": "^1.7"
diff --git a/src/Provider/LocationIQ/composer.json b/src/Provider/LocationIQ/composer.json
@@ -17,7 +17,7 @@
         "willdurand/geocoder": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "geocoder-php/provider-integration-tests": "^1.0",
         "php-http/message": "^1.0",
         "php-http/curl-client": "^1.7"
diff --git a/src/Provider/MapQuest/composer.json b/src/Provider/MapQuest/composer.json
@@ -17,7 +17,7 @@
         "willdurand/geocoder": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "geocoder-php/provider-integration-tests": "^1.1",
         "php-http/message": "^1.0",
         "php-http/curl-client": "^1.7"
diff --git a/src/Provider/Mapbox/composer.json b/src/Provider/Mapbox/composer.json
@@ -17,7 +17,7 @@
         "willdurand/geocoder": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "geocoder-php/provider-integration-tests": "^1.0",
         "php-http/message": "^1.0",
         "php-http/curl-client": "^1.7"
diff --git a/src/Provider/Mapzen/composer.json b/src/Provider/Mapzen/composer.json
@@ -17,7 +17,7 @@
         "willdurand/geocoder": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "geocoder-php/provider-integration-tests": "^1.0",
         "php-http/message": "^1.0",
         "php-http/curl-client": "^1.7"
diff --git a/src/Provider/MaxMind/composer.json b/src/Provider/MaxMind/composer.json
@@ -17,7 +17,7 @@
         "igorw/get-in": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "geocoder-php/common-http": "^4.0",
         "geocoder-php/provider-integration-tests": "^1.0",
         "php-http/message": "^1.0",
diff --git a/src/Provider/MaxMindBinary/composer.json b/src/Provider/MaxMindBinary/composer.json
@@ -17,7 +17,7 @@
         "willdurand/geocoder": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^7.5",
         "geocoder-php/provider-integration-tests": "^1.0.1"
     },
     "provide": {
diff --git a/src/Provider/Nominatim/composer.json b/src/Provider/Nominatim/composer.json
@@ -17,7 +17,7 @@
         "willdurand/geocoder": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "geocoder-php/provider-integration-tests": "^1.0",
         "php-http/message": "^1.0",
         "php-http/curl-client": "^1.7"
diff --git a/src/Provider/OpenCage/composer.json b/src/Provider/OpenCage/composer.json
@@ -17,8 +17,8 @@
         "willdurand/geocoder": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
-        "geocoder-php/provider-integration-tests": "^1.0",
+        "phpunit/phpunit": "^6.5 || ^7.5",
+        "geocoder-php/provider-integration-tests": "^1.2",
         "php-http/message": "^1.0",
         "php-http/curl-client": "^1.7"
     },
diff --git a/src/Provider/Photon/composer.json b/src/Provider/Photon/composer.json
@@ -22,7 +22,7 @@
         "geocoder-php/provider-integration-tests": "^1.0",
         "php-http/curl-client": "^1.7",
         "php-http/message": "^1.0",
-        "phpunit/phpunit": "6.3.*"
+        "phpunit/phpunit": "^6.5 || ^7.5"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Provider/PickPoint/composer.json b/src/Provider/PickPoint/composer.json
@@ -17,7 +17,7 @@
         "willdurand/geocoder": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "geocoder-php/provider-integration-tests": "^1.0",
         "php-http/message": "^1.0",
         "php-http/curl-client": "^1.7"
diff --git a/src/Provider/TomTom/composer.json b/src/Provider/TomTom/composer.json
@@ -17,7 +17,7 @@
         "willdurand/geocoder": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "geocoder-php/provider-integration-tests": "^1.0",
         "php-http/message": "^1.0",
         "php-http/curl-client": "^1.7"
diff --git a/src/Provider/Yandex/composer.json b/src/Provider/Yandex/composer.json
@@ -17,7 +17,7 @@
         "geocoder-php/common-http": "^4.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "6.3.*",
+        "phpunit/phpunit": "^6.5 || ^7.5",
         "geocoder-php/provider-integration-tests": "^1.0",
         "php-http/message": "^1.0",
         "php-http/curl-client": "^1.7"
