Merge pull request #18 from sanjaymandadi/master

Fix issue post/put operations

Author: Sanjay

composer.json

@@ -7,8 +7,8 @@
     "license": "Apache-2.0",
     "require": {
         "php": ">=5.5",
-        "guzzlehttp/guzzle": "6.0.1",
-        "guzzlehttp/psr7": "~1.0",
+        "guzzlehttp/guzzle": "6.0.2",
+        "guzzlehttp/psr7": "~1.1",
         "guzzlehttp/promises": "~1.0",
         "apache/log4php": "2.3.0"
     },

src/MozuClient.php

@@ -86,7 +86,7 @@ public function withContext(iApiContext $apiContext) {
 	}
 
 	public function withBody($body) {
-		$this->requestBody = json_encode ( $body );
+		$this->requestBody =  json_encode($body);
 		$this->isStreamContent = false;
 		return $this;
 	}
@@ -120,7 +120,7 @@ public function withHeader($header, $value) {
 	public function execute() {
 		$this->validateContext();
 		$this->buildClientAndRequest();
-        $promise = $this->client->sendAsync ($this->request);
+        $promise = $this->client->sendAsync($this->request);
         $this->response = $promise->wait();
 
 		return $this;
@@ -129,8 +129,8 @@ public function execute() {
     public function executeAsync() {
         $this->validateContext();
         $this->buildClientAndRequest();
-        return $this->client->sendAsync ($this->request)
-        ->then(function($response) {
+        $promise = $this->client->sendAsync($this->request);
+        return $promise->then(function($response) {
             $mozuResult = new MozuResult();
             if (!$this->notFoundFromServer) {
                 $mozuResult->contentType = $response->getHeader("Content-Type");
@@ -221,7 +221,7 @@ private function addRequestHeaders(RequestInterface $request) {
             $request = $request->withHeader(Headers::CONTENT_TYPE,$this->contentType);
         }
         if (!$this->isStreamContent)
-            $request= $request->withHeader('Content-Type', 'application/json');
+            $request= $request->withHeader('Content-Type', 'application/json; charset=utf-8');
 
         if ($this->apiContext != null && $this->apiContext->getUserAuthTicket() != null) {
             $this->setUserAuth();
@@ -232,6 +232,9 @@ private function addRequestHeaders(RequestInterface $request) {
         foreach ($this->headers as $name => $value) {
             $request = $request->withHeader($name, $value );
         }
+
+        if ($this->requestBody != null)
+            $request = $request->withHeader("Content-Length", strlen($this->requestBody));
         return $request;
     }
 

tests/src/Resources/Commerce/Catalog/Admin/AttributeDefinition/ProductTypeTest.php

@@ -0,0 +1,74 @@
+<?php
+
+use GuzzleHttp\Promise;
+use Mozu\Api\ApiContext;
+use Mozu\Api\DataViewMode;
+use Mozu\Api\Resources\Commerce\Catalog\Admin\Attributedefinition\ProductTypeResource;
+use Mozu\Api\Contracts\ProductAdmin\ProductType;
+
+use Mozu\Api\Resources\Platform\TenantResource;
+use Mozu\Tests\BaseTest;
+
+/**
+ * Test class for ProductResource.
+ * Generated by PHPUnit on 2013-09-25 at 15:38:56.
+ */
+class ProductTypeResourceTest extends BaseTest
+{
+    /**
+     * @var ProductResource
+     */
+    protected $object;
+
+    /**
+     * Sets up the fixture, for example, opens a network connection.
+     * This method is called before a test is executed.
+     */
+    protected function setUp()
+    {
+        printf("Getting tenant");
+        $tenantResource = new TenantResource();
+        $tenantPromise = $tenantResource->getTenantAsync($this->tenantId);
+        $tenantPromise->then(function($mozuResult) {
+            $apiContext = new ApiContext($mozuResult->json());
+            $this->object = new ProductTypeResource($apiContext, DataViewMode::LIVE);
+        }, function($apiException) {
+            parent::printError($apiException);
+            throw $apiException;
+        });
+
+        $tenantPromise->wait();
+
+    }
+
+    /**
+     * Tears down the fixture, for example, closes a network connection.
+     * This method is called after a test is executed.
+     */
+    protected function tearDown()
+    {
+    }
+
+    /**
+     * @covers Mozu\Api\Resources\Commerce\Catalog\Admin\ProductResource::getProducts
+     * @todo Implement testGetProducts().
+     */
+    public function testAddProductTypeAsync()
+    {
+        $apiContext = new ApiContext($this->tenantId, 0, 1, 1);
+        //$type_resource = new ProductTypeResource($apiContext, DataViewMode::LIVE);
+
+        $product_type = new ProductType();
+        $product_type->goodsType = 'Physical';
+        $product_type->masterCatalogId = 1;
+        $product_type->productUsages = array('Standard', 'Configurable', 'Component');
+        $product_type->name = "test3";
+        $product_type->isBaseProductType = False;
+
+        $result = $this->object->addProductTypeAsync($product_type)->wait();
+        var_dump($result);
+    }
+
+
+}
+?>

tests/src/Resources/Commerce/Catalog/Admin/ProductResourceTest.php

@@ -1,5 +1,4 @@
 <?php
-require_once __DIR__ . '/../../../../../../BaseTest.php';
 
 use GuzzleHttp\Promise;
 use Mozu\Api\ApiContext;

tests/src/Resources/Content/Documentlists/DocumentResourceTest.php

@@ -71,7 +71,7 @@ public function testGetDocumentContentNotFound()
 
     public function testUpdateDocumentContent() {
         $file = file_get_contents("C:\\files\\phpdownload.jpg");
-        $promise = $this->object->updateDocumentContentAsync($file, "files@mozu", "1bab2900-e57e-4c5b-83be-183edeef9bda", "image/jpg");
+        $promise = $this->object->updateDocumentContentAsync($file, "files@mozu", "a487bccd-7ee3-4fef-af9b-91b454559f7d", "image/jpg");
         $promise->then(function($mozuResult){
             printf($mozuResult->correlationId);
         }, function($apiException){