salaros / vtwsclib-php

src/WSClient.php

Doc Comments +3 added lines, -3 removed lines

@@ -258,7 +258,7 @@ 
     /**
      * Gets last operation error, if any
      * @access public
-     * @return WSClientError The error object
+     * @return boolean The error object
      */
     public function getLastError()
     {
@@ -616,8 +616,8 @@ 
      * Builds the query using the supplied parameters
      * @param  string   $moduleName  The name of the module / entity type
      * @param  array    $params  Data used to find the matching entries
-     * @return array    $select  The list of fields to select (defaults to SQL-like '*' - all the fields)
-     * @return int      $limit  limit the list of entries to N records (acts like LIMIT in SQL)
+     * @return string    $select  The list of fields to select (defaults to SQL-like '*' - all the fields)
+     * @return string      $limit  limit the list of entries to N records (acts like LIMIT in SQL)
      * @return string   The query build out of the supplied parameters
      */
     private function buildQuery($moduleName, array $params, array $select = [], $limit = 0)

Spacing +46 added lines, -46 removed lines

@@ -77,7 +77,7 @@ 
         if (!preg_match('/^https?:\/\//i', $url)) {
             $url = sprintf('http://%s', $url);
         }
-        if (strripos($url, '/') != (strlen($url)-1)) {
+        if (strripos($url, '/') != (strlen($url) - 1)) {
             $url .= '/';
         }
 
@@ -95,14 +95,14 @@ 
      */
     private function checkForError(array $jsonResult) // TODO move checkForError body to sendHttpRequest method's body
     {
-        if (isset($jsonResult['success']) && (bool)$jsonResult['success'] === true) {
+        if (isset($jsonResult[ 'success' ]) && (bool) $jsonResult[ 'success' ] === true) {
             $this->lastErrorMessage = null;
             return false;
         }
 
         $this->lastErrorMessage = new WSClientError(
-            $jsonResult['error']['message'],
-            $jsonResult['error']['code']
+            $jsonResult[ 'error' ][ 'message' ],
+            $jsonResult[ 'error' ][ 'code' ]
         );
 
         return true;
@@ -132,10 +132,10 @@ 
         try {
             switch ($method) {
                 case 'GET':
-                    $response = $this->httpClient->get($this->serviceBaseURL, ['query' => $requestData]);
+                    $response = $this->httpClient->get($this->serviceBaseURL, [ 'query' => $requestData ]);
                     break;
                 case 'POST':
-                    $response = $this->httpClient->post($this->serviceBaseURL, ['form_params' => $requestData]);
+                    $response = $this->httpClient->post($this->serviceBaseURL, [ 'form_params' => $requestData ]);
                     break;
                 default:
                     $this->lastErrorMessage = new WSClientError("Unknown request type {$method}");
@@ -154,7 +154,7 @@ 
 
         return (!is_array($jsonObj) || $this->checkForError($jsonObj))
             ? null
-            : $jsonObj['result'];
+            : $jsonObj[ 'result' ];
     }
 
     /**
@@ -171,13 +171,13 @@ 
         ];
         $result = $this->sendHttpRequest($getdata, 'GET');
         
-        if (!is_array($result) || !isset($result['token'])) {
+        if (!is_array($result) || !isset($result[ 'token' ])) {
             return false;
         }
 
-        $this->serviceServerTime = $result['serverTime'];
-        $this->serviceExpireTime = $result['expireTime'];
-        $this->serviceToken = $result['token'];
+        $this->serviceServerTime = $result[ 'serverTime' ];
+        $this->serviceExpireTime = $result[ 'expireTime' ];
+        $this->serviceToken = $result[ 'token' ];
 
         return true;
     }
@@ -212,12 +212,12 @@ 
         $this->accessKey = $accessKey;
 
         // Session data
-        $this->sessionName = $result['sessionName'];
-        $this->userID = $result['userId'];
+        $this->sessionName = $result[ 'sessionName' ];
+        $this->userID = $result[ 'userId' ];
 
         // Vtiger CRM and WebServices API version
-        $this->apiVersion = $result['version'];
-        $this->vtigerVersion = $result['vtigerVersion'];
+        $this->apiVersion = $result[ 'version' ];
+        $this->vtigerVersion = $result[ 'vtigerVersion' ];
 
         return true;
     }
@@ -249,8 +249,8 @@ 
         }
 
         $accessKey = array_key_exists('accesskey', $result)
-            ? $result['accesskey']
-            : $result[0];
+            ? $result[ 'accesskey' ]
+            : $result[ 0 ];
 
         return $this->login($username, $accessKey);
     }
@@ -292,11 +292,11 @@ 
         ];
 
         $result = $this->sendHttpRequest($getdata, 'GET');
-        $modules = $result['types'];
+        $modules = $result[ 'types' ];
 
         $result = array();
         foreach ($modules as $moduleName) {
-            $result[$moduleName] = ['name' => $moduleName];
+            $result[ $moduleName ] = [ 'name' => $moduleName ];
         }
         return $result;
     }
@@ -330,7 +330,7 @@ 
      */
     private function getTypedID($moduleName, $entityID)
     {
-        if (stripos((string)$entityID, 'x') !== false) {
+        if (stripos((string) $entityID, 'x') !== false) {
             return $entityID;
         }
 
@@ -341,7 +341,7 @@ 
             return false;
         }
 
-        return "{$type['idPrefix']}x{$entityID}";
+        return "{$type[ 'idPrefix' ]}x{$entityID}";
     }
 
     /**
@@ -393,7 +393,7 @@ 
         $this->checkLogin();
 
         // Make sure the query ends with ;
-        $query = (strripos($query, ';') != strlen($query)-1)
+        $query = (strripos($query, ';') != strlen($query) - 1)
             ? trim($query .= ';')
             : trim($query);
 
@@ -436,13 +436,13 @@ 
      * @return array   $select  The list of fields to select (defaults to SQL-like '*' - all the fields)
      * @return int  The matching record
      */
-    public function entityRetrieve($moduleName, array $params, array $select = [])
+    public function entityRetrieve($moduleName, array $params, array $select = [ ])
     {
         $records = $this->entitiesRetrieve($moduleName, $params, $select, 1);
-        if (false === $records || !isset($records[0])) {
+        if (false === $records || !isset($records[ 0 ])) {
             return false;
         }
-        return $records[0];
+        return $records[ 0 ];
     }
 
     /**
@@ -453,15 +453,15 @@ 
      */
     public function entityRetrieveID($moduleName, array $params) // TODO check if params is an assoc array
     {
-        $record = $this->entityRetrieve($moduleName, $params, ['id']);
-        if (false === $record || !isset($record['id'])) {
+        $record = $this->entityRetrieve($moduleName, $params, [ 'id' ]);
+        if (false === $record || !isset($record[ 'id' ])) {
             return false;
         }
 
-        $entityID = $record['id'];
+        $entityID = $record[ 'id' ];
         $entityIDParts = explode('x', $entityID, 2);
         return (is_array($entityIDParts) && count($entityIDParts) === 2)
-            ? $entityIDParts[1]
+            ? $entityIDParts[ 1 ]
             : -1;
     }
 
@@ -477,8 +477,8 @@ 
         $this->checkLogin();
 
         // Assign record to logged in user if not specified
-        if (!isset($params['assigned_user_id'])) {
-            $params['assigned_user_id'] = $this->userID;
+        if (!isset($params[ 'assigned_user_id' ])) {
+            $params[ 'assigned_user_id' ] = $this->userID;
         }
 
         $postdata = [
@@ -503,19 +503,19 @@ 
         $this->checkLogin();
 
         // Assign record to logged in user if not specified
-        if (!isset($params['assigned_user_id'])) {
-            $params['assigned_user_id'] = $this->userID;
+        if (!isset($params[ 'assigned_user_id' ])) {
+            $params[ 'assigned_user_id' ] = $this->userID;
         }
 
         // TODO implement the case when no ID is given
         if (array_key_exists('id', $params)) {
-            $data = $this->entityRetrieveByID($moduleName, $params['id']);
+            $data = $this->entityRetrieveByID($moduleName, $params[ 'id' ]);
             if ($data !== false && is_array($data)) {
-                $entityID = $data['id'];
+                $entityID = $data[ 'id' ];
                 $params = array_merge(
-                    $data,      // needed to provide mandatory field values
-                    $params,    // updated data override
-                    ['id'=>$entityID] // fixing id, might be useful when non <moduleid>x<id> one was specified
+                    $data, // needed to provide mandatory field values
+                    $params, // updated data override
+                    [ 'id'=>$entityID ] // fixing id, might be useful when non <moduleid>x<id> one was specified
                 );
             }
         }
@@ -561,7 +561,7 @@ 
      * @return int      $limit  limit the list of entries to N records (acts like LIMIT in SQL)
      * @return bool|array  The array containing the matching entries or false if nothing was found
      */
-    public function entitiesRetrieve($moduleName, array $params, array $select = [], $limit = 0)
+    public function entitiesRetrieve($moduleName, array $params, array $select = [ ], $limit = 0)
     {
         if (empty($params) || !is_array($params) || !$this->isAssocArray($params)) {
             $errorMessage = "You have to specify at least one search parameter (prop => value) in order to filter entities";
@@ -606,7 +606,7 @@ 
         ];
 
         if (!empty($moduleName)) {
-            $requestData['elementType'] = $moduleName;
+            $requestData[ 'elementType' ] = $moduleName;
         }
 
         return $this->sendHttpRequest($requestData, true);
@@ -620,18 +620,18 @@ 
      * @return int      $limit  limit the list of entries to N records (acts like LIMIT in SQL)
      * @return string   The query build out of the supplied parameters
      */
-    private function buildQuery($moduleName, array $params, array $select = [], $limit = 0)
+    private function buildQuery($moduleName, array $params, array $select = [ ], $limit = 0)
     {
         $criteria = array();
-        $select=(empty($select)) ? '*' : implode(',', $select);
-        $query=sprintf("SELECT %s FROM $moduleName WHERE ", $select);
+        $select = (empty($select)) ? '*' : implode(',', $select);
+        $query = sprintf("SELECT %s FROM $moduleName WHERE ", $select);
         foreach ($params as $param => $value) {
-            $criteria[] = "{$param} LIKE '{$value}'";
+            $criteria[ ] = "{$param} LIKE '{$value}'";
         }
 
-        $query.=implode(" AND ", $criteria);
+        $query .= implode(" AND ", $criteria);
         if (intval($limit) > 0) {
-            $query.=sprintf(" LIMIT %s", intval($limit));
+            $query .= sprintf(" LIMIT %s", intval($limit));
         }
         return $query;
     }