merge all pull requests

Fix #93, #92,

Author: hlu2

src/Core/Http/Serialization/XmlObjectSerializer.php

@@ -233,6 +233,12 @@ public function Deserialize($message, $bLimitToOne = false)
         $resultObjects = null;
 
         $responseXmlObj = simplexml_load_string($message);
+
+        //handle count(*) case, for example Select count(*) from Invoice
+        if(isset($responseXmlObj->attributes()['totalCount']) && !isset($responseXmlObj->attributes()['startPosition'])){
+            return (int) $responseXmlObj->attributes()['totalCount'];
+        }
+
         foreach ($responseXmlObj as $oneXmlObj) {
             $oneXmlElementName = (string)$oneXmlObj->getName();
 

src/Core/HttpClients/BaseCurl.php

@@ -149,5 +149,3 @@ public function close()
       $this->curl = null;
   }
 }
-
- ?>

src/Core/HttpClients/ClientFactory.php

@@ -55,6 +55,3 @@ public static function createClient($clientName = CoreConstants::CLIENT_CURL){
       throw new SdkException("The client Name you passed is not supported. Please use either 'curl' or 'guzzle' for the client Name.");
   }
 }
-
-
- ?>

src/Core/HttpClients/CurlHttpClient.php

@@ -194,5 +194,3 @@ public function getLastResponse(){
     }
 
 }
-
- ?>

src/Core/HttpClients/FaultHandler.php

@@ -292,7 +292,4 @@ public function getIntuitErrorMessage(){
     public function getIntuitErrorDetail(){
         return $this->intuitErrorDetail;
     }
-
-
-
 }

src/Core/HttpClients/GuzzleHttpClient.php

@@ -121,7 +121,4 @@ public function getLastResponse(){
      public function clearResponse(){
        $this->intuitResponse = false;
      }
-
- }
-
- ?>
+}

src/Core/HttpClients/HttpClientInterface.php

@@ -60,5 +60,4 @@ public function getLastResponse();
       * @param mix  The response from the http client
       */
      public function setIntuitResponse($response);
- }
- ?>
+}

src/Core/OAuth/OAuth2/OAuth2AccessToken.php

@@ -354,5 +354,3 @@ private function getDateFromSeconds($seconds){
       return date('Y/m/d H:i:s', $seconds);
     }
 }
-
- ?>

src/Core/OAuth/OAuth2/OAuth2LoginHelper.php

@@ -389,5 +389,3 @@ private function constructRefreshTokenBody($refresh_token){
         return http_build_query($parameters);
     }
 }
-
- ?>

src/DataService/DataService.php

@@ -335,7 +335,7 @@ public static function Configure($settings)
 
             }
 
-            if($ServiceContext->IppConfiguration->OAuthMode = CoreConstants::OAUTH2)
+            if($ServiceContext->IppConfiguration->OAuthMode == CoreConstants::OAUTH2)
             {
                 $oauth2Config = $ServiceContext->IppConfiguration->Security;
                 if($oauth2Config instanceof OAuth2AccessToken){
@@ -357,7 +357,8 @@ public static function Configure($settings)
      * @param OAuth2AccessToken $oauth2Conifg      OAuth 2 Token related information
      * @param Array $settings                      The array that include the redirectURL, scope, state information
      */
-    private function configureOAuth2LoginHelper($oauth2Conifg, $settings){
+    private function configureOAuth2LoginHelper($oauth2Conifg, $settings)
+    {
           $refreshToken = CoreConstants::getRefreshTokenFromArray($settings);
           if(isset($refreshToken)){
                //Login helper for refresh token API call
@@ -385,15 +386,17 @@ private function configureOAuth2LoginHelper($oauth2Conifg, $settings){
      * Return the OAuth 2 Login Helper. The OAuth 2 Login helper can be used to generate OAuth code, get refresh Token, etc.
      * @return $OAuth2LoginHelper      A helper to get OAuth 2 related values.
      */
-    public function getOAuth2LoginHelper(){
+    public function getOAuth2LoginHelper()
+    {
         return $this->OAuth2LoginHelper;
     }
 
     /**
      * Update the OAuth 2 Token that will be used for API calls later.
      * @param OAuth2AccessToken $newOAuth2AccessToken   The OAuth 2 Access Token that will be used later.
      */
-    public function updateOAuth2Token($newOAuth2AccessToken){
+    public function updateOAuth2Token($newOAuth2AccessToken)
+    {
         try{
           $this->serviceContext->updateOAuth2Token($newOAuth2AccessToken);
           $realmID = $newOAuth2AccessToken->getRealmID();
@@ -585,7 +588,7 @@ private function sendRequestParseResponseBodyAndHandleHttpError($entity, $uri, $
                 $requestParameters = $this->getPostRequestParameters($uri, "multipart/form-data; boundary={$boundaryString}");
                 break;
             case DataService::SENDEMAIL:
-                $requestParameters = $this->getPostRequestParameters($uri . (is_null($email) ? '' : '?sendTo=' . $email), CoreConstants::CONTENTTYPE_OCTETSTREAM);
+                $requestParameters = $this->getPostRequestParameters($uri . (is_null($email) ? '' : '?sendTo=' . urlencode($email)), CoreConstants::CONTENTTYPE_OCTETSTREAM);
                 break;
         }
         //$restRequestHandler = new SyncRestHandler($this->serviceContext);