Merge pull request #1 from cassell/guzzle6

Guzzle6

.gitignore

@@ -1,4 +1,4 @@
 /vendor
 .idea
 composer.lock
-tests
+/phpunit.xml

composer.json

@@ -3,12 +3,14 @@
     "description": "PHP SDK for Tremendous API",
     "type": "library",
     "require": {
-        "php": "^7.0",
-        "guzzlehttp/guzzle": "^5.0",
-        "symfony/http-foundation": "2.8.*|3.0.*"
+        "php": "^7.1",
+        "guzzlehttp/guzzle": "^6.0",
+        "symfony/http-foundation": "2.8.*|3.0.*",
+        "ext-json": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.0"
+        "phpunit/phpunit": "^6.0",
+        "fzaninotto/faker": "^1.9"
     },
     "autoload": {
         "psr-4": {

phpunit.xml.dist

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         beStrictAboutTestsThatDoNotTestAnything="false"
+         bootstrap="tests/bootstrap.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnError="false"
+         stopOnFailure="false"
+         verbose="true"
+>
+    <testsuites>
+        <testsuite name="Tremendous Test Suite">
+            <directory suffix=".php">./tests/</directory>
+        </testsuite>
+    </testsuites>
+    <php>
+        <env name="TREMENDOUS_ENDPOINT" value="https://testflight.tremendous.com/api/v2/"/>
+        <env name="TREMENDOUS_API_TOKEN" value=""/>
+        <env name="TREMENDOUS_FUNDING_SOURCE" value=""/>
+        <env name="TREMENDOUS_TEST_CAMPAIGN_IDENTIFIER" value="" />
+    </php>
+</phpunit>

src/Exception/CreateOrderException.php

@@ -12,9 +12,10 @@ class CreateOrderException extends Exception
      * CreateOrderException constructor.
      *
      * @param string $errorMessage
+     * @param Exception|null $previous
      */
-    public function __construct(string $errorMessage)
+    public function __construct(string $errorMessage, $previous = null)
     {
-        parent::__construct($errorMessage);
+        parent::__construct($errorMessage, 0, $previous);
     }
 }

src/Tremendous.php

@@ -3,25 +3,58 @@
 
 namespace Tremendous;
 
+use GuzzleHttp\ClientInterface;
 use Tremendous\Exception\CreateOrderException;
 use Tremendous\Request\CreateOrderRequest;
-use Tremendous\Response\CreateOrderResponse;
 
-class Tremendous extends Client
+class Tremendous
 {
-    public function createOrder(CreateOrderRequest $orderRequest) {
+    /**
+     * @var ClientInterface Http Client
+     */
+    protected $httpClient;
 
-        $uri = "orders";
+    /**
+     * Client constructor.
+     *
+     * @param ClientInterface $httpClient
+     *
+     */
+    public function __construct(ClientInterface $httpClient)
+    {
+        $this->httpClient = $httpClient;
+    }
 
-        $request = $this->httpClient->createRequest('POST', $uri);
-        $response = new CreateOrderResponse(
-            $this->sendRequest($request, $orderRequest->getPayload())
-        );
+    protected function decode(string $string): array
+    {
+        $array = \json_decode($string, true);
 
-        if (!$response->getClientResponse()->isSuccessful()) {
-            throw new CreateOrderException($response->getErrorMessage());
+        if (json_last_error() !== JSON_ERROR_NONE || !is_array($array)) {
+            throw new \InvalidArgumentException('Invalid json data');
         }
 
-        return Order::fromCreateArray($response->getOrder());
+        return $array;
+    }
+
+    public function createOrder(CreateOrderRequest $orderRequest)
+    {
+        $uri = "orders";
+
+        try {
+
+            $request = $this->httpClient->request('POST', $uri, [
+                'body'    => json_encode($orderRequest->getPayload()),
+                'headers' => [
+                    'Content-Type' => 'application/json'
+                ]
+            ]);
+
+            $data = $this->decode((string)$request->getBody());
+
+            return Order::fromCreateArray($data['order']);
+
+        } catch (\GuzzleHttp\Exception\ClientException $exception) {
+            throw new CreateOrderException($exception->getMessage(), $exception);
+        }
     }
 }

tests/ClientTest.php

@@ -0,0 +1,107 @@
+<?php
+declare(strict_types=1);
+
+use GuzzleHttp\Client;
+use PHPUnit\Framework\TestCase;
+use Tremendous\Request\CreateOrderRequest;
+use Tremendous\Tremendous;
+
+class ClientTest extends TestCase
+{
+    /**
+     * @throws \Tremendous\Exception\CreateOrderException
+     * @expectedException \Tremendous\Exception\CreateOrderException
+     * @expectedExceptionMessage Invalid Access token
+     */
+    public function testFailure()
+    {
+        $faker = \Faker\Factory::create();
+
+        $fundingSource = (string)getenv('TREMENDOUS_FUNDING_SOURCE');
+
+        $reward = [
+            'campaign_id' => getenv('TREMENDOUS_TEST_CAMPAIGN_IDENTIFIER'),
+            'value'       => [
+                'denomination'  => 5.00,
+                'currency_code' => 'USD'
+            ],
+            'recipient'   => [
+                'name'  => $faker->name(),
+                'email' => $faker->safeEmail()
+            ],
+            'delivery'    => [
+                'method' => 'LINK'
+            ],
+        ];
+
+        $rewardExternalId = \Faker\Provider\Uuid::uuid();
+
+        $invalidToken = 'invalid83924ded57c64add9881e70e35f92a46efbccdd1067a4830b6d6d89b4';
+
+        $config = [
+            'base_uri' => (string)getenv('TREMENDOUS_ENDPOINT'),
+            'headers'  => [
+                'Authorization' => 'Bearer ' . $invalidToken,
+                'Accept'        => 'application/json',
+                'Content-Type'  => 'application/json'
+            ]
+        ];
+
+        $httpClient = new Client($config);
+
+        $tremendousApi = new Tremendous($httpClient);
+
+        $orderRequest = new CreateOrderRequest($fundingSource, $reward, $rewardExternalId);
+
+        $tremendousApi->createOrder($orderRequest);
+    }
+
+    public function testLink()
+    {
+        $faker = \Faker\Factory::create();
+
+        $fundingSource = (string)getenv('TREMENDOUS_FUNDING_SOURCE');
+
+        $reward = [
+            'campaign_id' => getenv('TREMENDOUS_TEST_CAMPAIGN_IDENTIFIER'),
+            'value'       => [
+                'denomination'  => 5.00,
+                'currency_code' => 'USD'
+            ],
+            'recipient'   => [
+                'name'  => $faker->name(),
+                'email' => $faker->safeEmail()
+            ],
+            'delivery'    => [
+                'method' => 'LINK'
+            ],
+        ];
+
+        $rewardExternalId = \Faker\Provider\Uuid::uuid();
+
+        $config = [
+            'base_uri' => (string)getenv('TREMENDOUS_ENDPOINT'),
+            'headers'  => [
+                'Authorization' => 'Bearer ' . (string)getenv('TREMENDOUS_API_TOKEN'),
+                'Accept'        => 'application/json',
+                'Content-Type'  => 'application/json'
+            ]
+        ];
+
+
+        $httpClient = new Client($config);
+
+        $tremendousApi = new Tremendous($httpClient);
+
+        $orderRequest = new CreateOrderRequest($fundingSource, $reward, $rewardExternalId);
+
+        $order = $tremendousApi->createOrder($orderRequest);
+
+        $this->assertEquals(5.00, $order->getRewards()[0]->getValue()->getDenomination());
+        $this->assertEquals('USD', $order->getRewards()[0]->getValue()->getCurrencyCode());
+        $this->assertEquals('SUCCEEDED', $order->getRewards()[0]->getDelivery()->getStatus());
+
+    }
+
+
+}