Implement httplug #487
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,3 +3,4 @@ composer.lock | |
| composer.phar | ||
| phpunit.xml | ||
| php-cs-fixer.phar | ||
| .puli/ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,164 @@ | ||
| { | ||
| "version": "1.0", | ||
| "name": "willdurand/geocoder", | ||
| "config": { | ||
| "bootstrap-file": "vendor/autoload.php" | ||
| }, | ||
| "packages": { | ||
| "clue/stream-filter": { | ||
| "install-path": "vendor/clue/stream-filter", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "geoip2/geoip2": { | ||
| "install-path": "vendor/geoip2/geoip2", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "guzzlehttp/guzzle": { | ||
| "install-path": "vendor/guzzlehttp/guzzle", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "guzzlehttp/promises": { | ||
| "install-path": "vendor/guzzlehttp/promises", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "guzzlehttp/psr7": { | ||
| "install-path": "vendor/guzzlehttp/psr7", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "igorw/get-in": { | ||
| "install-path": "vendor/igorw/get-in", | ||
| "installer": "composer" | ||
| }, | ||
| "justinrainbow/json-schema": { | ||
| "install-path": "vendor/justinrainbow/json-schema", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "maxmind-db/reader": { | ||
| "install-path": "vendor/maxmind-db/reader", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "maxmind/web-service-common": { | ||
| "install-path": "vendor/maxmind/web-service-common", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "php-http/client-common": { | ||
| "install-path": "vendor/php-http/client-common", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "php-http/discovery": { | ||
| "install-path": "vendor/php-http/discovery", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "php-http/guzzle6-adapter": { | ||
| "install-path": "vendor/php-http/guzzle6-adapter", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "php-http/httplug": { | ||
| "install-path": "vendor/php-http/httplug", | ||
| "installer": "composer" | ||
| }, | ||
| "php-http/message": { | ||
| "install-path": "vendor/php-http/message", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "php-http/message-factory": { | ||
| "install-path": "vendor/php-http/message-factory", | ||
| "installer": "composer" | ||
| }, | ||
| "php-http/mock-client": { | ||
| "install-path": "vendor/php-http/mock-client", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "php-http/promise": { | ||
| "install-path": "vendor/php-http/promise", | ||
| "installer": "composer" | ||
| }, | ||
| "psr/http-message": { | ||
| "install-path": "vendor/psr/http-message", | ||
| "installer": "composer" | ||
| }, | ||
| "psr/log": { | ||
| "install-path": "vendor/psr/log", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "puli/composer-plugin": { | ||
| "install-path": "vendor/puli/composer-plugin", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "puli/discovery": { | ||
| "install-path": "vendor/puli/discovery", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "puli/repository": { | ||
| "install-path": "vendor/puli/repository", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "puli/url-generator": { | ||
| "install-path": "vendor/puli/url-generator", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "ramsey/uuid": { | ||
| "install-path": "vendor/ramsey/uuid", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "seld/jsonlint": { | ||
| "install-path": "vendor/seld/jsonlint", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "symfony/process": { | ||
| "install-path": "vendor/symfony/process", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "symfony/stopwatch": { | ||
| "install-path": "vendor/symfony/stopwatch", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "webmozart/assert": { | ||
| "install-path": "vendor/webmozart/assert", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "webmozart/expression": { | ||
| "install-path": "vendor/webmozart/expression", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "webmozart/glob": { | ||
| "install-path": "vendor/webmozart/glob", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "webmozart/json": { | ||
| "install-path": "vendor/webmozart/json", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "webmozart/path-util": { | ||
| "install-path": "vendor/webmozart/path-util", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,35 +10,44 @@ | |
|
|
||
| namespace Geocoder\Provider; | ||
|
|
||
| use Http\Message\MessageFactory; | ||
| use Http\Discovery\HttpClientDiscovery; | ||
| use Http\Discovery\MessageFactoryDiscovery; | ||
| use Http\Client\HttpClient; | ||
|
|
||
| /** | ||
| * @author William Durand <[email protected]> | ||
| */ | ||
| class AbstractHttpProvider extends AbstractProvider | ||
| { | ||
| /** | ||
| * @var HttpClient | ||
| */ | ||
| protected $client; | ||
|
|
||
| /** | ||
| * @var MessageFactory | ||
| */ | ||
| protected $messageFactory; | ||
|
|
||
| /** | ||
| * @param HttpClient $client An HTTP adapter | ||
| */ | ||
| public function __construct(HttpClient $client = null, MessageFactory $factory = null) | ||
| { | ||
| parent::__construct(); | ||
|
|
||
| $this->client = $client ?: HttpClientDiscovery::find(); | ||
| $this->messageFactory = $factory ?: MessageFactoryDiscovery::find(); | ||
|
There was a problem hiding this comment. Put these in the getters. This will allow us not to use puli discovery by using |
||
| } | ||
|
|
||
| /** | ||
| * Returns the HTTP adapter. | ||
| * | ||
| * @return HttpClient | ||
| */ | ||
| public function getHttpClient() | ||
|
There was a problem hiding this comment. Maybe add public setters and protected getters. Otherwise we have to modify the constructors of every provider. |
||
| { | ||
| return $this->client; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,7 @@ | |
|
|
||
| use Geocoder\Exception\NoResult; | ||
| use Geocoder\Exception\UnsupportedOperation; | ||
| use Http\Client\HttpClient; | ||
|
|
||
| /** | ||
| * @author ALKOUM Dorian <[email protected]> | ||
|
|
@@ -40,13 +40,13 @@ class ArcGISOnline extends AbstractHttpProvider implements Provider | |
| private $protocol; | ||
|
|
||
| /** | ||
| * @param HttpClient $client An HTTP adapter | ||
| * @param string $sourceCountry Country biasing (optional) | ||
| * @param bool $useSsl Whether to use an SSL connection (optional) | ||
| */ | ||
| public function __construct(HttpClient $client, $sourceCountry = null, $useSsl = false) | ||
| { | ||
| parent::__construct($client); | ||
|
|
||
| $this->sourceCountry = $sourceCountry; | ||
| $this->protocol = $useSsl ? 'https' : 'http'; | ||
|
|
@@ -167,8 +167,9 @@ private function buildQuery($query) | |
| */ | ||
| private function executeQuery($query) | ||
| { | ||
| $query = $this->buildQuery($query); | ||
| $request = $this->messageFactory->createRequest('GET', $query); | ||
|
There was a problem hiding this comment. Use $this->getHttpMessageFactory() here and on other providers. |
||
| $content = (string) $this->getHttpClient()->sendRequest($request)->getBody(); | ||
|
|
||
| if (empty($content)) { | ||
| throw new NoResult(sprintf('Could not execute query "%s".', $query)); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,7 @@ | |
| use Geocoder\Exception\InvalidCredentials; | ||
| use Geocoder\Exception\NoResult; | ||
| use Geocoder\Exception\UnsupportedOperation; | ||
| use Http\Client\HttpClient; | ||
|
|
||
| /** | ||
| * @author David Guyon <[email protected]> | ||
|
|
@@ -38,13 +38,13 @@ class BingMaps extends AbstractHttpProvider implements LocaleAwareProvider | |
| private $apiKey; | ||
|
|
||
| /** | ||
| * @param HttpClient $client An HTTP adapter | ||
| * @param string $apiKey An API key | ||
| * @param string $locale A locale (optional) | ||
| */ | ||
| public function __construct(HttpClient $client, $apiKey, $locale = null) | ||
| { | ||
| parent::__construct($client); | ||
|
|
||
| $this->apiKey = $apiKey; | ||
| $this->locale = $locale; | ||
|
|
@@ -100,7 +100,8 @@ private function executeQuery($query) | |
| $query = sprintf('%s&culture=%s', $query, str_replace('_', '-', $this->getLocale())); | ||
| } | ||
|
|
||
| $request = $this->messageFactory->createRequest('GET', $query); | ||
| $content = (string) $this->getHttpClient()->sendRequest($request)->getBody(); | ||
|
|
||
| if (empty($content)) { | ||
| throw new NoResult(sprintf('Could not execute query "%s".', $query)); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,7 +15,7 @@ | |
| use Geocoder\Exception\NoResult; | ||
| use Geocoder\Exception\QuotaExceeded; | ||
| use Geocoder\Exception\UnsupportedOperation; | ||
| use Http\Client\HttpClient; | ||
|
|
||
| /** | ||
| * @author Andrea Cristaudo <[email protected]> | ||
|
|
@@ -50,12 +50,12 @@ class GeoIPs extends AbstractHttpProvider implements Provider | |
| private $apiKey; | ||
|
|
||
| /** | ||
| * @param HttpClient $client An HTTP adapter | ||
| * @param string $apiKey An API key | ||
| */ | ||
| public function __construct(HttpClient $client, $apiKey) | ||
| { | ||
| parent::__construct($client); | ||
|
|
||
| $this->apiKey = $apiKey; | ||
| } | ||
|
|
@@ -107,7 +107,8 @@ public function getName() | |
| */ | ||
| private function executeQuery($query) | ||
| { | ||
| $request = $this->messageFactory->createRequest('GET', $query); | ||
| $content = (string) $this->getHttpClient()->sendRequest($request)->getBody(); | ||
|
|
||
| if (empty($content)) { | ||
| throw new NoResult(sprintf('Invalid response from GeoIPs API for query "%s".', $query)); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Use "php-http/discovery": "^0.8.0" and put that in require.