From 0426632a0832e41f21d4f7ab5baeafc1d82691cd Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Sun, 31 May 2020 00:39:48 +0100
Subject: [PATCH] Refactor, add traits

---
 src/Glassboxx/Request/AbstractRequest.php   | 13 +++----------
 src/Glassboxx/Request/CustomerRequest.php   | 10 +++-------
 src/Glassboxx/Traits/UsesAuthTokenTrait.php | 15 +++++++++++++++
 src/Glassboxx/Traits/UsesConfigTrait.php    | 20 ++++++++++++++++++++
 4 files changed, 41 insertions(+), 17 deletions(-)
 create mode 100644 src/Glassboxx/Traits/UsesAuthTokenTrait.php
 create mode 100644 src/Glassboxx/Traits/UsesConfigTrait.php

diff --git a/src/Glassboxx/Request/AbstractRequest.php b/src/Glassboxx/Request/AbstractRequest.php
index 1bf70f7..74795df 100644
--- a/src/Glassboxx/Request/AbstractRequest.php
+++ b/src/Glassboxx/Request/AbstractRequest.php
@@ -5,28 +5,21 @@ declare(strict_types=1);
 namespace Opdavies\Glassboxx\Request;
 
 use Opdavies\Glassboxx\Config;
+use Opdavies\Glassboxx\Traits\UsesConfigTrait;
 use Symfony\Component\HttpClient\HttpClient;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 abstract class AbstractRequest
 {
+    use UsesConfigTrait;
+
     public const BASE_URL = 'https://server.glassboxx.co.uk/rest/V1';
 
     /** @var HttpClient */
     protected $client;
 
-    /** @var Config */
-    protected $config;
-
     public function __construct(HttpClientInterface $client)
     {
         $this->client = $client;
     }
-
-    public function withConfig(Config $config): AbstractRequest
-    {
-        $this->config = $config;
-
-        return $this;
-    }
 }
diff --git a/src/Glassboxx/Request/CustomerRequest.php b/src/Glassboxx/Request/CustomerRequest.php
index eede002..d60d92d 100644
--- a/src/Glassboxx/Request/CustomerRequest.php
+++ b/src/Glassboxx/Request/CustomerRequest.php
@@ -4,10 +4,13 @@ declare(strict_types=1);
 
 namespace Opdavies\Glassboxx\Request;
 
+use Opdavies\Glassboxx\Traits\UsesAuthTokenTrait;
 use Opdavies\Glassboxx\ValueObject\CustomerInterface;
 
 final class CustomerRequest extends AbstractRequest
 {
+    use UsesAuthTokenTrait;
+
     public const ENDPOINT = '/glassboxxorder/customCustomer';
 
     /** @var string */
@@ -23,13 +26,6 @@ final class CustomerRequest extends AbstractRequest
         return $this;
     }
 
-    public function withAuthToken(string $authToken): self
-    {
-        $this->authToken = $authToken;
-
-        return $this;
-    }
-
     public function execute(): string
     {
         $body = [
diff --git a/src/Glassboxx/Traits/UsesAuthTokenTrait.php b/src/Glassboxx/Traits/UsesAuthTokenTrait.php
new file mode 100644
index 0000000..e68378e
--- /dev/null
+++ b/src/Glassboxx/Traits/UsesAuthTokenTrait.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Opdavies\Glassboxx\Traits;
+
+trait UsesAuthTokenTrait
+{
+    public function withAuthToken(string $authToken): self
+    {
+        $this->authToken = $authToken;
+
+        return $this;
+    }
+}
diff --git a/src/Glassboxx/Traits/UsesConfigTrait.php b/src/Glassboxx/Traits/UsesConfigTrait.php
new file mode 100644
index 0000000..dad7f0f
--- /dev/null
+++ b/src/Glassboxx/Traits/UsesConfigTrait.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Opdavies\Glassboxx\Traits;
+
+use Opdavies\Glassboxx\Config;
+
+trait UsesConfigTrait
+{
+    /** @var Config */
+    protected $config;
+
+    public function withConfig(Config $config): self
+    {
+        $this->config = $config;
+
+        return $this;
+    }
+}