mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-01-26 00:28:10 +00:00
Code Issues Projects Releases Wiki Activity

Improved Guzzle subscribers extensibility

Browse source 
Allows 3rd parties to register new guzzle subscribers by adding extra calls to the http_client_factory service.
This commit is contained in:
Bertrand Dunogier 2017-01-14 16:42:03 +01:00
parent cebed9c01f
commit 5b914b0422
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/Wallabag/CoreBundle/Helper/HttpClientFactory.php
View file

@ -13,8 +13,8 @@ use Psr\Log\LoggerInterface;
*/ */
class HttpClientFactory class HttpClientFactory
{ {
/** @var \GuzzleHttp\Event\SubscriberInterface */ /** @var [\GuzzleHttp\Event\SubscriberInterface] */
private $authenticatorSubscriber; private $subscribers = [];
/** @var \GuzzleHttp\Cookie\CookieJar */ /** @var \GuzzleHttp\Cookie\CookieJar */
private $cookieJar; private $cookieJar;
@ -25,14 +25,12 @@ class HttpClientFactory
/** /**
* HttpClientFactory constructor. * HttpClientFactory constructor.
* *
* @param \GuzzleHttp\Event\SubscriberInterface $authenticatorSubscriber * @param \GuzzleHttp\Cookie\CookieJar $cookieJar
* @param \GuzzleHttp\Cookie\CookieJar $cookieJar * @param string $restrictedAccess This param is a kind of boolean. Values: 0 or 1
* @param string $restrictedAccess this param is a kind of boolean. Values: 0 or 1
* @param LoggerInterface $logger * @param LoggerInterface $logger
*/ */
public function __construct(SubscriberInterface $authenticatorSubscriber, CookieJar $cookieJar, $restrictedAccess, LoggerInterface $logger) public function __construct(CookieJar $cookieJar, $restrictedAccess, LoggerInterface $logger)
{ {
$this->authenticatorSubscriber = $authenticatorSubscriber;
$this->cookieJar = $cookieJar; $this->cookieJar = $cookieJar;
$this->restrictedAccess = $restrictedAccess; $this->restrictedAccess = $restrictedAccess;
$this->logger = $logger; $this->logger = $logger;
@ -53,8 +51,20 @@ class HttpClientFactory
$this->cookieJar->clear(); $this->cookieJar->clear();
// need to set the (shared) cookie jar // need to set the (shared) cookie jar
$client = new Client(['handler' => new SafeCurlHandler(), 'defaults' => ['cookies' => $this->cookieJar]]); $client = new Client(['handler' => new SafeCurlHandler(), 'defaults' => ['cookies' => $this->cookieJar]]);
$client->getEmitter()->attach($this->authenticatorSubscriber); foreach ($this->subscribers as $subscriber) {
$client->getEmitter()->attach($subscriber);
}
return $client; return $client;
} }
/**
* Adds a subscriber to the HTTP client.
*
* @param SubscriberInterface $subscriber
*/
public function addSubscriber(SubscriberInterface $subscriber)
{
$this->subscribers[] = $subscriber;
}
} }

3
src/Wallabag/CoreBundle/Resources/config/services.yml
View file

@ -71,10 +71,11 @@ services:
wallabag_core.guzzle.http_client_factory: wallabag_core.guzzle.http_client_factory:
class: Wallabag\CoreBundle\Helper\HttpClientFactory class: Wallabag\CoreBundle\Helper\HttpClientFactory
arguments: arguments:
- "@bd_guzzle_site_authenticator.authenticator_subscriber"
- "@wallabag_core.guzzle.cookie_jar" - "@wallabag_core.guzzle.cookie_jar"
- '@=service(''craue_config'').get(''restricted_access'')' - '@=service(''craue_config'').get(''restricted_access'')'
- '@logger' - '@logger'
calls:
- ["addSubscriber", ["@bd_guzzle_site_authenticator.authenticator_subscriber"]]
wallabag_core.guzzle.cookie_jar: wallabag_core.guzzle.cookie_jar:
class: GuzzleHttp\Cookie\FileCookieJar class: GuzzleHttp\Cookie\FileCookieJar