Fix Bugs for #40, #46, #41, #42

Author: hlu2

src/Core/Http/Serialization/JsonObjectSerializer.php

@@ -6,6 +6,7 @@
 use QuickBooksOnline\API\Diagnostics\TraceLogger;
 use QuickBooksOnline\API\Exception\IdsExceptionManager;
 use QuickBooksOnline\API\Core\CoreConstants;
+use QuickBooksOnline\API\Facades\FacadeHelper;
 
 /**
  * Json Serializer to serialize and de serialize.
@@ -163,8 +164,44 @@ public function getResourceURL()
     public function Serialize($entity)
     {
         $this->collectResourceURL($entity);
-           //TODO pre-processing for objects (ones which lack support in PHP 5.2)
-           return $this->checkResult(json_encode($entity));
+        $arrayObj = $this->customerConvertObjectToArray($entity);
+        $array = $this->removeNullProperties($arrayObj);
+        return $this->checkResult(json_encode($array, true));
+    }
+
+    private function customerConvertObjectToArray($obj){
+      if(is_object($obj)) $obj = (array) $obj;
+      if(is_array($obj)) {
+        $new = array();
+        foreach($obj as $key => $val) {
+          $new[$key] = $this->customerConvertObjectToArray($val);
+        }
+      }
+      else $new = $obj;
+      return $new;
+    }
+
+    /**
+     * The input will always be an asscoiate array
+     * So we will judge based on this two situration
+     */
+    private function removeNullProperties($val){
+        $filterArray = array_filter($val);
+        $returned = array();
+        foreach($filterArray as $k => $v){
+          if(is_array($v)){
+            if(FacadeHelper::isRecurrsiveArray($v)){
+              $list = array();
+              foreach($v as $kk => $vv){
+                  $list[] = array_filter($vv);
+              }
+              $returned[$k] = $list;
+            }
+          }else{
+            $returned[$k] = $v;
+          }
+        }
+        return $returned;
     }
 
     /**

src/Core/HttpClients/FaultHandler.php

@@ -111,10 +111,46 @@ public function getIntuitErrorDetail(){
         return $this->intuitErrorDetail;
     }
     public function parseResponse($message){
+      if(!$this->isValidXml($message)){
+          return;
+      }
+
       $xmlObj = simplexml_load_string($message);
-      $this->intuitErrorType = (string)$xmlObj->Fault->attributes()['type'];
-      $this->intuitErrorCode = (string)$xmlObj->Fault->Error->attributes()['code'];
-      $this->intuitErrorMessage = (string)$xmlObj->Fault->Error->Message;
-      $this->intuitErrorDetail = (string)$xmlObj->Fault->Error->Detail;
+      $type = (string)$xmlObj->Fault->attributes()['type'];
+      if(isset($type) && !empty($type)){
+        $this->intuitErrorType = $type;
+      }
+
+      $code = (string)$xmlObj->Fault->Error->attributes()['code'];
+      if(isset($code) && !empty($code)){
+        $this->intuitErrorCode = $code;
+      }
+
+      $message = (string)$xmlObj->Fault->Error->Message;
+      if(isset($message) && !empty($message)){
+        $this->intuitErrorMessage = $message;
+      }
+
+      $detail = (string)$xmlObj->Fault->Error->Detail;
+      if(isset($detail) && !empty($detail)){
+        $this->intuitErrorDetail = $detail;
+      }
+
+    }
+
+    private function isValidXml($content)
+   {
+      $content = trim($content);
+      if (empty($content)) {
+          return false;
+        }
+
+      libxml_use_internal_errors(true);
+      simplexml_load_string($content);
+      $errors = libxml_get_errors();
+      libxml_clear_errors();
+
+      return empty($errors);
     }
+
 }

src/Core/HttpClients/IntuitResponse.php

@@ -34,7 +34,7 @@ public function __construct($passedHeaders, $passedBody, $passedHttpResponseCode
                  $this->faultHandler->setResponseBody($this->body);
                  $this->faultHandler->parseResponse($this->body);
                  //Manually set the error message
-                 $this->faultHandler->setOAuthHelperError("Invalid auth/bad request (got a 401, expected HTTP/1.1 20X or a redirect)");
+                 $this->faultHandler->setOAuthHelperError("Invalid auth/bad request (got a " .$passedHttpResponseCode . ", expected HTTP/1.1 20X or a redirect)");
               }
           }else{
               throw new SdkException("Passed Http status code is null.");

src/Data/IPPSalesFormsPrefs.php

@@ -285,6 +285,18 @@ public function __construct($keyValInitializers=array(), $verbose=false)
      * @var boolean
      */
     public $PrintItemWithZeroAmount;
+
+    /**
+     * @Definition
+                        Product:QBO
+                        If Email Copy To Company
+     * @xmlType element
+     * @xmlNamespace http://schema.intuit.com/finance/v3
+     * @xmlMinOccurs 0
+     * @xmlName EmailCopyToCompany
+     * @var boolean
+     */
+    public $EmailCopyToCompany;
     /**
      * @Definition
                         Product:QBW

src/DataService/Batch.php

@@ -95,7 +95,7 @@ public function __construct($serviceContext, $restHandler)
      */
     public function Count()
     {
-        return count($this->batchRequest);
+        return count($this->batchRequests);
     }
 
     /**

src/Facades/TaxRate.php

@@ -0,0 +1,23 @@
+<?php
+namespace QuickBooksOnline\API\Facades;
+
+class TaxRate{
+
+    public static function create(array $data, $throwException = TRUE){
+        if(!isset($data) || empty($data)) throw new \Exception("Passed array for creating TaxRate is Empty.");
+        $TaxRateObject = FacadeHelper::reflectArrayToObject("TaxRateDetails", $data, $throwException );
+        TaxRate::changeTaxApplicationOnValueToString($TaxRateObject);
+        return $TaxRateObject;
+    }
+
+    private static function changeTaxApplicationOnValueToString($TaxServiceObject){
+      $val = $TaxServiceObject->TaxApplicableOn;
+      if(is_object($val)){
+         if(isset($val->value)){
+            $newValue = $val->value;
+            $TaxServiceObject->TaxApplicableOn =  $newValue;
+         }
+      }
+    }
+
+}

src/Facades/TaxService.php

@@ -0,0 +1,11 @@
+<?php
+namespace QuickBooksOnline\API\Facades;
+
+class TaxService{
+
+    public static function create(array $data, $throwException = TRUE){
+        if(!isset($data) || empty($data)) throw new \Exception("Passed array for creating TaxService is Empty.");
+        $TaxServiceObject = FacadeHelper::reflectArrayToObject("TaxService", $data, $throwException );
+        return $TaxServiceObject;
+    }
+}

src/XSD2PHP/src/com/mikebevz/xsd2php/Php2Xml.php

@@ -311,7 +311,7 @@ private function parseObjectValue($obj, $element)
                             }
                         } else {
                             //SDK-39
-                            $el = $this->dom->createElement($code.":".$propDocs['xmlName'], $value);
+                            $el = $this->dom->createElement($code.":".$propDocs['xmlName'], htmlspecialchars($value));
                             $element->appendChild($el);
                         }
                         //print_r("Added element ".$propDocs['xmlName']." with NS = ".$propDocs['xmlNamespace']." \n");

src/_Samples/TaxServiceExample.php

@@ -7,8 +7,9 @@
 use QuickBooksOnline\API\DataService\DataService;
 use QuickBooksOnline\API\PlatformService\PlatformService;
 use QuickBooksOnline\API\Core\Http\Serialization\XmlObjectSerializer;
-use QuickBooksOnline\API\Data\IPPTaxRateDetails;
-use QuickBooksOnline\API\Data\IPPTaxService;
+use QuickBooksOnline\API\Facades\TaxService;
+use QuickBooksOnline\API\Facades\TaxRate;
+
 
 // Prep Data Services
 $dataService = DataService::Configure(array(
@@ -23,19 +24,26 @@
 
 $dataService->setLogLocation("/Users/hlu2/Desktop/newFolderForLog");
 
+$TaxRateDetails = array();
 $rnd = rand();
-$taxRateDetails = new IPPTaxRateDetails();
-$taxRateDetails->TaxRateName = "myNewTaxRateName_$rnd";
-$taxRateDetails->RateValue = "7777";//As Invalid number
-$taxRateDetails->TaxAgencyId = "1";
-$taxRateDetails->TaxApplicableOn = "Sales";
-
-$taxService = new IPPTaxService();
-$taxService->TaxCode = 'MyTaxCodeName_' . $rnd;
-$taxService->TaxRateDetails = array($taxRateDetails);
+for($int = 1; $int <=2 ; $int++){
+   $rateValue = $int + 5;
+   $currentTaxServiceDetail = TaxRate::create([
+     "TaxRateName" => "myNewTaxRateName_" . $int . "_$rnd",
+     "RateValue" =>  $rateValue,
+     "TaxAgencyId" => "1",
+     "TaxApplicableOn" => "Sales"
+   ]);
+   $TaxRateDetails[] = $currentTaxServiceDetail;
+}
 
+$TaxService = TaxService::create([
+  "TaxCode" => "TestValue_$rnd",
+  "TaxRateDetails" => $TaxRateDetails
+]);
 
-$result = $dataService->Add($taxService);
+var_dump($TaxService);
+$result = $dataService->Add($TaxService);
 $error = $dataService->getLastError();
 if ($error != null) {
     echo "The Status code is: " . $error->getHttpStatusCode() . "\n";
@@ -45,7 +53,7 @@
 }
 
 
-print_r($result);
+print_r($result->TaxService->TaxCodeId);