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

Merge pull request #7881 from wallabag/remove-fixupmondediplomatiqueurisubscriber

Browse source 
Remove FixupMondeDiplomatiqueUriSubscriber
This commit is contained in:
Yassine Guedidi 2024-12-08 10:25:31 +01:00 committed by GitHub
commit 76d49d661c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 0 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/config/services.yml
View file

@ -219,7 +219,6 @@ services:
Wallabag\Helper\HttpClientFactory:
calls:
- ['addSubscriber', ['@Wallabag\Guzzle\AuthenticatorSubscriber']]
- ['addSubscriber', ['@Wallabag\Guzzle\FixupMondeDiplomatiqueUriSubscriber']]
RulerZ\RulerZ:
alias: rulerz

33
src/Guzzle/FixupMondeDiplomatiqueUriSubscriber.php
View file

@ -1,33 +0,0 @@
<?php
namespace Wallabag\Guzzle;
use GuzzleHttp\Event\CompleteEvent;
use GuzzleHttp\Event\SubscriberInterface;
/**
* Fixes url encoding of a parameter guzzle fails with.
*/
class FixupMondeDiplomatiqueUriSubscriber implements SubscriberInterface
{
public function getEvents(): array
{
return ['complete' => [['fixUri', 500]]];
}
public function fixUri(CompleteEvent $event)
{
$response = $event->getResponse();
if (!$response->hasHeader('Location')) {
return;
}
$uri = $response->getHeader('Location');
if (false === ($badParameter = strstr($uri, 'retour=http://'))) {
return;
}
$response->setHeader('Location', str_replace($badParameter, urlencode($badParameter), $uri));
}
}

95
tests/Guzzle/FixupMondeDiplomatiqueUriSubscriberTest.php
View file

@ -1,95 +0,0 @@
<?php
namespace Tests\Wallabag\Guzzle;
use GuzzleHttp\Event\CompleteEvent;
use GuzzleHttp\Message\Response;
use GuzzleHttp\Stream\Stream;
use PHPUnit\Framework\TestCase;
use Wallabag\Guzzle\FixupMondeDiplomatiqueUriSubscriber;
class FixupMondeDiplomatiqueUriSubscriberTest extends TestCase
{
public function testGetEvents()
{
$subscriber = new FixupMondeDiplomatiqueUriSubscriber();
$events = $subscriber->getEvents();
$this->assertArrayHasKey('complete', $events);
$this->assertCount(2, $events['complete'][0]);
}
public function testGetEventsWithoutHeaderLocation()
{
$response = new Response(
200,
[
'content-type' => 'text/html',
],
Stream::factory('<html></html>')
);
$event = $this->getMockBuilder(CompleteEvent::class)
->disableOriginalConstructor()
->getMock();
$event->expects($this->once())
->method('getResponse')
->willReturn($response);
$subscriber = new FixupMondeDiplomatiqueUriSubscriber();
$subscriber->fixUri($event);
$this->assertFalse($response->hasHeader('Location'));
}
public function testGetEventsWithNotMachingHeaderLocation()
{
$response = new Response(
200,
[
'content-type' => 'text/html',
'Location' => 'http://example.com',
],
Stream::factory('<html></html>')
);
$event = $this->getMockBuilder(CompleteEvent::class)
->disableOriginalConstructor()
->getMock();
$event->expects($this->once())
->method('getResponse')
->willReturn($response);
$subscriber = new FixupMondeDiplomatiqueUriSubscriber();
$subscriber->fixUri($event);
$this->assertSame('http://example.com', $response->getHeader('Location'));
}
public function testGetEventsWithMachingHeaderLocation()
{
$response = new Response(
200,
[
'content-type' => 'text/html',
'Location' => 'http://example.com/?foo=bar&retour=http://example.com',
],
Stream::factory('<html></html>')
);
$event = $this->getMockBuilder(CompleteEvent::class)
->disableOriginalConstructor()
->getMock();
$event->expects($this->once())
->method('getResponse')
->willReturn($response);
$subscriber = new FixupMondeDiplomatiqueUriSubscriber();
$subscriber->fixUri($event);
$this->assertSame('http://example.com/?foo=bar&retour%3Dhttp%3A%2F%2Fexample.com', $response->getHeader('Location'));
}
}