Replace Guzzle with Symfony HTTP client

Author: jmleroux

src/Api/Job/JobTestMetadata.php

@@ -19,13 +19,9 @@ class JobTestMetadata
 {
     use ValidateClientVersionTrait;
 
-    /** @var Client */
-    private $client;
-
-    public function __construct(Client $client)
+    public function __construct(private readonly Client $client)
     {
-        $this->validateClientVersion($client, ['v2']);
-        $this->client = $client;
+        $this->validateClientVersion($this->client, ['v2']);
     }
 
     /**

src/Api/Workflow/CancelWorkflow.php

@@ -17,13 +17,9 @@ class CancelWorkflow
 {
     use ValidateClientVersionTrait;
 
-    /** @var Client */
-    private $client;
-
-    public function __construct(Client $client)
+    public function __construct(private Client $client)
     {
         $this->validateClientVersion($client, ['v2']);
-        $this->client = $client;
     }
 
     public function execute(string $workflowId): void

src/Client.php

@@ -10,7 +10,7 @@
 
 class Client
 {
-    protected readonly HttpClientInterface $client;
+    protected HttpClientInterface $client;
 
     public function __construct(private readonly string $token, private readonly ?string $version = 'v1.1')
     {

src/ValidateClientVersionTrait.php

@@ -12,7 +12,6 @@
 trait ValidateClientVersionTrait
 {
     /**
-     * @param Client $client
      * @param string[]  $supportedVersions
      */
     private function validateClientVersion(Client $client, array $supportedVersions): void

tests/Integration/Api/Project/BuildSummaryForBranchTest.php

@@ -60,13 +60,13 @@ public function testMaxResults()
         $personalToken = $_ENV['CIRCLECI_PERSONNAL_TOKEN'];
         $client = new Client($personalToken, 'v1.1');
         $query = new BuildSummaryForBranch($client);
-        $builds = $this->executeWithRetry($query, ['github', 'jmleroux', 'circleci-php-client', 'master', [], 8]);
-        $this->assertCount(8, $builds);
+        $builds = $this->executeWithRetry($query, ['github', 'jmleroux', 'circleci-php-client', 'master', [], 2]);
+        $this->assertCount(2, $builds);
 
-        $builds = $query->execute('github', 'jmleroux', 'circleci-php-client', 'master', [], 50);
-        $this->assertCount(50, $builds);
+        $builds = $query->execute('github', 'jmleroux', 'circleci-php-client', 'master', [], 8);
+        $this->assertCount(8, $builds);
 
-        $builds = $query->execute('github', 'jmleroux', 'circleci-php-client', 'master', ['limit' => 6], 22);
-        $this->assertCount(22, $builds);
+        $builds = $query->execute('github', 'jmleroux', 'circleci-php-client', 'master', ['limit' => 6], 8);
+        $this->assertCount(8, $builds);
     }
 }

tests/Integration/Api/Workflow/CancelWorkflowTest.php

@@ -4,10 +4,10 @@
 
 namespace Jmleroux\CircleCi\Tests\Integration\Api\Workflow;
 
-use GuzzleHttp\Exception\RequestException;
 use Jmleroux\CircleCi\Api\Workflow\CancelWorkflow;
 use Jmleroux\CircleCi\Client;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpClient\Exception\ClientException;
 
 class CancelWorkflowTest extends TestCase
 {
@@ -22,9 +22,8 @@ public function setUp(): void
 
     public function testQueryKo()
     {
-        $this->expectException(RequestException::class);
+        $this->expectException(ClientException::class);
         $this->expectExceptionCode(404);
-        $this->expectExceptionMessage('{"message":"Workflow not found"}');
 
         $query = new CancelWorkflow($this->client);
         $query->execute('foobar');

tests/Integration/TestClient.php

@@ -17,8 +17,8 @@ public function __construct(
         string $token,
         ?string $version = 'v1.1'
     ) {
+        parent::__construct($token, $version);
         $baseUri = sprintf('%s/api/%s/', $mockServerBaseUrl, $version);
         $this->client = HttpClient::create(['base_uri' => $baseUri]);
-        $this->token = $token;
     }
 }