route4me / route4me-php-sdk

src/Route4Me/V5/Vehicles/DataTypes/VehicleReduced.php

Indentation +57 added lines, -57 removed lines

@@ -9,73 +9,73 @@
  */
 class VehicleReduced extends \Route4Me\Common
 {
-    /** The vehicle ID
-     * @var string $vehicle_id
-     */
-    public $vehicle_id;
+	/** The vehicle ID
+	 * @var string $vehicle_id
+	 */
+	public $vehicle_id;
 
-    /** Vehicle alias
-     * @var string $vehicle_alias
-     */
-    public $vehicle_alias;
+	/** Vehicle alias
+	 * @var string $vehicle_alias
+	 */
+	public $vehicle_alias;
 
-    /** Vehicle VIN
-     * @var string $vehicle_vin
-     */
-    public $vehicle_vin;
+	/** Vehicle VIN
+	 * @var string $vehicle_vin
+	 */
+	public $vehicle_vin;
 
-    /** A license plate of the vehicle.
-     * @var string $vehicle_license_plate
-     */
-    public $vehicle_license_plate;
+	/** A license plate of the vehicle.
+	 * @var string $vehicle_license_plate
+	 */
+	public $vehicle_license_plate;
 
-    /** Vehicle maker brend.
-     * <para>Available values:</para>
-     * "american coleman", "bmw", "chevrolet", "ford", "freightliner", "gmc",
-     * <para>"hino", "honda", "isuzu", "kenworth", "mack", "mercedes-benz", "mitsubishi", </para>
-     * "navistar", "nissan", "peterbilt", "renault", "scania", "sterling", "toyota",
-     * <para>"volvo", "western star" </para>
-     * @var string $vehicle_make
-     */
-    public $vehicle_make;
+	/** Vehicle maker brend.
+	 * <para>Available values:</para>
+	 * "american coleman", "bmw", "chevrolet", "ford", "freightliner", "gmc",
+	 * <para>"hino", "honda", "isuzu", "kenworth", "mack", "mercedes-benz", "mitsubishi", </para>
+	 * "navistar", "nissan", "peterbilt", "renault", "scania", "sterling", "toyota",
+	 * <para>"volvo", "western star" </para>
+	 * @var string $vehicle_make
+	 */
+	public $vehicle_make;
 
-    /** Vehicle model year
-     * @var integer $vehicle_model_year
-     */
-    public $vehicle_model_year;
+	/** Vehicle model year
+	 * @var integer $vehicle_model_year
+	 */
+	public $vehicle_model_year;
 
-    /** Vehicle model
-     * @var string $vehicle_model
-     */
-    public $vehicle_model;
+	/** Vehicle model
+	 * @var string $vehicle_model
+	 */
+	public $vehicle_model;
 
-    /** The year, vehicle was acquired
-     * @var integer $vehicle_year_acquired
-     */
-    public $vehicle_year_acquired;
+	/** The year, vehicle was acquired
+	 * @var integer $vehicle_year_acquired
+	 */
+	public $vehicle_year_acquired;
 
-    /** A cost of the new vehicle
-     * @var float $vehicle_cost_new
-     */
-    public $vehicle_cost_new;
+	/** A cost of the new vehicle
+	 * @var float $vehicle_cost_new
+	 */
+	public $vehicle_cost_new;
 
-    /** If true, the vehicle was purchased new.
-     * @var boolean $purchased_new
-     */
-    public $purchased_new;
+	/** If true, the vehicle was purchased new.
+	 * @var boolean $purchased_new
+	 */
+	public $purchased_new;
 
-    /** Start date of the license
-     * @var string $license_start_date
-     */
-    public $license_start_date;
+	/** Start date of the license
+	 * @var string $license_start_date
+	 */
+	public $license_start_date;
 
-    /** End date of the license
-     * @var string $license_end_date
-     */
-    public $license_end_date;
+	/** End date of the license
+	 * @var string $license_end_date
+	 */
+	public $license_end_date;
 
-    /** If equal to '1', the vehicle is operational.
-     * @var boolean $is_operational
-     */
-    public $is_operational;
+	/** If equal to '1', the vehicle is operational.
+	 * @var boolean $is_operational
+	 */
+	public $is_operational;
 }

src/Route4Me/V5/Vehicles/DataTypes/VehicleLocationItem.php

Indentation +16 added lines, -16 removed lines

@@ -9,23 +9,23 @@
  */
 class VehicleLocationItem extends \Route4Me\Common
 {
-    /** The vehicle ID
-     * @var string $vehicle_id
-     */
-    public $vehicle_id;
+	/** The vehicle ID
+	 * @var string $vehicle_id
+	 */
+	public $vehicle_id;
 
-    /** When a vehicle activity was detected.
-     * @var integer $activity_timestamp
-     */
-    public $activity_timestamp;
+	/** When a vehicle activity was detected.
+	 * @var integer $activity_timestamp
+	 */
+	public $activity_timestamp;
 
-    /** Latitude of a vehicle position.
-     * @var float $lat
-     */
-    public $lat;
+	/** Latitude of a vehicle position.
+	 * @var float $lat
+	 */
+	public $lat;
 
-    /** Longitude of a vehicle position
-     * @var float $lng
-     */
-    public $lng;
+	/** Longitude of a vehicle position
+	 * @var float $lng
+	 */
+	public $lng;
 }

src/Route4Me/V5/Vehicles/DataTypes/VehicleResponse.php

Indentation +17 added lines, -17 removed lines

@@ -11,23 +11,23 @@
  */
 class VehicleResponse extends Common
 {
-    /** Vehicle data
-     * @var DataVehicle $data
-     */
-    public $data = [];
+	/** Vehicle data
+	 * @var DataVehicle $data
+	 */
+	public $data = [];
 
-    public static function fromArray(array $params)
-    {
-        $vehResp = new self();
+	public static function fromArray(array $params)
+	{
+		$vehResp = new self();
 
-        foreach ($params as $key => $value) {
-            if (is_null(Common::getValue($params, $key))) {
-                continue;
-            }
-            if (property_exists($vehResp, $key)) {
-                $vehResp->$key = $value;
-            }
-        }
-        return $vehResp;
-    }
+		foreach ($params as $key => $value) {
+			if (is_null(Common::getValue($params, $key))) {
+				continue;
+			}
+			if (property_exists($vehResp, $key)) {
+				$vehResp->$key = $value;
+			}
+		}
+		return $vehResp;
+	}
 }

src/Route4Me/V5/Vehicles/DataTypes/VehicleProfilesResponse.php

Indentation +74 added lines, -74 removed lines

@@ -11,78 +11,78 @@
  */
 class VehicleProfilesResponse extends Common
 {
-    /** Current page of the paginated vehicle profiles list.
-     * @var integer $current_page
-     */
-    public $current_page;
-
-    /** An array of the vehicle profiles
-     * @var VehileProfile[] $data
-     */
-    public $data = [];
-
-    /** URL to the first page of the paginated vehicle profiles list.
-     * @var string $first_page_url
-     */
-    public $first_page_url;
-
-    /** From which vehicle profile is starting the page
-     * @var integer $from
-     */
-    public $from;
-
-    /** Last page
-     * @var integer $last_page
-     */
-    public $last_page;
-
-    /** URL to the last page of the paginated vehicle profiles list.
-     * @var string $last_page_url
-     */
-    public $last_page_url;
-
-    /** URL to the next page of the paginated vehicle profiles list.
-     * @var string $next_page_url
-     */
-    public $next_page_url;
-
-    /** Path to the API endpoint
-     * @var string $path
-     */
-    public $path;
-
-    /** Vehicles number per page
-     * @var integer $per_page
-     */
-    public $per_page;
-
-    /** URL to the previous page
-     * @var string $prev_page_url
-     */
-    public $prev_page_url;
-
-    /** To which vehicle profile is ending the page
-     * @var integer $to
-     */
-    public $to;
-
-    /** Total number of the vehicles.
-     * @var integer $total
-     */
-    public $total;
-
-    public static function fromArray(array $params)
-    {
-        $profResp = new self();
-
-        foreach ($params as $key => $value) {
-            if (is_null(Common::getValue($params, $key))) {
-                continue;
-            }
-            if (property_exists($profResp, $key)) {
-                $profResp->$key = $value;
-            }
-        }
-        return $profResp;
-    }
+	/** Current page of the paginated vehicle profiles list.
+	 * @var integer $current_page
+	 */
+	public $current_page;
+
+	/** An array of the vehicle profiles
+	 * @var VehileProfile[] $data
+	 */
+	public $data = [];
+
+	/** URL to the first page of the paginated vehicle profiles list.
+	 * @var string $first_page_url
+	 */
+	public $first_page_url;
+
+	/** From which vehicle profile is starting the page
+	 * @var integer $from
+	 */
+	public $from;
+
+	/** Last page
+	 * @var integer $last_page
+	 */
+	public $last_page;
+
+	/** URL to the last page of the paginated vehicle profiles list.
+	 * @var string $last_page_url
+	 */
+	public $last_page_url;
+
+	/** URL to the next page of the paginated vehicle profiles list.
+	 * @var string $next_page_url
+	 */
+	public $next_page_url;
+
+	/** Path to the API endpoint
+	 * @var string $path
+	 */
+	public $path;
+
+	/** Vehicles number per page
+	 * @var integer $per_page
+	 */
+	public $per_page;
+
+	/** URL to the previous page
+	 * @var string $prev_page_url
+	 */
+	public $prev_page_url;
+
+	/** To which vehicle profile is ending the page
+	 * @var integer $to
+	 */
+	public $to;
+
+	/** Total number of the vehicles.
+	 * @var integer $total
+	 */
+	public $total;
+
+	public static function fromArray(array $params)
+	{
+		$profResp = new self();
+
+		foreach ($params as $key => $value) {
+			if (is_null(Common::getValue($params, $key))) {
+				continue;
+			}
+			if (property_exists($profResp, $key)) {
+				$profResp->$key = $value;
+			}
+		}
+		return $profResp;
+	}
 }

src/Route4Me/V5/Vehicles/DataTypes/VehicleTrackItem.php

Indentation +34 added lines, -34 removed lines

@@ -4,38 +4,38 @@
 
 class VehicleTrackItem extends \Route4Me\Common
 {
-    /** The vehicle ID
-     * @var string $vehicle_id
-     */
-    public $vehicle_id;
-
-    /** The member ID
-     * @var integer $member_id
-     */
-    public $member_id;
-
-    /** Latitude of a vehicle position.
-     * @var float $lat
-     */
-    public $lat;
-
-    /** Longitude of a vehicle position.
-     * @var float $lng
-     */
-    public $lng;
-
-    /** The geographic altitude
-     * @var integer $altitude
-     */
-    public $altitude;
-
-    /** Vehicle speed
-     * @var integer $speed
-     */
-    public $speed;
-
-    /** When a vehicle activity was detected.
-     * @var integer $timestamp
-     */
-    public $timestamp;
+	/** The vehicle ID
+	 * @var string $vehicle_id
+	 */
+	public $vehicle_id;
+
+	/** The member ID
+	 * @var integer $member_id
+	 */
+	public $member_id;
+
+	/** Latitude of a vehicle position.
+	 * @var float $lat
+	 */
+	public $lat;
+
+	/** Longitude of a vehicle position.
+	 * @var float $lng
+	 */
+	public $lng;
+
+	/** The geographic altitude
+	 * @var integer $altitude
+	 */
+	public $altitude;
+
+	/** Vehicle speed
+	 * @var integer $speed
+	 */
+	public $speed;
+
+	/** When a vehicle activity was detected.
+	 * @var integer $timestamp
+	 */
+	public $timestamp;
 }

src/Route4Me/V5/Vehicles/DataTypes/DataVehicle.php

Indentation +4 added lines, -4 removed lines

@@ -6,8 +6,8 @@
 
 class DataVehicle extends Common
 {
-    /** Reduced vehicle object
-     * @var VehicleReduced $vehicle
-     */
-    public $vehicle = [];
+	/** Reduced vehicle object
+	 * @var VehicleReduced $vehicle
+	 */
+	public $vehicle = [];
 }

src/Route4Me/V5/Vehicles/DataTypes/VehicleOrderResponse.php

Indentation +21 added lines, -21 removed lines

@@ -11,28 +11,28 @@
  */
 class VehicleOrderResponse extends Common
 {
-    /** Vehicle ID
-     * @var string $vehicle_id
-     */
-    public $vehicle_id;
+	/** Vehicle ID
+	 * @var string $vehicle_id
+	 */
+	public $vehicle_id;
 
-    /** Order ID
-     * @var integer $order_id
-     */
-    public $order_id;
+	/** Order ID
+	 * @var integer $order_id
+	 */
+	public $order_id;
 
-    public static function fromArray(array $params)
-    {
-        $ordParams = new self();
+	public static function fromArray(array $params)
+	{
+		$ordParams = new self();
 
-        foreach ($params as $key => $value) {
-            if (is_null(Common::getValue($params, $key))) {
-                continue;
-            }
-            if (property_exists($ordParams, $key)) {
-                $ordParams->$key = $value;
-            }
-        }
-        return $ordParams;
-    }
+		foreach ($params as $key => $value) {
+			if (is_null(Common::getValue($params, $key))) {
+				continue;
+			}
+			if (property_exists($ordParams, $key)) {
+				$ordParams->$key = $value;
+			}
+		}
+		return $ordParams;
+	}
 }

src/Route4Me/V5/Vehicles/DataTypes/VehicleTemporary.php

Indentation +39 added lines, -39 removed lines

@@ -11,43 +11,43 @@
  */
 class VehicleTemporary extends Common
 {
-    /** The vehicle ID
-     * @var integer $vehicle_id
-     */
-    public $vehicle_id;
-
-    /** A license plate of the vehicle.
-     * @var string $vehicle_license_plate
-     */
-    public $vehicle_license_plate;
-
-    /** Member ID assigned to the temporary vehicle.
-     * @var string $assigned_member_id
-     */
-    public $assigned_member_id;
-
-    /** An expiration date of the temporary vehicle.
-     * @var string $expires_at
-     */
-    public $expires_at;
-
-    /** If true, an assignment forced.
-     * @var boolean $force_assignment
-     */
-    public $force_assignment;
-
-    public static function fromArray(array $params)
-    {
-        $vehicleTemp = new self();
-
-        foreach ($params as $key => $value) {
-            if (is_null(Common::getValue($params, $key))) {
-                continue;
-            }
-            if (property_exists($vehicleTemp, $key)) {
-                $vehicleTemp->$key = $value;
-            }
-        }
-        return $vehicleTemp;
-    }
+	/** The vehicle ID
+	 * @var integer $vehicle_id
+	 */
+	public $vehicle_id;
+
+	/** A license plate of the vehicle.
+	 * @var string $vehicle_license_plate
+	 */
+	public $vehicle_license_plate;
+
+	/** Member ID assigned to the temporary vehicle.
+	 * @var string $assigned_member_id
+	 */
+	public $assigned_member_id;
+
+	/** An expiration date of the temporary vehicle.
+	 * @var string $expires_at
+	 */
+	public $expires_at;
+
+	/** If true, an assignment forced.
+	 * @var boolean $force_assignment
+	 */
+	public $force_assignment;
+
+	public static function fromArray(array $params)
+	{
+		$vehicleTemp = new self();
+
+		foreach ($params as $key => $value) {
+			if (is_null(Common::getValue($params, $key))) {
+				continue;
+			}
+			if (property_exists($vehicleTemp, $key)) {
+				$vehicleTemp->$key = $value;
+			}
+		}
+		return $vehicleTemp;
+	}
 }

src/Route4Me/Route4Me.php

Switch Indentation +35 added lines, -35 removed lines

@@ -119,44 +119,44 @@
             curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
         } else {
             switch ($method) {
-                case 'DELETE':
-                    curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');
-                    break;
-                case 'DELETEARRAY':
-                    curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');
-                    curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
-                    break;
-                case 'PUT':
-                    curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT');
-                    break;
-                case 'POST':
-                    if (isset($body)) {
-                        if (isset($options['HTTPHEADER'])
-                            && strpos($options['HTTPHEADER'], 'multipart/form-data') > 0) {
-                            $bodyData = $body;
-                        } else {
-                            $bodyData = json_encode($body);
-                        }
-                        curl_setopt($ch, CURLOPT_POST, 1);
-                        curl_setopt($ch, CURLOPT_POSTREDIR, 7);
-                        curl_setopt($ch, CURLOPT_POSTFIELDS, $bodyData);
-                    }
-                    break;
-                case 'ADD':
-                    curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
-                    break;
-                case 'PATCH':
-                    if (isset($body)) {
+            case 'DELETE':
+                curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');
+                break;
+            case 'DELETEARRAY':
+                curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');
+                curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
+                break;
+            case 'PUT':
+                curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT');
+                break;
+            case 'POST':
+                if (isset($body)) {
+                    if (isset($options['HTTPHEADER'])
+                        && strpos($options['HTTPHEADER'], 'multipart/form-data') > 0) {
+                        $bodyData = $body;
+                    } else {
                         $bodyData = json_encode($body);
-                        if (isset($options['HTTPHEADER'])) {
-                            if (strpos($options['HTTPHEADER'], 'multipart/form-data') > 0) {
-                                $bodyData = $body;
-                            }
+                    }
+                    curl_setopt($ch, CURLOPT_POST, 1);
+                    curl_setopt($ch, CURLOPT_POSTREDIR, 7);
+                    curl_setopt($ch, CURLOPT_POSTFIELDS, $bodyData);
+                }
+                break;
+            case 'ADD':
+                curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
+                break;
+            case 'PATCH':
+                if (isset($body)) {
+                    $bodyData = json_encode($body);
+                    if (isset($options['HTTPHEADER'])) {
+                        if (strpos($options['HTTPHEADER'], 'multipart/form-data') > 0) {
+                            $bodyData = $body;
                         }
-                        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PATCH');
-                        curl_setopt($ch, CURLOPT_POSTFIELDS, $bodyData);
                     }
-                    break;
+                    curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PATCH');
+                    curl_setopt($ch, CURLOPT_POSTFIELDS, $bodyData);
+                }
+                break;
             }
 
             if (is_numeric(array_search($method, ['DELETE', 'PUT']))) {

Indentation +370 added lines, -370 removed lines

@@ -7,374 +7,374 @@
 
 class Route4Me
 {
-    public static $apiKey;
-    public static $baseUrl = Endpoint::BASE_URL;
-
-    public static function setApiKey($apiKey)
-    {
-        self::$apiKey = $apiKey;
-    }
-
-    public static function getApiKey()
-    {
-        return self::$apiKey;
-    }
-
-    public static function setBaseUrl($baseUrl)
-    {
-        self::$baseUrl = $baseUrl;
-    }
-
-    public static function getBaseUrl()
-    {
-        return self::$baseUrl;
-    }
-
-    /**
-     * Make request with CURL
-     *
-     * @since 1.2.3 changed error handling
-     * @since 1.2.8 added $options['return_headers']
-     *
-     * @param array  $options
-     *   string url                        - HTTP URL.
-     *   string method                     - HTTP method.
-     *   string api_key                    - API key to access to route4me server.
-     *   array  query                      - Array of query parameters.
-     *   array  body                       - Array of body parameters.
-     *   string HTTPHEADER                 - Content type of body e.g.
-     *                                       'Content-Type: application/json'
-     *                                       'Content-Type: multipart/form-data'
-     *   array  HTTPHEADERS                - Array of headers.
-     *   string FILE                       - Path to uploading file.
-     *   array  return_headers             - Array of response headers to return as a result.
-     * @throws Exception\ApiError
-     */
-    public static function makeRequst($options)
-    {
-        $method = isset($options['method']) ? $options['method'] : 'GET';
-        $query = isset($options['query'])
-            ? array_filter($options['query'], function ($x) {
-                return !is_null($x);
-            }) : [];
-
-        $body = isset($options['body']) ? $options['body'] : null;
-        $file = isset($options['FILE']) ? $options['FILE'] : null;
-        $headers = [
-            'User-Agent: Route4Me php-sdk',
-        ];
-
-        $return_headers = (isset($options['return_headers']) ? $options['return_headers'] : null);
-
-        if (isset($options['HTTPHEADER'])) {
-            $headers[] = $options['HTTPHEADER'];
-        }
-
-        if (isset($options['HTTPHEADERS'])) {
-            foreach ($options['HTTPHEADERS'] as $header) {
-                $headers[] = $header;
-            }
-        }
-
-        $ch = curl_init();
-
-        $url = isset($options['url'])
-            ? $options['url'] . '?' . http_build_query(array_merge(
-                $query,
-                ['api_key' => self::getApiKey()]
-            )) : '';
-
-        $baseUrl = self::getBaseUrl();
-
-        $curlOpts = [
-            CURLOPT_URL             => $baseUrl.$url,
-            CURLOPT_RETURNTRANSFER  => true,
-            CURLOPT_TIMEOUT         => 120,
-            CURLOPT_FOLLOWLOCATION  => true,
-            CURLOPT_SSL_VERIFYHOST  => false,
-            CURLOPT_SSL_VERIFYPEER  => false,
-            CURLOPT_HTTPHEADER      => $headers,
-        ];
-
-        curl_setopt_array($ch, $curlOpts);
-
-        // read response headers if need
-        $response_headers = [];
-        if ($return_headers) {
-            curl_setopt($ch, CURLOPT_HEADERFUNCTION, function ($curl, $header) use (&$response_headers) {
-                $len = strlen($header);
-                $header = explode(':', $header, 2);
-                if (count($header) >= 2) {
-                    $response_headers[strtolower(trim($header[0]))] = trim($header[1]);
-                }
-                return $len;
-            });
-        }
-
-        if (null != $file) {
-            $cfile = new \CURLFile($file, '', '');
-            $body['strFilename']=$cfile;
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-            curl_setopt($ch, CURLOPT_POST, true);
-            curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
-        } else {
-            switch ($method) {
-                case 'DELETE':
-                    curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');
-                    break;
-                case 'DELETEARRAY':
-                    curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');
-                    curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
-                    break;
-                case 'PUT':
-                    curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT');
-                    break;
-                case 'POST':
-                    if (isset($body)) {
-                        if (isset($options['HTTPHEADER'])
-                            && strpos($options['HTTPHEADER'], 'multipart/form-data') > 0) {
-                            $bodyData = $body;
-                        } else {
-                            $bodyData = json_encode($body);
-                        }
-                        curl_setopt($ch, CURLOPT_POST, 1);
-                        curl_setopt($ch, CURLOPT_POSTREDIR, 7);
-                        curl_setopt($ch, CURLOPT_POSTFIELDS, $bodyData);
-                    }
-                    break;
-                case 'ADD':
-                    curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
-                    break;
-                case 'PATCH':
-                    if (isset($body)) {
-                        $bodyData = json_encode($body);
-                        if (isset($options['HTTPHEADER'])) {
-                            if (strpos($options['HTTPHEADER'], 'multipart/form-data') > 0) {
-                                $bodyData = $body;
-                            }
-                        }
-                        curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PATCH');
-                        curl_setopt($ch, CURLOPT_POSTFIELDS, $bodyData);
-                    }
-                    break;
-            }
-
-            if (is_numeric(array_search($method, ['DELETE', 'PUT']))) {
-                if (isset($body)) {
-                    curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body));
-                }
-            }
-        }
-
-        $result = curl_exec($ch);
-        $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        curl_close($ch);
-
-        $json = null;
-        if (strpos($result, '<?xml') > -1) {
-            $xml = simplexml_load_string($result);
-            $json = self::object2array($xml);
-        } else {
-            $json = json_decode($result, true);
-        }
-        if (200 == $code || 201 == $code || 202 == $code || 204 == $code) {
-            if (isset($json['errors'])) {
-                throw new ApiError(implode(', ', $json['errors']), $code, $result);
-            } else {
-                // return response headers if they were asked for
-                if (count($response_headers) !== 0) {
-                    $res = [
-                        'code' => $code,
-                        'data' => $json
-                    ];
-                    foreach ($return_headers as $key => $value) {
-                        // most headers has char '-' but it is forbidden in PHP names replace it with '_'
-                        $res[strtolower(str_replace('-', '_', $value))] =
-                            (isset($response_headers[$value]) ? $response_headers[$value] : null);
-                    }
-                    return $res;
-                }
-                if (204 == $code) {
-                    return true;
-                }
-                return $json;
-            }
-        } elseif (isset($code) && (!isset($result) || !$result)) {
-            throw new ApiError('', $code, $result);
-        } else {
-            if (isset($json['messages'])) {
-                $msg = '';
-                foreach ($json['messages'] as $key => $value) {
-                    if ($msg !== '') {
-                        $msg .= PHP_EOL;
-                    }
-                    $msg .= $key . ': ' . (is_array($value) ? implode(', ', $value) : $value);
-                }
-                throw new ApiError($msg, $code, $result);
-            } elseif (isset($json['error']) && !empty($json['error'])) {
-                throw new ApiError($json['error'], $code, $result);
-            } elseif (isset($json['error'])) {
-                $msg = '';
-                foreach ($json['errors'] as $key => $value) {
-                    if ($msg !== '') {
-                        $msg .= PHP_EOL;
-                    }
-                    $msg .= $value;
-                }
-                throw new ApiError($msg, $code, $result);
-            } else {
-                throw new ApiError($result, $code, $result);
-            }
-        }
-    }
-
-    /**
-     * @param $object: JSON object
-     */
-    public static function object2array($object)
-    {
-        return @json_decode(@json_encode($object), 1);
-    }
-
-    /**
-     * Prints on the screen main keys and values of the array.
-     *
-     * @param $results: object to be printed on the screen
-     * @param $deepPrinting: if true, object will be printed recursively
-     */
-    public static function simplePrint($results, $deepPrinting = null)
-    {
-        if (isset($results)) {
-            if (is_array($results)) {
-                foreach ($results as $key => $result) {
-                    if (is_array($result)) {
-                        foreach ($result as $key1 => $result1) {
-                            if (is_array($result1)) {
-                                if ($deepPrinting) {
-                                    echo "<br>$key1 ------><br>";
-                                    self::simplePrint($result1, true);
-                                    echo '------<br>';
-                                } else {
-                                    echo $key1.' --> '.'Array() <br>';
-                                }
-                            } else {
-                                if (is_object($result1)) {
-                                    if ($deepPrinting) {
-                                        echo "<br>$key1 ------><br>";
-                                        $oarray = (array) $result1;
-                                        self::simplePrint($oarray, true);
-                                        echo '------<br>';
-                                    } else {
-                                        echo $key1.' --> '.'Object <br>';
-                                    }
-                                } else {
-                                    if (!is_null($result1)) {
-                                        echo $key1.' --> '.$result1.'<br>';
-                                    }
-                                }
-                            }
-                        }
-                    } else {
-                        if (is_object($result)) {
-                            if ($deepPrinting) {
-                                echo "<br>$key ------><br>";
-                                $oarray = (array) $result;
-                                self::simplePrint($oarray, true);
-                                echo '------<br>';
-                            } else {
-                                echo $key.' --> '.'Object <br>';
-                            }
-                        } else {
-                            if (!is_null($result)) {
-                                echo $key.' --> '.$result.'<br>';
-                            }
-                        }
-                    }
-                    //echo "<br>";
-                }
-            }
-        }
-    }
-
-    /**
-     * Generates query or body parameters.
-     *
-     * @param $allFields: all known fields could be used for parameters generation
-     * @param $params: input parameters (array or object)
-     */
-    public static function generateRequestParameters($allFields, $params)
-    {
-        $generatedParams = [];
-
-        if (is_array($params)) {
-            foreach ($allFields as $field) {
-                if (isset($params[$field])) {
-                    $generatedParams[$field] = $params[$field];
-                }
-            }
-        } elseif (is_object($params)) {
-            foreach ($allFields as $field) {
-                if (isset($params->{$field})) {
-                    $generatedParams[$field] = $params->{$field};
-                }
-            }
-        }
-
-        return $generatedParams;
-    }
-
-    /**
-     * Returns an array of the object properties.
-     *
-     * @param $object: An object
-     * @param $exclude: array of the object parameters to be excluded from the returned array
-     */
-    public static function getObjectProperties($object, $exclude)
-    {
-        $objectParameters = [];
-
-        foreach (get_object_vars($object) as $key => $value) {
-            if (property_exists($object, $key)) {
-                if (!is_numeric(array_search($key, $exclude))) {
-                    array_push($objectParameters, $key);
-                }
-            }
-        }
-
-        return $objectParameters;
-    }
-
-    /**
-     * Returns url path generated from the array of the fields and parameters.
-     *
-     * @param $allFields; array of the paossible fields (parameter names)
-     * @param $params: input parameters (array or object)
-     */
-    public static function generateUrlPath($allFields, $params)
-    {
-        $generatedPath = '';
-
-        if (is_array($params)) {
-            foreach ($allFields as $field) {
-                if (isset($params[$field])) {
-                    $generatedPath .= $params[$field].'/';
-                }
-            }
-        } elseif (is_object($params)) {
-            foreach ($allFields as $field) {
-                if (isset($params->{$field})) {
-                    $generatedPath .= $params->{$field}.'/';
-                }
-            }
-        }
-
-        return $generatedPath;
-    }
-
-    public static function getFileRealPath($fileName)
-    {
-        $rpath = function_exists('curl_file_create') ? curl_file_create(realpath($fileName)) : '@'.realpath($fileName);
-
-        return $rpath;
-    }
+	public static $apiKey;
+	public static $baseUrl = Endpoint::BASE_URL;
+
+	public static function setApiKey($apiKey)
+	{
+		self::$apiKey = $apiKey;
+	}
+
+	public static function getApiKey()
+	{
+		return self::$apiKey;
+	}
+
+	public static function setBaseUrl($baseUrl)
+	{
+		self::$baseUrl = $baseUrl;
+	}
+
+	public static function getBaseUrl()
+	{
+		return self::$baseUrl;
+	}
+
+	/**
+	 * Make request with CURL
+	 *
+	 * @since 1.2.3 changed error handling
+	 * @since 1.2.8 added $options['return_headers']
+	 *
+	 * @param array  $options
+	 *   string url                        - HTTP URL.
+	 *   string method                     - HTTP method.
+	 *   string api_key                    - API key to access to route4me server.
+	 *   array  query                      - Array of query parameters.
+	 *   array  body                       - Array of body parameters.
+	 *   string HTTPHEADER                 - Content type of body e.g.
+	 *                                       'Content-Type: application/json'
+	 *                                       'Content-Type: multipart/form-data'
+	 *   array  HTTPHEADERS                - Array of headers.
+	 *   string FILE                       - Path to uploading file.
+	 *   array  return_headers             - Array of response headers to return as a result.
+	 * @throws Exception\ApiError
+	 */
+	public static function makeRequst($options)
+	{
+		$method = isset($options['method']) ? $options['method'] : 'GET';
+		$query = isset($options['query'])
+			? array_filter($options['query'], function ($x) {
+				return !is_null($x);
+			}) : [];
+
+		$body = isset($options['body']) ? $options['body'] : null;
+		$file = isset($options['FILE']) ? $options['FILE'] : null;
+		$headers = [
+			'User-Agent: Route4Me php-sdk',
+		];
+
+		$return_headers = (isset($options['return_headers']) ? $options['return_headers'] : null);
+
+		if (isset($options['HTTPHEADER'])) {
+			$headers[] = $options['HTTPHEADER'];
+		}
+
+		if (isset($options['HTTPHEADERS'])) {
+			foreach ($options['HTTPHEADERS'] as $header) {
+				$headers[] = $header;
+			}
+		}
+
+		$ch = curl_init();
+
+		$url = isset($options['url'])
+			? $options['url'] . '?' . http_build_query(array_merge(
+				$query,
+				['api_key' => self::getApiKey()]
+			)) : '';
+
+		$baseUrl = self::getBaseUrl();
+
+		$curlOpts = [
+			CURLOPT_URL             => $baseUrl.$url,
+			CURLOPT_RETURNTRANSFER  => true,
+			CURLOPT_TIMEOUT         => 120,
+			CURLOPT_FOLLOWLOCATION  => true,
+			CURLOPT_SSL_VERIFYHOST  => false,
+			CURLOPT_SSL_VERIFYPEER  => false,
+			CURLOPT_HTTPHEADER      => $headers,
+		];
+
+		curl_setopt_array($ch, $curlOpts);
+
+		// read response headers if need
+		$response_headers = [];
+		if ($return_headers) {
+			curl_setopt($ch, CURLOPT_HEADERFUNCTION, function ($curl, $header) use (&$response_headers) {
+				$len = strlen($header);
+				$header = explode(':', $header, 2);
+				if (count($header) >= 2) {
+					$response_headers[strtolower(trim($header[0]))] = trim($header[1]);
+				}
+				return $len;
+			});
+		}
+
+		if (null != $file) {
+			$cfile = new \CURLFile($file, '', '');
+			$body['strFilename']=$cfile;
+			curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+			curl_setopt($ch, CURLOPT_POST, true);
+			curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
+		} else {
+			switch ($method) {
+				case 'DELETE':
+					curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');
+					break;
+				case 'DELETEARRAY':
+					curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'DELETE');
+					curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
+					break;
+				case 'PUT':
+					curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT');
+					break;
+				case 'POST':
+					if (isset($body)) {
+						if (isset($options['HTTPHEADER'])
+							&& strpos($options['HTTPHEADER'], 'multipart/form-data') > 0) {
+							$bodyData = $body;
+						} else {
+							$bodyData = json_encode($body);
+						}
+						curl_setopt($ch, CURLOPT_POST, 1);
+						curl_setopt($ch, CURLOPT_POSTREDIR, 7);
+						curl_setopt($ch, CURLOPT_POSTFIELDS, $bodyData);
+					}
+					break;
+				case 'ADD':
+					curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
+					break;
+				case 'PATCH':
+					if (isset($body)) {
+						$bodyData = json_encode($body);
+						if (isset($options['HTTPHEADER'])) {
+							if (strpos($options['HTTPHEADER'], 'multipart/form-data') > 0) {
+								$bodyData = $body;
+							}
+						}
+						curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PATCH');
+						curl_setopt($ch, CURLOPT_POSTFIELDS, $bodyData);
+					}
+					break;
+			}
+
+			if (is_numeric(array_search($method, ['DELETE', 'PUT']))) {
+				if (isset($body)) {
+					curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body));
+				}
+			}
+		}
+
+		$result = curl_exec($ch);
+		$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+		curl_close($ch);
+
+		$json = null;
+		if (strpos($result, '<?xml') > -1) {
+			$xml = simplexml_load_string($result);
+			$json = self::object2array($xml);
+		} else {
+			$json = json_decode($result, true);
+		}
+		if (200 == $code || 201 == $code || 202 == $code || 204 == $code) {
+			if (isset($json['errors'])) {
+				throw new ApiError(implode(', ', $json['errors']), $code, $result);
+			} else {
+				// return response headers if they were asked for
+				if (count($response_headers) !== 0) {
+					$res = [
+						'code' => $code,
+						'data' => $json
+					];
+					foreach ($return_headers as $key => $value) {
+						// most headers has char '-' but it is forbidden in PHP names replace it with '_'
+						$res[strtolower(str_replace('-', '_', $value))] =
+							(isset($response_headers[$value]) ? $response_headers[$value] : null);
+					}
+					return $res;
+				}
+				if (204 == $code) {
+					return true;
+				}
+				return $json;
+			}
+		} elseif (isset($code) && (!isset($result) || !$result)) {
+			throw new ApiError('', $code, $result);
+		} else {
+			if (isset($json['messages'])) {
+				$msg = '';
+				foreach ($json['messages'] as $key => $value) {
+					if ($msg !== '') {
+						$msg .= PHP_EOL;
+					}
+					$msg .= $key . ': ' . (is_array($value) ? implode(', ', $value) : $value);
+				}
+				throw new ApiError($msg, $code, $result);
+			} elseif (isset($json['error']) && !empty($json['error'])) {
+				throw new ApiError($json['error'], $code, $result);
+			} elseif (isset($json['error'])) {
+				$msg = '';
+				foreach ($json['errors'] as $key => $value) {
+					if ($msg !== '') {
+						$msg .= PHP_EOL;
+					}
+					$msg .= $value;
+				}
+				throw new ApiError($msg, $code, $result);
+			} else {
+				throw new ApiError($result, $code, $result);
+			}
+		}
+	}
+
+	/**
+	 * @param $object: JSON object
+	 */
+	public static function object2array($object)
+	{
+		return @json_decode(@json_encode($object), 1);
+	}
+
+	/**
+	 * Prints on the screen main keys and values of the array.
+	 *
+	 * @param $results: object to be printed on the screen
+	 * @param $deepPrinting: if true, object will be printed recursively
+	 */
+	public static function simplePrint($results, $deepPrinting = null)
+	{
+		if (isset($results)) {
+			if (is_array($results)) {
+				foreach ($results as $key => $result) {
+					if (is_array($result)) {
+						foreach ($result as $key1 => $result1) {
+							if (is_array($result1)) {
+								if ($deepPrinting) {
+									echo "<br>$key1 ------><br>";
+									self::simplePrint($result1, true);
+									echo '------<br>';
+								} else {
+									echo $key1.' --> '.'Array() <br>';
+								}
+							} else {
+								if (is_object($result1)) {
+									if ($deepPrinting) {
+										echo "<br>$key1 ------><br>";
+										$oarray = (array) $result1;
+										self::simplePrint($oarray, true);
+										echo '------<br>';
+									} else {
+										echo $key1.' --> '.'Object <br>';
+									}
+								} else {
+									if (!is_null($result1)) {
+										echo $key1.' --> '.$result1.'<br>';
+									}
+								}
+							}
+						}
+					} else {
+						if (is_object($result)) {
+							if ($deepPrinting) {
+								echo "<br>$key ------><br>";
+								$oarray = (array) $result;
+								self::simplePrint($oarray, true);
+								echo '------<br>';
+							} else {
+								echo $key.' --> '.'Object <br>';
+							}
+						} else {
+							if (!is_null($result)) {
+								echo $key.' --> '.$result.'<br>';
+							}
+						}
+					}
+					//echo "<br>";
+				}
+			}
+		}
+	}
+
+	/**
+	 * Generates query or body parameters.
+	 *
+	 * @param $allFields: all known fields could be used for parameters generation
+	 * @param $params: input parameters (array or object)
+	 */
+	public static function generateRequestParameters($allFields, $params)
+	{
+		$generatedParams = [];
+
+		if (is_array($params)) {
+			foreach ($allFields as $field) {
+				if (isset($params[$field])) {
+					$generatedParams[$field] = $params[$field];
+				}
+			}
+		} elseif (is_object($params)) {
+			foreach ($allFields as $field) {
+				if (isset($params->{$field})) {
+					$generatedParams[$field] = $params->{$field};
+				}
+			}
+		}
+
+		return $generatedParams;
+	}
+
+	/**
+	 * Returns an array of the object properties.
+	 *
+	 * @param $object: An object
+	 * @param $exclude: array of the object parameters to be excluded from the returned array
+	 */
+	public static function getObjectProperties($object, $exclude)
+	{
+		$objectParameters = [];
+
+		foreach (get_object_vars($object) as $key => $value) {
+			if (property_exists($object, $key)) {
+				if (!is_numeric(array_search($key, $exclude))) {
+					array_push($objectParameters, $key);
+				}
+			}
+		}
+
+		return $objectParameters;
+	}
+
+	/**
+	 * Returns url path generated from the array of the fields and parameters.
+	 *
+	 * @param $allFields; array of the paossible fields (parameter names)
+	 * @param $params: input parameters (array or object)
+	 */
+	public static function generateUrlPath($allFields, $params)
+	{
+		$generatedPath = '';
+
+		if (is_array($params)) {
+			foreach ($allFields as $field) {
+				if (isset($params[$field])) {
+					$generatedPath .= $params[$field].'/';
+				}
+			}
+		} elseif (is_object($params)) {
+			foreach ($allFields as $field) {
+				if (isset($params->{$field})) {
+					$generatedPath .= $params->{$field}.'/';
+				}
+			}
+		}
+
+		return $generatedPath;
+	}
+
+	public static function getFileRealPath($fileName)
+	{
+		$rpath = function_exists('curl_file_create') ? curl_file_create(realpath($fileName)) : '@'.realpath($fileName);
+
+		return $rpath;
+	}
 }

Spacing +17 added lines, -17 removed lines

@@ -54,7 +54,7 @@ 
     {
         $method = isset($options['method']) ? $options['method'] : 'GET';
         $query = isset($options['query'])
-            ? array_filter($options['query'], function ($x) {
+            ? array_filter($options['query'], function($x) {
                 return !is_null($x);
             }) : [];
 
@@ -79,7 +79,7 @@ 
         $ch = curl_init();
 
         $url = isset($options['url'])
-            ? $options['url'] . '?' . http_build_query(array_merge(
+            ? $options['url'].'?'.http_build_query(array_merge(
                 $query,
                 ['api_key' => self::getApiKey()]
             )) : '';
@@ -101,19 +101,19 @@ 
         // read response headers if need
         $response_headers = [];
         if ($return_headers) {
-            curl_setopt($ch, CURLOPT_HEADERFUNCTION, function ($curl, $header) use (&$response_headers) {
+            curl_setopt($ch, CURLOPT_HEADERFUNCTION, function($curl, $header) use (&$response_headers) {
                 $len = strlen($header);
                 $header = explode(':', $header, 2);
-                if (count($header) >= 2) {
+                if (count($header)>=2) {
                     $response_headers[strtolower(trim($header[0]))] = trim($header[1]);
                 }
                 return $len;
             });
         }
 
-        if (null != $file) {
+        if (null!=$file) {
             $cfile = new \CURLFile($file, '', '');
-            $body['strFilename']=$cfile;
+            $body['strFilename'] = $cfile;
             curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
             curl_setopt($ch, CURLOPT_POST, true);
             curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
@@ -132,7 +132,7 @@ 
                 case 'POST':
                     if (isset($body)) {
                         if (isset($options['HTTPHEADER'])
-                            && strpos($options['HTTPHEADER'], 'multipart/form-data') > 0) {
+                            && strpos($options['HTTPHEADER'], 'multipart/form-data')>0) {
                             $bodyData = $body;
                         } else {
                             $bodyData = json_encode($body);
@@ -149,7 +149,7 @@ 
                     if (isset($body)) {
                         $bodyData = json_encode($body);
                         if (isset($options['HTTPHEADER'])) {
-                            if (strpos($options['HTTPHEADER'], 'multipart/form-data') > 0) {
+                            if (strpos($options['HTTPHEADER'], 'multipart/form-data')>0) {
                                 $bodyData = $body;
                             }
                         }
@@ -171,18 +171,18 @@ 
         curl_close($ch);
 
         $json = null;
-        if (strpos($result, '<?xml') > -1) {
+        if (strpos($result, '<?xml')>-1) {
             $xml = simplexml_load_string($result);
             $json = self::object2array($xml);
         } else {
             $json = json_decode($result, true);
         }
-        if (200 == $code || 201 == $code || 202 == $code || 204 == $code) {
+        if (200==$code || 201==$code || 202==$code || 204==$code) {
             if (isset($json['errors'])) {
                 throw new ApiError(implode(', ', $json['errors']), $code, $result);
             } else {
                 // return response headers if they were asked for
-                if (count($response_headers) !== 0) {
+                if (count($response_headers)!==0) {
                     $res = [
                         'code' => $code,
                         'data' => $json
@@ -194,7 +194,7 @@ 
                     }
                     return $res;
                 }
-                if (204 == $code) {
+                if (204==$code) {
                     return true;
                 }
                 return $json;
@@ -205,10 +205,10 @@ 
             if (isset($json['messages'])) {
                 $msg = '';
                 foreach ($json['messages'] as $key => $value) {
-                    if ($msg !== '') {
+                    if ($msg!=='') {
                         $msg .= PHP_EOL;
                     }
-                    $msg .= $key . ': ' . (is_array($value) ? implode(', ', $value) : $value);
+                    $msg .= $key.': '.(is_array($value) ? implode(', ', $value) : $value);
                 }
                 throw new ApiError($msg, $code, $result);
             } elseif (isset($json['error']) && !empty($json['error'])) {
@@ -216,7 +216,7 @@ 
             } elseif (isset($json['error'])) {
                 $msg = '';
                 foreach ($json['errors'] as $key => $value) {
-                    if ($msg !== '') {
+                    if ($msg!=='') {
                         $msg .= PHP_EOL;
                     }
                     $msg .= $value;
@@ -261,7 +261,7 @@ 
                                 if (is_object($result1)) {
                                     if ($deepPrinting) {
                                         echo "<br>$key1 ------><br>";
-                                        $oarray = (array) $result1;
+                                        $oarray = (array)$result1;
                                         self::simplePrint($oarray, true);
                                         echo '------<br>';
                                     } else {
@@ -278,7 +278,7 @@ 
                         if (is_object($result)) {
                             if ($deepPrinting) {
                                 echo "<br>$key ------><br>";
-                                $oarray = (array) $result;
+                                $oarray = (array)$result;
                                 self::simplePrint($oarray, true);
                                 echo '------<br>';
                             } else {