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 |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| <?php | ||
|
|
||
| namespace Puli; | ||
|
|
||
| use Puli\Discovery\Api\Discovery; | ||
| use Puli\Discovery\Binding\Initializer\ResourceBindingInitializer; | ||
| use Puli\Discovery\KeyValueStoreDiscovery; | ||
| use Puli\Manager\Api\Server\ServerCollection; | ||
| use Puli\Repository\Api\ResourceRepository; | ||
| use Puli\Repository\PathMappingRepository; | ||
| use Puli\UrlGenerator\Api\UrlGenerator; | ||
| use Puli\UrlGenerator\DiscoveryUrlGenerator; | ||
| use RuntimeException; | ||
| use Webmozart\KeyValueStore\JsonFileStore; | ||
|
|
||
| /** | ||
| * Creates Puli's core services. | ||
| * | ||
| * This class was auto-generated by Puli. | ||
| * | ||
| * IMPORTANT: Before modifying the code below, set the "factory.auto-generate" | ||
| * configuration key to false: | ||
| * | ||
| * $ puli config factory.auto-generate false | ||
| * | ||
| * Otherwise any modifications will be overwritten! | ||
| */ | ||
| class GeneratedPuliFactory | ||
| { | ||
| /** | ||
| * Creates the resource repository. | ||
| * | ||
| * @return ResourceRepository The created resource repository. | ||
| */ | ||
| public function createRepository() | ||
| { | ||
| if (!interface_exists('Puli\Repository\Api\ResourceRepository')) { | ||
| throw new RuntimeException('Please install puli/repository to create ResourceRepository instances.'); | ||
| } | ||
|
|
||
| $store = new JsonFileStore(__DIR__.'/path-mappings.json', true); | ||
| $repo = new PathMappingRepository($store, __DIR__.'/..'); | ||
|
|
||
| return $repo; | ||
| } | ||
|
|
||
| /** | ||
| * Creates the resource discovery. | ||
| * | ||
| * @param ResourceRepository $repo The resource repository to read from. | ||
| * | ||
| * @return Discovery The created discovery. | ||
| */ | ||
| public function createDiscovery(ResourceRepository $repo) | ||
| { | ||
| if (!interface_exists('Puli\Discovery\Api\Discovery')) { | ||
| throw new RuntimeException('Please install puli/discovery to create Discovery instances.'); | ||
| } | ||
|
|
||
| $store = new JsonFileStore(__DIR__.'/bindings.json', true); | ||
| $discovery = new KeyValueStoreDiscovery($store, array( | ||
| new ResourceBindingInitializer($repo), | ||
| )); | ||
|
|
||
| return $discovery; | ||
| } | ||
|
|
||
| /** | ||
| * Creates the URL generator. | ||
| * | ||
| * @param Discovery $discovery The discovery to read from. | ||
| * | ||
| * @return UrlGenerator The created URL generator. | ||
| */ | ||
| public function createUrlGenerator(Discovery $discovery) | ||
| { | ||
| if (!interface_exists('Puli\UrlGenerator\Api\UrlGenerator')) { | ||
| throw new RuntimeException('Please install puli/url-generator to create UrlGenerator instances.'); | ||
| } | ||
|
|
||
| $generator = new DiscoveryUrlGenerator($discovery, array()); | ||
|
|
||
| return $generator; | ||
| } | ||
| } |
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,216 @@ | ||
| { | ||
| "version": "1.0", | ||
| "name": "willdurand/geocoder", | ||
| "config": { | ||
| "bootstrap-file": "vendor/autoload.php" | ||
| }, | ||
| "packages": { | ||
| "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" | ||
| }, | ||
| "padraic/humbug_get_contents": { | ||
| "install-path": "vendor/padraic/humbug_get_contents", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "padraic/phar-updater": { | ||
| "install-path": "vendor/padraic/phar-updater", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "php-http/client-common": { | ||
| "install-path": "vendor/php-http/client-common", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "php-http/curl-client": { | ||
| "install-path": "vendor/php-http/curl-client", | ||
| "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", | ||
| "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", | ||
| "env": "dev" | ||
| }, | ||
| "psr/http-message": { | ||
| "install-path": "vendor/psr/http-message", | ||
| "installer": "composer" | ||
| }, | ||
| "psr/log": { | ||
| "install-path": "vendor/psr/log", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "puli/cli": { | ||
| "install-path": "vendor/puli/cli", | ||
| "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/manager": { | ||
| "install-path": "vendor/puli/manager", | ||
| "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/console": { | ||
| "install-path": "vendor/symfony/console", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "symfony/event-dispatcher": { | ||
| "install-path": "vendor/symfony/event-dispatcher", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "symfony/filesystem": { | ||
| "install-path": "vendor/symfony/filesystem", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "symfony/polyfill-mbstring": { | ||
| "install-path": "vendor/symfony/polyfill-mbstring", | ||
| "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/console": { | ||
| "install-path": "vendor/webmozart/console", | ||
| "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/key-value-store": { | ||
| "install-path": "vendor/webmozart/key-value-store", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "webmozart/path-util": { | ||
| "install-path": "vendor/webmozart/path-util", | ||
| "installer": "composer", | ||
| "env": "dev" | ||
| }, | ||
| "zendframework/zend-diactoros": { | ||
| "install-path": "vendor/zendframework/zend-diactoros", | ||
| "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,39 @@ | |
|
|
||
| namespace Geocoder\Provider; | ||
|
|
||
| use Http\Client\HttpClient; | ||
| use Http\Message\MessageFactory; | ||
| use Http\Discovery\HttpClientDiscovery; | ||
| use Http\Discovery\MessageFactoryDiscovery; | ||
|
|
||
| /** | ||
| * @author William Durand <[email protected]> | ||
| */ | ||
| class AbstractHttpProvider extends AbstractProvider | ||
| { | ||
| /** | ||
| * @var HttpClient | ||
| */ | ||
| private $client; | ||
|
|
||
| /** | ||
| * @param HttpClient $client An HTTP adapter | ||
| */ | ||
| public function __construct(HttpClient $client = null, MessageFactory $factory = null) | ||
| { | ||
| parent::__construct(); | ||
|
|
||
| $this->client = $client ?: HttpClientDiscovery::find(); | ||
| $this->factory = $factory ?: MessageFactoryDiscovery::find(); | ||
|
There was a problem hiding this comment. One of the way we have done this for not having discovery, is to put discovery in suggest package then on the constructor we check the existence of the DiscoveryClass, if it has not been found we throw a \LogicException with a specific error which will be in our documentation for easy googling on that, here is an example : if (null === $responseFactory && !class_exists('\Http\Discovery\MessageFactoryDiscovery')) {
throw new \LogicException('No response factory provided and no discovery service is present to guess it, maybe you need to install php-http/discovery package?');
}There was a problem hiding this comment. I'm not sure about the discovery service at all, it brings many problems and puli as new dependency. Maybe we should wait for a stable release of the discovery service. |
||
| } | ||
|
|
||
| /** | ||
| * 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; | ||
| } | ||
| } | ||
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.
I think it miss the require on php-httplug, even if it's included by the client implementation, its the direct package that it is linked too.