namespace Wallabag\CoreBundle\Helper;
-use Graby\Ring\Client\SafeCurlHandler;
-use GuzzleHttp\Client;
+use GuzzleHttp\Client as GuzzleClient;
use GuzzleHttp\Cookie\CookieJar;
use GuzzleHttp\Event\SubscriberInterface;
+use Http\Adapter\Guzzle5\Client as GuzzleAdapter;
+use Psr\Log\LoggerInterface;
+use Http\Client\HttpClient;
+use Http\HttplugBundle\ClientFactory\ClientFactory;
/**
- * Builds and configures the Guzzle HTTP client.
+ * Builds and configures the HTTP client.
*/
-class HttpClientFactory
+class HttpClientFactory implements ClientFactory
{
- /** @var \GuzzleHttp\Event\SubscriberInterface */
- private $authenticatorSubscriber;
+ /** @var [\GuzzleHttp\Event\SubscriberInterface] */
+ private $subscribers = [];
/** @var \GuzzleHttp\Cookie\CookieJar */
private $cookieJar;
private $restrictedAccess;
+ private $logger;
/**
* HttpClientFactory constructor.
*
- * @param \GuzzleHttp\Event\SubscriberInterface $authenticatorSubscriber
- * @param \GuzzleHttp\Cookie\CookieJar $cookieJar
- * @param string $restrictedAccess
+ * @param \GuzzleHttp\Cookie\CookieJar $cookieJar
+ * @param string $restrictedAccess This param is a kind of boolean. Values: 0 or 1
+ * @param LoggerInterface $logger
*/
- public function __construct(SubscriberInterface $authenticatorSubscriber, CookieJar $cookieJar, $restrictedAccess)
+ public function __construct(CookieJar $cookieJar, $restrictedAccess, LoggerInterface $logger)
{
- $this->authenticatorSubscriber = $authenticatorSubscriber;
$this->cookieJar = $cookieJar;
$this->restrictedAccess = $restrictedAccess;
+ $this->logger = $logger;
}
/**
- * @return \GuzzleHttp\Client|null
+ * Adds a subscriber to the HTTP client.
+ *
+ * @param SubscriberInterface $subscriber
+ */
+ public function addSubscriber(SubscriberInterface $subscriber)
+ {
+ $this->subscribers[] = $subscriber;
+ }
+
+ /**
+ * Input an array of configuration to be able to create a HttpClient.
+ *
+ * @param array $config
+ *
+ * @return HttpClient
*/
- public function buildHttpClient()
+ public function createClient(array $config = [])
{
+ $this->logger->log('debug', 'Restricted access config enabled?', ['enabled' => (int) $this->restrictedAccess]);
+
if (0 === (int) $this->restrictedAccess) {
- return null;
+ return new GuzzleAdapter(new GuzzleClient($config));
}
// we clear the cookie to avoid websites who use cookies for analytics
$this->cookieJar->clear();
- // need to set the (shared) cookie jar
- $client = new Client(['handler' => new SafeCurlHandler(), 'defaults' => ['cookies' => $this->cookieJar]]);
- $client->getEmitter()->attach($this->authenticatorSubscriber);
+ if (!isset($config['defaults']['cookies'])) {
+ // need to set the (shared) cookie jar
+ $config['defaults']['cookies'] = $this->cookieJar;
+ }
+
+ $guzzle = new GuzzleClient($config);
+ foreach ($this->subscribers as $subscriber) {
+ $guzzle->getEmitter()->attach($subscriber);
+ }
- return $client;
+ return new GuzzleAdapter($guzzle);
}
}