Merge pull request #243 from bowphp/5.x-refactoring-for-perf

[5.x] Fixes testcase service errors

Author: papac

src/Http/Client/HttpClient.php

@@ -15,6 +15,13 @@ class HttpClient
      */
     private $attach = [];
 
+    /**
+     * The headers collection
+     *
+     * @var array
+     */
+    private $headers = [];
+
     /**
      * The curl instance
      *
@@ -146,6 +153,7 @@ public function delete(string $url, array $data = []): Response
         $this->applyCommonOptions();
 
         curl_setopt($this->ch, CURLOPT_CUSTOMREQUEST, "DELETE");
+
         $content = $this->execute();
 
         return new Response($this->ch, $content);
@@ -170,14 +178,10 @@ public function addAttach(string|array $attach): array
      */
     public function addHeaders(array $headers): HttpClient
     {
-        $data = [];
-
         foreach ($headers as $key => $value) {
-            $data[] = $key . ': ' . $value;
+            $this->headers[] = $key . ': ' . $value;
         }
 
-        curl_setopt($this->ch, CURLOPT_HTTPHEADER, $data);
-
         return $this;
     }
 
@@ -189,7 +193,7 @@ public function addHeaders(array $headers): HttpClient
      */
     private function init(string $url): void
     {
-        if (is_null($this->base_url)) {
+        if (!is_null($this->base_url)) {
             $url = $this->base_url . "/" . trim($url, "/");
         }
 
@@ -227,6 +231,10 @@ private function close(): void
      */
     private function execute(): string
     {
+        if ($this->headers) {
+            curl_setopt($this->ch, CURLOPT_HTTPHEADER, $this->headers);
+        }
+
         $content = curl_exec($this->ch);
         $errno = curl_errno($this->ch);
 

src/Testing/TestCase.php

@@ -58,18 +58,31 @@ public function attach(array $attach): TestCase
     }
 
     /**
-     * Specify the additionnal who are use in the request
+     * Specify the additionnal headers
      *
      * @param array $headers
      * @return TestCase
      */
-    public function withHeader(array $headers): TestCase
+    public function withHeaders(array $headers): TestCase
     {
         $this->headers = $headers;
 
         return $this;
     }
 
+    /**
+     * Specify the additionnal header
+     *
+     * @param array $headers
+     * @return TestCase
+     */
+    public function withHeader(string $key, string $value): TestCase
+    {
+        $this->headers[$key] = $value;
+
+        return $this;
+    }
+
     /**
      * Get request
      *

tests/Support/HttpClientTest.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Bow\Tests\Support;
+
+use Bow\Http\Client\HttpClient;
+use PHPUnit\Framework\TestCase;
+
+class HttpClientTest extends TestCase
+{
+    public function test_get_method()
+    {
+        $http = new HttpClient();
+
+        $response = $http->get("https://google.com");
+
+        $this->assertEquals($response->statusCode(), 200);
+    }
+
+    public function test_get_method_with_custom_headers()
+    {
+        $http = new HttpClient();
+
+        $http->addHeaders(["X-Api-Key" => "Fake-Key"]);
+        $response = $http->get("https://google.com");
+
+        $this->assertEquals($response->statusCode(), 200);
+    }
+
+    public function test_should_be_fail_with_get_method()
+    {
+        $http = new HttpClient("https://google.com");
+
+        $http->addHeaders(["X-Api-Key" => "Fake-Key"]);
+        $response = $http->get("/the-fake-url");
+
+        $this->assertEquals($response->statusCode(), 404);
+    }
+}

tests/Support/TestingTest.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Bow\Tests\Support;
+
+use Bow\Testing\TestCase;
+
+class TestingTest extends TestCase
+{
+    /**
+     * The base url
+     *
+     * @var string
+     */
+    protected ?string $url = "https://google.com";
+
+    public function test_get_method()
+    {
+        $response = $this->get("/");
+
+        $response->assertStatus(200);
+    }
+
+    public function test_get_method_with_custom_headers()
+    {
+        $this->withHeaders(["X-Api-Key" => "Fake-Key"]);
+
+        $response = $this->get("/");
+
+        $response->assertStatus(200);
+    }
+
+    public function test_should_be_fail_with_get_method()
+    {
+        $this->withHeaders(["X-Api-Key" => "Fake-Key"]);
+
+        $response = $this->get("/the-fake-url-for-my-testing-please-do-not-block-this");
+
+        $response->assertStatus(404);
+    }
+}