Skip to content

Commit

Permalink
Remove nyholm/psr7 from require-dev (#928)
Browse files Browse the repository at this point in the history 
* Remove nyholm/psr7 from require-dev

* cs
  • Loading branch information
@Nyholm
Nyholm committed Jan 5, 2019
1 parent be6de42 commit 8f53187
Show file tree
Hide file tree
Showing 31 changed files with 29 additions and 60 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ env:
matrix: matrix:
fast_finish: true fast_finish: true
include: include:
- php: 7.0 - php: 7.2
env: deps="low" env: deps="low"
- php: 7.1 - php: 7.2
env: deps="high" env: deps="high"
- php: 7.0 - php: 7.0
- php: 7.1 - php: 7.1
Expand Down
2 changes: 1 addition & 1 deletion src/Common/.travis.yml
View file
Original file line number Original file line Diff line number Diff line change
@@ -1,7 +1,7 @@
language: php language: php
sudo: false sudo: false


php: 7.0 php: 7.2


install: install:
- composer update --prefer-stable --prefer-dist - composer update --prefer-stable --prefer-dist
Expand Down
2 changes: 1 addition & 1 deletion src/Http/.travis.yml
View file
Original file line number Original file line Diff line number Diff line change
@@ -1,7 +1,7 @@
language: php language: php
sudo: false sudo: false


php: 7.0 php: 7.2


install: install:
- composer update --prefer-stable --prefer-dist - composer update --prefer-stable --prefer-dist
Expand Down
6 changes: 0 additions & 6 deletions src/Http/Tests/Provider/AbstractHttpProviderTest.php
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -18,17 +18,11 @@
use Geocoder\Query\GeocodeQuery; use Geocoder\Query\GeocodeQuery;
use Geocoder\Query\ReverseQuery; use Geocoder\Query\ReverseQuery;
use Http\Client\HttpClient; use Http\Client\HttpClient;
use Http\Discovery\ClassDiscovery;
use Http\Mock\Client; use Http\Mock\Client;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;


class AbstractHttpProviderTest extends TestCase class AbstractHttpProviderTest extends TestCase
{ {
public static function setUpBeforeClass()
{
ClassDiscovery::prependStrategy('\Nyholm\Psr7\Httplug\DiscoveryStrategy');
}

public function testHttpClientGetter() public function testHttpClientGetter()
{ {
$client = $this->getMockBuilder(Client::class)->disableOriginalConstructor()->getMock(); $client = $this->getMockBuilder(Client::class)->disableOriginalConstructor()->getMock();
Expand Down
2 changes: 1 addition & 1 deletion src/Http/composer.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"symfony/stopwatch": "~2.5", "symfony/stopwatch": "~2.5",
"php-http/message": "^1.0", "php-http/message": "^1.0",
"php-http/mock-client": "^1.0", "php-http/mock-client": "^1.0",
"nyholm/psr7": "^0.2.2" "nyholm/psr7": "^1.0"
}, },
"autoload": { "autoload": {
"psr-4": { "Geocoder\\Http\\": "" }, "psr-4": { "Geocoder\\Http\\": "" },
Expand Down
2 changes: 1 addition & 1 deletion src/Plugin/.travis.yml
View file
Original file line number Original file line Diff line number Diff line change
@@ -1,7 +1,7 @@
language: php language: php
sudo: false sudo: false


php: 7.0 php: 7.2


install: install:
- composer update --prefer-stable --prefer-dist - composer update --prefer-stable --prefer-dist
Expand Down
3 changes: 1 addition & 2 deletions src/Provider/AlgoliaPlaces/composer.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
"phpunit/phpunit": "6.3.*", "phpunit/phpunit": "6.3.*",
"geocoder-php/provider-integration-tests": "^1.1", "geocoder-php/provider-integration-tests": "^1.1",
"php-http/message": "^1.0", "php-http/message": "^1.0",
"php-http/curl-client": "^1.7", "php-http/curl-client": "^1.7"
"nyholm/psr7": "^0.2.2"
}, },
"provide": { "provide": {
"geocoder-php/provider-implementation": "1.0" "geocoder-php/provider-implementation": "1.0"
Expand Down
3 changes: 1 addition & 2 deletions src/Provider/ArcGISOnline/composer.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
"phpunit/phpunit": "6.3.*", "phpunit/phpunit": "6.3.*",
"geocoder-php/provider-integration-tests": "^1.0", "geocoder-php/provider-integration-tests": "^1.0",
"php-http/message": "^1.0", "php-http/message": "^1.0",
"php-http/curl-client": "^1.7", "php-http/curl-client": "^1.7"
"nyholm/psr7": "^0.2.2"
}, },
"provide": { "provide": {
"geocoder-php/provider-implementation": "1.0" "geocoder-php/provider-implementation": "1.0"
Expand Down
3 changes: 1 addition & 2 deletions src/Provider/BingMaps/composer.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
"phpunit/phpunit": "6.3.*", "phpunit/phpunit": "6.3.*",
"geocoder-php/provider-integration-tests": "^1.0", "geocoder-php/provider-integration-tests": "^1.0",
"php-http/message": "^1.0", "php-http/message": "^1.0",
"php-http/curl-client": "^1.7", "php-http/curl-client": "^1.7"
"nyholm/psr7": "^0.2.2"
}, },
"provide": { "provide": {
"geocoder-php/provider-implementation": "1.0" "geocoder-php/provider-implementation": "1.0"
Expand Down
1 change: 0 additions & 1 deletion src/Provider/Chain/composer.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"phpunit/phpunit": "6.3.*", "phpunit/phpunit": "6.3.*",
"php-http/message": "^1.0", "php-http/message": "^1.0",
"php-http/curl-client": "^1.7", "php-http/curl-client": "^1.7",
"nyholm/psr7": "^0.2.2",
"nyholm/nsa": "^1.1" "nyholm/nsa": "^1.1"
}, },
"provide": { "provide": {
Expand Down
3 changes: 1 addition & 2 deletions src/Provider/FreeGeoIp/composer.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
"phpunit/phpunit": "6.3.*", "phpunit/phpunit": "6.3.*",
"geocoder-php/provider-integration-tests": "^1.0", "geocoder-php/provider-integration-tests": "^1.0",
"php-http/message": "^1.0", "php-http/message": "^1.0",
"php-http/curl-client": "^1.7", "php-http/curl-client": "^1.7"
"nyholm/psr7": "^0.2.2"
}, },
"provide": { "provide": {
"geocoder-php/provider-implementation": "1.0" "geocoder-php/provider-implementation": "1.0"
Expand Down
3 changes: 1 addition & 2 deletions src/Provider/GeoIPs/composer.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
"phpunit/phpunit": "6.3.*", "phpunit/phpunit": "6.3.*",
"geocoder-php/provider-integration-tests": "^1.0", "geocoder-php/provider-integration-tests": "^1.0",
"php-http/message": "^1.0", "php-http/message": "^1.0",
"php-http/curl-client": "^1.7", "php-http/curl-client": "^1.7"
"nyholm/psr7": "^0.2.2"
}, },
"provide": { "provide": {
"geocoder-php/provider-implementation": "1.0" "geocoder-php/provider-implementation": "1.0"
Expand Down
3 changes: 1 addition & 2 deletions src/Provider/GeoPlugin/composer.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
"phpunit/phpunit": "6.3.*", "phpunit/phpunit": "6.3.*",
"geocoder-php/provider-integration-tests": "^1.0", "geocoder-php/provider-integration-tests": "^1.0",
"php-http/message": "^1.0", "php-http/message": "^1.0",
"php-http/curl-client": "^1.7", "php-http/curl-client": "^1.7"
"nyholm/psr7": "^0.2.2"
}, },
"provide": { "provide": {
"geocoder-php/provider-implementation": "1.0" "geocoder-php/provider-implementation": "1.0"
Expand Down
3 changes: 1 addition & 2 deletions src/Provider/Geonames/composer.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
"phpunit/phpunit": "6.3.*", "phpunit/phpunit": "6.3.*",
"geocoder-php/provider-integration-tests": "^1.0", "geocoder-php/provider-integration-tests": "^1.0",
"php-http/message": "^1.0", "php-http/message": "^1.0",
"php-http/curl-client": "^1.7", "php-http/curl-client": "^1.7"
"nyholm/psr7": "^0.2.2"
}, },
"provide": { "provide": {
"geocoder-php/provider-implementation": "1.0" "geocoder-php/provider-implementation": "1.0"
Expand Down
3 changes: 1 addition & 2 deletions src/Provider/GoogleMaps/composer.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
"phpunit/phpunit": "6.3.*", "phpunit/phpunit": "6.3.*",
"geocoder-php/provider-integration-tests": "^1.0", "geocoder-php/provider-integration-tests": "^1.0",
"php-http/message": "^1.0", "php-http/message": "^1.0",
"php-http/curl-client": "^1.7", "php-http/curl-client": "^1.7"
"nyholm/psr7": "^0.2.2"
}, },
"provide": { "provide": {
"geocoder-php/provider-implementation": "1.0" "geocoder-php/provider-implementation": "1.0"
Expand Down
3 changes: 1 addition & 2 deletions src/Provider/Here/composer.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
"phpunit/phpunit": "6.3.*", "phpunit/phpunit": "6.3.*",
"geocoder-php/provider-integration-tests": "^1.1", "geocoder-php/provider-integration-tests": "^1.1",
"php-http/message": "^1.0", "php-http/message": "^1.0",
"php-http/curl-client": "^1.7", "php-http/curl-client": "^1.7"
"nyholm/psr7": "^0.2.2"
}, },
"provide": { "provide": {
"geocoder-php/provider-implementation": "1.0" "geocoder-php/provider-implementation": "1.0"
Expand Down
3 changes: 1 addition & 2 deletions src/Provider/HostIp/composer.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
"phpunit/phpunit": "6.3.*", "phpunit/phpunit": "6.3.*",
"geocoder-php/provider-integration-tests": "^1.0", "geocoder-php/provider-integration-tests": "^1.0",
"php-http/message": "^1.0", "php-http/message": "^1.0",
"php-http/curl-client": "^1.7", "php-http/curl-client": "^1.7"
"nyholm/psr7": "^0.2.2"
}, },
"provide": { "provide": {
"geocoder-php/provider-implementation": "1.0" "geocoder-php/provider-implementation": "1.0"
Expand Down
3 changes: 1 addition & 2 deletions src/Provider/IpInfo/composer.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
"phpunit/phpunit": "6.3.*", "phpunit/phpunit": "6.3.*",
"geocoder-php/provider-integration-tests": "^1.0", "geocoder-php/provider-integration-tests": "^1.0",
"php-http/message": "^1.0", "php-http/message": "^1.0",
"php-http/curl-client": "^1.7", "php-http/curl-client": "^1.7"
"nyholm/psr7": "^0.2.2"
}, },
"provide": { "provide": {
"geocoder-php/provider-implementation": "1.0" "geocoder-php/provider-implementation": "1.0"
Expand Down
3 changes: 1 addition & 2 deletions src/Provider/IpInfoDb/composer.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
"phpunit/phpunit": "6.3.*", "phpunit/phpunit": "6.3.*",
"geocoder-php/provider-integration-tests": "^1.0", "geocoder-php/provider-integration-tests": "^1.0",
"php-http/message": "^1.0", "php-http/message": "^1.0",
"php-http/curl-client": "^1.7", "php-http/curl-client": "^1.7"
"nyholm/psr7": "^0.2.2"
}, },
"provide": { "provide": {
"geocoder-php/provider-implementation": "1.0" "geocoder-php/provider-implementation": "1.0"
Expand Down
3 changes: 1 addition & 2 deletions src/Provider/Ipstack/composer.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
"phpunit/phpunit": "6.3.*", "phpunit/phpunit": "6.3.*",
"geocoder-php/provider-integration-tests": "^1.0", "geocoder-php/provider-integration-tests": "^1.0",
"php-http/message": "^1.0", "php-http/message": "^1.0",
"php-http/curl-client": "^1.7", "php-http/curl-client": "^1.7"
"nyholm/psr7": "^0.2.2"
}, },
"provide": { "provide": {
"geocoder-php/provider-implementation": "1.0" "geocoder-php/provider-implementation": "1.0"
Expand Down
3 changes: 1 addition & 2 deletions src/Provider/LocationIQ/composer.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
"phpunit/phpunit": "6.3.*", "phpunit/phpunit": "6.3.*",
"geocoder-php/provider-integration-tests": "^1.0", "geocoder-php/provider-integration-tests": "^1.0",
"php-http/message": "^1.0", "php-http/message": "^1.0",
"php-http/curl-client": "^1.7", "php-http/curl-client": "^1.7"
"nyholm/psr7": "^0.2.2"
}, },
"provide": { "provide": {
"geocoder-php/provider-implementation": "1.0" "geocoder-php/provider-implementation": "1.0"
Expand Down
3 changes: 1 addition & 2 deletions src/Provider/MapQuest/composer.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
"phpunit/phpunit": "6.3.*", "phpunit/phpunit": "6.3.*",
"geocoder-php/provider-integration-tests": "^1.1", "geocoder-php/provider-integration-tests": "^1.1",
"php-http/message": "^1.0", "php-http/message": "^1.0",
"php-http/curl-client": "^1.7", "php-http/curl-client": "^1.7"
"nyholm/psr7": "^0.2.2"
}, },
"provide": { "provide": {
"geocoder-php/provider-implementation": "1.0" "geocoder-php/provider-implementation": "1.0"
Expand Down
3 changes: 1 addition & 2 deletions src/Provider/Mapbox/composer.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
"phpunit/phpunit": "6.3.*", "phpunit/phpunit": "6.3.*",
"geocoder-php/provider-integration-tests": "^1.0", "geocoder-php/provider-integration-tests": "^1.0",
"php-http/message": "^1.0", "php-http/message": "^1.0",
"php-http/curl-client": "^1.7", "php-http/curl-client": "^1.7"
"nyholm/psr7": "^0.2.2"
}, },
"provide": { "provide": {
"geocoder-php/provider-implementation": "1.0" "geocoder-php/provider-implementation": "1.0"
Expand Down
3 changes: 1 addition & 2 deletions src/Provider/Mapzen/composer.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
"phpunit/phpunit": "6.3.*", "phpunit/phpunit": "6.3.*",
"geocoder-php/provider-integration-tests": "^1.0", "geocoder-php/provider-integration-tests": "^1.0",
"php-http/message": "^1.0", "php-http/message": "^1.0",
"php-http/curl-client": "^1.7", "php-http/curl-client": "^1.7"
"nyholm/psr7": "^0.2.2"
}, },
"provide": { "provide": {
"geocoder-php/provider-implementation": "1.0" "geocoder-php/provider-implementation": "1.0"
Expand Down
3 changes: 1 addition & 2 deletions src/Provider/MaxMind/composer.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
"geocoder-php/common-http": "^4.0", "geocoder-php/common-http": "^4.0",
"geocoder-php/provider-integration-tests": "^1.0", "geocoder-php/provider-integration-tests": "^1.0",
"php-http/message": "^1.0", "php-http/message": "^1.0",
"php-http/curl-client": "^1.7", "php-http/curl-client": "^1.7"
"nyholm/psr7": "^0.2.2"
}, },
"provide": { "provide": {
"geocoder-php/provider-implementation": "1.0" "geocoder-php/provider-implementation": "1.0"
Expand Down
3 changes: 1 addition & 2 deletions src/Provider/Nominatim/composer.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
"phpunit/phpunit": "6.3.*", "phpunit/phpunit": "6.3.*",
"geocoder-php/provider-integration-tests": "^1.0", "geocoder-php/provider-integration-tests": "^1.0",
"php-http/message": "^1.0", "php-http/message": "^1.0",
"php-http/curl-client": "^1.7", "php-http/curl-client": "^1.7"
"nyholm/psr7": "^0.2.2"
}, },
"provide": { "provide": {
"geocoder-php/provider-implementation": "1.0" "geocoder-php/provider-implementation": "1.0"
Expand Down
3 changes: 1 addition & 2 deletions src/Provider/OpenCage/composer.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
"phpunit/phpunit": "6.3.*", "phpunit/phpunit": "6.3.*",
"geocoder-php/provider-integration-tests": "^1.0", "geocoder-php/provider-integration-tests": "^1.0",
"php-http/message": "^1.0", "php-http/message": "^1.0",
"php-http/curl-client": "^1.7", "php-http/curl-client": "^1.7"
"nyholm/psr7": "^0.2.2"
}, },
"provide": { "provide": {
"geocoder-php/provider-implementation": "1.0" "geocoder-php/provider-implementation": "1.0"
Expand Down
1 change: 0 additions & 1 deletion src/Provider/Photon/composer.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
}, },
"require-dev": { "require-dev": {
"geocoder-php/provider-integration-tests": "^1.0", "geocoder-php/provider-integration-tests": "^1.0",
"nyholm/psr7": "^1.0",
"php-http/curl-client": "^1.7", "php-http/curl-client": "^1.7",
"php-http/message": "^1.0", "php-http/message": "^1.0",
"phpunit/phpunit": "6.3.*" "phpunit/phpunit": "6.3.*"
Expand Down
3 changes: 1 addition & 2 deletions src/Provider/PickPoint/composer.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
"phpunit/phpunit": "6.3.*", "phpunit/phpunit": "6.3.*",
"geocoder-php/provider-integration-tests": "^1.0", "geocoder-php/provider-integration-tests": "^1.0",
"php-http/message": "^1.0", "php-http/message": "^1.0",
"php-http/curl-client": "^1.7", "php-http/curl-client": "^1.7"
"nyholm/psr7": "^0.2.2"
}, },
"provide": { "provide": {
"geocoder-php/provider-implementation": "1.0" "geocoder-php/provider-implementation": "1.0"
Expand Down
3 changes: 1 addition & 2 deletions src/Provider/TomTom/composer.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
"phpunit/phpunit": "6.3.*", "phpunit/phpunit": "6.3.*",
"geocoder-php/provider-integration-tests": "^1.0", "geocoder-php/provider-integration-tests": "^1.0",
"php-http/message": "^1.0", "php-http/message": "^1.0",
"php-http/curl-client": "^1.7", "php-http/curl-client": "^1.7"
"nyholm/psr7": "^0.2.2"
}, },
"provide": { "provide": {
"geocoder-php/provider-implementation": "1.0" "geocoder-php/provider-implementation": "1.0"
Expand Down
3 changes: 1 addition & 2 deletions src/Provider/Yandex/composer.json
View file
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
"phpunit/phpunit": "6.3.*", "phpunit/phpunit": "6.3.*",
"geocoder-php/provider-integration-tests": "^1.0", "geocoder-php/provider-integration-tests": "^1.0",
"php-http/message": "^1.0", "php-http/message": "^1.0",
"php-http/curl-client": "^1.7", "php-http/curl-client": "^1.7"
"nyholm/psr7": "^0.2.2"
}, },
"provide": { "provide": {
"geocoder-php/provider-implementation": "1.0" "geocoder-php/provider-implementation": "1.0"
Expand Down

0 comments on commit 8f53187

Please sign in to comment.