Replace Guzzle with Symfony HTTP client

Author: jmleroux

Diff for: src/Api/Pipeline/AllPipelines.php

@@ -12,25 +12,21 @@
  * Retrieve pipelines of a project, optionally filtered by branch.
  *
  * @author jmleroux <[email protected]>
- * @link https://circleci.com/docs/api/v2/#operation/listPipelinesForProject
+ * @link   https://circleci.com/docs/api/v2/#operation/listPipelinesForProject
  */
 class AllPipelines
 {
     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;
     }
 
     /**
      * @return Pipeline[]
      */
-    public function execute(string $projectSlug, ?int $maxPipelineCount, ?string $branch): array
+    public function execute(string $projectSlug, ?int $maxPipelineCount = null, ?string $branch = null): array
     {
         $pipelines = [];
 
@@ -52,7 +48,7 @@ public function execute(string $projectSlug, ?int $maxPipelineCount, ?string $br
                 unset($params['branch']);
             }
 
-            $response = json_decode((string) $this->client->get($uri, $params)->getContent());
+            $response = json_decode((string)$this->client->get($uri, $params)->getContent());
             $nextPageToken = $response->next_page_token;
 
             foreach ($response->items as $item) {

Diff for: tests/Integration/Api/Pipeline/AllPipelinesTest.php

@@ -21,13 +21,9 @@ class AllPipelinesTest extends TestCase
 
     private Client $client;
 
-    public static function setUpBeforeClass(): void
-    {
-        MockServer::startServer();
-    }
-
     public function setUp(): void
     {
+        MockServer::startServer();
         $personaltoken = $_ENV['CIRCLECI_PERSONNAL_TOKEN'];
         $this->client = new TestClient(MockServer::getServerRoot(), $personaltoken, 'v2');
     }
@@ -69,7 +65,7 @@ public function testQueryWithBranch()
         $this->assertIsArray($pipelines);
         foreach ($pipelines as $pipeline) {
             $this->assertInstanceOf(Pipeline::class, $pipeline);
-            $this->assertEquals('master', $pipeline->vcs()->branch());
+            $this->assertEquals('feature/design-new-api', $pipeline->vcs()->branch());
         }
     }
 }

Diff for: tests/Integration/Api/Project/BuildSummaryForBranchTest.php

@@ -31,9 +31,6 @@ public function testQueryOk()
         $this->assertIsInt($firstBuild->buildNum());
         $this->assertIsString($firstBuild->branch());
         $this->assertIsString($firstBuild->vcsRevision());
-        $this->assertIsString($firstBuild->committerName());
-        $this->assertIsString($firstBuild->committerEmail());
-        $this->assertIsString($firstBuild->body());
         $this->assertIsString($firstBuild->why());
         $this->assertNull($firstBuild->dontBuild());
         if (null !== $firstBuild->queuedAt()) {

Diff for: tests/Integration/Api/Project/ProjectSummaryMetricsTest.php

@@ -20,8 +20,7 @@ class ProjectSummaryMetricsTest extends TestCase
 {
     use ExecuteWithRetryTrait;
 
-    /** @var Client */
-    private $client;
+    private Client $client;
 
     public function setUp(): void
     {

Diff for: tests/Integration/Api/Workflow/WorkflowJobsTest.php

@@ -4,6 +4,8 @@
 
 namespace Jmleroux\CircleCi\Tests\Integration\Api\Workflow;
 
+use Jmleroux\CircleCi\Api\Pipeline\AllPipelines;
+use Jmleroux\CircleCi\Api\Pipeline\PipelineWorkflows;
 use Jmleroux\CircleCi\Api\Workflow\WorkflowJobs;
 use Jmleroux\CircleCi\Client;
 use Jmleroux\CircleCi\Model\Job;
@@ -15,8 +17,7 @@ class WorkflowJobsTest extends TestCase
 {
     use ExecuteWithRetryTrait;
 
-    /** @var Client */
-    private $client;
+    private Client $client;
 
     public function setUp(): void
     {
@@ -26,8 +27,12 @@ public function setUp(): void
 
     public function testQuery()
     {
+        $query = new AllPipelines($this->client);
+        $pipelines = $query->execute('gh/jmleroux/circleci-php-client', 1);
+        $query = new PipelineWorkflows($this->client);
+        $workflows = $query->execute($pipelines[0]->id(), 1);
         $query = new WorkflowJobs($this->client);
-        $jobs = $this->executeWithRetry($query, ['78176b2f-c1e3-4c18-86e3-5a80a2f109bb']);
+        $jobs = $this->executeWithRetry($query, [$workflows[0]->id()]);
         Assert::assertIsArray($jobs);
 
         $firstJob = $jobs[0];