Extract out generation code

Author: Jaspaul

src/Requests/Payload.php

@@ -29,36 +29,38 @@ public function __construct($request)
     }
 
     /**
-     * Returns the payload from a guzzle request.
+     * Generates a payload with the provided properties
      *
-     * @param \Psr\Http\Message\RequestInterface $request
-     *        An instance of the guzzle request to extract a payload from.
+     * @param string $identifier
+     * @param string $method
+     * @param string $timestamp
+     * @param string $uri
+     * @param string $content
      *
      * @return string
-     *         The payload.
      */
-    protected function generateFromPsr7Request(Psr7Request $request) : string
-    {
-        $id = isset($this->request->getHeader('X-SIGNED-ID')[0]) ?
-            $this->request->getHeader('X-SIGNED-ID')[0] : '';
-        $timestamp = isset($this->request->getHeader('X-SIGNED-TIMESTAMP')[0]) ?
-            $this->request->getHeader('X-SIGNED-TIMESTAMP')[0] : '';
-
+    private function generate(
+        string $identifier,
+        string $method,
+        string $timestamp,
+        string $uri,
+        string $content
+    ) : string {
         $payload = [
-            'id' => (string) $id,
-            'method' => strtoupper($this->request->getMethod()),
+            'id' => $identifier,
+            'method' => strtoupper($method),
             'timestamp' => $timestamp,
-            'uri' => rtrim((string) $this->request->getUri(), '/')
+            'uri' => rtrim($uri, '/')
         ];
 
-        if (is_null(json_decode((string) $this->request->getBody()))) {
+        if (is_null(json_decode($content))) {
             $payload = array_merge($payload, [
-                'content' => (string) $this->request->getBody()
+                'content' => $content
             ]);
         } else {
             $payload = array_merge($payload, [
                 'content' => json_encode(
-                    json_decode((string) $this->request->getBody()),
+                    json_decode($content),
                     JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE
                 )
             ]);
@@ -67,6 +69,31 @@ protected function generateFromPsr7Request(Psr7Request $request) : string
         return json_encode($payload, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
     }
 
+    /**
+     * Returns the payload from a guzzle request.
+     *
+     * @param \Psr\Http\Message\RequestInterface $request
+     *        An instance of the guzzle request to extract a payload from.
+     *
+     * @return string
+     *         The payload.
+     */
+    protected function generateFromPsr7Request(Psr7Request $request) : string
+    {
+        $id = isset($this->request->getHeader('X-SIGNED-ID')[0]) ?
+            $this->request->getHeader('X-SIGNED-ID')[0] : '';
+        $timestamp = isset($this->request->getHeader('X-SIGNED-TIMESTAMP')[0]) ?
+            $this->request->getHeader('X-SIGNED-TIMESTAMP')[0] : '';
+
+        return $this->generate(
+            (string) $id,
+            (string) $this->request->getMethod(),
+            (string) $timestamp,
+            (string) $this->request->getUri(),
+            (string) $this->request->getBody()
+        );
+    }
+
     /**
      * Retruns the payload from an illuminate request.
      *
@@ -81,27 +108,13 @@ protected function generateFromIlluminateRequest(IlluminateRequest $request) : s
         $id = $this->request->headers->get('X-SIGNED-ID', '');
         $timestamp = $this->request->headers->get('X-SIGNED-TIMESTAMP', '');
 
-        $payload = [
-            'id' => (string) $id,
-            'method' => strtoupper($this->request->getMethod()),
-            'timestamp' => $timestamp,
-            'uri' => rtrim((string) $this->request->fullUrl(), '/'),
-        ];
-
-        if (is_null(json_decode((string) $this->request->getContent()))) {
-            $payload = array_merge($payload, [
-                'content' => (string) $this->request->getContent()
-            ]);
-        } else {
-            $payload = array_merge($payload, [
-                'content' => json_encode(
-                    json_decode((string)$this->request->getContent()),
-                    JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE
-                )
-            ]);
-        }
-
-        return json_encode($payload, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+        return $this->generate(
+            (string) $id,
+            (string) $this->request->getMethod(),
+            (string) $timestamp,
+            (string) $this->request->fullUrl(),
+            (string) $this->request->getContent()
+        );
     }
 
     /**