1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-07-27 17:28:39 +00:00
This commit is contained in:
Jeremy Benoist 2019-01-28 06:10:26 +01:00
parent 1048c9c4a8
commit 448d99f84e
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
5 changed files with 7 additions and 8 deletions

View file

@ -312,7 +312,7 @@ class DownloadImages
* Retrieve and validate the extension from the response of the url of the image. * Retrieve and validate the extension from the response of the url of the image.
* *
* @param ResponseInterface $res Http Response * @param ResponseInterface $res Http Response
* @param string $imagePath Path from the src image from the content (used for log only) * @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 * @return string|false Extension name or false if validation failed
*/ */

View file

@ -6,9 +6,9 @@ use GuzzleHttp\Client as GuzzleClient;
use GuzzleHttp\Cookie\CookieJar; use GuzzleHttp\Cookie\CookieJar;
use GuzzleHttp\Event\SubscriberInterface; use GuzzleHttp\Event\SubscriberInterface;
use Http\Adapter\Guzzle5\Client as GuzzleAdapter; use Http\Adapter\Guzzle5\Client as GuzzleAdapter;
use Psr\Log\LoggerInterface;
use Http\Client\HttpClient; use Http\Client\HttpClient;
use Http\HttplugBundle\ClientFactory\ClientFactory; use Http\HttplugBundle\ClientFactory\ClientFactory;
use Psr\Log\LoggerInterface;
/** /**
* Builds and configures the HTTP client. * Builds and configures the HTTP client.

View file

@ -5,12 +5,12 @@ namespace Wallabag\ImportBundle\Import;
use Http\Client\Common\HttpMethodsClient; use Http\Client\Common\HttpMethodsClient;
use Http\Client\Common\Plugin\ErrorPlugin; use Http\Client\Common\Plugin\ErrorPlugin;
use Http\Client\Common\PluginClient; use Http\Client\Common\PluginClient;
use Http\Client\Exception\RequestException;
use Http\Client\HttpClient; use Http\Client\HttpClient;
use Http\Discovery\MessageFactoryDiscovery; use Http\Discovery\MessageFactoryDiscovery;
use Http\Message\MessageFactory; use Http\Message\MessageFactory;
use Http\Client\Exception\RequestException;
use Wallabag\CoreBundle\Entity\Entry;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Wallabag\CoreBundle\Entity\Entry;
class PocketImport extends AbstractImport class PocketImport extends AbstractImport
{ {
@ -88,7 +88,6 @@ class PocketImport extends AbstractImport
*/ */
public function authorize($code) public function authorize($code)
{ {
try { try {
$response = $this->client->post('https://getpocket.com/v3/oauth/authorize', [], json_encode([ $response = $this->client->post('https://getpocket.com/v3/oauth/authorize', [], json_encode([
'consumer_key' => $this->user->getConfig()->getPocketConsumerKey(), 'consumer_key' => $this->user->getConfig()->getPocketConsumerKey(),
@ -153,7 +152,7 @@ class PocketImport extends AbstractImport
/** /**
* Set the Http client. * Set the Http client.
* *
* @param HttpClient $client * @param HttpClient $client
* @param MessageFactory|null $messageFactory * @param MessageFactory|null $messageFactory
*/ */
public function setClient(HttpClient $client, MessageFactory $messageFactory = null) public function setClient(HttpClient $client, MessageFactory $messageFactory = null)

View file

@ -3,10 +3,10 @@
namespace Tests\Wallabag\CoreBundle\Helper; namespace Tests\Wallabag\CoreBundle\Helper;
use GuzzleHttp\Client; use GuzzleHttp\Client;
use GuzzleHttp\Psr7\Response;
use GuzzleHttp\Stream\Stream; use GuzzleHttp\Stream\Stream;
use GuzzleHttp\Subscriber\Mock; use GuzzleHttp\Subscriber\Mock;
use Http\Mock\Client as HttpMockClient; use Http\Mock\Client as HttpMockClient;
use GuzzleHttp\Psr7\Response;
use Monolog\Handler\TestHandler; use Monolog\Handler\TestHandler;
use Monolog\Logger; use Monolog\Logger;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;

View file

@ -2,8 +2,8 @@
namespace Tests\Wallabag\ImportBundle\Import; namespace Tests\Wallabag\ImportBundle\Import;
use Http\Mock\Client as HttpMockClient;
use GuzzleHttp\Psr7\Response; use GuzzleHttp\Psr7\Response;
use Http\Mock\Client as HttpMockClient;
use M6Web\Component\RedisMock\RedisMockFactory; use M6Web\Component\RedisMock\RedisMockFactory;
use Monolog\Handler\TestHandler; use Monolog\Handler\TestHandler;
use Monolog\Logger; use Monolog\Logger;