Merge pull request #260 from blockchyp/feature/javaBug

Java test bug and php null exception fix

lib/Exception/BlockChypException.php

@@ -24,8 +24,11 @@ public static function factory($message, $httpStatus = null, $httpBody = null)
         $instance = new static($message);
         $instance->setHttpStatus($httpStatus);
         $instance->setHttpBody($httpBody);
-        $instance->setJsonBody(json_decode($httpBody, true));
-
+        if (isset($httpBody)) {
+            $httpBody = json_decode($httpBody, true);
+        }
+        $instance->setJsonBody($httpBody);
+
         return $instance;
     }
 

tests/itests/MerchantCredentialGenerationTest.php

@@ -0,0 +1,50 @@
+<?php
+
+use BlockChyp\BlockChyp;
+
+require_once(__DIR__ . '/../BlockChypTestCase.php');
+
+class MerchantCredentialGenerationTest extends BlockChypTestCase
+{
+
+    /**
+     * @group itest
+     */
+    public function testMerchantCredentialGeneration()
+    {
+        $config = $this->loadTestConfiguration();
+
+        BlockChyp::setApiKey($config->apiKey);
+        BlockChyp::setBearerToken($config->bearerToken);
+        BlockChyp::setSigningKey($config->signingKey);
+        BlockChyp::setGatewayHost($config->gatewayHost);
+        BlockChyp::setTestGatewayHost($config->testGatewayHost);
+        BlockChyp::setDashboardHost($config->dashboardHost);
+
+        echo 'Running MerchantCredentialGenerationTest...' . PHP_EOL;        // Set request values
+        $request = [
+            'test' => true,
+            'merchantId' => '<MERCHANT ID>',
+        ];
+
+        // self::logRequest($request);
+
+         try {
+
+            $response = BlockChyp::merchantCredentialGeneration($request);
+
+            // self::logResponse($response);
+
+            // Response assertions
+
+            $this->assertTrue($response['success']);
+
+        } catch (Exception $ex) {
+
+            echo $ex->getTraceAsString();
+            $this->assertEmpty($ex);
+
+        }
+        $this->processResponseDelay($request);
+    }
+}