README.md

@@ -137,19 +137,3 @@ Example:
 ```php
 $client->call("my/endpoint")->params(["foo" => "bar"])->delete();
 ```
-
-### `OPTIONS` Request
-
-Make an `OPTIONS` request by chaining `options()` at the end of a method chain. This method will return a `Reflect\Response` object.
-
-Use this method to query Reflect for available request methods.
-
-```php
-Client->options(): Reflect\Response;
-```
-
-Example:
-
-```php
-$client->call("my/endpoint"))->options();
-```

src/Reflect/Client.php

@@ -9,17 +9,15 @@
     require_once "Response.php";
 
     class Client {
-        private string $params;
-        private string $endpoint;
-        private array $headers = [];
-        private ?array $payload = null;
-
         protected ?string $key;
         protected string $base_url;
         protected bool $https_verify_peer;
+
+        protected string $endpoint;
+        protected string $params;
             
         public function __construct(string $base_url, string $key = null, bool $verify_peer = true) {
-            // Set optional API key and Authorization header
+            // Optional API key
             $this->key = $key;
 
             // Append tailing "/" if absent
@@ -36,25 +34,27 @@
         // ----
 
         // Construct stream_context_create() compatible header string
-        private function get_headers(): string {
+        private function http_headers(): string {
-            // Set Authorization header if an API key is used
+            $headers = ["Content-Type: application/json"];
-            if ($this->key) {
+
-                $this->headers["Authorization"] = "Bearer {$this->key}";
+            // Append Authentication header if API key is provided
+            if (!empty($this->key)) {
+                $headers[] = "Authorization: Bearer {$this->key}";
             }
-            
+
-            // Construct HTTP headers string from array
+            // Append new line chars to each header
-            $headers = array_map(fn(string $k, string $v): string => "{$k}: {$v}\r\n", array_keys($this->headers), array_values($this->headers));
+            $headers = array_map(fn($header): string => $header . "\r\n", $headers);
             return implode("", $headers);
         }
 
         // Make request and return response over HTTP
-        private function http_call(Method $method): array {
+        private function http_call(Method $method, array $payload = null): array {
             $context = stream_context_create([
                 "http" => [
-                    "header"        => $this->get_headers(),
+                    "header"        => $this->http_headers(),
                     "method"        => $method->name,
                     "ignore_errors" => true,
-                    "content"       => !empty($this->payload) ? json_encode($this->payload) : ""
+                    "content"       => !empty($payload) ? json_encode($payload) : ""
                 ],
                 "ssl" => [
                     "verify_peer"       => $this->https_verify_peer,
@@ -73,20 +73,6 @@
             return [$resp, $resp_code];
         }
 
-        // Set request body to be JSON-stringified
-        private function set_request_body(?array $payload = null): self {
-            // Unset request body if no payload defined
-            if (empty($payload)) {
-                $this->payload = null;
-                return $this;
-            }
-
-            $this->headers["Content-Type"] = "application/json";
-
-            $this->payload = $payload;
-            return $this;
-        }
-
         // ----
 
         // Construct URL search parameters from array if set
@@ -102,10 +88,8 @@
                 ? $endpoint 
                 : substr($endpoint, 1, strlen($endpoint) - 1);
 
-            // Reset initial values
+            // Reset search parameters
             $this->params();
-            $this->headers = [];
-            $this->set_request_body();
 
             return $this;
         }
@@ -118,26 +102,18 @@
         }
 
         public function patch(?array $payload = []): Response {
-            $this->set_request_body($payload);
+            return new Response(...$this->http_call(Method::PATCH, $payload));
-            return new Response(...$this->http_call(Method::PATCH));
         }
 
         public function put(?array $payload = []): Response {
-            $this->set_request_body($payload);
+            return new Response(...$this->http_call(Method::PUT, $payload));
-            return new Response(...$this->http_call(Method::PUT));
         }
 
         public function post(?array $payload = []): Response {
-            $this->set_request_body($payload);
+            return new Response(...$this->http_call(Method::POST, $payload));
-            return new Response(...$this->http_call(Method::POST));
         }
 
         public function delete(?array $payload = []): Response {
-            $this->set_request_body($payload);
+            return new Response(...$this->http_call(Method::DELETE, $payload));
-            return new Response(...$this->http_call(Method::DELETE));
         }
-
+    }
-        public function options(): Response {
-            return new Response(...$this->http_call(Method::OPTIONS));
-        }
-    }