mirror of
https://github.com/wallabag/wallabag.git
synced 2024-12-16 20:56:28 +00:00
Merge pull request #3390 from aaa2000/httplug
Use httplug and graby 2.0
This commit is contained in:
Jérémy Benoist
GitHub
commit
48d136d3a0
14 changed files with 452 additions and 484 deletions
|
|
@ -34,6 +34,7 @@ class AppKernel extends Kernel
|
|||
new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
|
||||
new BD\GuzzleSiteAuthenticatorBundle\BDGuzzleSiteAuthenticatorBundle(),
|
||||
new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),
|
||||
new Http\HttplugBundle\HttplugBundle(),
|
||||
|
||||
// wallabag bundles
|
||||
new Wallabag\CoreBundle\WallabagCoreBundle(),
|
||||
|
|
|
|||
|
|
@ -370,3 +370,25 @@ jms_serializer:
|
|||
sensio_framework_extra:
|
||||
router:
|
||||
annotations: false
|
||||
|
||||
httplug:
|
||||
clients:
|
||||
wallabag_core:
|
||||
factory: 'wallabag_core.http_client_factory'
|
||||
config:
|
||||
defaults:
|
||||
timeout: 10
|
||||
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
|
||||
|
|
|
|||
|
|
@ -66,8 +66,9 @@
|
|||
"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",
|
||||
|
|
@ -89,7 +90,8 @@
|
|||
"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",
|
||||
|
|
@ -101,7 +103,9 @@
|
|||
"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"
|
||||
|
|
|
|||
|
|
@ -369,9 +369,7 @@ class EntryRestController extends WallabagRestController
|
|||
'language' => !empty($data['language']) ? $data['language'] : $entry->getLanguage(),
|
||||
'date' => !empty($data['publishedAt']) ? $data['publishedAt'] : $entry->getPublishedAt(),
|
||||
// faking the open graph preview picture
|
||||
'open_graph' => [
|
||||
'og_image' => !empty($data['picture']) ? $data['picture'] : $entry->getPreviewPicture(),
|
||||
],
|
||||
'image' => !empty($data['picture']) ? $data['picture'] : $entry->getPreviewPicture(),
|
||||
'authors' => \is_string($data['authors']) ? explode(',', $data['authors']) : $entry->getPublishedBy(),
|
||||
]
|
||||
);
|
||||
|
|
|
|||
|
|
@ -54,7 +54,11 @@ class ContentProxy
|
|||
|
||||
if ((empty($content) || false === $this->validateContent($content)) && false === $disableContentUpdate) {
|
||||
$fetchedContent = $this->graby->fetchContent($url);
|
||||
$fetchedContent['title'] = $this->sanitizeContentTitle($fetchedContent['title'], $fetchedContent['content_type']);
|
||||
|
||||
$fetchedContent['title'] = $this->sanitizeContentTitle(
|
||||
$fetchedContent['title'],
|
||||
isset($fetchedContent['headers']['content-type']) ? $fetchedContent['headers']['content-type'] : ''
|
||||
);
|
||||
|
||||
// when content is imported, we have information in $content
|
||||
// in case fetching content goes bad, we'll keep the imported information instead of overriding them
|
||||
|
|
@ -188,8 +192,8 @@ class ContentProxy
|
|||
/**
|
||||
* Try to sanitize the title of the fetched content from wrong character encodings and invalid UTF-8 character.
|
||||
*
|
||||
* @param $title
|
||||
* @param $contentType
|
||||
* @param string $title
|
||||
* @param string $contentType
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
|
|
@ -253,16 +257,14 @@ class ContentProxy
|
|||
|
||||
if (!empty($content['title'])) {
|
||||
$entry->setTitle($content['title']);
|
||||
} elseif (!empty($content['open_graph']['og_title'])) {
|
||||
$entry->setTitle($content['open_graph']['og_title']);
|
||||
}
|
||||
|
||||
if (empty($content['html'])) {
|
||||
$content['html'] = $this->fetchingErrorMessage;
|
||||
|
||||
if (!empty($content['open_graph']['og_description'])) {
|
||||
if (!empty($content['description'])) {
|
||||
$content['html'] .= '<p><i>But we found a short description: </i></p>';
|
||||
$content['html'] .= $content['open_graph']['og_description'];
|
||||
$content['html'] .= $content['description'];
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -277,8 +279,8 @@ class ContentProxy
|
|||
$entry->setPublishedBy($content['authors']);
|
||||
}
|
||||
|
||||
if (!empty($content['all_headers']) && $this->storeArticleHeaders) {
|
||||
$entry->setHeaders($content['all_headers']);
|
||||
if (!empty($content['headers'])) {
|
||||
$entry->setHeaders($content['headers']);
|
||||
}
|
||||
|
||||
if (!empty($content['date'])) {
|
||||
|
|
@ -290,28 +292,29 @@ class ContentProxy
|
|||
}
|
||||
|
||||
$previewPictureUrl = '';
|
||||
if (!empty($content['open_graph']['og_image'])) {
|
||||
$previewPictureUrl = $content['open_graph']['og_image'];
|
||||
if (!empty($content['image'])) {
|
||||
$previewPictureUrl = $content['image'];
|
||||
}
|
||||
|
||||
// if content is an image, define it as a preview too
|
||||
if (!empty($content['content_type']) && \in_array($this->mimeGuesser->guess($content['content_type']), ['jpeg', 'jpg', 'gif', 'png'], true)) {
|
||||
if (!empty($content['headers']['content-type']) && \in_array($this->mimeGuesser->guess($content['headers']['content-type']), ['jpeg', 'jpg', 'gif', 'png'], true)) {
|
||||
$previewPictureUrl = $content['url'];
|
||||
} elseif (empty($previewPictureUrl)) {
|
||||
$this->logger->debug('Extracting images from content to provide a default preview picture');
|
||||
$imagesUrls = DownloadImages::extractImagesUrlsFromHtml($content['html']);
|
||||
$this->logger->debug(\count($imagesUrls) . ' pictures found');
|
||||
|
||||
if (!empty($imagesUrls)) {
|
||||
$previewPictureUrl = $imagesUrls[0];
|
||||
}
|
||||
}
|
||||
|
||||
if (!empty($previewPictureUrl)) {
|
||||
$this->updatePreviewPicture($entry, $previewPictureUrl);
|
||||
if (!empty($content['headers']['content-type'])) {
|
||||
$entry->setMimetype($content['headers']['content-type']);
|
||||
}
|
||||
|
||||
if (!empty($content['content_type'])) {
|
||||
$entry->setMimetype($content['content_type']);
|
||||
if (!empty($previewPictureUrl)) {
|
||||
$this->updatePreviewPicture($entry, $previewPictureUrl);
|
||||
}
|
||||
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -2,8 +2,13 @@
|
|||
|
||||
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;
|
||||
|
|
@ -19,9 +24,9 @@ class DownloadImages
|
|||
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;
|
||||
|
|
@ -135,7 +140,7 @@ class DownloadImages
|
|||
$localPath = $folderPath . '/' . $hashImage . '.' . $ext;
|
||||
|
||||
try {
|
||||
$im = imagecreatefromstring($res->getBody());
|
||||
$im = imagecreatefromstring((string) $res->getBody());
|
||||
} catch (\Exception $e) {
|
||||
$im = false;
|
||||
}
|
||||
|
|
@ -306,14 +311,14 @@ class DownloadImages
|
|||
/**
|
||||
* Retrieve and validate the extension from the response of the url of the image.
|
||||
*
|
||||
* @param Response $res Guzzle Response
|
||||
* @param string $imagePath Path from the src image from the content (used for log only)
|
||||
* @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
|
||||
|
|
|
|||
|
|
@ -2,16 +2,18 @@
|
|||
|
||||
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 Http\Client\HttpClient;
|
||||
use Http\HttplugBundle\ClientFactory\ClientFactory;
|
||||
use Psr\Log\LoggerInterface;
|
||||
|
||||
/**
|
||||
* 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 = [];
|
||||
|
|
@ -36,29 +38,6 @@ class HttpClientFactory
|
|||
$this->logger = $logger;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return \GuzzleHttp\Client|null
|
||||
*/
|
||||
public function buildHttpClient()
|
||||
{
|
||||
$this->logger->log('debug', 'Restricted access config enabled?', ['enabled' => (int) $this->restrictedAccess]);
|
||||
|
||||
if (0 === (int) $this->restrictedAccess) {
|
||||
return;
|
||||
}
|
||||
|
||||
// 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]]);
|
||||
|
||||
foreach ($this->subscribers as $subscriber) {
|
||||
$client->getEmitter()->attach($subscriber);
|
||||
}
|
||||
|
||||
return $client;
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds a subscriber to the HTTP client.
|
||||
*
|
||||
|
|
@ -68,4 +47,34 @@ class HttpClientFactory
|
|||
{
|
||||
$this->subscribers[] = $subscriber;
|
||||
}
|
||||
|
||||
/**
|
||||
* Input an array of configuration to be able to create a HttpClient.
|
||||
*
|
||||
* @param array $config
|
||||
*
|
||||
* @return HttpClient
|
||||
*/
|
||||
public function createClient(array $config = [])
|
||||
{
|
||||
$this->logger->log('debug', 'Restricted access config enabled?', ['enabled' => (int) $this->restrictedAccess]);
|
||||
|
||||
if (0 === (int) $this->restrictedAccess) {
|
||||
return new GuzzleAdapter(new GuzzleClient($config));
|
||||
}
|
||||
|
||||
// we clear the cookie to avoid websites who use cookies for analytics
|
||||
$this->cookieJar->clear();
|
||||
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 new GuzzleAdapter($guzzle);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ services:
|
|||
-
|
||||
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" ] ]
|
||||
|
|
@ -55,9 +55,8 @@ services:
|
|||
- {}
|
||||
- "@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
|
||||
|
|
@ -73,7 +72,7 @@ services:
|
|||
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"
|
||||
|
|
@ -212,7 +211,7 @@ services:
|
|||
- "@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
|
||||
|
|
|
|||
|
|
@ -2,13 +2,22 @@
|
|||
|
||||
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\Exception\RequestException;
|
||||
use Http\Client\HttpClient;
|
||||
use Http\Discovery\MessageFactoryDiscovery;
|
||||
use Http\Message\MessageFactory;
|
||||
use Psr\Http\Message\ResponseInterface;
|
||||
use Wallabag\CoreBundle\Entity\Entry;
|
||||
|
||||
class PocketImport extends AbstractImport
|
||||
{
|
||||
const NB_ELEMENTS = 5000;
|
||||
/**
|
||||
* @var HttpMethodsClient
|
||||
*/
|
||||
private $client;
|
||||
private $accessToken;
|
||||
|
||||
|
|
@ -55,24 +64,18 @@ class PocketImport extends AbstractImport
|
|||
*/
|
||||
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'];
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -85,24 +88,18 @@ class PocketImport extends AbstractImport
|
|||
*/
|
||||
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;
|
||||
}
|
||||
|
|
@ -114,29 +111,23 @@ class PocketImport extends AbstractImport
|
|||
{
|
||||
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']);
|
||||
|
|
@ -159,13 +150,14 @@ class PocketImport extends AbstractImport
|
|||
}
|
||||
|
||||
/**
|
||||
* 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());
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -252,4 +244,15 @@ class PocketImport extends AbstractImport
|
|||
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,9 @@ class WallabagV2Import extends WallabagImport
|
|||
{
|
||||
return [
|
||||
'html' => $entry['content'],
|
||||
'content_type' => $entry['mimetype'],
|
||||
'headers' => [
|
||||
'content-type' => $entry['mimetype'],
|
||||
],
|
||||
'is_archived' => (bool) ($entry['is_archived'] || $this->markAsRead),
|
||||
'is_starred' => (bool) $entry['is_starred'],
|
||||
] + $entry;
|
||||
|
|
|
|||
|
|
@ -7,13 +7,7 @@ services:
|
|||
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
|
||||
|
|
|
|||
|
|
@ -36,7 +36,9 @@ class ContentProxyTest extends TestCase
|
|||
'html' => false,
|
||||
'title' => '',
|
||||
'url' => '',
|
||||
'content_type' => '',
|
||||
'headers' => [
|
||||
'content-type' => '',
|
||||
],
|
||||
'language' => '',
|
||||
]);
|
||||
|
||||
|
|
@ -71,7 +73,9 @@ class ContentProxyTest extends TestCase
|
|||
'html' => false,
|
||||
'title' => '',
|
||||
'url' => '',
|
||||
'content_type' => '',
|
||||
'headers' => [
|
||||
'content-type' => '',
|
||||
],
|
||||
'language' => '',
|
||||
]);
|
||||
|
||||
|
|
@ -104,15 +108,14 @@ class ContentProxyTest extends TestCase
|
|||
->method('fetchContent')
|
||||
->willReturn([
|
||||
'html' => false,
|
||||
'title' => '',
|
||||
'title' => 'my title',
|
||||
'url' => '',
|
||||
'content_type' => '',
|
||||
'headers' => [
|
||||
'content-type' => '',
|
||||
],
|
||||
'language' => '',
|
||||
'status' => '',
|
||||
'open_graph' => [
|
||||
'og_title' => 'my title',
|
||||
'og_description' => 'desc',
|
||||
],
|
||||
'description' => 'desc',
|
||||
]);
|
||||
|
||||
$proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage);
|
||||
|
|
@ -147,13 +150,12 @@ class ContentProxyTest extends TestCase
|
|||
'html' => str_repeat('this is my content', 325),
|
||||
'title' => 'this is my title',
|
||||
'url' => 'http://1.1.1.1',
|
||||
'content_type' => 'text/html',
|
||||
'language' => 'fr',
|
||||
'status' => '200',
|
||||
'open_graph' => [
|
||||
'og_title' => 'my OG title',
|
||||
'og_description' => 'OG desc',
|
||||
'og_image' => 'http://3.3.3.3/cover.jpg',
|
||||
'description' => 'OG desc',
|
||||
'image' => 'http://3.3.3.3/cover.jpg',
|
||||
'headers' => [
|
||||
'content-type' => 'text/html',
|
||||
],
|
||||
]);
|
||||
|
||||
|
|
@ -189,13 +191,12 @@ class ContentProxyTest extends TestCase
|
|||
'html' => str_repeat('this is my content', 325),
|
||||
'title' => 'this is my title',
|
||||
'url' => 'http://1.1.1.1',
|
||||
'content_type' => 'text/html',
|
||||
'language' => 'fr',
|
||||
'status' => '200',
|
||||
'open_graph' => [
|
||||
'og_title' => 'my OG title',
|
||||
'og_description' => 'OG desc',
|
||||
'og_image' => null,
|
||||
'description' => 'OG desc',
|
||||
'image' => null,
|
||||
'headers' => [
|
||||
'content-type' => 'text/html',
|
||||
],
|
||||
]);
|
||||
|
||||
|
|
@ -231,14 +232,12 @@ class ContentProxyTest extends TestCase
|
|||
'html' => "<h1>Test</h1><p><img src='http://3.3.3.3/cover.jpg'/></p>",
|
||||
'title' => 'this is my title',
|
||||
'url' => 'http://1.1.1.1',
|
||||
'content_type' => 'text/html',
|
||||
'headers' => [
|
||||
'content-type' => 'text/html',
|
||||
],
|
||||
'language' => 'fr',
|
||||
'status' => '200',
|
||||
'open_graph' => [
|
||||
'og_title' => 'my OG title',
|
||||
'og_description' => 'OG desc',
|
||||
'og_image' => null,
|
||||
],
|
||||
'image' => null,
|
||||
]);
|
||||
|
||||
$proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage);
|
||||
|
|
@ -273,14 +272,12 @@ class ContentProxyTest extends TestCase
|
|||
'html' => "<h1>Test</h1><p><img src='http://3.3.3.3/nevermind.jpg'/></p>",
|
||||
'title' => 'this is my title',
|
||||
'url' => 'http://1.1.1.1',
|
||||
'content_type' => 'text/html',
|
||||
'headers' => [
|
||||
'content-type' => 'text/html',
|
||||
],
|
||||
'language' => 'fr',
|
||||
'status' => '200',
|
||||
'open_graph' => [
|
||||
'og_title' => 'my OG title',
|
||||
'og_description' => 'OG desc',
|
||||
'og_image' => 'http://3.3.3.3/cover.jpg',
|
||||
],
|
||||
'image' => 'http://3.3.3.3/cover.jpg',
|
||||
]);
|
||||
|
||||
$proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage);
|
||||
|
|
@ -320,9 +317,11 @@ class ContentProxyTest extends TestCase
|
|||
'html' => str_repeat('this is my content', 325),
|
||||
'title' => 'this is my title',
|
||||
'url' => 'http://1.1.1.1',
|
||||
'content_type' => 'text/html',
|
||||
'language' => 'dontexist',
|
||||
'status' => '200',
|
||||
'headers' => [
|
||||
'content-type' => 'text/html',
|
||||
],
|
||||
]);
|
||||
|
||||
$proxy = new ContentProxy($graby, $tagger, $validator, $this->getLogger(), $this->fetchingErrorMessage);
|
||||
|
|
@ -364,14 +363,13 @@ class ContentProxyTest extends TestCase
|
|||
'html' => str_repeat('this is my content', 325),
|
||||
'title' => 'this is my title',
|
||||
'url' => 'http://1.1.1.1',
|
||||
'content_type' => 'text/html',
|
||||
'headers' => [
|
||||
'content-type' => 'text/html',
|
||||
],
|
||||
'language' => 'fr',
|
||||
'status' => '200',
|
||||
'open_graph' => [
|
||||
'og_title' => 'my OG title',
|
||||
'og_description' => 'OG desc',
|
||||
'og_image' => 'https://',
|
||||
],
|
||||
'description' => 'OG desc',
|
||||
'image' => 'https://',
|
||||
]);
|
||||
|
||||
$proxy = new ContentProxy($graby, $tagger, $validator, $this->getLogger(), $this->fetchingErrorMessage);
|
||||
|
|
@ -404,12 +402,12 @@ class ContentProxyTest extends TestCase
|
|||
'html' => str_repeat('this is my content', 325),
|
||||
'title' => 'this is my title',
|
||||
'url' => 'http://1.1.1.1',
|
||||
'content_type' => 'text/html',
|
||||
'language' => 'fr',
|
||||
'date' => '1395635872',
|
||||
'authors' => ['Jeremy', 'Nico', 'Thomas'],
|
||||
'all_headers' => [
|
||||
'Cache-Control' => 'no-cache',
|
||||
'headers' => [
|
||||
'cache-control' => 'no-cache',
|
||||
'content-type' => 'text/html',
|
||||
],
|
||||
]
|
||||
);
|
||||
|
|
@ -447,9 +445,11 @@ class ContentProxyTest extends TestCase
|
|||
'html' => str_repeat('this is my content', 325),
|
||||
'title' => 'this is my title',
|
||||
'url' => 'http://1.1.1.1',
|
||||
'content_type' => 'text/html',
|
||||
'language' => 'fr',
|
||||
'date' => '2016-09-08T11:55:58+0200',
|
||||
'headers' => [
|
||||
'content-type' => 'text/html',
|
||||
],
|
||||
]
|
||||
);
|
||||
|
||||
|
|
@ -482,9 +482,11 @@ class ContentProxyTest extends TestCase
|
|||
'html' => str_repeat('this is my content', 325),
|
||||
'title' => 'this is my title',
|
||||
'url' => 'http://1.1.1.1',
|
||||
'content_type' => 'text/html',
|
||||
'language' => 'fr',
|
||||
'date' => '01 02 2012',
|
||||
'headers' => [
|
||||
'content-type' => 'text/html',
|
||||
],
|
||||
]
|
||||
);
|
||||
|
||||
|
|
@ -519,8 +521,10 @@ class ContentProxyTest extends TestCase
|
|||
'html' => str_repeat('this is my content', 325),
|
||||
'title' => 'this is my title',
|
||||
'url' => 'http://1.1.1.1',
|
||||
'content_type' => 'text/html',
|
||||
'language' => 'fr',
|
||||
'headers' => [
|
||||
'content-type' => 'text/html',
|
||||
],
|
||||
]
|
||||
);
|
||||
|
||||
|
|
@ -559,13 +563,13 @@ class ContentProxyTest extends TestCase
|
|||
'html' => $html,
|
||||
'title' => 'this is my title',
|
||||
'url' => 'http://1.1.1.1',
|
||||
'content_type' => 'text/html',
|
||||
'language' => 'fr',
|
||||
'status' => '200',
|
||||
'open_graph' => [
|
||||
'og_title' => 'my OG title',
|
||||
'og_description' => 'OG desc',
|
||||
'og_image' => 'http://3.3.3.3/cover.jpg',
|
||||
//'og_title' => 'my OG title',
|
||||
'description' => 'OG desc',
|
||||
'image' => 'http://3.3.3.3/cover.jpg',
|
||||
'headers' => [
|
||||
'content-type' => 'text/html',
|
||||
],
|
||||
]
|
||||
);
|
||||
|
|
@ -597,9 +601,10 @@ class ContentProxyTest extends TestCase
|
|||
'html' => '<p><img src="http://1.1.1.1/image.jpg" /></p>',
|
||||
'title' => 'this is my title',
|
||||
'url' => 'http://1.1.1.1/image.jpg',
|
||||
'content_type' => 'image/jpeg',
|
||||
'status' => '200',
|
||||
'open_graph' => [],
|
||||
'headers' => [
|
||||
'content-type' => 'image/jpeg',
|
||||
],
|
||||
]);
|
||||
|
||||
$proxy = new ContentProxy($graby, $tagger, $this->getValidator(), $this->getLogger(), $this->fetchingErrorMessage);
|
||||
|
|
@ -637,7 +642,9 @@ class ContentProxyTest extends TestCase
|
|||
'html' => false,
|
||||
'title' => $actualTitle,
|
||||
'url' => '',
|
||||
'content_type' => 'text/html',
|
||||
'headers' => [
|
||||
'content-type' => 'text/html',
|
||||
],
|
||||
'language' => '',
|
||||
]);
|
||||
|
||||
|
|
@ -672,7 +679,9 @@ class ContentProxyTest extends TestCase
|
|||
'html' => false,
|
||||
'title' => $actualTitle,
|
||||
'url' => '',
|
||||
'content_type' => 'text/html',
|
||||
'headers' => [
|
||||
'content-type' => 'text/html',
|
||||
],
|
||||
'language' => '',
|
||||
]);
|
||||
|
||||
|
|
@ -706,7 +715,9 @@ class ContentProxyTest extends TestCase
|
|||
'html' => false,
|
||||
'title' => $actualTitle,
|
||||
'url' => '',
|
||||
'content_type' => 'application/pdf',
|
||||
'headers' => [
|
||||
'content-type' => 'application/pdf',
|
||||
],
|
||||
'language' => '',
|
||||
]);
|
||||
|
||||
|
|
@ -740,7 +751,9 @@ class ContentProxyTest extends TestCase
|
|||
'html' => false,
|
||||
'title' => $actualTitle,
|
||||
'url' => '',
|
||||
'content_type' => 'application/pdf',
|
||||
'headers' => [
|
||||
'content-type' => 'application/pdf',
|
||||
],
|
||||
'language' => '',
|
||||
]);
|
||||
|
||||
|
|
@ -774,7 +787,9 @@ class ContentProxyTest extends TestCase
|
|||
'html' => false,
|
||||
'title' => $actualTitle,
|
||||
'url' => '',
|
||||
'content_type' => 'application/pdf',
|
||||
'headers' => [
|
||||
'content-type' => 'application/pdf',
|
||||
],
|
||||
'language' => '',
|
||||
]);
|
||||
|
||||
|
|
@ -809,7 +824,9 @@ class ContentProxyTest extends TestCase
|
|||
'html' => false,
|
||||
'title' => $actualTitle,
|
||||
'url' => '',
|
||||
'content_type' => 'application/pdf',
|
||||
'headers' => [
|
||||
'content-type' => 'application/pdf',
|
||||
],
|
||||
'language' => '',
|
||||
]);
|
||||
|
||||
|
|
@ -939,7 +956,9 @@ class ContentProxyTest extends TestCase
|
|||
'html' => false,
|
||||
'title' => '',
|
||||
'url' => $content_url,
|
||||
'content_type' => '',
|
||||
'headers' => [
|
||||
'content-type' => '',
|
||||
],
|
||||
'language' => '',
|
||||
],
|
||||
true
|
||||
|
|
@ -970,7 +989,9 @@ class ContentProxyTest extends TestCase
|
|||
}
|
||||
|
||||
/**
|
||||
* https://stackoverflow.com/a/18506801.
|
||||
* Convert hex to string.
|
||||
*
|
||||
* @see https://stackoverflow.com/a/18506801
|
||||
*
|
||||
* @param $hex
|
||||
*
|
||||
|
|
|
|||
|
|
@ -2,10 +2,8 @@
|
|||
|
||||
namespace Tests\Wallabag\CoreBundle\Helper;
|
||||
|
||||
use GuzzleHttp\Client;
|
||||
use GuzzleHttp\Message\Response;
|
||||
use GuzzleHttp\Stream\Stream;
|
||||
use GuzzleHttp\Subscriber\Mock;
|
||||
use GuzzleHttp\Psr7\Response;
|
||||
use Http\Mock\Client as HttpMockClient;
|
||||
use Monolog\Handler\TestHandler;
|
||||
use Monolog\Logger;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
|
@ -32,18 +30,14 @@ class DownloadImagesTest extends 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);
|
||||
|
||||
|
|
@ -53,18 +47,13 @@ class DownloadImagesTest extends TestCase
|
|||
|
||||
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');
|
||||
|
|
@ -85,18 +74,13 @@ class DownloadImagesTest extends TestCase
|
|||
*/
|
||||
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);
|
||||
|
|
@ -104,18 +88,13 @@ class DownloadImagesTest extends TestCase
|
|||
|
||||
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');
|
||||
|
|
@ -123,18 +102,13 @@ class DownloadImagesTest extends TestCase
|
|||
|
||||
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');
|
||||
|
|
@ -142,18 +116,13 @@ class DownloadImagesTest extends TestCase
|
|||
|
||||
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');
|
||||
|
|
@ -161,18 +130,13 @@ class DownloadImagesTest extends TestCase
|
|||
|
||||
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,
|
||||
|
|
@ -186,20 +150,15 @@ class DownloadImagesTest extends TestCase
|
|||
|
||||
public function testProcessImageWithSrcset()
|
||||
{
|
||||
$client = new Client();
|
||||
|
||||
$mock = new Mock([
|
||||
new Response(200, ['content-type' => 'image/jpeg'], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg'))),
|
||||
new Response(200, ['content-type' => 'image/jpeg'], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg'))),
|
||||
new Response(200, ['content-type' => 'image/jpeg'], 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')));
|
||||
$httpMockClient->addResponse(new Response(200, ['content-type' => null], file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg')));
|
||||
$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->processHtml(123, '<p><img class="alignnone wp-image-1153" src="http://piketty.blog.lemonde.fr/files/2017/10/F1FR-530x375.jpg" alt="" width="628" height="444" srcset="http://piketty.blog.lemonde.fr/files/2017/10/F1FR-530x375.jpg 530w, http://piketty.blog.lemonde.fr/files/2017/10/F1FR-768x543.jpg 768w, http://piketty.blog.lemonde.fr/files/2017/10/F1FR-900x636.jpg 900w" sizes="(max-width: 628px) 100vw, 628px" /></p>', 'http://piketty.blog.lemonde.fr/2017/10/12/budget-2018-la-jeunesse-sacrifiee/');
|
||||
|
||||
$this->assertNotContains('http://piketty.blog.lemonde.fr/', $res, 'Image srcset attribute were not replaced');
|
||||
|
|
@ -207,20 +166,15 @@ class DownloadImagesTest extends TestCase
|
|||
|
||||
public function testProcessImageWithTrickySrcset()
|
||||
{
|
||||
$client = new Client();
|
||||
|
||||
$mock = new Mock([
|
||||
new Response(200, ['content-type' => 'image/jpeg'], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg'))),
|
||||
new Response(200, ['content-type' => 'image/jpeg'], Stream::factory(file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg'))),
|
||||
new Response(200, ['content-type' => 'image/jpeg'], 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')));
|
||||
$httpMockClient->addResponse(new Response(200, ['content-type' => null], file_get_contents(__DIR__ . '/../fixtures/image-no-content-type.jpg')));
|
||||
$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->processHtml(123, '<figure id="post-257260" class="align-none media-257260"><img src="https://cdn.css-tricks.com/wp-content/uploads/2017/08/the-critical-request.png" srcset="https://res.cloudinary.com/css-tricks/image/upload/c_scale,w_1000,f_auto,q_auto/v1501594717/the-critical-request_bqdfaa.png 1000w, https://res.cloudinary.com/css-tricks/image/upload/c_scale,w_200,f_auto,q_auto/v1501594717/the-critical-request_bqdfaa.png 200w" sizes="(min-width: 1850px) calc( (100vw - 555px) / 3 )
|
||||
(min-width: 1251px) calc( (100vw - 530px) / 2 )
|
||||
(min-width: 1086px) calc(100vw - 480px)
|
||||
|
|
@ -232,18 +186,13 @@ class DownloadImagesTest extends TestCase
|
|||
|
||||
public function testProcessImageWithNullPath()
|
||||
{
|
||||
$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,
|
||||
|
|
|
|||
|
|
@ -2,10 +2,8 @@
|
|||
|
||||
namespace Tests\Wallabag\ImportBundle\Import;
|
||||
|
||||
use GuzzleHttp\Client;
|
||||
use GuzzleHttp\Message\Response;
|
||||
use GuzzleHttp\Stream\Stream;
|
||||
use GuzzleHttp\Subscriber\Mock;
|
||||
use GuzzleHttp\Psr7\Response;
|
||||
use Http\Mock\Client as HttpMockClient;
|
||||
use M6Web\Component\RedisMock\RedisMockFactory;
|
||||
use Monolog\Handler\TestHandler;
|
||||
use Monolog\Logger;
|
||||
|
|
@ -38,16 +36,11 @@ class PocketImportTest extends TestCase
|
|||
|
||||
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');
|
||||
|
||||
|
|
@ -56,16 +49,11 @@ class PocketImportTest extends TestCase
|
|||
|
||||
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');
|
||||
|
||||
|
|
@ -78,16 +66,11 @@ class PocketImportTest extends TestCase
|
|||
|
||||
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');
|
||||
|
||||
|
|
@ -97,16 +80,11 @@ class PocketImportTest extends TestCase
|
|||
|
||||
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');
|
||||
|
||||
|
|
@ -122,94 +100,90 @@ class PocketImportTest extends TestCase
|
|||
*/
|
||||
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);
|
||||
|
||||
|
|
@ -240,7 +214,7 @@ class PocketImportTest extends TestCase
|
|||
->method('updateEntry')
|
||||
->willReturn($entry);
|
||||
|
||||
$pocketImport->setClient($client);
|
||||
$pocketImport->setClient($httpMockClient);
|
||||
$pocketImport->authorize('wunderbar_code');
|
||||
|
||||
$res = $pocketImport->import();
|
||||
|
|
@ -254,56 +228,52 @@ class PocketImportTest extends TestCase
|
|||
*/
|
||||
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);
|
||||
|
||||
|
|
@ -335,7 +305,7 @@ class PocketImportTest extends TestCase
|
|||
->method('updateEntry')
|
||||
->willReturn($entry);
|
||||
|
||||
$pocketImport->setClient($client);
|
||||
$pocketImport->setClient($httpMockClient);
|
||||
$pocketImport->authorize('wunderbar_code');
|
||||
|
||||
$res = $pocketImport->setMarkAsRead(true)->import();
|
||||
|
|
@ -349,7 +319,7 @@ class PocketImportTest extends TestCase
|
|||
*/
|
||||
public function testImportWithRabbit()
|
||||
{
|
||||
$client = new Client();
|
||||
$httpMockClient = new HttpMockClient();
|
||||
|
||||
$body = <<<'JSON'
|
||||
{
|
||||
|
|
@ -374,19 +344,16 @@ class PocketImportTest extends TestCase
|
|||
}
|
||||
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();
|
||||
|
||||
|
|
@ -420,7 +387,7 @@ JSON;
|
|||
->method('publish')
|
||||
->with(json_encode($bodyAsArray));
|
||||
|
||||
$pocketImport->setClient($client);
|
||||
$pocketImport->setClient($httpMockClient);
|
||||
$pocketImport->setProducer($producer);
|
||||
$pocketImport->authorize('wunderbar_code');
|
||||
|
||||
|
|
@ -435,7 +402,7 @@ JSON;
|
|||
*/
|
||||
public function testImportWithRedis()
|
||||
{
|
||||
$client = new Client();
|
||||
$httpMockClient = new HttpMockClient();
|
||||
|
||||
$body = <<<'JSON'
|
||||
{
|
||||
|
|
@ -460,19 +427,16 @@ 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();
|
||||
|
||||
|
|
@ -499,7 +463,7 @@ JSON;
|
|||
$queue = new RedisQueue($redisMock, 'pocket');
|
||||
$producer = new Producer($queue);
|
||||
|
||||
$pocketImport->setClient($client);
|
||||
$pocketImport->setClient($httpMockClient);
|
||||
$pocketImport->setProducer($producer);
|
||||
$pocketImport->authorize('wunderbar_code');
|
||||
|
||||
|
|
@ -513,17 +477,13 @@ JSON;
|
|||
|
||||
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();
|
||||
|
|
@ -537,25 +497,23 @@ JSON;
|
|||
|
||||
public function testImportWithExceptionFromGraby()
|
||||
{
|
||||
$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(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->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);
|
||||
|
||||
|
|
@ -579,7 +537,7 @@ JSON;
|
|||
->method('updateEntry')
|
||||
->will($this->throwException(new \Exception()));
|
||||
|
||||
$pocketImport->setClient($client);
|
||||
$pocketImport->setClient($httpMockClient);
|
||||
$pocketImport->authorize('wunderbar_code');
|
||||
|
||||
$res = $pocketImport->import();
|
||||
|
|
|
|||
Loading…
Reference in a new issue