Skip to content

[HttpClient][Messenger] add PingWebhookMessage and PingWebhookMessageHandler #49815

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
use Symfony\Component\HtmlSanitizer\HtmlSanitizer;
use Symfony\Component\HtmlSanitizer\HtmlSanitizerConfig;
use Symfony\Component\HtmlSanitizer\HtmlSanitizerInterface;
use Symfony\Component\HttpClient\Messenger\PingWebhookMessageHandler;
use Symfony\Component\HttpClient\MockHttpClient;
use Symfony\Component\HttpClient\Retry\GenericRetryStrategy;
use Symfony\Component\HttpClient\RetryableHttpClient;
Expand Down Expand Up @@ -2455,6 +2456,10 @@ private function registerHttpClientConfiguration(array $config, ContainerBuilder
unset($options['vars']);
$container->getDefinition('http_client.transport')->setArguments([$options, $config['max_host_connections'] ?? 6]);

if (!class_exists(PingWebhookMessageHandler::class)) {
$container->removeDefinition('http_client.messenger.ping_webhook_handler');
}

if (!$hasPsr18 = ContainerBuilder::willBeAvailable('psr/http-client', ClientInterface::class, ['symfony/framework-bundle', 'symfony/http-client'])) {
$container->removeDefinition('psr18.http_client');
$container->removeAlias(ClientInterface::class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
use Psr\Http\Message\StreamFactoryInterface;
use Symfony\Component\HttpClient\HttpClient;
use Symfony\Component\HttpClient\HttplugClient;
use Symfony\Component\HttpClient\Messenger\PingWebhookMessageHandler;
use Symfony\Component\HttpClient\Psr18Client;
use Symfony\Component\HttpClient\Retry\GenericRetryStrategy;
use Symfony\Component\HttpClient\UriTemplateHttpClient;
Expand Down Expand Up @@ -90,5 +91,11 @@
->args([
[inline_service(\Rize\UriTemplate::class), 'expand'],
])

->set('http_client.messenger.ping_webhook_handler', PingWebhookMessageHandler::class)
->args([
service('http_client'),
])
->tag('messenger.message_handler')
;
};
1 change: 1 addition & 0 deletions src/Symfony/Component/HttpClient/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ CHANGELOG

* Add `HarFileResponseFactory` testing utility, allow to replay responses from `.har` files
* Add `max_retries` option to `RetryableHttpClient` to adjust the retry logic on a per request level
* Add `PingWehookMessage` and `PingWebhookMessageHandler`

6.3
---
Expand Down
31 changes: 31 additions & 0 deletions src/Symfony/Component/HttpClient/Messenger/PingWebhookMessage.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?php

/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace Symfony\Component\HttpClient\Messenger;

/**
* @author Kevin Bond <kevinbond@gmail.com>
*/
final class PingWebhookMessage implements \Stringable
{
public function __construct(
public readonly string $method,
public readonly string $url,
public readonly array $options = [],
public readonly bool $throw = true,
) {
}

public function __toString(): string
{
return "[{$this->method}] {$this->url}";
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?php

/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace Symfony\Component\HttpClient\Messenger;

use Symfony\Contracts\HttpClient\HttpClientInterface;
use Symfony\Contracts\HttpClient\ResponseInterface;

/**
* @author Kevin Bond <kevinbond@gmail.com>
*/
class PingWebhookMessageHandler
{
public function __construct(
private readonly HttpClientInterface $httpClient,
) {
}

public function __invoke(PingWebhookMessage $message): ResponseInterface
{
$response = $this->httpClient->request($message->method, $message->url, $message->options);
$response->getHeaders($message->throw);

return $response;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?php

/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace Symfony\Component\HttpClient\Tests\Messenger;

use PHPUnit\Framework\TestCase;
use Symfony\Component\HttpClient\Exception\ClientException;
use Symfony\Component\HttpClient\Messenger\PingWebhookMessage;
use Symfony\Component\HttpClient\Messenger\PingWebhookMessageHandler;
use Symfony\Component\HttpClient\MockHttpClient;
use Symfony\Component\HttpClient\Response\MockResponse;

/**
* @author Kevin Bond <kevinbond@gmail.com>
*/
final class PingWebhookMessageHandlerTest extends TestCase
{
public function testSuccessfulPing()
{
$client = new MockHttpClient([
function ($method, $url) {
$this->assertSame('POST', $method);
$this->assertSame('https://endpoint.com/key', $url);

return new MockResponse('a response');
},
]);
$handler = new PingWebhookMessageHandler($client);
$response = $handler(new PingWebhookMessage('POST', 'https://endpoint.com/key'));

$this->assertSame(200, $response->getStatusCode());
$this->assertSame('a response', $response->getContent());
$this->assertSame('https://endpoint.com/key', $response->getInfo('url'));
}

public function testPingErrorThrowsException()
{
$client = new MockHttpClient([
function ($method, $url) {
$this->assertSame('POST', $method);
$this->assertSame('https://endpoint.com/key', $url);

return new MockResponse('a response', ['http_code' => 404]);
},
]);

$handler = new PingWebhookMessageHandler($client);

$this->expectException(ClientException::class);

$handler(new PingWebhookMessage('POST', 'https://endpoint.com/key'));
}

public function testPingErrorDoesNotThrowException()
{
$client = new MockHttpClient([
function ($method, $url) {
$this->assertSame('POST', $method);
$this->assertSame('https://endpoint.com/key', $url);

return new MockResponse('a response', ['http_code' => 404]);
},
]);

$handler = new PingWebhookMessageHandler($client);
$response = $handler(new PingWebhookMessage('POST', 'https://endpoint.com/key', throw: false));

$this->assertSame(404, $response->getStatusCode());
$this->assertSame('a response', $response->getContent(false));
$this->assertSame('https://endpoint.com/key', $response->getInfo('url'));
}
}
1 change: 1 addition & 0 deletions src/Symfony/Component/HttpClient/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"psr/http-client": "^1.0",
"symfony/dependency-injection": "^5.4|^6.0|^7.0",
"symfony/http-kernel": "^5.4|^6.0|^7.0",
"symfony/messenger": "^5.4|^6.0|^7.0",
"symfony/process": "^5.4|^6.0|^7.0",
"symfony/stopwatch": "^5.4|^6.0|^7.0"
},
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy