Skip to content
Permalink
Browse files

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

* Make sure we dont include multiple vendor folders

* Require discovery 1.6
  • Loading branch information...
Nyholm committed Feb 6, 2019
1 parent c3ed5f1 commit 80da39e5b4049e00540564fdfe8c2ac94383b86c
@@ -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",
15 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';
@@ -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"
},
@@ -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",
@@ -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": {
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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": {
@@ -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"
@@ -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"
@@ -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": {
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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",
@@ -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": {
@@ -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"
@@ -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"
},
@@ -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": {
@@ -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"
@@ -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"
@@ -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"

0 comments on commit 80da39e

Please sign in to comment.
You can’t perform that action at this time.