route4me / route4me-php-sdk

src/Route4Me/Route.php

Spacing +14 added lines, -14 removed lines

@@ -95,14 +95,14 @@ 
         return $route;
     }
 
-    public static function getRoutes($routeId=null, $params=null)
+    public static function getRoutes($routeId = null, $params = null)
     {
         $result = Route4Me::makeRequst(array(
             'url'    => Endpoint::ROUTE_V4,
             'method' => 'GET',
             'query'  => array(
                 'api_key'                  => Route4Me::getApiKey(),
-                'route_id'                 => !is_null($routeId) ? implode(',', (array) $routeId) : null,
+                'route_id'                 => !is_null($routeId) ? implode(',', (array)$routeId) : null,
                 'route_path_output'        => isset($params['route_path_output']) ? $params['route_path_output'] : null,
                 'query'                    => isset($params['query']) ? $params['query'] : null,
                 'directions'               => isset($params['directions']) ? $params['directions'] : null,
@@ -116,7 +116,7 @@ 
             return Route::fromArray($result); die("");
         } else {
             $routes = array();
-            foreach($result as $route) {
+            foreach ($result as $route) {
                 $routes[] = Route::fromArray($route);
             }
             return $routes;
@@ -230,7 +230,7 @@ 
     }
     
     // Returns random route_id from existing routes between $offset and $offset+$limit
-    public function getRandomRouteId($offset,$limit)
+    public function getRandomRouteId($offset, $limit)
     {
         $query['limit'] = isset($params['limit']) ? $params['limit'] : 30;
         $query['offset'] = isset($params['offset']) ? $params['offset'] : 0;
@@ -244,12 +244,12 @@ 
         if (sizeof($json)>0) {
             $routes = array();
             
-            foreach($json as $route) {
+            foreach ($json as $route) {
                 $routes[] = Route::fromArray($route);
             }
             
-            $num=rand(0,sizeof($routes)-1);
-            $rRoute=(array)$routes[$num];
+            $num = rand(0, sizeof($routes) - 1);
+            $rRoute = (array)$routes[$num];
             
             if (is_array($rRoute)) {
                 return $rRoute["route_id"];
@@ -270,7 +270,7 @@ 
             'query'  => array(
                 'route_id'  => isset($this->route_id) ? $this->route_id : null
             ),
-            'body' => array (
+            'body' => array(
                 'parameters' => $this->parameters,
                 ),
             'HTTPHEADER'  => isset($this->httpheaders) ? $this->httpheaders : null,
@@ -279,7 +279,7 @@ 
         return Route::fromArray($route);
     }
     
-    public function updateAddress($address=null)
+    public function updateAddress($address = null)
     {
         $body = sizeof($this->addresses)<1 ? get_object_vars($this->parameters) 
             : (isset($this->addresses[0]) ? $this->addresses[0] : get_object_vars($this->parameters));
@@ -358,7 +358,7 @@ 
         $fname = isset($params['strFilename']) ? $params['strFilename'] : null;
         $rpath = realpath($fname);
         
-        $result= Route4Me::makeRequst(array(
+        $result = Route4Me::makeRequst(array(
             'url'    => Endpoint::ROUTE_NOTES_ADD,
             'method' => 'POST',
             'query'  => array(
@@ -390,7 +390,7 @@ 
         $result = Route4Me::makeRequst(array(
             'url'    => Endpoint::ROUTE_V4,
             'method' => 'DELETE',
-            'query'  => array( 'route_id' => $route_id )
+            'query'  => array('route_id' => $route_id)
         ));
         
          $result = Route4Me::makeRequst(array(
@@ -407,7 +407,7 @@ 
     
     public function GetAddressesFromRoute($route_id)
     {
-        $route1=Route::getRoutes($route_id,null);
+        $route1 = Route::getRoutes($route_id, null);
         if (isset($route1)) {
             return $route1->addresses;
         } else {
@@ -417,12 +417,12 @@ 
     
     public function GetRandomAddressFromRoute($route_id)
     {
-        $route1 = Route::getRoutes($route_id,null);
+        $route1 = Route::getRoutes($route_id, null);
         
         if (isset($route1)) {
             $addresses = $route1->addresses;
             
-            $rnd = rand(0,sizeof($addresses)-1);
+            $rnd = rand(0, sizeof($addresses) - 1);
             
             return $addresses[$rnd];
             

src/Route4Me/AddressBookLocation.php

Spacing +48 added lines, -48 removed lines

@@ -53,7 +53,7 @@ 
     {
         $addressbooklocation = new AddressBookLocation();
         
-        foreach($params as $key => $value) {
+        foreach ($params as $key => $value) {
             if (property_exists($addressbooklocation, $key)) {
                 $addressbooklocation->{$key} = $value;
             }
@@ -78,7 +78,7 @@ 
     
     public static function searchRoutedLocation($params)
     {
-        $result= Route4Me::makeRequst(array(
+        $result = Route4Me::makeRequst(array(
             'url'    => Endpoint::ADDRESS_BOOK_V4,
             'method' => 'GET',
             'query'  => array(
@@ -134,7 +134,7 @@ 
         if (isset($ablocations["results"])) {
             $locationsSize = sizeof($ablocations["results"]);
             
-            if ($locationsSize > 0) {
+            if ($locationsSize>0) {
                 $randomLocationIndex = rand(0, $locationsSize - 1);
                 return $ablocations["results"][$randomLocationIndex];
             } 
@@ -148,8 +148,8 @@ 
         $body = array();
         $abLocations = new AddressBookLocation();
         
-        foreach($params as $key => $value) {
-            if ($key == "address_id") continue; 
+        foreach ($params as $key => $value) {
+            if ($key=="address_id") continue; 
             if (property_exists($abLocations, $key)) {
                 if (isset($params->{$key})) {
                     $body[$key] = $params->{$key};
@@ -184,7 +184,7 @@ 
         $body = array();
         $abLocations = new AddressBookLocation();
         
-        foreach($params as $key => $value) {
+        foreach ($params as $key => $value) {
             if (property_exists($abLocations, $key)) {
                 if (isset($params->{$key})) {
                     $body[$key] = $params->{$key};
@@ -219,7 +219,7 @@ 
     
     public static function validateScheduleMode($scheduleMode)
     {
-        $schedMmodes = array("daily","weekly","monthly","annually");
+        $schedMmodes = array("daily", "weekly", "monthly", "annually");
         
         if (in_array($scheduleMode, $schedMmodes)) 
             return TRUE; 
@@ -229,7 +229,7 @@ 
     
     public static function validateScheduleEnable($scheduleEnabled)
     {
-        $schedEnambles = array(TRUE,FALSE);
+        $schedEnambles = array(TRUE, FALSE);
         
         if (in_array($scheduleEnabled, $schedEnambles))
             return TRUE;
@@ -249,14 +249,14 @@ 
     {
         $weekdays = explode(',', $scheduleWeekDays);
         
-        if (sizeof($weekdays) < 1) return FALSE;
+        if (sizeof($weekdays)<1) return FALSE;
         
         $isValid = TRUE;
         
-        for ($i=0; $i < sizeof($weekdays); $i++) { 
+        for ($i = 0; $i<sizeof($weekdays); $i++) { 
             if (is_numeric($weekdays[$i])) {
                 $wday = intval($weekdays[$i]);
-                if ($wday < 1 || $wday > 7) $isValid = FALSE;
+                if ($wday<1 || $wday>7) $isValid = FALSE;
             }
             else $isValid = FALSE;
         }
@@ -266,7 +266,7 @@ 
     
     public static function validateScheduleMonthlyMode($scheduleMonthlyMode)
     {
-        $schedMonthlyMmodes = array("dates","nth");
+        $schedMonthlyMmodes = array("dates", "nth");
         
         if (in_array($scheduleMonthlyMode, $schedMonthlyMmodes))
             return TRUE;
@@ -278,14 +278,14 @@ 
     {
         $monthlyDates = explode(',', $scheduleMonthlyDates);
         
-        if (sizeof($monthlyDates) <1) return FALSE;
+        if (sizeof($monthlyDates)<1) return FALSE;
         
         $isValid = TRUE;
         
-        for ($i=0; $i < sizeof($monthlyDates); $i++) { 
+        for ($i = 0; $i<sizeof($monthlyDates); $i++) { 
             if (is_numeric($monthlyDates[$i])) {
                 $mday = intval($monthlyDates[$i]);
-                if ($mday <1 || $mday > 31) $isValid = FALSE;
+                if ($mday<1 || $mday>31) $isValid = FALSE;
             }
             else $isValid = FALSE;
         }
@@ -297,7 +297,7 @@ 
     {
         if (!is_numeric($scheduleNthN)) return FALSE;
         
-        $schedNthNs = array(1,2,3,4,5,-1);
+        $schedNthNs = array(1, 2, 3, 4, 5, -1);
         
         if (in_array($scheduleNthN, $schedNthNs))
             return TRUE;
@@ -333,17 +333,17 @@ 
         $columns = fgetcsv($csvFileHandle, $max_line_length, $delemietr);
 
         if (empty($columns)) {
-            array_push($results['fail'],'Empty CSV table');
+            array_push($results['fail'], 'Empty CSV table');
             return ($results);
         }
 
         $iRow = 1;
         
-        while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr)) !== false) {
+        while (($rows = fgetcsv($csvFileHandle, $max_line_length, $delemietr))!==false) {
             if ($rows[$locationsFieldsMapping['cached_lat']] 
                   && $rows[$locationsFieldsMapping['cached_lng']] 
                   && $rows[$locationsFieldsMapping['address_1']] 
-                  && array(null) !== $rows) {
+                  && array(null)!==$rows) {
                 $curSchedule = "";
                 $mode = "";
                 
@@ -352,32 +352,32 @@ 
                         $curSchedule = '"mode":"'.$rows[$locationsFieldsMapping['schedule_mode']].'",'; 
                         $mode = $rows[$locationsFieldsMapping['schedule_mode']];
                     } else {
-                        array_push($results['fail'],"$iRow --> Wrong schedule mode parameter"); 
+                        array_push($results['fail'], "$iRow --> Wrong schedule mode parameter"); 
                         $curSchedule = "";
                     }
                 } else {
-                    array_push($results['fail'],"$iRow --> The schedule mode parameter is not set"); 
+                    array_push($results['fail'], "$iRow --> The schedule mode parameter is not set"); 
                     $curSchedule = "";
                 }
                 
                 if (isset($rows[$locationsFieldsMapping['schedule_enabled']])) {
                     if ($this->validateScheduleEnable($rows[$locationsFieldsMapping['schedule_enabled']])) { 
-                        $curSchedule.='"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
+                        $curSchedule .= '"enabled":'.$rows[$locationsFieldsMapping['schedule_enabled']].',';
                     } else {
-                        array_push($results['fail'],"$iRow --> The schedule enabled parameter is not set ");  
+                        array_push($results['fail'], "$iRow --> The schedule enabled parameter is not set ");  
                         $curSchedule = "";
                     }
                 }
                 
                 if (isset($rows[$locationsFieldsMapping['schedule_every']])) {
                     if ($this->validateScheduleEvery($rows[$locationsFieldsMapping['schedule_every']])) {
-                        $curSchedule.='"'.$mode.'":{'.'"every":'.$rows[$locationsFieldsMapping['schedule_every']].','; 
-                        if ($mode == 'daily') {
-                            $curSchedule = trim($curSchedule,',');
-                            $curSchedule.='}';
+                        $curSchedule .= '"'.$mode.'":{'.'"every":'.$rows[$locationsFieldsMapping['schedule_every']].','; 
+                        if ($mode=='daily') {
+                            $curSchedule = trim($curSchedule, ',');
+                            $curSchedule .= '}';
                         }
                     } else {
-                        array_push($results['fail'],"$iRow --> The parameter sched_every is not set"); 
+                        array_push($results['fail'], "$iRow --> The parameter sched_every is not set"); 
                         $curSchedule = ""; 
                     }
                 }
@@ -387,13 +387,13 @@ 
                         case 'weekly':
                             if (isset($rows[$locationsFieldsMapping['schedule_weekdays']])) {
                                 if ($this->validateScheduleWeekDays($rows[$locationsFieldsMapping['schedule_weekdays']])) {
-                                     $curSchedule.='"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
+                                     $curSchedule .= '"weekdays":['.$rows[$locationsFieldsMapping['schedule_weekdays']].']}';
                                 } else {
-                                    array_push($results['fail'],"$iRow --> Wrong weekdays"); 
+                                    array_push($results['fail'], "$iRow --> Wrong weekdays"); 
                                     $curSchedule = "";
                                 }
                             } else {
-                                array_push($results['fail'],"$iRow --> The parameters sched_weekdays is not set"); 
+                                array_push($results['fail'], "$iRow --> The parameters sched_weekdays is not set"); 
                                 $curSchedule = "";
                             }
                             break;
@@ -402,24 +402,24 @@ 
                             if (isset($rows[$locationsFieldsMapping['monthly_mode']])) {
                                 if ($this->validateScheduleMonthlyMode($rows[$locationsFieldsMapping['monthly_mode']])) {
                                      $monthlyMode = $rows[$locationsFieldsMapping['monthly_mode']];
-                                     $curSchedule.='"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
+                                     $curSchedule .= '"mode": "'.$rows[$locationsFieldsMapping['monthly_mode']].'",';
                                 } else {
-                                    array_push($results['fail'],"$iRow --> Wrong monthly mode"); 
+                                    array_push($results['fail'], "$iRow --> Wrong monthly mode"); 
                                     $curSchedule = "";
                                 }
                             } else {
-                                array_push($results['fail'],"$iRow --> The parameter sched_monthly_mode is not set"); 
+                                array_push($results['fail'], "$iRow --> The parameter sched_monthly_mode is not set"); 
                                 $curSchedule = "";
                             }
                             
-                            if ($monthlyMode != "") {
+                            if ($monthlyMode!="") {
                                 switch ($monthlyMode) {
                                     case 'dates':
                                         if (isset($rows[$locationsFieldsMapping['monthly_dates']])) {
                                             if ($this->validateScheduleMonthlyDates($rows[$locationsFieldsMapping['monthly_dates']])) {
-                                                 $curSchedule.='"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
+                                                 $curSchedule .= '"dates":['.$rows[$locationsFieldsMapping['monthly_dates']].']}';
                                             } else {
-                                                array_push($results['fail'],"$iRow --> Wrong monthly dates"); 
+                                                array_push($results['fail'], "$iRow --> Wrong monthly dates"); 
                                                 $curSchedule = "";
                                             }
                                         }
@@ -427,26 +427,26 @@ 
                                     case 'nth':
                                         if (isset($rows[$locationsFieldsMapping['monthly_nth_n']])) {
                                             if ($this->validateScheduleNthN($rows[$locationsFieldsMapping['monthly_nth_n']])) {
-                                                 $curSchedule.='"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
+                                                 $curSchedule .= '"nth":{"n":'.$rows[$locationsFieldsMapping['monthly_nth_n']].',';
                                             } else {
-                                                array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_n"); 
+                                                array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_n"); 
                                                 $curSchedule = "";
                                             }
                                         } else {
-                                            array_push($results['fail'],"$iRow --> The parameter sched_nth_n is not set"); 
+                                            array_push($results['fail'], "$iRow --> The parameter sched_nth_n is not set"); 
                                             $curSchedule = "";
                                         }
                                         
-                                        if ($curSchedule != "") {
+                                        if ($curSchedule!="") {
                                             if (isset($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
                                                 if ($this->validateScheduleNthWhat($rows[$locationsFieldsMapping['monthly_nth_wwhat']])) {
-                                                     $curSchedule.='"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
+                                                     $curSchedule .= '"what":'.$rows[$locationsFieldsMapping['monthly_nth_wwhat']].'}}';
                                                 } else {
-                                                    array_push($results['fail'],"$iRow --> Wrong parameter sched_nth_what"); 
+                                                    array_push($results['fail'], "$iRow --> Wrong parameter sched_nth_what"); 
                                                     $curSchedule = "";
                                                 }
                                             } else {
-                                                array_push($results['fail'],"$iRow --> The parameter sched_nth_what is not set"); 
+                                                array_push($results['fail'], "$iRow --> The parameter sched_nth_what is not set"); 
                                                 $curSchedule = "";
                                             }
                                         }
@@ -460,16 +460,16 @@ 
                     }
                 }
 
-                if (($mode == 'daily' || $mode == 'weekly' || $mode == 'monthy') && $curSchedule == "") {
+                if (($mode=='daily' || $mode=='weekly' || $mode=='monthy') && $curSchedule=="") {
                     $iRow++; 
                     continue;
                 }
                 
-                $curSchedule =strtolower($curSchedule);
+                $curSchedule = strtolower($curSchedule);
                 
                 $curSchedule = '[{'.$curSchedule.'}]';
 
-                $oSchedule = json_decode($curSchedule,TRUE);
+                $oSchedule = json_decode($curSchedule, TRUE);
                 
                 $AdressBookLocationParameters = AddressBookLocation::fromArray(array(
                     "cached_lat"                 => $rows[$locationsFieldsMapping['cached_lat']],
@@ -544,7 +544,7 @@ 
 
                 $abcResults = $abContacts->addAdressBookLocation($AdressBookLocationParameters); //temporarry
                 
-                array_push($results['success'],"The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly.");
+                array_push($results['success'], "The schedule location with address_id = ".strval($abcResults["address_id"])." added successfuly.");
             }
         }
 

src/Route4Me/OptimizationProblemParams.php

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);
             }
@@ -77,7 +77,7 @@ 
     {
         $addresses = array();
         
-        foreach($this->addresses as $address) {
+        foreach ($this->addresses as $address) {
             $addresses[] = $address->toArray();
         }
         

src/Route4Me/MyQ.php

Spacing +12 added lines, -12 removed lines

@@ -44,7 +44,7 @@ 
      *
      * @return MyQ
      */
-    public function __construct ($params = array())
+    public function __construct($params = array())
     {
         // Overwrite class variables
         foreach ($params as $k => $v) {
@@ -52,8 +52,8 @@ 
         }
         
         // Initialize cURL request headers
-        if (sizeof($this->_headers) == 0) {
-            $this->_headers = array (
+        if (sizeof($this->_headers)==0) {
+            $this->_headers = array(
                 'MyQApplicationId' => $this->appId,
                 'Culture' => $this->culture,
                 'Content-Type' => $this->contentType,
@@ -75,7 +75,7 @@ 
      *
      * @return MyQ
      */
-    public function login ($username = null, $password = null)
+    public function login($username = null, $password = null)
     {
         // Set username/password if not null
         if (!is_null($username)) {
@@ -96,8 +96,8 @@ 
             $error[] = 'password';
         }
         
-        if (sizeof($error) > 0) {
-            throw new MyQException('Missing required auth credential: ' . implode(',', $error));
+        if (sizeof($error)>0) {
+            throw new MyQException('Missing required auth credential: '.implode(',', $error));
         }
         
         $this->_login();
@@ -107,7 +107,7 @@ 
     {
         $this->_getDetails();
         $timeInState = time() - $this->_doorStateTime;
-        echo implode(',', array (
+        echo implode(',', array(
             $this->_locationName,
             $this->_doorName,
             $this->_doorState,
@@ -125,7 +125,7 @@ 
         if (!isset($this->_conn)) {
             $this->_conn = curl_init();
             
-            curl_setopt_array($this->_conn, array (
+            curl_setopt_array($this->_conn, array(
                 CURLOPT_RETURNTRANSFER => true,
                 CURLOPT_ENCODING       => "",
                 CURLOPT_MAXREDIRS      => 10,
@@ -167,7 +167,7 @@ 
         
         $data = json_decode($output);
         
-        if ($data == false || !isset($data->SecurityToken)) {
+        if ($data==false || !isset($data->SecurityToken)) {
             throw new MyQException("Error processing login request: $output");
         }
         
@@ -187,16 +187,16 @@ 
         
         $data = json_decode($output);
         
-        if ($data == false || !isset($data->Devices)) {
+        if ($data==false || !isset($data->Devices)) {
             throw new MyQException("Error fetching device details: $output");
         }
         
         // Find our door device ID
         foreach ($data->Devices as $device) {
-            if (stripos($device->MyQDeviceTypeName, "Gateway") !== false) {
+            if (stripos($device->MyQDeviceTypeName, "Gateway")!==false) {
                 // Find location name
                 foreach ($device->Attributes as $attr) {
-                    if ($attr->AttributeDisplayName == 'desc') {
+                    if ($attr->AttributeDisplayName=='desc') {
                         $this->_locationName = $attr->Value;
                     }
                 }

src/Route4Me/Address.php

Spacing +7 added lines, -7 removed lines

@@ -78,7 +78,7 @@ 
         }*/
 
         $address = new Address();
-        foreach($params as $key => $value) {
+        foreach ($params as $key => $value) {
             if (property_exists($address, $key)) {
                 $address->{$key} = $value;
             }
@@ -156,10 +156,10 @@ 
             'url'    => Endpoint::MARK_ADDRESS_DEPARTED,
             '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,
             ),
         ));
 
@@ -303,8 +303,8 @@ 
         foreach ($params as $key => $value) {
             $kpos = strpos($key, "custom_note_type");
             
-            if ($kpos !== false) {
-                $customArray[$key]=$value;
+            if ($kpos!==false) {
+                $customArray[$key] = $value;
             }
         }
         

src/Route4Me/curl_http_client.php

Spacing +58 added lines, -58 removed lines

@@ -3,7 +3,7 @@ 
 
 class CurlHttpClient
 {
-    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
@@ -34,7 +34,7 @@ 
      * @param string pass
      * @access public
      */
-    function setCredentials($username,$password)
+    function setCredentials($username, $password)
     {
         curl_setopt($this->ch, CURLOPT_USERPWD, "$username:$password");
     }
@@ -89,21 +89,21 @@ 
      * @return string data
      * @access public
      */
-    function sendPostData($url, $postdata, $ip=null, $timeout=10)
+    function sendPostData($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($this->debug)
+        if ($ip) {
+            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
@@ -116,11 +116,11 @@ 
         
         //and finally send curl request
         $result = curl_exec_redir($this->ch);
-        if(curl_errno($this->ch)) {
-            if($this->debug) {
+        if (curl_errno($this->ch)) {
+            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;
         } else {
@@ -137,23 +137,23 @@ 
      * @return string data
      * @access public
      */
-    function fetchUrl($url, $ip=null, $timeout=5)
+    function fetchUrl($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($this->debug) {
+        if ($ip) {
+            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
@@ -161,11 +161,11 @@ 
         
         //and finally send curl request
         $result = curl_exec_redir($this->ch);
-        if(curl_errno($this->ch)) {
-            if($this->debug) {
+        if (curl_errno($this->ch)) {
+            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;
         } else {
@@ -183,18 +183,18 @@ 
      * @return boolean true on success false othervise
      * @access public
      */
-    function fetchIntoFile($url, $fp, $ip=null, $timeout=5)
+    function fetchIntoFile($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($this->debug) {
+        if ($ip) {
+            if ($this->debug) {
                 echo "Binding to ip $ip\n";
             }
             curl_setopt($this->ch, CURLOPT_INTERFACE, $ip);
@@ -205,15 +205,15 @@ 
         
         //and finally send curl request
         $result = curl_exec_redir($this->ch);
-        if(curl_errno($this->ch)) {
-            if($this->debug) {
+        if (curl_errno($this->ch)) {
+            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;
-        } else  {
+        } else {
             return true;
         }
     }
@@ -230,7 +230,7 @@ 
      * @return string data
      * @access public
      */
-    function sendMultipartPostData($url, $postdata, $file_field_array=array(), $ip=null, $timeout=30)
+    function sendMultipartPostData($url, $postdata, $file_field_array = array(), $ip = null, $timeout = 30)
     {
         //set various curl options first
         // set url to post to
@@ -239,12 +239,12 @@ 
         curl_setopt($this->ch, CURLOPT_RETURNTRANSFER, true);
         
         //bind to specific ip address if it is sent trough arguments
-        if($ip) {
-            if($this->debug) {
+        if ($ip) {
+            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
@@ -261,26 +261,26 @@ 
         $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)) {
-            foreach($file_field_array as $var_name => $var_value) {
-                if(strpos(PHP_OS, "WIN") !== false) $var_value = str_replace("/", "\\", $var_value); // win hack
+        if (!empty($file_field_array)) {
+            foreach ($file_field_array as $var_name => $var_value) {
+                if (strpos(PHP_OS, "WIN")!==false) $var_value = str_replace("/", "\\", $var_value); // win hack
                 $file_field_array[$var_name] = "@".$var_value;
             }
         }
@@ -291,11 +291,11 @@ 
         
         //and finally send curl request
         $result = curl_exec_redir($this->ch);
-        if(curl_errno($this->ch)) {
-            if($this->debug) {
+        if (curl_errno($this->ch)) {
+            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;
@@ -312,8 +312,8 @@ 
     function storeCookies($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);
     }
     
     /**
@@ -323,7 +323,7 @@ 
      */
     function setCookie($cookie)
     {        
-        curl_setopt ($this->ch, CURLOPT_COOKIE, $cookie);
+        curl_setopt($this->ch, CURLOPT_COOKIE, $cookie);
     }
     
     /**
@@ -354,8 +354,8 @@ 
      */
     function getErrorMsg()
     {
-        $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;
     }
     
@@ -381,7 +381,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;
     }
@@ -398,9 +398,9 @@ 
     //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);
@@ -422,13 +422,13 @@ 
         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;
     }
 }

src/Route4Me/Enum/Endpoint.php

Spacing +12 added lines, -12 removed lines

@@ -44,18 +44,18 @@
   const ORDER_V4 = '/api.v4/order.php';
   
   const ROUTE_V4 = '/api.v4/route.php';
-  const ROUTE_DUPLICATE ='/actions/duplicate_route.php';
-  const ROUTES_DELETE ='/actions/delete_routes.php';
-  const REOPTIMIZE_V3_2 ='/api.v3/route/reoptimize_2.php';
-  const ROUTES_MERGE ='/actions/merge_routes.php';
-  const ROUTE_SHARE ='/actions/route/share_route.php';
-  const ROUTE_NOTES_ADD ='/actions/addRouteNotes.php';
-  const STATUS_V4 ='/api.v4/status.php';
-  const GET_DEVICE_LOCATION ='/api/track/get_device_location.php';
-  
-  const TRACK_SET ='/track/set.php';
-  
-  const NOTE_CUSTOM_TYPES_V4 ='/api.v4/note_custom_types.php';
+  const ROUTE_DUPLICATE = '/actions/duplicate_route.php';
+  const ROUTES_DELETE = '/actions/delete_routes.php';
+  const REOPTIMIZE_V3_2 = '/api.v3/route/reoptimize_2.php';
+  const ROUTES_MERGE = '/actions/merge_routes.php';
+  const ROUTE_SHARE = '/actions/route/share_route.php';
+  const ROUTE_NOTES_ADD = '/actions/addRouteNotes.php';
+  const STATUS_V4 = '/api.v4/status.php';
+  const GET_DEVICE_LOCATION = '/api/track/get_device_location.php';
+  
+  const TRACK_SET = '/track/set.php';
+  
+  const NOTE_CUSTOM_TYPES_V4 = '/api.v4/note_custom_types.php';
   
   const VEHICLE_V4 = '/api/vehicles';
 }

src/Route4Me/Enum/AlgorithmType.php

Spacing +1 added lines, -1 removed lines

@@ -10,6 +10,6 @@
     const TSP_TW = 5;
     const TSP_TW_CR = 6;
     const BBCVRP = 7;
-    const ALG_NONE  =  100;
+    const ALG_NONE  = 100;
     const ALG_LEGACY_DISTRIBUTED = 101;
 }

src/Route4Me/Vehicle.php

Spacing +12 added lines, -12 removed lines

@@ -59,14 +59,14 @@ 
     public $weight_metric;
     public $max_weight_per_axle_group_metric;
     
-    public function __construct () 
+    public function __construct() 
     {
         Route4Me::setBaseUrl(Endpoint::WH_BASE_URL);
     }
     
     public static function fromArray(array $params) {
-        $vehicle= new Vehicle();
-        foreach($params as $key => $value) {
+        $vehicle = new Vehicle();
+        foreach ($params as $key => $value) {
             if (property_exists($vehicle, $key)) {
                 $vehicle->{$key} = $value;
             }
@@ -90,7 +90,7 @@ 
         return $response;
     }
     
-    public function getRandomVehicleId($page,$perPage)
+    public function getRandomVehicleId($page, $perPage)
     {
         $query['page'] = isset($page) ? $page : 1;
         $query['perPage'] = isset($perPage) ? $perPage : 10;
@@ -102,7 +102,7 @@ 
         if (!isset($vehicles['data'])) return null;
         if (sizeof($vehicles['data'])<1) return null;
         
-        $randomIndex = rand(0, sizeof($vehicles['data'])-1);
+        $randomIndex = rand(0, sizeof($vehicles['data']) - 1);
         
         return $vehicles['data'][$randomIndex]['vehicle_id'];
     }
@@ -110,7 +110,7 @@ 
     public function getVehicleByID($vehicleID)
     {
         $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::VEHICLE_V4 . '/' . $vehicleID,
+            'url'    => Endpoint::VEHICLE_V4.'/'.$vehicleID,
             'method' => 'GET'
         ));
 
@@ -123,9 +123,9 @@ 
         
         $body = array();
         
-        $vehicle= new Vehicle();
+        $vehicle = new Vehicle();
         
-        foreach($params as $key => $value) {
+        foreach ($params as $key => $value) {
             if ($key=="vehicle_id") continue; 
             if (property_exists($vehicle, $key)) {
                 if (isset($params->{$key})) {
@@ -135,7 +135,7 @@ 
         }
         
         $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::VEHICLE_V4 . '/' . $vehicleID,
+            'url'    => Endpoint::VEHICLE_V4.'/'.$vehicleID,
             'method' => 'PUT',
             'body'   => $body,
             'HTTPHEADER'  => 'Content-Type: application/json'
@@ -148,9 +148,9 @@ 
     {
         $body = array();
         
-        $vehicle= new Vehicle();
+        $vehicle = new Vehicle();
         
-        foreach($params as $key => $value) {
+        foreach ($params as $key => $value) {
             if ($key=="vehicle_id") continue; 
             if (property_exists($vehicle, $key)) {
                 if (isset($params->{$key})) {
@@ -174,7 +174,7 @@ 
         $vehicleID = isset($params->vehicle_id) ? $params->vehicle_id : null;
         
         $response = Route4Me::makeRequst(array(
-            'url'    => Endpoint::VEHICLE_V4 . '/' . $vehicleID,
+            'url'    => Endpoint::VEHICLE_V4.'/'.$vehicleID,
             'method' => 'DELETE',
             'HTTPHEADER'  => 'Content-Type: application/json'
         ));