new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
new BD\GuzzleSiteAuthenticatorBundle\BDGuzzleSiteAuthenticatorBundle(),
new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),
+ new Http\HttplugBundle\HttplugBundle(),
// wallabag bundles
new Wallabag\CoreBundle\WallabagCoreBundle(),
sensio_framework_extra:
router:
annotations: false
+
+httplug:
+ clients:
+ wallabag_core:
+ factory: 'wallabag_core.http_client_factory'
+ plugins: ['httplug.plugin.logger']
+ wallabag_core.entry.download_images:
+ factory: 'httplug.factory.auto'
+ plugins: ['httplug.plugin.logger']
+ wallabag_import.pocket.client:
+ factory: 'httplug.factory.auto'
+ plugins:
+ - 'httplug.plugin.logger'
+ - header_defaults:
+ headers:
+ 'content-type': 'application/json'
+ 'X-Accept': 'application/json'
+ discovery:
+ client: false
"simplepie/simplepie": "~1.5",
"willdurand/hateoas-bundle": "~1.3",
"liip/theme-bundle": "^1.4.6",
- "lexik/form-filter-bundle": "^5.0",
- "j0k3r/graby": "^1.0",
+ "lexik/form-filter-bundle": "^5.0.4",
+ "j0k3r/graby": "^2.0",
+ "php-http/guzzle5-adapter": "^2.0",
"friendsofsymfony/user-bundle": "2.0.*",
"friendsofsymfony/oauth-server-bundle": "^1.5",
"stof/doctrine-extensions-bundle": "^1.2",
"bdunogier/guzzle-site-authenticator": "^1.0.0",
"defuse/php-encryption": "^2.1",
"html2text/html2text": "^4.1",
- "pragmarx/recovery": "^0.1.0"
+ "pragmarx/recovery": "^0.1.0",
+ "php-http/httplug-bundle": "^1.14"
},
"require-dev": {
"doctrine/doctrine-fixtures-bundle": "~3.0",
"phpstan/phpstan": "^0.11.0",
"phpstan/phpstan-phpunit": "^0.11.0",
"phpstan/phpstan-symfony": "^0.11.0",
- "phpstan/phpstan-doctrine": "^0.11.0"
+ "phpstan/phpstan-doctrine": "^0.11.0",
+ "php-http/mock-client": "^1.0",
+ "guzzlehttp/psr7": "^1.0"
},
"suggest": {
"ext-imagick": "To keep GIF animation when downloading image is enabled"
namespace Wallabag\CoreBundle\Helper;
-use GuzzleHttp\Client;
-use GuzzleHttp\Message\Response;
+use Http\Client\Common\HttpMethodsClient;
+use Http\Client\Common\Plugin\ErrorPlugin;
+use Http\Client\Common\PluginClient;
+use Http\Client\HttpClient;
+use Http\Discovery\MessageFactoryDiscovery;
+use Http\Message\MessageFactory;
+use Psr\Http\Message\ResponseInterface;
use Psr\Log\LoggerInterface;
use Symfony\Component\DomCrawler\Crawler;
use Symfony\Component\Finder\Finder;
private $mimeGuesser;
private $wallabagUrl;
- public function __construct(Client $client, $baseFolder, $wallabagUrl, LoggerInterface $logger)
+ public function __construct(HttpClient $client, $baseFolder, $wallabagUrl, LoggerInterface $logger, MessageFactory $messageFactory = null)
{
- $this->client = $client;
+ $this->client = new HttpMethodsClient(new PluginClient($client, [new ErrorPlugin()]), $messageFactory ?: MessageFactoryDiscovery::find());
$this->baseFolder = $baseFolder;
$this->wallabagUrl = rtrim($wallabagUrl, '/');
$this->logger = $logger;
$localPath = $folderPath . '/' . $hashImage . '.' . $ext;
try {
- $im = imagecreatefromstring($res->getBody());
+ $im = imagecreatefromstring((string) $res->getBody());
} catch (\Exception $e) {
$im = false;
}
/**
* Retrieve and validate the extension from the response of the url of the image.
*
- * @param Response $res Guzzle Response
+ * @param ResponseInterface $res Http Response
* @param string $imagePath Path from the src image from the content (used for log only)
*
* @return string|false Extension name or false if validation failed
*/
- private function getExtensionFromResponse(Response $res, $imagePath)
+ private function getExtensionFromResponse(ResponseInterface $res, $imagePath)
{
- $ext = $this->mimeGuesser->guess($res->getHeader('content-type'));
+ $ext = $this->mimeGuesser->guess(current($res->getHeader('content-type')));
$this->logger->debug('DownloadImages: Checking extension', ['ext' => $ext, 'header' => $res->getHeader('content-type')]);
// ok header doesn't have the extension, try a different way
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 $subscribers = [];
}
/**
- * @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;
+ return new GuzzleAdapter(new GuzzleClient());
}
// 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]]);
-
+ $guzzle = new GuzzleClient(['defaults' => ['cookies' => $this->cookieJar]]);
foreach ($this->subscribers as $subscriber) {
- $client->getEmitter()->attach($subscriber);
+ $guzzle->getEmitter()->attach($subscriber);
}
- return $client;
- }
-
- /**
- * Adds a subscriber to the HTTP client.
- *
- * @param SubscriberInterface $subscriber
- */
- public function addSubscriber(SubscriberInterface $subscriber)
- {
- $this->subscribers[] = $subscriber;
+ return new GuzzleAdapter($guzzle);
}
}
-
error_message: '%wallabag_core.fetching_error_message%'
error_message_title: '%wallabag_core.fetching_error_message_title%'
- - "@wallabag_core.guzzle.http_client"
+ - "@wallabag_core.http_client"
- "@wallabag_core.graby.config_builder"
calls:
- [ setLogger, [ "@logger" ] ]
- {}
- "@logger"
- wallabag_core.guzzle.http_client:
- class: GuzzleHttp\ClientInterface
- factory: ["@wallabag_core.guzzle.http_client_factory", buildHttpClient]
+ wallabag_core.http_client:
+ alias: 'httplug.client.wallabag_core'
wallabag_core.guzzle_authenticator.config_builder:
class: Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder
bd_guzzle_site_authenticator.site_config_builder:
alias: wallabag_core.guzzle_authenticator.config_builder
- wallabag_core.guzzle.http_client_factory:
+ wallabag_core.http_client_factory:
class: Wallabag\CoreBundle\Helper\HttpClientFactory
arguments:
- "@wallabag_core.guzzle.cookie_jar"
- "@logger"
wallabag_core.entry.download_images.client:
- class: GuzzleHttp\Client
+ alias: 'httplug.client.wallabag_core.entry.download_images'
wallabag_core.helper.crypto_proxy:
class: Wallabag\CoreBundle\Helper\CryptoProxy
namespace Wallabag\ImportBundle\Import;
-use GuzzleHttp\Client;
-use GuzzleHttp\Exception\RequestException;
+use Http\Client\Common\HttpMethodsClient;
+use Http\Client\Common\Plugin\ErrorPlugin;
+use Http\Client\Common\PluginClient;
+use Http\Client\HttpClient;
+use Http\Discovery\MessageFactoryDiscovery;
+use Http\Message\MessageFactory;
+use Http\Client\Exception\RequestException;
use Wallabag\CoreBundle\Entity\Entry;
+use Psr\Http\Message\ResponseInterface;
class PocketImport extends AbstractImport
{
const NB_ELEMENTS = 5000;
+ /**
+ * @var HttpMethodsClient
+ */
private $client;
private $accessToken;
*/
public function getRequestToken($redirectUri)
{
- $request = $this->client->createRequest('POST', 'https://getpocket.com/v3/oauth/request',
- [
- 'body' => json_encode([
- 'consumer_key' => $this->user->getConfig()->getPocketConsumerKey(),
- 'redirect_uri' => $redirectUri,
- ]),
- ]
- );
-
try {
- $response = $this->client->send($request);
+ $response = $this->client->post('https://getpocket.com/v3/oauth/request', [], json_encode([
+ 'consumer_key' => $this->user->getConfig()->getPocketConsumerKey(),
+ 'redirect_uri' => $redirectUri,
+ ]));
} catch (RequestException $e) {
$this->logger->error(sprintf('PocketImport: Failed to request token: %s', $e->getMessage()), ['exception' => $e]);
return false;
}
- return $response->json()['code'];
+ return $this->jsonDecode($response)['code'];
}
/**
*/
public function authorize($code)
{
- $request = $this->client->createRequest('POST', 'https://getpocket.com/v3/oauth/authorize',
- [
- 'body' => json_encode([
- 'consumer_key' => $this->user->getConfig()->getPocketConsumerKey(),
- 'code' => $code,
- ]),
- ]
- );
try {
- $response = $this->client->send($request);
+ $response = $this->client->post('https://getpocket.com/v3/oauth/authorize', [], json_encode([
+ 'consumer_key' => $this->user->getConfig()->getPocketConsumerKey(),
+ 'code' => $code,
+ ]));
} catch (RequestException $e) {
$this->logger->error(sprintf('PocketImport: Failed to authorize client: %s', $e->getMessage()), ['exception' => $e]);
return false;
}
- $this->accessToken = $response->json()['access_token'];
+ $this->accessToken = $this->jsonDecode($response)['access_token'];
return true;
}
{
static $run = 0;
- $request = $this->client->createRequest('POST', 'https://getpocket.com/v3/get',
- [
- 'body' => json_encode([
- 'consumer_key' => $this->user->getConfig()->getPocketConsumerKey(),
- 'access_token' => $this->accessToken,
- 'detailType' => 'complete',
- 'state' => 'all',
- 'sort' => 'newest',
- 'count' => self::NB_ELEMENTS,
- 'offset' => $offset,
- ]),
- ]
- );
-
try {
- $response = $this->client->send($request);
+ $response = $this->client->post('https://getpocket.com/v3/get', [], json_encode([
+ 'consumer_key' => $this->user->getConfig()->getPocketConsumerKey(),
+ 'access_token' => $this->accessToken,
+ 'detailType' => 'complete',
+ 'state' => 'all',
+ 'sort' => 'newest',
+ 'count' => self::NB_ELEMENTS,
+ 'offset' => $offset,
+ ]));
} catch (RequestException $e) {
$this->logger->error(sprintf('PocketImport: Failed to import: %s', $e->getMessage()), ['exception' => $e]);
return false;
}
- $entries = $response->json();
+ $entries = $this->jsonDecode($response);
if ($this->producer) {
$this->parseEntriesForProducer($entries['list']);
}
/**
- * Set the Guzzle client.
+ * Set the Http client.
*
- * @param Client $client
+ * @param HttpClient $client
+ * @param MessageFactory|null $messageFactory
*/
- public function setClient(Client $client)
+ public function setClient(HttpClient $client, MessageFactory $messageFactory = null)
{
- $this->client = $client;
+ $this->client = new HttpMethodsClient(new PluginClient($client, [new ErrorPlugin()]), $messageFactory ?: MessageFactoryDiscovery::find());
}
/**
return $importedEntry;
}
+
+ protected function jsonDecode(ResponseInterface $response)
+ {
+ $data = \json_decode((string) $response->getBody(), true);
+
+ if (JSON_ERROR_NONE !== json_last_error()) {
+ throw new \InvalidArgumentException('Unable to parse JSON data: ' . json_last_error_msg());
+ }
+
+ return $data;
+ }
}
class: Wallabag\ImportBundle\Import\ImportChain
wallabag_import.pocket.client:
- class: GuzzleHttp\Client
- arguments:
- -
- defaults:
- headers:
- content-type: "application/json"
- X-Accept: "application/json"
+ alias: 'httplug.client.wallabag_import.pocket.client'
wallabag_import.pocket.import:
class: Wallabag\ImportBundle\Import\PocketImport
namespace Tests\Wallabag\CoreBundle\Helper;
use GuzzleHttp\Client;
-use GuzzleHttp\Message\Response;
use GuzzleHttp\Stream\Stream;
use GuzzleHttp\Subscriber\Mock;
+use Http\Mock\Client as HttpMockClient;
+use GuzzleHttp\Psr7\Response;
use Monolog\Handler\TestHandler;
use Monolog\Logger;
use PHPUnit\Framework\TestCase;
*/
public function testProcessHtml($html, $url)
{
- $client = new Client();
+ $httpMockClient = new HttpMockClient();
- $mock = new Mock([
- new Response(200, ['content-type' => 'image/png'], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/unnamed.png'))),
- ]);
-
- $client->getEmitter()->attach($mock);
+ $httpMockClient->addResponse(new Response(200, ['content-type' => 'image/png'], file_get_contents(__DIR__ . '/../fixtures/unnamed.png')));
$logHandler = new TestHandler();
$logger = new Logger('test', [$logHandler]);
- $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+ $download = new DownloadImages($httpMockClient, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
$res = $download->processHtml(123, $html, $url);
public function testProcessHtmlWithBadImage()
{
- $client = new Client();
-
- $mock = new Mock([
- new Response(200, ['content-type' => 'application/json'], Stream::factory('')),
- ]);
-
- $client->getEmitter()->attach($mock);
+ $httpMockClient = new HttpMockClient();
+ $httpMockClient->addResponse(new Response(200, ['content-type' => 'application/json'], ''));
$logHandler = new TestHandler();
$logger = new Logger('test', [$logHandler]);
- $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+ $download = new DownloadImages($httpMockClient, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
$res = $download->processHtml(123, '<div><img src="http://i.imgur.com/T9qgcHc.jpg" /></div>', 'http://imgur.com/gallery/WxtWY');
$this->assertContains('http://i.imgur.com/T9qgcHc.jpg', $res, 'Image were not replace because of content-type');
*/
public function testProcessSingleImage($header, $extension)
{
- $client = new Client();
-
- $mock = new Mock([
- new Response(200, ['content-type' => $header], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/unnamed.png'))),
- ]);
-
- $client->getEmitter()->attach($mock);
+ $httpMockClient = new HttpMockClient();
+ $httpMockClient->addResponse(new Response(200, ['content-type' => $header], file_get_contents(__DIR__ . '/../fixtures/unnamed.png')));
$logHandler = new TestHandler();
$logger = new Logger('test', [$logHandler]);
- $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+ $download = new DownloadImages($httpMockClient, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
$res = $download->processSingleImage(123, 'T9qgcHc.jpg', 'http://imgur.com/gallery/WxtWY');
$this->assertContains('/assets/images/9/b/9b0ead26/ebe60399.' . $extension, $res);
public function testProcessSingleImageWithBadUrl()
{
- $client = new Client();
-
- $mock = new Mock([
- new Response(404, []),
- ]);
-
- $client->getEmitter()->attach($mock);
+ $httpMockClient = new HttpMockClient();
+ $httpMockClient->addResponse(new Response(404, []));
$logHandler = new TestHandler();
$logger = new Logger('test', [$logHandler]);
- $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+ $download = new DownloadImages($httpMockClient, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
$res = $download->processSingleImage(123, 'T9qgcHc.jpg', 'http://imgur.com/gallery/WxtWY');
$this->assertFalse($res, 'Image can not be found, so it will not be replaced');
public function testProcessSingleImageWithBadImage()
{
- $client = new Client();
-
- $mock = new Mock([
- new Response(200, ['content-type' => 'image/png'], Stream::factory('')),
- ]);
-
- $client->getEmitter()->attach($mock);
+ $httpMockClient = new HttpMockClient();
+ $httpMockClient->addResponse(new Response(200, ['content-type' => 'image/png'], ''));
$logHandler = new TestHandler();
$logger = new Logger('test', [$logHandler]);
- $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+ $download = new DownloadImages($httpMockClient, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
$res = $download->processSingleImage(123, 'http://i.imgur.com/T9qgcHc.jpg', 'http://imgur.com/gallery/WxtWY');
$this->assertFalse($res, 'Image can not be loaded, so it will not be replaced');
public function testProcessSingleImageFailAbsolute()
{
- $client = new Client();
-
- $mock = new Mock([
- new Response(200, ['content-type' => 'image/png'], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/unnamed.png'))),
- ]);
-
- $client->getEmitter()->attach($mock);
+ $httpMockClient = new HttpMockClient();
+ $httpMockClient->addResponse(new Response(200, ['content-type' => 'image/png'], file_get_contents(__DIR__ . '/../fixtures/unnamed.png')));
$logHandler = new TestHandler();
$logger = new Logger('test', [$logHandler]);
- $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+ $download = new DownloadImages($httpMockClient, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
$res = $download->processSingleImage(123, '/i.imgur.com/T9qgcHc.jpg', 'imgur.com/gallery/WxtWY');
$this->assertFalse($res, 'Absolute image can not be determined, so it will not be replaced');
public function testProcessRealImage()
{
- $client = new Client();
-
- $mock = new Mock([
- new Response(200, ['content-type' => null], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg'))),
- ]);
-
- $client->getEmitter()->attach($mock);
+ $httpMockClient = new HttpMockClient();
+ $httpMockClient->addResponse(new Response(200, ['content-type' => null], file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg')));
$logHandler = new TestHandler();
$logger = new Logger('test', [$logHandler]);
- $download = new DownloadImages($client, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
+ $download = new DownloadImages($httpMockClient, sys_get_temp_dir() . '/wallabag_test', 'http://wallabag.io/', $logger);
$res = $download->processSingleImage(
123,
namespace Tests\Wallabag\ImportBundle\Import;
-use GuzzleHttp\Client;
-use GuzzleHttp\Message\Response;
-use GuzzleHttp\Stream\Stream;
-use GuzzleHttp\Subscriber\Mock;
+use Http\Mock\Client as HttpMockClient;
+use GuzzleHttp\Psr7\Response;
use M6Web\Component\RedisMock\RedisMockFactory;
use Monolog\Handler\TestHandler;
use Monolog\Logger;
public function testOAuthRequest()
{
- $client = new Client();
-
- $mock = new Mock([
- new Response(200, ['Content-Type' => 'application/json'], Stream::factory(json_encode(['code' => 'wunderbar_code']))),
- ]);
-
- $client->getEmitter()->attach($mock);
+ $httpMockClient = new HttpMockClient();
+ $httpMockClient->addResponse(new Response(200, ['Content-Type' => 'application/json'], json_encode(['code' => 'wunderbar_code'])));
$pocketImport = $this->getPocketImport();
- $pocketImport->setClient($client);
+ $pocketImport->setClient($httpMockClient);
$code = $pocketImport->getRequestToken('http://0.0.0.0/redirect');
public function testOAuthRequestBadResponse()
{
- $client = new Client();
-
- $mock = new Mock([
- new Response(403),
- ]);
-
- $client->getEmitter()->attach($mock);
+ $httpMockClient = new HttpMockClient();
+ $httpMockClient->addResponse(new Response(403));
$pocketImport = $this->getPocketImport();
- $pocketImport->setClient($client);
+ $pocketImport->setClient($httpMockClient);
$code = $pocketImport->getRequestToken('http://0.0.0.0/redirect');
public function testOAuthAuthorize()
{
- $client = new Client();
-
- $mock = new Mock([
- new Response(200, ['Content-Type' => 'application/json'], Stream::factory(json_encode(['access_token' => 'wunderbar_token']))),
- ]);
-
- $client->getEmitter()->attach($mock);
+ $httpMockClient = new HttpMockClient();
+ $httpMockClient->addResponse(new Response(200, ['Content-Type' => 'application/json'], json_encode(['access_token' => 'wunderbar_token'])));
$pocketImport = $this->getPocketImport();
- $pocketImport->setClient($client);
+ $pocketImport->setClient($httpMockClient);
$res = $pocketImport->authorize('wunderbar_code');
public function testOAuthAuthorizeBadResponse()
{
- $client = new Client();
-
- $mock = new Mock([
- new Response(403),
- ]);
-
- $client->getEmitter()->attach($mock);
+ $httpMockClient = new HttpMockClient();
+ $httpMockClient->addResponse(new Response(403));
$pocketImport = $this->getPocketImport();
- $pocketImport->setClient($client);
+ $pocketImport->setClient($httpMockClient);
$res = $pocketImport->authorize('wunderbar_code');
*/
public function testImport()
{
- $client = new Client();
-
- $mock = new Mock([
- new Response(200, ['Content-Type' => 'application/json'], Stream::factory(json_encode(['access_token' => 'wunderbar_token']))),
- new Response(200, ['Content-Type' => 'application/json'], Stream::factory('
- {
- "status": 1,
- "list": {
- "229279689": {
- "item_id": "229279689",
- "resolved_id": "229279689",
- "given_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview",
- "given_title": "The Massive Ryder Cup Preview - The Triangle Blog - Grantland",
- "favorite": "1",
- "status": "1",
- "time_added": "1473020899",
- "time_updated": "1473020899",
- "time_read": "0",
- "time_favorited": "0",
- "sort_id": 0,
- "resolved_title": "The Massive Ryder Cup Preview",
- "resolved_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview",
- "excerpt": "The list of things I love about the Ryder Cup is so long that it could fill a (tedious) novel, and golf fans can probably guess most of them.",
- "is_article": "1",
- "is_index": "0",
- "has_video": "1",
- "has_image": "1",
- "word_count": "3197",
- "images": {
- "1": {
- "item_id": "229279689",
- "image_id": "1",
- "src": "http://a.espncdn.com/combiner/i?img=/photo/2012/0927/grant_g_ryder_cr_640.jpg&w=640&h=360",
- "width": "0",
- "height": "0",
- "credit": "Jamie Squire/Getty Images",
- "caption": ""
- }
- },
- "videos": {
- "1": {
- "item_id": "229279689",
- "video_id": "1",
- "src": "http://www.youtube.com/v/Er34PbFkVGk?version=3&hl=en_US&rel=0",
- "width": "420",
- "height": "315",
- "type": "1",
- "vid": "Er34PbFkVGk"
- }
- },
- "tags": {
- "grantland": {
- "item_id": "1147652870",
- "tag": "grantland"
- },
- "Ryder Cup": {
- "item_id": "1147652870",
- "tag": "Ryder Cup"
- }
+ $httpMockClient = new HttpMockClient();
+ $httpMockClient->addResponse(new Response(200, ['Content-Type' => 'application/json'], json_encode(['access_token' => 'wunderbar_token'])));
+ $httpMockClient->addResponse(new Response(200, ['Content-Type' => 'application/json'], <<<'JSON'
+ {
+ "status": 1,
+ "list": {
+ "229279689": {
+ "item_id": "229279689",
+ "resolved_id": "229279689",
+ "given_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview",
+ "given_title": "The Massive Ryder Cup Preview - The Triangle Blog - Grantland",
+ "favorite": "1",
+ "status": "1",
+ "time_added": "1473020899",
+ "time_updated": "1473020899",
+ "time_read": "0",
+ "time_favorited": "0",
+ "sort_id": 0,
+ "resolved_title": "The Massive Ryder Cup Preview",
+ "resolved_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview",
+ "excerpt": "The list of things I love about the Ryder Cup is so long that it could fill a (tedious) novel, and golf fans can probably guess most of them.",
+ "is_article": "1",
+ "is_index": "0",
+ "has_video": "1",
+ "has_image": "1",
+ "word_count": "3197",
+ "images": {
+ "1": {
+ "item_id": "229279689",
+ "image_id": "1",
+ "src": "http://a.espncdn.com/combiner/i?img=/photo/2012/0927/grant_g_ryder_cr_640.jpg&w=640&h=360",
+ "width": "0",
+ "height": "0",
+ "credit": "Jamie Squire/Getty Images",
+ "caption": ""
}
},
- "229279690": {
- "item_id": "229279689",
- "resolved_id": "229279689",
- "given_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview",
- "given_title": "The Massive Ryder Cup Preview - The Triangle Blog - Grantland",
- "favorite": "1",
- "status": "1",
- "time_added": "1473020899",
- "time_updated": "1473020899",
- "time_read": "0",
- "time_favorited": "0",
- "sort_id": 1,
- "resolved_title": "The Massive Ryder Cup Preview",
- "resolved_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview",
- "excerpt": "The list of things I love about the Ryder Cup is so long that it could fill a (tedious) novel, and golf fans can probably guess most of them.",
- "is_article": "1",
- "is_index": "0",
- "has_video": "0",
- "has_image": "0",
- "word_count": "3197"
+ "videos": {
+ "1": {
+ "item_id": "229279689",
+ "video_id": "1",
+ "src": "http://www.youtube.com/v/Er34PbFkVGk?version=3&hl=en_US&rel=0",
+ "width": "420",
+ "height": "315",
+ "type": "1",
+ "vid": "Er34PbFkVGk"
+ }
+ },
+ "tags": {
+ "grantland": {
+ "item_id": "1147652870",
+ "tag": "grantland"
+ },
+ "Ryder Cup": {
+ "item_id": "1147652870",
+ "tag": "Ryder Cup"
+ }
}
+ },
+ "229279690": {
+ "item_id": "229279689",
+ "resolved_id": "229279689",
+ "given_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview",
+ "given_title": "The Massive Ryder Cup Preview - The Triangle Blog - Grantland",
+ "favorite": "1",
+ "status": "1",
+ "time_added": "1473020899",
+ "time_updated": "1473020899",
+ "time_read": "0",
+ "time_favorited": "0",
+ "sort_id": 1,
+ "resolved_title": "The Massive Ryder Cup Preview",
+ "resolved_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview",
+ "excerpt": "The list of things I love about the Ryder Cup is so long that it could fill a (tedious) novel, and golf fans can probably guess most of them.",
+ "is_article": "1",
+ "is_index": "0",
+ "has_video": "0",
+ "has_image": "0",
+ "word_count": "3197"
}
}
- ')),
- ]);
-
- $client->getEmitter()->attach($mock);
+ }
+JSON
+));
$pocketImport = $this->getPocketImport('ConsumerKey', 1);
->method('updateEntry')
->willReturn($entry);
- $pocketImport->setClient($client);
+ $pocketImport->setClient($httpMockClient);
$pocketImport->authorize('wunderbar_code');
$res = $pocketImport->import();
*/
public function testImportAndMarkAllAsRead()
{
- $client = new Client();
-
- $mock = new Mock([
- new Response(200, ['Content-Type' => 'application/json'], Stream::factory(json_encode(['access_token' => 'wunderbar_token']))),
- new Response(200, ['Content-Type' => 'application/json'], Stream::factory('
- {
- "status": 1,
- "list": {
- "229279689": {
- "item_id": "229279689",
- "resolved_id": "229279689",
- "given_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview",
- "given_title": "The Massive Ryder Cup Preview - The Triangle Blog - Grantland",
- "favorite": "1",
- "status": "1",
- "time_added": "1473020899",
- "time_updated": "1473020899",
- "time_read": "0",
- "time_favorited": "0",
- "sort_id": 0,
- "excerpt": "The list of things I love about the Ryder Cup is so long that it could fill a (tedious) novel, and golf fans can probably guess most of them.",
- "is_article": "1",
- "has_video": "1",
- "has_image": "1",
- "word_count": "3197"
- },
- "229279690": {
- "item_id": "229279689",
- "resolved_id": "229279689",
- "given_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview/2",
- "given_title": "The Massive Ryder Cup Preview - The Triangle Blog - Grantland",
- "favorite": "1",
- "status": "0",
- "time_added": "1473020899",
- "time_updated": "1473020899",
- "time_read": "0",
- "time_favorited": "0",
- "sort_id": 1,
- "excerpt": "The list of things I love about the Ryder Cup is so long that it could fill a (tedious) novel, and golf fans can probably guess most of them.",
- "is_article": "1",
- "has_video": "0",
- "has_image": "0",
- "word_count": "3197"
- }
+ $httpMockClient = new HttpMockClient();
+ $httpMockClient->addResponse(new Response(200, ['Content-Type' => 'application/json'], json_encode(['access_token' => 'wunderbar_token'])));
+ $httpMockClient->addResponse(new Response(200, ['Content-Type' => 'application/json'], <<<'JSON'
+ {
+ "status": 1,
+ "list": {
+ "229279689": {
+ "item_id": "229279689",
+ "resolved_id": "229279689",
+ "given_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview",
+ "given_title": "The Massive Ryder Cup Preview - The Triangle Blog - Grantland",
+ "favorite": "1",
+ "status": "1",
+ "time_added": "1473020899",
+ "time_updated": "1473020899",
+ "time_read": "0",
+ "time_favorited": "0",
+ "sort_id": 0,
+ "excerpt": "The list of things I love about the Ryder Cup is so long that it could fill a (tedious) novel, and golf fans can probably guess most of them.",
+ "is_article": "1",
+ "has_video": "1",
+ "has_image": "1",
+ "word_count": "3197"
+ },
+ "229279690": {
+ "item_id": "229279689",
+ "resolved_id": "229279689",
+ "given_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview/2",
+ "given_title": "The Massive Ryder Cup Preview - The Triangle Blog - Grantland",
+ "favorite": "1",
+ "status": "0",
+ "time_added": "1473020899",
+ "time_updated": "1473020899",
+ "time_read": "0",
+ "time_favorited": "0",
+ "sort_id": 1,
+ "excerpt": "The list of things I love about the Ryder Cup is so long that it could fill a (tedious) novel, and golf fans can probably guess most of them.",
+ "is_article": "1",
+ "has_video": "0",
+ "has_image": "0",
+ "word_count": "3197"
}
}
- ')),
- ]);
-
- $client->getEmitter()->attach($mock);
+ }
+JSON
+));
$pocketImport = $this->getPocketImport('ConsumerKey', 2);
->method('updateEntry')
->willReturn($entry);
- $pocketImport->setClient($client);
+ $pocketImport->setClient($httpMockClient);
$pocketImport->authorize('wunderbar_code');
$res = $pocketImport->setMarkAsRead(true)->import();
*/
public function testImportWithRabbit()
{
- $client = new Client();
+ $httpMockClient = new HttpMockClient();
$body = <<<'JSON'
{
}
JSON;
- $mock = new Mock([
- new Response(200, ['Content-Type' => 'application/json'], Stream::factory(json_encode(['access_token' => 'wunderbar_token']))),
- new Response(200, ['Content-Type' => 'application/json'], Stream::factory('
- {
- "status": 1,
- "list": {
- "229279690": ' . $body . '
- }
+ $httpMockClient->addResponse(new Response(200, ['Content-Type' => 'application/json'], json_encode(['access_token' => 'wunderbar_token'])));
+ $httpMockClient->addResponse(new Response(200, ['Content-Type' => 'application/json'], <<<JSON
+ {
+ "status": 1,
+ "list": {
+ "229279690": $body
}
- ')),
- ]);
-
- $client->getEmitter()->attach($mock);
+ }
+JSON
+ ));
$pocketImport = $this->getPocketImport();
->method('publish')
->with(json_encode($bodyAsArray));
- $pocketImport->setClient($client);
+ $pocketImport->setClient($httpMockClient);
$pocketImport->setProducer($producer);
$pocketImport->authorize('wunderbar_code');
*/
public function testImportWithRedis()
{
- $client = new Client();
+ $httpMockClient = new HttpMockClient();
$body = <<<'JSON'
{
}
JSON;
- $mock = new Mock([
- new Response(200, ['Content-Type' => 'application/json'], Stream::factory(json_encode(['access_token' => 'wunderbar_token']))),
- new Response(200, ['Content-Type' => 'application/json'], Stream::factory('
- {
- "status": 1,
- "list": {
- "229279690": ' . $body . '
- }
+ $httpMockClient->addResponse(new Response(200, ['Content-Type' => 'application/json'], json_encode(['access_token' => 'wunderbar_token'])));
+ $httpMockClient->addResponse(new Response(200, ['Content-Type' => 'application/json'], <<<JSON
+ {
+ "status": 1,
+ "list": {
+ "229279690": $body
}
- ')),
- ]);
-
- $client->getEmitter()->attach($mock);
+ }
+JSON
+ ));
$pocketImport = $this->getPocketImport();
$queue = new RedisQueue($redisMock, 'pocket');
$producer = new Producer($queue);
- $pocketImport->setClient($client);
+ $pocketImport->setClient($httpMockClient);
$pocketImport->setProducer($producer);
$pocketImport->authorize('wunderbar_code');
public function testImportBadResponse()
{
- $client = new Client();
+ $httpMockClient = new HttpMockClient();
- $mock = new Mock([
- new Response(200, ['Content-Type' => 'application/json'], Stream::factory(json_encode(['access_token' => 'wunderbar_token']))),
- new Response(403),
- ]);
-
- $client->getEmitter()->attach($mock);
+ $httpMockClient->addResponse(new Response(200, ['Content-Type' => 'application/json'], json_encode(['access_token' => 'wunderbar_token'])));
+ $httpMockClient->addResponse(new Response(403));
$pocketImport = $this->getPocketImport();
- $pocketImport->setClient($client);
+ $pocketImport->setClient($httpMockClient);
$pocketImport->authorize('wunderbar_code');
$res = $pocketImport->import();
public function testImportWithExceptionFromGraby()
{
- $client = new Client();
-
- $mock = new Mock([
- new Response(200, ['Content-Type' => 'application/json'], Stream::factory(json_encode(['access_token' => 'wunderbar_token']))),
- new Response(200, ['Content-Type' => 'application/json'], Stream::factory('
- {
- "status": 1,
- "list": {
- "229279689": {
- "status": "1",
- "favorite": "1",
- "resolved_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview"
- }
+ $httpMockClient = new HttpMockClient();
+
+ $httpMockClient->addResponse(new Response(200, ['Content-Type' => 'application/json'], json_encode(['access_token' => 'wunderbar_token'])));
+ $httpMockClient->addResponse(new Response(200, ['Content-Type' => 'application/json'], <<<'JSON'
+ {
+ "status": 1,
+ "list": {
+ "229279689": {
+ "status": "1",
+ "favorite": "1",
+ "resolved_url": "http://www.grantland.com/blog/the-triangle/post/_/id/38347/ryder-cup-preview"
}
}
- ')),
- ]);
-
- $client->getEmitter()->attach($mock);
+ }
+
+JSON
+ ));
$pocketImport = $this->getPocketImport('ConsumerKey', 1);
->method('updateEntry')
->will($this->throwException(new \Exception()));
- $pocketImport->setClient($client);
+ $pocketImport->setClient($httpMockClient);
$pocketImport->authorize('wunderbar_code');
$res = $pocketImport->import();
projects / github / wallabag / wallabag.git / commitdiff
