route4me / route4me-php-sdk

src/Route4Me/Route4Me.php

Indentation +99 added lines, -99 removed lines

@@ -6,74 +6,74 @@ 
 
 class Route4Me
 {
-    static public $apiKey;
-    static public $baseUrl = 'https://route4me.com';
+	static public $apiKey;
+	static public $baseUrl = 'https://route4me.com';
 
-    public static function setApiKey($apiKey)
-    {
-        self::$apiKey = $apiKey;
-    }
+	public static function setApiKey($apiKey)
+	{
+		self::$apiKey = $apiKey;
+	}
 
-    public static function getApiKey()
-    {
-        return self::$apiKey;
-    }
+	public static function getApiKey()
+	{
+		return self::$apiKey;
+	}
 
-    public static function setBaseUrl($baseUrl)
-    {
-        self::$baseUrl = $baseUrl;
-    }
+	public static function setBaseUrl($baseUrl)
+	{
+		self::$baseUrl = $baseUrl;
+	}
 
-    public static function getBaseUrl()
-    {
-        return self::$baseUrl;
-    }
+	public static function getBaseUrl()
+	{
+		return self::$baseUrl;
+	}
 
-    public static function makeRequst($options) {
-        $method = isset($options['method']) ? $options['method'] : 'GET';
-        $query = isset($options['query']) ?
-            array_filter($options['query']) : array();
-        $body = isset($options['body']) ?
-            array_filter($options['body']) : null;
+	public static function makeRequst($options) {
+		$method = isset($options['method']) ? $options['method'] : 'GET';
+		$query = isset($options['query']) ?
+			array_filter($options['query']) : array();
+		$body = isset($options['body']) ?
+			array_filter($options['body']) : null;
 		$httpHeader = isset($options['HTTPHEADER']) ? $options['HTTPHEADER'] : null;
 			
-        $ch = curl_init();
-        $url = $options['url'] . '?' . http_build_query(array_merge(
-            $query, array( 'api_key' => self::getApiKey())
-        ));
+		$ch = curl_init();
+		$url = $options['url'] . '?' . http_build_query(array_merge(
+			$query, array( 'api_key' => self::getApiKey())
+		));
 		
 		//$jfile=json_encode($body); echo $jfile; die("");
 		$baseUrl=self::getBaseUrl();
 		
 		if (strpos($url,'move_route_destination')>0) $baseUrl='https://www.route4me.com';
-        $curlOpts = arraY(
-            CURLOPT_URL            => $baseUrl. $url,
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_TIMEOUT        => 60,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_SSL_VERIFYHOST => FALSE,
-            CURLOPT_SSL_VERIFYPEER => FALSE,
-            CURLOPT_HTTPHEADER     => array(
-                'User-Agent' => 'Route4Me php-sdk'
-            )
-        );
+		$curlOpts = arraY(
+			CURLOPT_URL            => $baseUrl. $url,
+			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_TIMEOUT        => 60,
+			CURLOPT_FOLLOWLOCATION => true,
+			CURLOPT_SSL_VERIFYHOST => FALSE,
+			CURLOPT_SSL_VERIFYPEER => FALSE,
+			CURLOPT_HTTPHEADER     => array(
+				'User-Agent' => 'Route4Me php-sdk'
+			)
+		);
 		//echo "url=".$baseUrl.$url."<br>";die("");
-        curl_setopt_array($ch, $curlOpts);
-        switch($method) {
-        case 'DELETE':
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
+		curl_setopt_array($ch, $curlOpts);
+		switch($method) {
+		case 'DELETE':
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
 
 			if (isset($body)) {
 				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
 			}
-            break;
+			break;
 		case 'DELETEARRAY':
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
-            break;
-        case 'PUT':
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
+			break;
+		case 'PUT':
 			//$jfile=json_encode($body); echo $jfile; die("");
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
 			if (isset($query)) {
 				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
 			}
@@ -82,10 +82,10 @@ 
 				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
 			}
 			break;
-        case 'POST':
+		case 'POST':
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST");
 			if (isset($query)) {
-            	curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); 
+				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); 
 			}
 
 			if (isset($body)) {
@@ -93,12 +93,12 @@ 
 			} 
 			break;
 		case 'ADD':
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
-        }
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
+		}
 
 		if ($httpHeader!=null) curl_setopt($ch, CURLOPT_HTTPHEADER, $httpHeader);
 		
-        $result = curl_exec($ch);
+		$result = curl_exec($ch);
 		//var_dump($result); die("");
 		$isxml=FALSE;
 		$jxml="";
@@ -109,58 +109,58 @@ 
 			$isxml = TRUE;
 		}
 		
-        $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        curl_close($ch);
+		$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+		curl_close($ch);
 		
 		if ($isxml) {
 			$json = $jxml;
 		} else $json = json_decode($result, true);
 		//var_dump($json); die("");
-        if (200 == $code) {
-            return $json;
-        } elseif (isset($json['errors'])) {
-            throw new ApiError(implode(', ', $json['errors']));
-        } else {
-            throw new ApiError('Something wrong');
-        }
-    }
+		if (200 == $code) {
+			return $json;
+		} elseif (isset($json['errors'])) {
+			throw new ApiError(implode(', ', $json['errors']));
+		} else {
+			throw new ApiError('Something wrong');
+		}
+	}
 
 	public static function makeUrlRequst($url, $options) {
 		$method = isset($options['method']) ? $options['method'] : 'GET';
-        $query = isset($options['query']) ?
-            array_filter($options['query']) : array();
-        $body = isset($options['body']) ?
-            array_filter($options['body']) : null;
-        $ch = curl_init();
+		$query = isset($options['query']) ?
+			array_filter($options['query']) : array();
+		$body = isset($options['body']) ?
+			array_filter($options['body']) : null;
+		$ch = curl_init();
 		
 		$curlOpts = arraY(
-            CURLOPT_URL            => $url,
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_TIMEOUT        => 60,
-            CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_SSL_VERIFYHOST => FALSE,
-            CURLOPT_SSL_VERIFYPEER => FALSE,
-            CURLOPT_HTTPHEADER     => array(
-                'User-Agent' => 'Route4Me php-sdk'
-            )
-        );
+			CURLOPT_URL            => $url,
+			CURLOPT_RETURNTRANSFER => true,
+			CURLOPT_TIMEOUT        => 60,
+			CURLOPT_FOLLOWLOCATION => true,
+			CURLOPT_SSL_VERIFYHOST => FALSE,
+			CURLOPT_SSL_VERIFYPEER => FALSE,
+			CURLOPT_HTTPHEADER     => array(
+				'User-Agent' => 'Route4Me php-sdk'
+			)
+		);
 		
 		curl_setopt_array($ch, $curlOpts);
 		
-        switch($method) {
-        case 'DELETE':
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
+		switch($method) {
+		case 'DELETE':
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
 
 			if (isset($body)) {
 				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
 			}
-            break;
+			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");
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
+			break;
+		case 'PUT':
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT");
 			if (isset($query)) {
 				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query));
 			}
@@ -169,10 +169,10 @@ 
 				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($body)); 
 			}
 			break;
-        case 'POST':
+		case 'POST':
 			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "POST"); 
 			if (isset($query)) {
-            	curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); 
+				curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); 
 			}
 
 			if (isset($body)) {
@@ -180,8 +180,8 @@ 
 			} 
 			break;
 		case 'ADD':
-            curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
-        }
+			curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
+		}
 
 		$result = curl_exec($ch);
 		$isxml=FALSE;
@@ -193,20 +193,20 @@ 
 			$isxml = TRUE;
 		}
 		
-        $code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        curl_close($ch);
+		$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+		curl_close($ch);
 		
 		if ($isxml) {
 			$json = $jxml;
 		} else $json = json_decode($result, true);
 		
-        if (200 == $code) {
-            return $json;
-        } elseif (isset($json['errors'])) {
-            throw new ApiError(implode(', ', $json['errors']));
-        } else {
-            throw new ApiError('Something wrong');
-        }
+		if (200 == $code) {
+			return $json;
+		} elseif (isset($json['errors'])) {
+			throw new ApiError(implode(', ', $json['errors']));
+		} else {
+			throw new ApiError('Something wrong');
+		}
 	}
 	
 	/**

Spacing +13 added lines, -13 removed lines

@@ -38,16 +38,16 @@ 
 		$httpHeader = isset($options['HTTPHEADER']) ? $options['HTTPHEADER'] : null;
 			
         $ch = curl_init();
-        $url = $options['url'] . '?' . http_build_query(array_merge(
-            $query, array( 'api_key' => self::getApiKey())
+        $url = $options['url'].'?'.http_build_query(array_merge(
+            $query, array('api_key' => self::getApiKey())
         ));
 		
 		//$jfile=json_encode($body); echo $jfile; die("");
-		$baseUrl=self::getBaseUrl();
+		$baseUrl = self::getBaseUrl();
 		
-		if (strpos($url,'move_route_destination')>0) $baseUrl='https://www.route4me.com';
+		if (strpos($url, 'move_route_destination')>0) $baseUrl = 'https://www.route4me.com';
         $curlOpts = arraY(
-            CURLOPT_URL            => $baseUrl. $url,
+            CURLOPT_URL            => $baseUrl.$url,
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_TIMEOUT        => 60,
             CURLOPT_FOLLOWLOCATION => true,
@@ -59,7 +59,7 @@ 
         );
 		//echo "url=".$baseUrl.$url."<br>";die("");
         curl_setopt_array($ch, $curlOpts);
-        switch($method) {
+        switch ($method) {
         case 'DELETE':
             curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
 
@@ -100,8 +100,8 @@ 
 		
         $result = curl_exec($ch);
 		//var_dump($result); die("");
-		$isxml=FALSE;
-		$jxml="";
+		$isxml = FALSE;
+		$jxml = "";
 		if (strpos($result, '<?xml')>-1)
 		{
 			$xml = simplexml_load_string($result);
@@ -116,7 +116,7 @@ 
 			$json = $jxml;
 		} else $json = json_decode($result, true);
 		//var_dump($json); die("");
-        if (200 == $code) {
+        if (200==$code) {
             return $json;
         } elseif (isset($json['errors'])) {
             throw new ApiError(implode(', ', $json['errors']));
@@ -147,7 +147,7 @@ 
 		
 		curl_setopt_array($ch, $curlOpts);
 		
-        switch($method) {
+        switch ($method) {
         case 'DELETE':
             curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "DELETE"); 
 
@@ -184,8 +184,8 @@ 
         }
 
 		$result = curl_exec($ch);
-		$isxml=FALSE;
-		$jxml="";
+		$isxml = FALSE;
+		$jxml = "";
 		if (strpos($result, '<?xml')>-1)
 		{
 			$xml = simplexml_load_string($result);
@@ -200,7 +200,7 @@ 
 			$json = $jxml;
 		} else $json = json_decode($result, true);
 		
-        if (200 == $code) {
+        if (200==$code) {
             return $json;
         } elseif (isset($json['errors'])) {
             throw new ApiError(implode(', ', $json['errors']));

Braces +12 added lines, -4 removed lines

@@ -45,7 +45,9 @@ 
 		//$jfile=json_encode($body); echo $jfile; die("");
 		$baseUrl=self::getBaseUrl();
 		
-		if (strpos($url,'move_route_destination')>0) $baseUrl='https://www.route4me.com';
+		if (strpos($url,'move_route_destination')>0) {
+			$baseUrl='https://www.route4me.com';
+		}
         $curlOpts = arraY(
             CURLOPT_URL            => $baseUrl. $url,
             CURLOPT_RETURNTRANSFER => true,
@@ -96,7 +98,9 @@ 
             curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($query)); break;
         }
 
-		if ($httpHeader!=null) curl_setopt($ch, CURLOPT_HTTPHEADER, $httpHeader);
+		if ($httpHeader!=null) {
+			curl_setopt($ch, CURLOPT_HTTPHEADER, $httpHeader);
+		}
 		
         $result = curl_exec($ch);
 		//var_dump($result); die("");
@@ -114,7 +118,9 @@ 
 		
 		if ($isxml) {
 			$json = $jxml;
-		} else $json = json_decode($result, true);
+		} else {
+			$json = json_decode($result, true);
+		}
 		//var_dump($json); die("");
         if (200 == $code) {
             return $json;
@@ -198,7 +204,9 @@ 
 		
 		if ($isxml) {
 			$json = $jxml;
-		} else $json = json_decode($result, true);
+		} else {
+			$json = json_decode($result, true);
+		}
 		
         if (200 == $code) {
             return $json;

src/Route4Me/OptimizationProblemParams.php

Indentation +69 added lines, -69 removed lines

@@ -8,85 +8,85 @@
 
 class OptimizationProblemParams extends Common
 {
-    public $optimization_problem_id;
-    public $reoptimize;
-    public $addresses = array();
-    public $parameters;
-    public $directions;
-    public $format;
-    public $route_path_output;
-    public $optimized_callback_url;
+	public $optimization_problem_id;
+	public $reoptimize;
+	public $addresses = array();
+	public $parameters;
+	public $directions;
+	public $format;
+	public $route_path_output;
+	public $optimized_callback_url;
 
-    public static function fromArray($params)
-    {
-        $param = new OptimizationProblemParams;
-        if (!isset($params['addresses'])) {
-            throw new BadParam('addresses must be provided.');
-        }
+	public static function fromArray($params)
+	{
+		$param = new OptimizationProblemParams;
+		if (!isset($params['addresses'])) {
+			throw new BadParam('addresses must be provided.');
+		}
 
-        if (!isset($params['parameters'])) {
-            throw new BadParam('parameters must be provided.');
-        }
+		if (!isset($params['parameters'])) {
+			throw new BadParam('parameters must be provided.');
+		}
 
-        if ($params['parameters'] instanceof RouteParameters) {
-            $param->setParameters($params['parameters']);
-        } else {
-            $param->setParameters(RouteParameters::fromArray($params['parameters']));
-        }
+		if ($params['parameters'] instanceof RouteParameters) {
+			$param->setParameters($params['parameters']);
+		} else {
+			$param->setParameters(RouteParameters::fromArray($params['parameters']));
+		}
 
-        foreach($params['addresses'] as $address) {
-            if (!($address instanceof Address)) {
-                $address = Address::fromArray($address);
-            }
-            $param->addAddress($address);
-        }
+		foreach($params['addresses'] as $address) {
+			if (!($address instanceof Address)) {
+				$address = Address::fromArray($address);
+			}
+			$param->addAddress($address);
+		}
 
-        $param->directions = self::getValue($params, 'directions');
-        $param->format = self::getValue($params, 'format');
-        $param->route_path_output = self::getValue($params, 'route_path_output');
-        $param->optimized_callback_url = self::getValue($params, 'optimized_callback_url');
-        $param->optimization_problem_id = self::getValue($params, 'optimization_problem_id');
-        $param->reoptimize = self::getValue($params, 'reoptimize');
+		$param->directions = self::getValue($params, 'directions');
+		$param->format = self::getValue($params, 'format');
+		$param->route_path_output = self::getValue($params, 'route_path_output');
+		$param->optimized_callback_url = self::getValue($params, 'optimized_callback_url');
+		$param->optimization_problem_id = self::getValue($params, 'optimization_problem_id');
+		$param->reoptimize = self::getValue($params, 'reoptimize');
 
-        return $param;
-    }
+		return $param;
+	}
 
-    public function __construct()
-    {
-        $this->parameters = new RouteParameters;
-    }
+	public function __construct()
+	{
+		$this->parameters = new RouteParameters;
+	}
 
-    public function setParameters(RouteParameters $params)
-    {
-        $this->parameters = $params;
-        return $this;
-    }
+	public function setParameters(RouteParameters $params)
+	{
+		$this->parameters = $params;
+		return $this;
+	}
 
-    public function addAddress(Address $address)
-    {
-        $this->addresses[] = $address;
-        return $this;
-    }
+	public function addAddress(Address $address)
+	{
+		$this->addresses[] = $address;
+		return $this;
+	}
     
-    public function getAddressesArray()
-    {
-        $addresses = array();
-        foreach($this->addresses as $address) {
-            $addresses[] = $address->toArray();
-        }
-        return $addresses;
-    }
+	public function getAddressesArray()
+	{
+		$addresses = array();
+		foreach($this->addresses as $address) {
+			$addresses[] = $address->toArray();
+		}
+		return $addresses;
+	}
 
-    public function getParametersArray()
-    {
-        return $this->parameters->toArray();
-    }
+	public function getParametersArray()
+	{
+		return $this->parameters->toArray();
+	}
 
-    public function setAddresses(array $addresses)
-    {
-        foreach ($addresses as $address) {
-            $this->addAddress($address);
-        }
-        return $this;
-    }
+	public function setAddresses(array $addresses)
+	{
+		foreach ($addresses as $address) {
+			$this->addAddress($address);
+		}
+		return $this;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
             $param->setParameters(RouteParameters::fromArray($params['parameters']));
         }
 
-        foreach($params['addresses'] as $address) {
+        foreach ($params['addresses'] as $address) {
             if (!($address instanceof Address)) {
                 $address = Address::fromArray($address);
             }
@@ -71,7 +71,7 @@ 
     public function getAddressesArray()
     {
         $addresses = array();
-        foreach($this->addresses as $address) {
+        foreach ($this->addresses as $address) {
             $addresses[] = $address->toArray();
         }
         return $addresses;

src/Route4Me/curl_http_client.php

Indentation +46 added lines, -46 removed lines

@@ -110,7 +110,7 @@ 
 		//and finally send curl request
 		$result = curl_exec_redir($this->ch);
 		if(curl_errno($this->ch))
-        {
+		{
 			if($this->debug)
 			{
 				echo "Error Occured in Curl\n";
@@ -120,7 +120,7 @@ 
 			return false;
 		}
 		else
-        {
+		{
 			return $result;
 		}
 	}
@@ -372,53 +372,53 @@ 
  */
 function curl_exec_redir($ch)
 {
-    static $curl_loops = 0;
-    static $curl_max_loops = 20;
-    if ($curl_loops++ >= $curl_max_loops)
-    {
-        $curl_loops = 0;
-        return FALSE;
-    }
-    curl_setopt($ch, CURLOPT_HTTPHEADER, array('Expect:'));
-    curl_setopt($ch, CURLOPT_HEADER, true);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-    curl_setopt($ch, CURLOPT_VERBOSE, false);
-    $data = curl_exec($ch);
-    $data = str_replace("\r", "\n", str_replace("\r\n", "\n", $data));
-    list($header, $data) = explode("\n\n", $data, 2);
-    $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+	static $curl_loops = 0;
+	static $curl_max_loops = 20;
+	if ($curl_loops++ >= $curl_max_loops)
+	{
+		$curl_loops = 0;
+		return FALSE;
+	}
+	curl_setopt($ch, CURLOPT_HTTPHEADER, array('Expect:'));
+	curl_setopt($ch, CURLOPT_HEADER, true);
+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+	curl_setopt($ch, CURLOPT_VERBOSE, false);
+	$data = curl_exec($ch);
+	$data = str_replace("\r", "\n", str_replace("\r\n", "\n", $data));
+	list($header, $data) = explode("\n\n", $data, 2);
+	$http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
     
-    //echo "*** Got HTTP code: $http_code ***\n";
-    //echo "**  Got headers: \n$header\n\n";
+	//echo "*** Got HTTP code: $http_code ***\n";
+	//echo "**  Got headers: \n$header\n\n";
     
-    if ( $http_code == 301 || $http_code == 302 )
-    {
-        // If we're redirected, we should revert to GET
+	if ( $http_code == 301 || $http_code == 302 )
+	{
+		// If we're redirected, we should revert to GET
 		curl_setopt($ch, CURLOPT_HTTPGET,true);
         
-        $matches = array();
-        preg_match('/Location:\s*(.*?)(\n|$)/i', $header, $matches);
-        $url = @parse_url(trim($matches[1]));
-        if (!$url)
-        {
-            //couldn't process the url to redirect to
-            $curl_loops = 0;
-            return $data;
-        }
-        $last_url = parse_url(curl_getinfo($ch, CURLINFO_EFFECTIVE_URL));
-        if (empty($url['scheme']))
-            $url['scheme'] = $last_url['scheme'];
-        if (empty($url['host']))
-            $url['host'] = $last_url['host'];
-        if (empty($url['path']))
-            $url['path'] = $last_url['path'];
-        $new_url = $url['scheme'] . '://' . $url['host'] . $url['path'] . (!empty($url['query'])?'?'.$url['query']:'');
-        //echo "Being redirected to $new_url\n";
-        curl_setopt($ch, CURLOPT_URL, $new_url);
-        return curl_exec_redir($ch);
-    } else {
-        $curl_loops=0;
-        return $data;
-    }
+		$matches = array();
+		preg_match('/Location:\s*(.*?)(\n|$)/i', $header, $matches);
+		$url = @parse_url(trim($matches[1]));
+		if (!$url)
+		{
+			//couldn't process the url to redirect to
+			$curl_loops = 0;
+			return $data;
+		}
+		$last_url = parse_url(curl_getinfo($ch, CURLINFO_EFFECTIVE_URL));
+		if (empty($url['scheme']))
+			$url['scheme'] = $last_url['scheme'];
+		if (empty($url['host']))
+			$url['host'] = $last_url['host'];
+		if (empty($url['path']))
+			$url['path'] = $last_url['path'];
+		$new_url = $url['scheme'] . '://' . $url['host'] . $url['path'] . (!empty($url['query'])?'?'.$url['query']:'');
+		//echo "Being redirected to $new_url\n";
+		curl_setopt($ch, CURLOPT_URL, $new_url);
+		return curl_exec_redir($ch);
+	} else {
+		$curl_loops=0;
+		return $data;
+	}
 }
 ?>

Spacing +57 added lines, -57 removed lines

@@ -3,7 +3,7 @@ 
 
 class Curl_HTTP_Client
 {
-	var $ch ;
+	var $ch;
 	var $debug = false;
 	var $error_msg;
 
@@ -21,7 +21,7 @@ 
 		//set error in case http return code bigger than 300
 		curl_setopt($this->ch, CURLOPT_FAILONERROR, true);
 		// use gzip if possible
-		curl_setopt($this->ch,CURLOPT_ENCODING , 'gzip, deflate');
+		curl_setopt($this->ch, CURLOPT_ENCODING, 'gzip, deflate');
 		// do not veryfy ssl
 		// this is important for windows
 		// as well for being able to access pages with non valid cert
@@ -33,7 +33,7 @@ 
 	 * @param string pass
 	 * @access public
 	 */
-	function set_credentials($username,$password)
+	function set_credentials($username, $password)
 	{
 		curl_setopt($this->ch, CURLOPT_USERPWD, "$username:$password");
 	}
@@ -83,22 +83,22 @@ 
 	 * @return string data
 	 * @access public
 	 */
-	function send_post_data($url, $postdata, $ip=null, $timeout=10)
+	function send_post_data($url, $postdata, $ip = null, $timeout = 10)
 	{
     
 		//set various curl options first
 		// set url to post to
-		curl_setopt($this->ch, CURLOPT_URL,$url);
+		curl_setopt($this->ch, CURLOPT_URL, $url);
 		// return into a variable rather than displaying it
-		curl_setopt($this->ch, CURLOPT_RETURNTRANSFER,true);
+		curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, true);
 		//bind to specific ip address if it is sent trough arguments
-		if($ip)
+		if ($ip)
 		{
-			if($this->debug)
+			if ($this->debug)
 			{
 				echo "Binding to ip $ip\n";
 			}
-			curl_setopt($this->ch,CURLOPT_INTERFACE,$ip);
+			curl_setopt($this->ch, CURLOPT_INTERFACE, $ip);
 		}
 		//set curl function timeout to $timeout
 		curl_setopt($this->ch, CURLOPT_TIMEOUT, $timeout);
@@ -109,13 +109,13 @@ 
 		curl_setopt($this->ch, CURLOPT_POSTFIELDS, $postdata);
 		//and finally send curl request
 		$result = curl_exec_redir($this->ch);
-		if(curl_errno($this->ch))
+		if (curl_errno($this->ch))
         {
-			if($this->debug)
+			if ($this->debug)
 			{
 				echo "Error Occured in Curl\n";
-				echo "Error number: " .curl_errno($this->ch) ."\n";
-				echo "Error message: " .curl_error($this->ch)."\n";
+				echo "Error number: ".curl_errno($this->ch)."\n";
+				echo "Error message: ".curl_error($this->ch)."\n";
 			}
 			return false;
 		}
@@ -133,35 +133,35 @@ 
 	 * @return string data
 	 * @access public
 	 */
-	function fetch_url($url, $ip=null, $timeout=5)
+	function fetch_url($url, $ip = null, $timeout = 5)
 	{
 		// set url to post to
-		curl_setopt($this->ch, CURLOPT_URL,$url);
+		curl_setopt($this->ch, CURLOPT_URL, $url);
         
 		//set method to get
-		curl_setopt($this->ch, CURLOPT_HTTPGET,true);
+		curl_setopt($this->ch, CURLOPT_HTTPGET, true);
 		// return into a variable rather than displaying it
-		curl_setopt($this->ch, CURLOPT_RETURNTRANSFER,true);
+		curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, true);
 		//bind to specific ip address if it is sent trough arguments
-		if($ip)
+		if ($ip)
 		{
-			if($this->debug)
+			if ($this->debug)
 			{
 				echo "Binding to ip $ip\n";
 			}
-			curl_setopt($this->ch,CURLOPT_INTERFACE,$ip);
+			curl_setopt($this->ch, CURLOPT_INTERFACE, $ip);
 		}
 		//set curl function timeout to $timeout
 		curl_setopt($this->ch, CURLOPT_TIMEOUT, $timeout);
 		//and finally send curl request
 		$result = curl_exec_redir($this->ch);
-		if(curl_errno($this->ch))
+		if (curl_errno($this->ch))
 		{
-			if($this->debug)
+			if ($this->debug)
 			{
 				echo "Error Occured in Curl\n";
-				echo "Error number: " .curl_errno($this->ch) ."\n";
-				echo "Error message: " .curl_error($this->ch)."\n";
+				echo "Error number: ".curl_errno($this->ch)."\n";
+				echo "Error message: ".curl_error($this->ch)."\n";
 			}
 			return false;
 		}
@@ -180,18 +180,18 @@ 
 	 * @return boolean true on success false othervise
 	 * @access public
 	 */
-	function fetch_into_file($url, $fp, $ip=null, $timeout=5)
+	function fetch_into_file($url, $fp, $ip = null, $timeout = 5)
 	{
 		// set url to post to
-		curl_setopt($this->ch, CURLOPT_URL,$url);
+		curl_setopt($this->ch, CURLOPT_URL, $url);
 		//set method to get
 		curl_setopt($this->ch, CURLOPT_HTTPGET, true);
 		// store data into file rather than displaying it
 		curl_setopt($this->ch, CURLOPT_FILE, $fp);
 		//bind to specific ip address if it is sent trough arguments
-		if($ip)
+		if ($ip)
 		{
-			if($this->debug)
+			if ($this->debug)
 			{
 				echo "Binding to ip $ip\n";
 			}
@@ -201,13 +201,13 @@ 
 		curl_setopt($this->ch, CURLOPT_TIMEOUT, $timeout);
 		//and finally send curl request
 		$result = curl_exec_redir($this->ch);
-		if(curl_errno($this->ch))
+		if (curl_errno($this->ch))
 		{
-			if($this->debug)
+			if ($this->debug)
 			{
 				echo "Error Occured in Curl\n";
-				echo "Error number: " .curl_errno($this->ch) ."\n";
-				echo "Error message: " .curl_error($this->ch)."\n";
+				echo "Error number: ".curl_errno($this->ch)."\n";
+				echo "Error message: ".curl_error($this->ch)."\n";
 			}
 			return false;
 		}
@@ -228,7 +228,7 @@ 
 	 * @return string data
 	 * @access public
 	 */
-	function send_multipart_post_data($url, $postdata, $file_field_array=array(), $ip=null, $timeout=30)
+	function send_multipart_post_data($url, $postdata, $file_field_array = array(), $ip = null, $timeout = 30)
 	{
 		//set various curl options first
 		// set url to post to
@@ -236,13 +236,13 @@ 
 		// return into a variable rather than displaying it
 		curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, true);
 		//bind to specific ip address if it is sent trough arguments
-		if($ip)
+		if ($ip)
 		{
-			if($this->debug)
+			if ($this->debug)
 			{
 				echo "Binding to ip $ip\n";
 			}
-			curl_setopt($this->ch,CURLOPT_INTERFACE,$ip);
+			curl_setopt($this->ch, CURLOPT_INTERFACE, $ip);
 		}
 		//set curl function timeout to $timeout
 		curl_setopt($this->ch, CURLOPT_TIMEOUT, $timeout);
@@ -257,28 +257,28 @@ 
 		//generate post string
 		$post_array = array();
 		$post_string_array = array();
-		if(!is_array($postdata))
+		if (!is_array($postdata))
 		{
 			return false;
 		}
-		foreach($postdata as $key=>$value)
+		foreach ($postdata as $key=>$value)
 		{
 			$post_array[$key] = $value;
 			$post_string_array[] = urlencode($key)."=".urlencode($value);
 		}
-		$post_string = implode("&",$post_string_array);
-		if($this->debug)
+		$post_string = implode("&", $post_string_array);
+		if ($this->debug)
 		{
 			echo "Post String: $post_string\n";
 		}
 		// set post string
 		//curl_setopt($this->ch, CURLOPT_POSTFIELDS, $post_string);
 		// set multipart form data - file array field-value pairs
-		if(!empty($file_field_array))
+		if (!empty($file_field_array))
 		{
-			foreach($file_field_array as $var_name => $var_value)
+			foreach ($file_field_array as $var_name => $var_value)
 			{
-				if(strpos(PHP_OS, "WIN") !== false) $var_value = str_replace("/", "\\", $var_value); // win hack
+				if (strpos(PHP_OS, "WIN")!==false) $var_value = str_replace("/", "\\", $var_value); // win hack
 				$file_field_array[$var_name] = "@".$var_value;
 			}
 		}
@@ -287,13 +287,13 @@ 
 		curl_setopt($this->ch, CURLOPT_POSTFIELDS, $result_post);
 		//and finally send curl request
 		$result = curl_exec_redir($this->ch);
-		if(curl_errno($this->ch))
+		if (curl_errno($this->ch))
 		{
-			if($this->debug)
+			if ($this->debug)
 			{
 				echo "Error Occured in Curl\n";
-				echo "Error number: " .curl_errno($this->ch) ."\n";
-				echo "Error message: " .curl_error($this->ch)."\n";
+				echo "Error number: ".curl_errno($this->ch)."\n";
+				echo "Error message: ".curl_error($this->ch)."\n";
 			}
 			return false;
 		}
@@ -310,8 +310,8 @@ 
 	function store_cookies($cookie_file)
 	{
 		// use cookies on each request (cookies stored in $cookie_file)
-		curl_setopt ($this->ch, CURLOPT_COOKIEJAR, $cookie_file);
-		curl_setopt ($this->ch, CURLOPT_COOKIEFILE, $cookie_file);
+		curl_setopt($this->ch, CURLOPT_COOKIEJAR, $cookie_file);
+		curl_setopt($this->ch, CURLOPT_COOKIEFILE, $cookie_file);
 	}
 	
 	/**
@@ -321,7 +321,7 @@ 
 	 */
 	function set_cookie($cookie)
 	{		
-		curl_setopt ($this->ch, CURLOPT_COOKIE, $cookie);
+		curl_setopt($this->ch, CURLOPT_COOKIE, $cookie);
 	}
 	/**
 	 * Get last URL info 
@@ -349,8 +349,8 @@ 
 	 */
 	function get_error_msg()
 	{
-		$err = "Error number: " .curl_errno($this->ch) ."\n";
-		$err .="Error message: " .curl_error($this->ch)."\n";
+		$err = "Error number: ".curl_errno($this->ch)."\n";
+		$err .= "Error message: ".curl_error($this->ch)."\n";
 		return $err;
 	}
 	
@@ -374,7 +374,7 @@ 
 {
     static $curl_loops = 0;
     static $curl_max_loops = 20;
-    if ($curl_loops++ >= $curl_max_loops)
+    if ($curl_loops++>=$curl_max_loops)
     {
         $curl_loops = 0;
         return FALSE;
@@ -391,10 +391,10 @@ 
     //echo "*** Got HTTP code: $http_code ***\n";
     //echo "**  Got headers: \n$header\n\n";
     
-    if ( $http_code == 301 || $http_code == 302 )
+    if ($http_code==301 || $http_code==302)
     {
         // If we're redirected, we should revert to GET
-		curl_setopt($ch, CURLOPT_HTTPGET,true);
+		curl_setopt($ch, CURLOPT_HTTPGET, true);
         
         $matches = array();
         preg_match('/Location:\s*(.*?)(\n|$)/i', $header, $matches);
@@ -412,12 +412,12 @@ 
             $url['host'] = $last_url['host'];
         if (empty($url['path']))
             $url['path'] = $last_url['path'];
-        $new_url = $url['scheme'] . '://' . $url['host'] . $url['path'] . (!empty($url['query'])?'?'.$url['query']:'');
+        $new_url = $url['scheme'].'://'.$url['host'].$url['path'].(!empty($url['query']) ? '?'.$url['query'] : '');
         //echo "Being redirected to $new_url\n";
         curl_setopt($ch, CURLOPT_URL, $new_url);
         return curl_exec_redir($ch);
     } else {
-        $curl_loops=0;
+        $curl_loops = 0;
         return $data;
     }
 }

Braces +17 added lines, -15 removed lines

@@ -118,8 +118,7 @@ 
 				echo "Error message: " .curl_error($this->ch)."\n";
 			}
 			return false;
-		}
-		else
+		} else
         {
 			return $result;
 		}
@@ -164,8 +163,7 @@ 
 				echo "Error message: " .curl_error($this->ch)."\n";
 			}
 			return false;
-		}
-		else
+		} else
 		{
 			return $result;
 		}
@@ -210,8 +208,7 @@ 
 				echo "Error message: " .curl_error($this->ch)."\n";
 			}
 			return false;
-		}
-		else
+		} else
 		{
 			return true;
 		}
@@ -278,7 +275,10 @@ 
 		{
 			foreach($file_field_array as $var_name => $var_value)
 			{
-				if(strpos(PHP_OS, "WIN") !== false) $var_value = str_replace("/", "\\", $var_value); // win hack
+				if(strpos(PHP_OS, "WIN") !== false) {
+					$var_value = str_replace("/", "\\", $var_value);
+				}
+				// win hack
 				$file_field_array[$var_name] = "@".$var_value;
 			}
 		}
@@ -296,8 +296,7 @@ 
 				echo "Error message: " .curl_error($this->ch)."\n";
 			}
 			return false;
-		}
-		else
+		} else
 		{
 			return $result;
 		}
@@ -406,12 +405,15 @@ 
             return $data;
         }
         $last_url = parse_url(curl_getinfo($ch, CURLINFO_EFFECTIVE_URL));
-        if (empty($url['scheme']))
-            $url['scheme'] = $last_url['scheme'];
-        if (empty($url['host']))
-            $url['host'] = $last_url['host'];
-        if (empty($url['path']))
-            $url['path'] = $last_url['path'];
+        if (empty($url['scheme'])) {
+                    $url['scheme'] = $last_url['scheme'];
+        }
+        if (empty($url['host'])) {
+                    $url['host'] = $last_url['host'];
+        }
+        if (empty($url['path'])) {
+                    $url['path'] = $last_url['path'];
+        }
         $new_url = $url['scheme'] . '://' . $url['host'] . $url['path'] . (!empty($url['query'])?'?'.$url['query']:'');
         //echo "Being redirected to $new_url\n";
         curl_setopt($ch, CURLOPT_URL, $new_url);

src/Route4Me/Order.php

Indentation +60 added lines, -60 removed lines

@@ -37,45 +37,45 @@ 
 		
 		public static function fromArray(array $params) {
 			$order= new Order();
-	        foreach($params as $key => $value) {
-	            if (property_exists($order, $key)) {
-	                $order->{$key} = $value;
-	            }
+			foreach($params as $key => $value) {
+				if (property_exists($order, $key)) {
+					$order->{$key} = $value;
+				}
 			}
 			
 			return $order;
 		}
 		
 		public static function addOrder($params)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'POST',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'POST',
+				'body'  => array(
 					'address_1' => 	isset($params->address_1) ? $params->address_1: null,
-	                'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
-	                'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
-	                'address_alias' => isset($params->address_alias) ? $params->address_alias : null,
-	                'address_city' => 	isset($params->address_1) ? $params->address_city: null,
-	                'EXT_FIELD_first_name' => 	isset($params->EXT_FIELD_first_name) ? $params->EXT_FIELD_first_name: null,
-	                'EXT_FIELD_last_name' => 	isset($params->EXT_FIELD_last_name) ? $params->EXT_FIELD_last_name: null,
-	                'EXT_FIELD_email' => 	isset($params->EXT_FIELD_email) ? $params->EXT_FIELD_email: null,
-	                'EXT_FIELD_phone' => 	isset($params->EXT_FIELD_phone) ? $params->EXT_FIELD_phone: null,
-	                'EXT_FIELD_custom_data' => 	isset($params->EXT_FIELD_custom_data) ? $params->EXT_FIELD_custom_data: null,
+					'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
+					'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
+					'address_alias' => isset($params->address_alias) ? $params->address_alias : null,
+					'address_city' => 	isset($params->address_1) ? $params->address_city: null,
+					'EXT_FIELD_first_name' => 	isset($params->EXT_FIELD_first_name) ? $params->EXT_FIELD_first_name: null,
+					'EXT_FIELD_last_name' => 	isset($params->EXT_FIELD_last_name) ? $params->EXT_FIELD_last_name: null,
+					'EXT_FIELD_email' => 	isset($params->EXT_FIELD_email) ? $params->EXT_FIELD_email: null,
+					'EXT_FIELD_phone' => 	isset($params->EXT_FIELD_phone) ? $params->EXT_FIELD_phone: null,
+					'EXT_FIELD_custom_data' => 	isset($params->EXT_FIELD_custom_data) ? $params->EXT_FIELD_custom_data: null,
 				)
-	        ));
+			));
 
 			return $response;
 		}
 
 		public static function addOrder2Route($params,$body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlRoute,
-	            'method' => 'PUT',
-	            'query'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrlRoute,
+				'method' => 'PUT',
+				'query'  => array(
 					'route_id' => 	isset($params->route_id) ? $params->route_id: null,
-	                'redirect' => isset($params->redirect) ? $params->redirect : null
+					'redirect' => isset($params->redirect) ? $params->redirect : null
 				),
 				'body'  => (array)$body
 			));
@@ -84,13 +84,13 @@ 
 		}
 		
 		public static function addOrder2Destination($params,$body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrlOpt,
-	            'method' => 'PUT',
-	            'query'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrlOpt,
+				'method' => 'PUT',
+				'query'  => array(
 					'optimization_problem_id' => 	isset($params->optimization_problem_id) ? $params->optimization_problem_id: null,
-	                'redirect' => isset($params->redirect) ? $params->redirect : null
+					'redirect' => isset($params->redirect) ? $params->redirect : null
 				),
 				'body'  => (array)$body
 			));
@@ -99,58 +99,58 @@ 
 		}
 		
 		public static function getOrder($params)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
 					'order_id' => 	isset($params->order_id) ? $params->order_id: null,
 				)
-	        ));
+			));
 
 			return $response;
 		}
 		
 		public static function getOrders()
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET'
-	        ));
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET'
+			));
 
 			return $response;
 		}
 		
 		public static function removeOrder($params)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'DELETE',
-	            'body'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'DELETE',
+				'body'  => array(
 					'order_ids' => 	isset($params->order_ids) ? $params->order_ids: null
 				)
-	        ));
+			));
 
 			return $response;
 		}
 		
 		public static function updateOrder($body)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'PUT',
-	            'body'  => (array)$body
-	        ));
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'PUT',
+				'body'  => (array)$body
+			));
 
 			return $response;
 		}
 		
 		public static function searchOrder($params)
-	    {
-	    	$response = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
+		{
+			$response = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
 					'day_added_YYMMDD' => 	isset($params->day_added_YYMMDD) ? $params->day_added_YYMMDD: null,
 					'scheduled_for_YYMMDD' => 	isset($params->scheduled_for_YYMMDD) ? $params->scheduled_for_YYMMDD: null,
 					'fields' => 	isset($params->fields) ? $params->fields: null,
@@ -158,7 +158,7 @@ 
 					'limit' => 	isset($params->limit) ? $params->limit: null,
 					'query' => 	isset($params->query) ? $params->query: null,
 				)
-	        ));
+			));
 
 			return $response;
 		}

Spacing +22 added lines, -22 removed lines

@@ -33,11 +33,11 @@ 
 		public $limit;
 		public $query;
 		
-		public function __construct () {  }
+		public function __construct() {  }
 		
 		public static function fromArray(array $params) {
-			$order= new Order();
-	        foreach($params as $key => $value) {
+			$order = new Order();
+	        foreach ($params as $key => $value) {
 	            if (property_exists($order, $key)) {
 	                $order->{$key} = $value;
 	            }
@@ -52,29 +52,29 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'POST',
 	            'body'  => array(
-					'address_1' => 	isset($params->address_1) ? $params->address_1: null,
+					'address_1' => 	isset($params->address_1) ? $params->address_1 : null,
 	                'cached_lat' => isset($params->cached_lat) ? $params->cached_lat : null,
 	                'cached_lng' => isset($params->cached_lng) ? $params->cached_lng : null,
 	                'address_alias' => isset($params->address_alias) ? $params->address_alias : null,
-	                'address_city' => 	isset($params->address_1) ? $params->address_city: null,
-	                'EXT_FIELD_first_name' => 	isset($params->EXT_FIELD_first_name) ? $params->EXT_FIELD_first_name: null,
-	                'EXT_FIELD_last_name' => 	isset($params->EXT_FIELD_last_name) ? $params->EXT_FIELD_last_name: null,
-	                'EXT_FIELD_email' => 	isset($params->EXT_FIELD_email) ? $params->EXT_FIELD_email: null,
-	                'EXT_FIELD_phone' => 	isset($params->EXT_FIELD_phone) ? $params->EXT_FIELD_phone: null,
-	                'EXT_FIELD_custom_data' => 	isset($params->EXT_FIELD_custom_data) ? $params->EXT_FIELD_custom_data: null,
+	                'address_city' => 	isset($params->address_1) ? $params->address_city : null,
+	                'EXT_FIELD_first_name' => 	isset($params->EXT_FIELD_first_name) ? $params->EXT_FIELD_first_name : null,
+	                'EXT_FIELD_last_name' => 	isset($params->EXT_FIELD_last_name) ? $params->EXT_FIELD_last_name : null,
+	                'EXT_FIELD_email' => 	isset($params->EXT_FIELD_email) ? $params->EXT_FIELD_email : null,
+	                'EXT_FIELD_phone' => 	isset($params->EXT_FIELD_phone) ? $params->EXT_FIELD_phone : null,
+	                'EXT_FIELD_custom_data' => 	isset($params->EXT_FIELD_custom_data) ? $params->EXT_FIELD_custom_data : null,
 				)
 	        ));
 
 			return $response;
 		}
 
-		public static function addOrder2Route($params,$body)
+		public static function addOrder2Route($params, $body)
 	    {
 	    	$response = Route4Me::makeRequst(array(
 	            'url'    => self::$apiUrlRoute,
 	            'method' => 'PUT',
 	            'query'  => array(
-					'route_id' => 	isset($params->route_id) ? $params->route_id: null,
+					'route_id' => 	isset($params->route_id) ? $params->route_id : null,
 	                'redirect' => isset($params->redirect) ? $params->redirect : null
 				),
 				'body'  => (array)$body
@@ -83,13 +83,13 @@ 
 			return $response;
 		}
 		
-		public static function addOrder2Destination($params,$body)
+		public static function addOrder2Destination($params, $body)
 	    {
 	    	$response = Route4Me::makeRequst(array(
 	            'url'    => self::$apiUrlOpt,
 	            'method' => 'PUT',
 	            'query'  => array(
-					'optimization_problem_id' => 	isset($params->optimization_problem_id) ? $params->optimization_problem_id: null,
+					'optimization_problem_id' => 	isset($params->optimization_problem_id) ? $params->optimization_problem_id : null,
 	                'redirect' => isset($params->redirect) ? $params->redirect : null
 				),
 				'body'  => (array)$body
@@ -104,7 +104,7 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'GET',
 	            'query'  => array(
-					'order_id' => 	isset($params->order_id) ? $params->order_id: null,
+					'order_id' => 	isset($params->order_id) ? $params->order_id : null,
 				)
 	        ));
 
@@ -127,7 +127,7 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'DELETE',
 	            'body'  => array(
-					'order_ids' => 	isset($params->order_ids) ? $params->order_ids: null
+					'order_ids' => 	isset($params->order_ids) ? $params->order_ids : null
 				)
 	        ));
 
@@ -151,12 +151,12 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'GET',
 	            'query'  => array(
-					'day_added_YYMMDD' => 	isset($params->day_added_YYMMDD) ? $params->day_added_YYMMDD: null,
-					'scheduled_for_YYMMDD' => 	isset($params->scheduled_for_YYMMDD) ? $params->scheduled_for_YYMMDD: null,
-					'fields' => 	isset($params->fields) ? $params->fields: null,
-					'offset' => 	isset($params->offset) ? $params->offset: null,
-					'limit' => 	isset($params->limit) ? $params->limit: null,
-					'query' => 	isset($params->query) ? $params->query: null,
+					'day_added_YYMMDD' => 	isset($params->day_added_YYMMDD) ? $params->day_added_YYMMDD : null,
+					'scheduled_for_YYMMDD' => 	isset($params->scheduled_for_YYMMDD) ? $params->scheduled_for_YYMMDD : null,
+					'fields' => 	isset($params->fields) ? $params->fields : null,
+					'offset' => 	isset($params->offset) ? $params->offset : null,
+					'limit' => 	isset($params->limit) ? $params->limit : null,
+					'query' => 	isset($params->query) ? $params->query : null,
 				)
 	        ));
 

src/Route4Me/Geocoding.php

Indentation +20 added lines, -20 removed lines

@@ -23,10 +23,10 @@ 
 		
 		public static function fromArray(array $params) {
 			$geocoding = new Geocoding();
-	        foreach($params as $key => $value) {
-	            if (property_exists($geocoding, $key)) {
-	                $geocoding->{$key} = $value;
-	            }
+			foreach($params as $key => $value) {
+				if (property_exists($geocoding, $key)) {
+					$geocoding->{$key} = $value;
+				}
 			}
 			return $geocoding;
 		}
@@ -35,15 +35,15 @@ 
 		{
 			//Route4Me::simplePrint($params);
 			$query = array(
-	                'format' => isset($params['format']) ? $params['format']: null,
-	                'addresses' => isset($params['addresses']) ? $params['addresses'] : null,
-	            );
+					'format' => isset($params['format']) ? $params['format']: null,
+					'addresses' => isset($params['addresses']) ? $params['addresses'] : null,
+				);
 			//var_dump($query);
 			$fgcoding = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'POST',
-	            'query'  => $query
-	        ));
+				'url'    => self::$apiUrl,
+				'method' => 'POST',
+				'query'  => $query
+			));
 			
 			return $fgcoding;
 		}
@@ -64,9 +64,9 @@ 
 			$query = array();
 			
 			$response = Route4Me::makeUrlRequst($url_query, array(
-	            'method' => 'GET',
-	            'query'  => $query
-	        ));
+				'method' => 'GET',
+				'query'  => $query
+			));
 			
 			return $response;
 		}
@@ -87,9 +87,9 @@ 
 			$query = array();
 			
 			$response = Route4Me::makeUrlRequst($url_query, array(
-	            'method' => 'GET',
-	            'query'  => $query
-	        ));
+				'method' => 'GET',
+				'query'  => $query
+			));
 			
 			return $response;
 		}
@@ -113,9 +113,9 @@ 
 			$query = array();
 			
 			$response = Route4Me::makeUrlRequst($url_query, array(
-	            'method' => 'GET',
-	            'query'  => $query
-	        ));
+				'method' => 'GET',
+				'query'  => $query
+			));
 			
 			return $response;
 		}

Spacing +13 added lines, -13 removed lines

@@ -19,11 +19,11 @@ 
 		public $housenumber;
 		public $zipcode;
 		
-		public function __construct () {  }
+		public function __construct() {  }
 		
 		public static function fromArray(array $params) {
 			$geocoding = new Geocoding();
-	        foreach($params as $key => $value) {
+	        foreach ($params as $key => $value) {
 	            if (property_exists($geocoding, $key)) {
 	                $geocoding->{$key} = $value;
 	            }
@@ -35,7 +35,7 @@ 
 		{
 			//Route4Me::simplePrint($params);
 			$query = array(
-	                'format' => isset($params['format']) ? $params['format']: null,
+	                'format' => isset($params['format']) ? $params['format'] : null,
 	                'addresses' => isset($params['addresses']) ? $params['addresses'] : null,
 	            );
 			//var_dump($query);
@@ -52,13 +52,13 @@ 
 		{
 			$url_query = self::$api_street;
 			if (isset($params['pk'])) {
-				$url_query.=$params['pk'].'/';
+				$url_query .= $params['pk'].'/';
 			}
 			if (isset($params['offset'])) {
-				$url_query.=$params['offset'].'/';
+				$url_query .= $params['offset'].'/';
 			}
 			if (isset($params['limit'])) {
-				$url_query.=$params['limit'].'/';
+				$url_query .= $params['limit'].'/';
 			}
 
 			$query = array();
@@ -75,13 +75,13 @@ 
 		{
 			$url_query = self::$api_zipcode;
 			if (isset($params['zipcode'])) {
-				$url_query.=$params['zipcode'].'/';
+				$url_query .= $params['zipcode'].'/';
 			}
 			if (isset($params['offset'])) {
-				$url_query.=$params['offset'].'/';
+				$url_query .= $params['offset'].'/';
 			}
 			if (isset($params['limit'])) {
-				$url_query.=$params['limit'].'/';
+				$url_query .= $params['limit'].'/';
 			}
 
 			$query = array();
@@ -98,16 +98,16 @@ 
 		{
 			$url_query = self::$api_service;
 			if (isset($params['zipcode'])) {
-				$url_query.=$params['zipcode'].'/';
+				$url_query .= $params['zipcode'].'/';
 			}
 			if (isset($params['housenumber'])) {
-				$url_query.=$params['housenumber'].'/';
+				$url_query .= $params['housenumber'].'/';
 			}
 			if (isset($params['offset'])) {
-				$url_query.=$params['offset'].'/';
+				$url_query .= $params['offset'].'/';
 			}
 			if (isset($params['limit'])) {
-				$url_query.=$params['limit'].'/';
+				$url_query .= $params['limit'].'/';
 			}
 
 			$query = array();

src/Route4Me/Common.php

Indentation +11 added lines, -11 removed lines

@@ -4,17 +4,17 @@
 
 class Common
 {
-    static public function getValue($array, $item, $default = null)
-    {
-        return (isset($array[$item])) ? $array[$item] : $default;
-    }
+	static public function getValue($array, $item, $default = null)
+	{
+		return (isset($array[$item])) ? $array[$item] : $default;
+	}
 
-    public function toArray()
-    {
-        $params = array_filter(get_object_vars($this), function($item) {
-            return ($item !== null) && !(is_array($item) && !count($item));
-        });
+	public function toArray()
+	{
+		$params = array_filter(get_object_vars($this), function($item) {
+			return ($item !== null) && !(is_array($item) && !count($item));
+		});
 
-        return $params;
-    }
+		return $params;
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
     public function toArray()
     {
         $params = array_filter(get_object_vars($this), function($item) {
-            return ($item !== null) && !(is_array($item) && !count($item));
+            return ($item!==null) && !(is_array($item) && !count($item));
         });
 
         return $params;

src/Route4Me/AvoidanceZone.php

Indentation +59 added lines, -59 removed lines

@@ -20,93 +20,93 @@
 		
 		public static function fromArray(array $params) {
 			if (!isset($params['territory_name'])) {
-	            throw new BadParam('Territory name must be provided');
-	        }
+				throw new BadParam('Territory name must be provided');
+			}
 			
 			if (!isset($params['territory_color'])) {
-	            throw new BadParam('Territory color must be provided');
-	        }
+				throw new BadParam('Territory color must be provided');
+			}
 			
 			if (!isset($params['territory'])) {
-	            throw new BadParam('Territory must be provided');
-	        }
+				throw new BadParam('Territory must be provided');
+			}
 			
 			$avoidancezoneparameters = new AvoidanceZone();
-	        foreach($params as $key => $value) {
-	            if (property_exists($avoidancezoneparameters, $key)) {
-	                $avoidancezoneparameters->{$key} = $value;
-	            }
+			foreach($params as $key => $value) {
+				if (property_exists($avoidancezoneparameters, $key)) {
+					$avoidancezoneparameters->{$key} = $value;
+				}
 			}
 			
 			return $avoidancezoneparameters;
 		}
 		
 		public static function getAvoidanceZone($territory_id)
-	    {
-	        $avoidancezone = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
-	                'territory_id'             => $territory_id
-	            )
-	        ));
+		{
+			$avoidancezone = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
+					'territory_id'             => $territory_id
+				)
+			));
 	
-	        return $avoidancezone;
-	    }
+			return $avoidancezone;
+		}
 		
 		public static function getAvoidanceZones($params)
-	    {
-	        $avoidancezones = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'GET',
-	            'query'  => array(
-	                'offset'  => isset($params->offset) ? $params->offset: null,
-	                'limit'   => isset($params->limit) ? $params->limit: null,
-	            )
-	        ));
+		{
+			$avoidancezones = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'GET',
+				'query'  => array(
+					'offset'  => isset($params->offset) ? $params->offset: null,
+					'limit'   => isset($params->limit) ? $params->limit: null,
+				)
+			));
 	
-	        return $avoidancezones;
-	    }
+			return $avoidancezones;
+		}
 
 		public static function addAvoidanceZone($params)
-	    {
-	    	$abcontacts = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'ADD',
-	            'query'  => array(
-	            	'territory_name' => 	isset($params->territory_name) ? $params->territory_name: null,
-	                'territory_color' => isset($params->territory_color) ? $params->territory_color : null,
-	                'territory' => isset($params->territory) ? $params->territory : null,
-	            )
-	        ));
+		{
+			$abcontacts = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'ADD',
+				'query'  => array(
+					'territory_name' => 	isset($params->territory_name) ? $params->territory_name: null,
+					'territory_color' => isset($params->territory_color) ? $params->territory_color : null,
+					'territory' => isset($params->territory) ? $params->territory : null,
+				)
+			));
 
 			return $abcontacts;
 		}
 		
 		public function deleteAvoidanceZone($territory_id)
-	    {
-	        $result = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'DELETEARRAY',
-	            'query'  => array(
-	                'territory_id'     => $territory_id
-	            )
-	        ));
+		{
+			$result = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'DELETEARRAY',
+				'query'  => array(
+					'territory_id'     => $territory_id
+				)
+			));
 	
-	        return $result;
-	    }
+			return $result;
+		}
 		
 		public function updateAvoidanceZone($params)
-	    {
-	        $avoidancezone = Route4Me::makeRequst(array(
-	            'url'    => self::$apiUrl,
-	            'method' => 'PUT',
-	            'query'   => (array)$params,
+		{
+			$avoidancezone = Route4Me::makeRequst(array(
+				'url'    => self::$apiUrl,
+				'method' => 'PUT',
+				'query'   => (array)$params,
 
-	        ));
+			));
 	
-	        return $avoidancezone;
-	    }
+			return $avoidancezone;
+		}
 	}
 	
 ?>
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -8,13 +8,13 @@ 
 	{
 		static public $apiUrl = '/api.v4/avoidance.php';
 	
-		public $territory_id;  // Avoidance zone id
+		public $territory_id; // Avoidance zone id
 		public $territory_name; 
 		public $territory_color;
 		public $member_id;
 		public $territory; // Territory parameters
 		
-		public function __construct () {
+		public function __construct() {
 			
 		}
 		
@@ -32,7 +32,7 @@ 
 	        }
 			
 			$avoidancezoneparameters = new AvoidanceZone();
-	        foreach($params as $key => $value) {
+	        foreach ($params as $key => $value) {
 	            if (property_exists($avoidancezoneparameters, $key)) {
 	                $avoidancezoneparameters->{$key} = $value;
 	            }
@@ -60,8 +60,8 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'GET',
 	            'query'  => array(
-	                'offset'  => isset($params->offset) ? $params->offset: null,
-	                'limit'   => isset($params->limit) ? $params->limit: null,
+	                'offset'  => isset($params->offset) ? $params->offset : null,
+	                'limit'   => isset($params->limit) ? $params->limit : null,
 	            )
 	        ));
 	
@@ -74,7 +74,7 @@ 
 	            'url'    => self::$apiUrl,
 	            'method' => 'ADD',
 	            'query'  => array(
-	            	'territory_name' => 	isset($params->territory_name) ? $params->territory_name: null,
+	            	'territory_name' => 	isset($params->territory_name) ? $params->territory_name : null,
 	                'territory_color' => isset($params->territory_color) ? $params->territory_color : null,
 	                'territory' => isset($params->territory) ? $params->territory : null,
 	            )

src/Route4Me/Address.php

Indentation +142 added lines, -142 removed lines

@@ -9,55 +9,55 @@ 
 
 class Address extends Common
 {
-    static public $apiUrl = '/api.v4/address.php';
+	static public $apiUrl = '/api.v4/address.php';
 	static public $apiUrlMove='/actions/route/move_route_destination.php';
 	static public $apiUrDeparted='/api/route/mark_address_departed.php';
 	static public $apiUrVisited='/actions/address/update_address_visited.php';
 
-    public $route_destination_id;
-    public $alias;
-    public $member_id;
-    public $address;
-    public $is_depot = false;
-    public $lat;
-    public $lng;
-    public $route_id;
-    public $original_route_id;
-    public $optimization_problem_id;
-    public $sequence_no;
-    public $geocoded;
-    public $preferred_geocoding;
-    public $failed_geocoding;
-    public $geocodings = array();
-    public $contact_id;
-    public $is_visited;
-    public $customer_po;
-    public $invoice_no;
-    public $reference_no;
-    public $order_no;
-    public $weight;
-    public $cost;
-    public $revenue;
-    public $cube;
-    public $pieces;
-    public $email;
-    public $phone;
-    public $destination_note_count;
-    public $drive_time_to_next_destination;
-    public $distance_to_next_destination;
-    public $generated_time_window_start;
-    public $generated_time_window_end;
-    public $time_window_start;
-    public $time_window_end;
-    public $time;
+	public $route_destination_id;
+	public $alias;
+	public $member_id;
+	public $address;
+	public $is_depot = false;
+	public $lat;
+	public $lng;
+	public $route_id;
+	public $original_route_id;
+	public $optimization_problem_id;
+	public $sequence_no;
+	public $geocoded;
+	public $preferred_geocoding;
+	public $failed_geocoding;
+	public $geocodings = array();
+	public $contact_id;
+	public $is_visited;
+	public $customer_po;
+	public $invoice_no;
+	public $reference_no;
+	public $order_no;
+	public $weight;
+	public $cost;
+	public $revenue;
+	public $cube;
+	public $pieces;
+	public $email;
+	public $phone;
+	public $destination_note_count;
+	public $drive_time_to_next_destination;
+	public $distance_to_next_destination;
+	public $generated_time_window_start;
+	public $generated_time_window_end;
+	public $time_window_start;
+	public $time_window_end;
+	public $time;
 	public $notes;
-    public $timestamp_last_visited;
-    public $custom_fields = array();
-    public $manifest = array();
+	public $timestamp_last_visited;
+	public $custom_fields = array();
+	public $manifest = array();
 
-    public static function fromArray(array $params)
-    {
-        /*if (!isset($params['address'])) {
+	public static function fromArray(array $params)
+	{
+		/*if (!isset($params['address'])) {
             throw new BadParam('address must be provided');
         }
 
@@ -69,124 +69,124 @@ 
             throw new BadParam('lng must be provided');
         }*/
 
-        $address = new Address();
-        foreach($params as $key => $value) {
-            if (property_exists($address, $key)) {
-                $address->{$key} = $value;
-            }
-        }
+		$address = new Address();
+		foreach($params as $key => $value) {
+			if (property_exists($address, $key)) {
+				$address->{$key} = $value;
+			}
+		}
+
+		return $address;
+	}
+
+	public static function getAddress($routeId, $addressId)
+	{
+		$address = Route4Me::makeRequst(array(
+			'url'    => self::$apiUrl,
+			'method' => 'GET',
+			'query'  => array(
+				'route_id'             => $routeId,
+				'route_destination_id' => $addressId,
+			)
+		));
+
+		return Address::fromArray($address);
+	}
 
-        return $address;
-    }
-
-    public static function getAddress($routeId, $addressId)
-    {
-        $address = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrl,
-            'method' => 'GET',
-            'query'  => array(
-                'route_id'             => $routeId,
-                'route_destination_id' => $addressId,
-            )
-        ));
-
-        return Address::fromArray($address);
-    }
-
-    public function update()
-    {
-        $address = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrl,
-            'method' => 'PUT',
-            'body'   => $this->toArray(),
-            'query'  => array(
-                'route_id'             => $this->route_id,
-                'route_destination_id' => $this->route_destination_id,
-            ),
-        ));
-
-        return Address::fromArray($address);
-    }
+	public function update()
+	{
+		$address = Route4Me::makeRequst(array(
+			'url'    => self::$apiUrl,
+			'method' => 'PUT',
+			'body'   => $this->toArray(),
+			'query'  => array(
+				'route_id'             => $this->route_id,
+				'route_destination_id' => $this->route_destination_id,
+			),
+		));
+
+		return Address::fromArray($address);
+	}
 	
 	public function markAddress($params, $body)
-    {
-        $result = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrl,
-            'method' => 'PUT',
-            'query'  => array(
-                'route_id'  => isset($params['route_id']) ? $params['route_id']: null, 
-                'route_destination_id' => isset($params['route_destination_id']) ? $params['route_destination_id'] : null,
-            ),
-            'body'   => $body
-        ));
-
-        return $result;
-    }
+	{
+		$result = Route4Me::makeRequst(array(
+			'url'    => self::$apiUrl,
+			'method' => 'PUT',
+			'query'  => array(
+				'route_id'  => isset($params['route_id']) ? $params['route_id']: null, 
+				'route_destination_id' => isset($params['route_destination_id']) ? $params['route_destination_id'] : null,
+			),
+			'body'   => $body
+		));
+
+		return $result;
+	}
 	
 	public function markAsDeparted($params)
 	{
 		$address = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrDeparted,
-            'method' => 'GET',
-            'query'  => array(
-                'route_id'   => isset($params['route_id']) ? $params['route_id']: null,
-                'address_id'   => isset($params['address_id']) ? $params['address_id']: null,
-                'is_departed'   => isset($params['is_departed']) ? $params['is_departed']: null,
-                'member_id'   => isset($params['member_id']) ? $params['member_id']: null,
-            ),
-        ));
-
-        return $address;
+			'url'    => self::$apiUrDeparted,
+			'method' => 'GET',
+			'query'  => array(
+				'route_id'   => isset($params['route_id']) ? $params['route_id']: null,
+				'address_id'   => isset($params['address_id']) ? $params['address_id']: null,
+				'is_departed'   => isset($params['is_departed']) ? $params['is_departed']: null,
+				'member_id'   => isset($params['member_id']) ? $params['member_id']: null,
+			),
+		));
+
+		return $address;
 	}
 	
 	public function markAsVisited($params)
 	{
 		$address = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrVisited,
-            'method' => 'GET',
-            'query'  => array(
-                'route_id'   => isset($params['route_id']) ? $params['route_id']: null,
-                'address_id'   => isset($params['address_id']) ? $params['address_id']: null,
-                'is_visited'   => isset($params['is_visited']) ? $params['is_visited']: null,
-                'member_id'   => isset($params['member_id']) ? $params['member_id']: null,
-            ),
-        ));
-
-        return $address;
+			'url'    => self::$apiUrVisited,
+			'method' => 'GET',
+			'query'  => array(
+				'route_id'   => isset($params['route_id']) ? $params['route_id']: null,
+				'address_id'   => isset($params['address_id']) ? $params['address_id']: null,
+				'is_visited'   => isset($params['is_visited']) ? $params['is_visited']: null,
+				'member_id'   => isset($params['member_id']) ? $params['member_id']: null,
+			),
+		));
+
+		return $address;
 	}
 
-    public function delete()
-    {
-        $address = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrl,
-            'method' => 'DELETE',
-            'query'  => array(
-                'route_id'             => $this->route_id,
-                'route_destination_id' => $this->route_destination_id,
-            )
-        ));
-
-        return (bool)$address['deleted'];
-    }
+	public function delete()
+	{
+		$address = Route4Me::makeRequst(array(
+			'url'    => self::$apiUrl,
+			'method' => 'DELETE',
+			'query'  => array(
+				'route_id'             => $this->route_id,
+				'route_destination_id' => $this->route_destination_id,
+			)
+		));
+
+		return (bool)$address['deleted'];
+	}
 	
 	public function MoveDestinationToRoute($params)
 	{
 		$result = Route4Me::makeRequst(array(
-            'url'    => self::$apiUrlMove,
-            'method' => 'POST',
-            'query'  => array(
-                'to_route_id' => isset($params['to_route_id']) ? $params['to_route_id'] : null,
-                'route_destination_id' => isset($params['route_destination_id']) ? $params['route_destination_id'] : null,
-                'after_destination_id' => isset($params['after_destination_id']) ? $params['after_destination_id'] : null
-            )
-        ));
-
-        return $result;
+			'url'    => self::$apiUrlMove,
+			'method' => 'POST',
+			'query'  => array(
+				'to_route_id' => isset($params['to_route_id']) ? $params['to_route_id'] : null,
+				'route_destination_id' => isset($params['route_destination_id']) ? $params['route_destination_id'] : null,
+				'after_destination_id' => isset($params['after_destination_id']) ? $params['after_destination_id'] : null
+			)
+		));
+
+		return $result;
 		
 	}
 
-    function getAddressId()
-    {
-        return $this->route_destination_id;
-    }
+	function getAddressId()
+	{
+		return $this->route_destination_id;
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -10,9 +10,9 @@ 
 class Address extends Common
 {
     static public $apiUrl = '/api.v4/address.php';
-	static public $apiUrlMove='/actions/route/move_route_destination.php';
-	static public $apiUrDeparted='/api/route/mark_address_departed.php';
-	static public $apiUrVisited='/actions/address/update_address_visited.php';
+	static public $apiUrlMove = '/actions/route/move_route_destination.php';
+	static public $apiUrDeparted = '/api/route/mark_address_departed.php';
+	static public $apiUrVisited = '/actions/address/update_address_visited.php';
 
     public $route_destination_id;
     public $alias;
@@ -70,7 +70,7 @@ 
         }*/
 
         $address = new Address();
-        foreach($params as $key => $value) {
+        foreach ($params as $key => $value) {
             if (property_exists($address, $key)) {
                 $address->{$key} = $value;
             }
@@ -114,7 +114,7 @@ 
             'url'    => self::$apiUrl,
             'method' => 'PUT',
             'query'  => array(
-                'route_id'  => isset($params['route_id']) ? $params['route_id']: null, 
+                'route_id'  => isset($params['route_id']) ? $params['route_id'] : null, 
                 'route_destination_id' => isset($params['route_destination_id']) ? $params['route_destination_id'] : null,
             ),
             'body'   => $body
@@ -129,10 +129,10 @@ 
             'url'    => self::$apiUrDeparted,
             'method' => 'GET',
             'query'  => array(
-                'route_id'   => isset($params['route_id']) ? $params['route_id']: null,
-                'address_id'   => isset($params['address_id']) ? $params['address_id']: null,
-                'is_departed'   => isset($params['is_departed']) ? $params['is_departed']: null,
-                'member_id'   => isset($params['member_id']) ? $params['member_id']: null,
+                'route_id'   => isset($params['route_id']) ? $params['route_id'] : null,
+                'address_id'   => isset($params['address_id']) ? $params['address_id'] : null,
+                'is_departed'   => isset($params['is_departed']) ? $params['is_departed'] : null,
+                'member_id'   => isset($params['member_id']) ? $params['member_id'] : null,
             ),
         ));
 
@@ -145,10 +145,10 @@ 
             'url'    => self::$apiUrVisited,
             'method' => 'GET',
             'query'  => array(
-                'route_id'   => isset($params['route_id']) ? $params['route_id']: null,
-                'address_id'   => isset($params['address_id']) ? $params['address_id']: null,
-                'is_visited'   => isset($params['is_visited']) ? $params['is_visited']: null,
-                'member_id'   => isset($params['member_id']) ? $params['member_id']: null,
+                'route_id'   => isset($params['route_id']) ? $params['route_id'] : null,
+                'address_id'   => isset($params['address_id']) ? $params['address_id'] : null,
+                'is_visited'   => isset($params['is_visited']) ? $params['is_visited'] : null,
+                'member_id'   => isset($params['member_id']) ? $params['member_id'] : null,
             ),
         ));
 

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
 use Route4Me\OptimizationProblemParams;
 use Route4Me\Route;
 use Route4Me\Route4Me;
-use GuzzleHttp\Client;
 
 class OptimizationProblem extends Common
 {

src/Route4Me/TrackSetParams.php

Indentation +98 added lines, -98 removed lines

@@ -9,102 +9,102 @@
 
 class TrackSetParams extends Common
 {
-    public $format;
-    public $member_id;
-    public $route_id;
-    public $tx_id;
-    public $vehicle_id;
-    public $course;
-    public $speed;
-    public $lat;
-    public $lng;
-    public $altitude;
-    public $device_type;
-    public $device_guid;
-    public $device_timestamp;
-    public $app_version;
-
-    public static function fromArray(array $params)
-    {
-        $param = new TrackSetParams;
-
-        if (!isset($params['format'])) {
-            throw new BadParam("format must be provided.");
-        }
-
-        $types = array(
-            Format::SERIALIZED,
-            Format::CSV,
-            Format::XML
-        );
-        if (!in_array($params['format'], $types)) {
-            throw new BadParam("format is invalid.");
-        }
-
-        if (!isset($params['route_id'])) {
-            throw new BadParam("route_id must be provided.");
-        }
-
-        if (!isset($params['member_id'])) {
-            throw new BadParam("member_id must be provided.");
-        }
-
-        if (!isset($params['course'])) {
-            throw new BadParam("course must be provided.");
-        }
-
-        if (!isset($params['speed'])) {
-            throw new BadParam("speed must be provided.");
-        }
-
-        if (!isset($params['lat'])) {
-            throw new BadParam("lat must be provided.");
-        }
-
-        if (!isset($params['lng'])) {
-            throw new BadParam("lng must be provided.");
-        }
-
-        if (!isset($params['device_type'])) {
-            throw new BadParam("device_type must be provided.");
-        }
-
-        $deviceTypes = array(
-            DeviceType::IPHONE,
-            DeviceType::IPAD,
-            DeviceType::ANDROID_PHONE,
-            DeviceType::ANDROID_TABLET
-        );
-        if (!in_array($params['device_type'], $deviceTypes)) {
-            throw new BadParam("device_type is invalid.");
-        }
-
-        if (!isset($params['device_guid'])) {
-            throw new BadParam("device_guid must be provided.");
-        }
-
-        if (isset($params['device_timestamp'])) {
-            $template = '/[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}/i';
-            if (!preg_match($template, $params['device_timestamp'])) {
-                throw new BadParam("device_timestamp is invalid.");
-            }
-        }
-
-        $param->format = self::getValue($params, 'format');
-        $param->route_id = self::getValue($params, 'route_id');
-        $param->member_id = self::getValue($params, 'member_id');
-        $param->course = self::getValue($params, 'course');
-        $param->speed = self::getValue($params, 'speed');
-        $param->lat = self::getValue($params, 'lat');
-        $param->lng = self::getValue($params, 'lng');
-        $param->device_type = self::getValue($params, 'device_type');
-        $param->device_guid = self::getValue($params, 'device_guid');
-        $param->device_timestamp = self::getValue($params, 'device_timestamp');
-        $param->vehicle_id = self::getValue($params, 'vehicle_id');
-        $param->altitude = self::getValue($params, 'altitude');
-        $param->app_version = self::getValue($params, 'app_version');
-        $param->tx_id = self::getValue($params, 'tx_id');
-
-        return $param;
-    }
+	public $format;
+	public $member_id;
+	public $route_id;
+	public $tx_id;
+	public $vehicle_id;
+	public $course;
+	public $speed;
+	public $lat;
+	public $lng;
+	public $altitude;
+	public $device_type;
+	public $device_guid;
+	public $device_timestamp;
+	public $app_version;
+
+	public static function fromArray(array $params)
+	{
+		$param = new TrackSetParams;
+
+		if (!isset($params['format'])) {
+			throw new BadParam("format must be provided.");
+		}
+
+		$types = array(
+			Format::SERIALIZED,
+			Format::CSV,
+			Format::XML
+		);
+		if (!in_array($params['format'], $types)) {
+			throw new BadParam("format is invalid.");
+		}
+
+		if (!isset($params['route_id'])) {
+			throw new BadParam("route_id must be provided.");
+		}
+
+		if (!isset($params['member_id'])) {
+			throw new BadParam("member_id must be provided.");
+		}
+
+		if (!isset($params['course'])) {
+			throw new BadParam("course must be provided.");
+		}
+
+		if (!isset($params['speed'])) {
+			throw new BadParam("speed must be provided.");
+		}
+
+		if (!isset($params['lat'])) {
+			throw new BadParam("lat must be provided.");
+		}
+
+		if (!isset($params['lng'])) {
+			throw new BadParam("lng must be provided.");
+		}
+
+		if (!isset($params['device_type'])) {
+			throw new BadParam("device_type must be provided.");
+		}
+
+		$deviceTypes = array(
+			DeviceType::IPHONE,
+			DeviceType::IPAD,
+			DeviceType::ANDROID_PHONE,
+			DeviceType::ANDROID_TABLET
+		);
+		if (!in_array($params['device_type'], $deviceTypes)) {
+			throw new BadParam("device_type is invalid.");
+		}
+
+		if (!isset($params['device_guid'])) {
+			throw new BadParam("device_guid must be provided.");
+		}
+
+		if (isset($params['device_timestamp'])) {
+			$template = '/[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}/i';
+			if (!preg_match($template, $params['device_timestamp'])) {
+				throw new BadParam("device_timestamp is invalid.");
+			}
+		}
+
+		$param->format = self::getValue($params, 'format');
+		$param->route_id = self::getValue($params, 'route_id');
+		$param->member_id = self::getValue($params, 'member_id');
+		$param->course = self::getValue($params, 'course');
+		$param->speed = self::getValue($params, 'speed');
+		$param->lat = self::getValue($params, 'lat');
+		$param->lng = self::getValue($params, 'lng');
+		$param->device_type = self::getValue($params, 'device_type');
+		$param->device_guid = self::getValue($params, 'device_guid');
+		$param->device_timestamp = self::getValue($params, 'device_timestamp');
+		$param->vehicle_id = self::getValue($params, 'vehicle_id');
+		$param->altitude = self::getValue($params, 'altitude');
+		$param->app_version = self::getValue($params, 'app_version');
+		$param->tx_id = self::getValue($params, 'tx_id');
+
+		return $param;
+	}
 }