Revert deprecating HttplugClient::sendRequest()

simonberger · simonberger · commit 5e20465668ca · 2023-03-15T16:25:24.000+01:00
diff --git a/UPGRADE-6.3.md b/UPGRADE-6.3.md
@@ -61,7 +61,6 @@ HttpClient
 ----------
 
 * Deprecate the `Http\Client\HttpClient` service, use the `Http\Client\HttpAsyncClient` service for method `::sendAsyncRequest` and `psr\Http\Client\ClientInterface` for `::sendRequest` instead
-* Deprecate `Symfony\Component\HttpClient\HttplugClient::sendRequest`, use `Psr\Http\Client\ClientInterface::sendRequest` instead
 
 HttpFoundation
 --------------
diff --git a/src/Symfony/Component/HttpClient/HttplugClient.php b/src/Symfony/Component/HttpClient/HttplugClient.php
@@ -108,13 +108,8 @@ public function withOptions(array $options): static
         return $clone;
     }
 
-    /**
-     * @deprecated since Symfony 6.3, use {@link ClientInterface::sendRequest()} instead
-     */
     public function sendRequest(RequestInterface $request): Psr7ResponseInterface
     {
-        trigger_deprecation('symfony/http-client', '6.3', 'The "%s()" method is deprecated, use "%s::sendRequest()" instead.', __METHOD__, ClientInterface::class);
-
         try {
             return $this->waitLoop->createPsr7Response($this->sendPsr7Request($request));
         } catch (TransportExceptionInterface $e) {
diff --git a/src/Symfony/Component/HttpClient/Tests/HttplugClientTest.php b/src/Symfony/Component/HttpClient/Tests/HttplugClientTest.php
@@ -18,7 +18,6 @@
 use Http\Promise\Promise;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\ResponseInterface;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\HttpClient\Exception\TransportException;
 use Symfony\Component\HttpClient\HttplugClient;
 use Symfony\Component\HttpClient\MockHttpClient;
@@ -28,20 +27,13 @@
 
 class HttplugClientTest extends TestCase
 {
-    use ExpectDeprecationTrait;
-
     public static function setUpBeforeClass(): void
     {
         TestHttpServer::start();
     }
 
-    /**
-     * @group legacy
-     */
     public function testSendRequest()
     {
-        $this->expectDeprecation('Since symfony/http-client 6.3: The "Symfony\Component\HttpClient\HttplugClient::sendRequest()" method is deprecated, use "Psr\Http\Client\ClientInterface::sendRequest()" instead.');
-
         $client = new HttplugClient(new NativeHttpClient());
 
         $response = $client->sendRequest($client->createRequest('GET', 'http://localhost:8057'));
@@ -111,13 +103,8 @@ public function testWait()
         $this->assertFalse($failureCallableCalled, 'Failure callable should not be called when request is successful.');
     }
 
-    /**
-     * @group legacy
-     */
     public function testPostRequest()
     {
-        $this->expectDeprecation('Since symfony/http-client 6.3: The "Symfony\Component\HttpClient\HttplugClient::sendRequest()" method is deprecated, use "Psr\Http\Client\ClientInterface::sendRequest()" instead.');
-
         $client = new HttplugClient(new NativeHttpClient());
 
         $request = $client->createRequest('POST', 'http://localhost:8057/post')
@@ -129,13 +116,8 @@ public function testPostRequest()
         $this->assertSame(['foo' => '0123456789', 'REQUEST_METHOD' => 'POST'], $body);
     }
 
-    /**
-     * @group legacy
-     */
     public function testNetworkException()
     {
-        $this->expectDeprecation('Since symfony/http-client 6.3: The "Symfony\Component\HttpClient\HttplugClient::sendRequest()" method is deprecated, use "Psr\Http\Client\ClientInterface::sendRequest()" instead.');
-
         $client = new HttplugClient(new NativeHttpClient());
 
         $this->expectException(NetworkException::class);
@@ -168,13 +150,8 @@ public function testAsyncNetworkException()
         $promise->wait(true);
     }
 
-    /**
-     * @group legacy
-     */
     public function testRequestException()
     {
-        $this->expectDeprecation('Since symfony/http-client 6.3: The "Symfony\Component\HttpClient\HttplugClient::sendRequest()" method is deprecated, use "Psr\Http\Client\ClientInterface::sendRequest()" instead.');
-
         $client = new HttplugClient(new NativeHttpClient());
 
         $this->expectException(RequestException::class);

Original file line number	Diff line number	Diff line change
`@@ -108,13 +108,8 @@ public function withOptions(array $options): static`
`108`	`108`	`return $clone;`
`109`	`109`	`}`
`110`	`110`
`111`		`- /**`
`112`		`- * @deprecated since Symfony 6.3, use {@link ClientInterface::sendRequest()} instead`
`113`		`- */`
`114`	`111`	`public function sendRequest(RequestInterface $request): Psr7ResponseInterface`
`115`	`112`	`{`
`116`		`- trigger_deprecation('symfony/http-client', '6.3', 'The "%s()" method is deprecated, use "%s::sendRequest()" instead.', __METHOD__, ClientInterface::class);`
`117`		`-`
`118`	`113`	`try {`
`119`	`114`	`return $this->waitLoop->createPsr7Response($this->sendPsr7Request($request));`
`120`	`115`	`} catch (TransportExceptionInterface $e) {`