From 7e0ef5a3bc0a7de4769cac4d37f6ebd97d35f9db Mon Sep 17 00:00:00 2001 From: 15 <15@mail.ru> Date: Fri, 2 Jun 2023 18:47:06 +0500 Subject: [PATCH] Moved function fromArray to base class Common --- src/Route4Me/ActivityParameters.php | 13 ----- src/Route4Me/Address.php | 15 ------ src/Route4Me/AddressBookGroup.php | 17 +------ src/Route4Me/AddressBookLocation.php | 13 ----- .../AddressBookLocationSearchResponse.php | 17 +------ src/Route4Me/AddressNote.php | 16 ------- src/Route4Me/AddressNoteResponse.php | 17 +------ src/Route4Me/AvoidanceZone.php | 11 +---- src/Route4Me/Common.php | 11 +++++ src/Route4Me/CustomNoteType.php | 17 +------ src/Route4Me/CustomNoteTypeResponse.php | 17 +------ src/Route4Me/Direction.php | 15 +----- src/Route4Me/DirectionLocation.php | 15 +----- src/Route4Me/DirectionStep.php | 15 +----- src/Route4Me/GeoPoint.php | 15 +----- src/Route4Me/Geocoding.php | 13 ----- src/Route4Me/GeocodingResponse.php | 13 ----- src/Route4Me/Members/Member.php | 19 ++------ .../Members/MemberAuthenticationResponse.php | 15 +----- src/Route4Me/Members/MemberCapabilities.php | 13 ----- src/Route4Me/Members/MemberConfiguration.php | 25 ++-------- src/Route4Me/Members/MemberResponse.php | 16 +------ src/Route4Me/Members/MemberResponseV4.php | 16 +------ src/Route4Me/Members/ResultsResponseV4.php | 15 +----- src/Route4Me/Order.php | 48 +++++++------------ src/Route4Me/OrderCustomField.php | 12 ----- src/Route4Me/RapidAddressSearchResponse.php | 15 +----- src/Route4Me/RouteParameters.php | 12 ----- src/Route4Me/RouteParametersQuery.php | 15 +----- src/Route4Me/ScheduleCalendarParameters.php | 18 +------ src/Route4Me/ScheduleCalendarResponse.php | 12 ----- src/Route4Me/SearchResponse.php | 17 +------ .../CreateConnectionResponse.php | 15 +----- .../TelematicsConnection.php | 13 ----- .../TelematicsConnectionParameters.php | 15 +----- .../TelematicsRegisterMemberResponse.php | 15 +----- .../TelematicsGateway/TelematicsVendor.php | 20 ++------ .../TelematicsVendorParameters.php | 15 +----- .../TelematicsGateway/TelematicsVendors.php | 19 ++------ src/Route4Me/TelematicsVendor.php | 13 ----- src/Route4Me/Territory.php | 11 +---- src/Route4Me/Tracking/FindAssetResponse.php | 21 ++------ src/Route4Me/Tracking/MemberData.php | 17 +------ src/Route4Me/Tracking/SetGpsResponse.php | 15 +----- src/Route4Me/Tracking/UserLocation.php | 15 +----- src/Route4Me/Tracking/UserTracking.php | 17 +------ src/Route4Me/V5/AccountProfile.php | 15 +----- src/Route4Me/V5/Addresses/Address.php | 17 +------ src/Route4Me/V5/Addresses/AddressNote.php | 19 +------- .../V5/Addresses/BundledItemResponse.php | 18 +------ .../V5/Addresses/RouteAdvancedConstraints.php | 14 +----- src/Route4Me/V5/Country.php | 15 +----- .../Members/DriverRatingApi/DriverReview.php | 16 +------ .../DriverRatingApi/SimplePaginationData.php | 15 +----- .../OrderInventoriesApi/OrderInventory.php | 16 +------ src/Route4Me/V5/ResultResponse.php | 16 +------ .../Routes/AddonRoutesApi/ApiCapabilities.php | 17 +------ .../Routes/AddonRoutesApi/ApiPreferences.php | 15 +----- .../RouteDataTableConfigResponse.php | 13 ----- .../AddonRoutesApi/RouteDuplicateResponse.php | 15 +----- .../AddonRoutesApi/RouteParametersQuery.php | 17 +------ .../AddonRoutesApi/RoutesDeleteResponse.php | 15 +----- .../V5/Routes/RouteAdvancedConstraints.php | 12 ----- src/Route4Me/V5/Routes/RouteParameters.php | 12 ----- .../V5/TelematicsPlatform/Connection.php | 15 +----- .../ConnectionParameters.php | 15 +----- src/Route4Me/V5/TelematicsVendorFeature.php | 23 ++------- 67 files changed, 98 insertions(+), 971 deletions(-) diff --git a/src/Route4Me/ActivityParameters.php b/src/Route4Me/ActivityParameters.php index 9b24a56..9fc17c5 100644 --- a/src/Route4Me/ActivityParameters.php +++ b/src/Route4Me/ActivityParameters.php @@ -34,19 +34,6 @@ public function __construct() Route4Me::setBaseUrl(Endpoint::BASE_URL); } - public static function fromArray(array $params) - { - $activityparameters = new self(); - - foreach ($params as $key => $value) { - if (property_exists($activityparameters, $key)) { - $activityparameters->{$key} = $value; - } - } - - return $activityparameters; - } - /* * Get all the activities limited by query parameters. */ diff --git a/src/Route4Me/Address.php b/src/Route4Me/Address.php index b3b3bcb..7136c79 100644 --- a/src/Route4Me/Address.php +++ b/src/Route4Me/Address.php @@ -103,21 +103,6 @@ public function __construct() Route4Me::setBaseUrl(Endpoint::BASE_URL); } - public static function fromArray(array $params) - { - $address = new self(); - - foreach ($params as $key => $value) { - if (property_exists($address, $key)) { - $address->{$key} = $value; - } else { - throw new BadParam("Correct parameter must be provided. Wrong Parameter: $key"); - } - } - - return $address; - } - public static function getAddress($routeId, $addressId) { $address = Route4Me::makeRequst([ diff --git a/src/Route4Me/AddressBookGroup.php b/src/Route4Me/AddressBookGroup.php index efa8e86..22266e2 100644 --- a/src/Route4Me/AddressBookGroup.php +++ b/src/Route4Me/AddressBookGroup.php @@ -18,19 +18,6 @@ public function __construct() Route4Me::setBaseUrl(Endpoint::BASE_URL); } - public static function fromArray(array $params) - { - $addressBookGroup = new self(); - - foreach ($params as $key => $value) { - if (property_exists($addressBookGroup, $key)) { - $addressBookGroup->{$key} = $value; - } - } - - return $addressBookGroup; - } - public static function getAddressBookGroup(array $params) { $abGroup = Route4Me::makeRequst([ @@ -83,7 +70,7 @@ public static function createAddressBookGroup(array $params) return $abGroup; } - public static function searchAddressBookGroups(array $params) + public static function searchAddressBookGroups(array $params) { $allBodyFields = ['fields', 'offset', 'limit', 'filter']; @@ -127,7 +114,7 @@ public static function getRandomAddressBookGroup(array $params) { $abGroups = self::getAddressBookGroups($params); - if (isset($abGroups) && sizeof($abGroups>1)) { + if (isset($abGroups) && sizeof($abGroups) > 1) { $groupsSize = sizeof($abGroups); $randomGroupIndex = rand(0, $groupsSize - 1); diff --git a/src/Route4Me/AddressBookLocation.php b/src/Route4Me/AddressBookLocation.php index 67eb9ea..0fbf7d4 100644 --- a/src/Route4Me/AddressBookLocation.php +++ b/src/Route4Me/AddressBookLocation.php @@ -267,19 +267,6 @@ public function __construct() Route4Me::setBaseUrl(Endpoint::BASE_URL); } - public static function fromArray(array $params) - { - $addressbooklocation = new self(); - - foreach ($params as $key => $value) { - if (property_exists($addressbooklocation, $key)) { - $addressbooklocation->{$key} = $value; - } - } - - return $addressbooklocation; - } - /** * @deprecated 1.2.8 * @see \Route4Me\V5\AddressBook\AddressBook::getAddressById() diff --git a/src/Route4Me/AddressBookLocationSearchResponse.php b/src/Route4Me/AddressBookLocationSearchResponse.php index 0ba8efd..fb85d85 100644 --- a/src/Route4Me/AddressBookLocationSearchResponse.php +++ b/src/Route4Me/AddressBookLocationSearchResponse.php @@ -9,19 +9,4 @@ class AddressBookLocationSearchResponse public $results=[]; public $total; public $fields=[]; - - public static function fromArray(array $params) - { - $ablSearchResponse = new self(); - - foreach ($params as $key => $value) { - if (property_exists($ablSearchResponse, $key)) { - $ablSearchResponse->{$key} = $value; - } else { - throw new BadParam("Correct parameter must be provided. Wrong Parameter: $key"); - } - } - - return $ablSearchResponse; - } -} \ No newline at end of file +} diff --git a/src/Route4Me/AddressNote.php b/src/Route4Me/AddressNote.php index 2520f76..88da8c5 100644 --- a/src/Route4Me/AddressNote.php +++ b/src/Route4Me/AddressNote.php @@ -97,22 +97,6 @@ class AddressNote extends Common public function __construct() { - - } - - public static function fromArray(array $params) - { - $addressNote = new self(); - - foreach ($params as $key => $value) { - if (property_exists($addressNote, $key)) { - $addressNote->{$key} = $value; - } else { - throw new BadParam("Correct parameter must be provided. Wrong Parameter: $key"); - } - } - - return $addressNote; } /** diff --git a/src/Route4Me/AddressNoteResponse.php b/src/Route4Me/AddressNoteResponse.php index 15b5ea2..15a88eb 100644 --- a/src/Route4Me/AddressNoteResponse.php +++ b/src/Route4Me/AddressNoteResponse.php @@ -13,19 +13,4 @@ class AddressNoteResponse extends Common public $note_id; public $upload_id; public $note; - - public static function fromArray(array $params) - { - $addressNoteResponse = new self(); - - foreach ($params as $key => $value) { - if (property_exists($addressNoteResponse, $key)) { - $addressNoteResponse->{$key} = $value; - } else { - throw new BadParam("Correct parameter must be provided. Wrong Parameter: $key"); - } - } - - return $addressNoteResponse; - } -} \ No newline at end of file +} diff --git a/src/Route4Me/AvoidanceZone.php b/src/Route4Me/AvoidanceZone.php index 9acf384..9253153 100644 --- a/src/Route4Me/AvoidanceZone.php +++ b/src/Route4Me/AvoidanceZone.php @@ -32,16 +32,7 @@ public static function fromArray(array $params) if (!isset($params['territory'])) { throw new BadParam('Territory must be provided'); } - - $avoidanceZoneParameters = new self(); - - foreach ($params as $key => $value) { - if (property_exists($avoidanceZoneParameters, $key)) { - $avoidanceZoneParameters->{$key} = $value; - } - } - - return $avoidanceZoneParameters; + return parent::fromArray($params); } public static function getAvoidanceZone($territory_id) diff --git a/src/Route4Me/Common.php b/src/Route4Me/Common.php index 301a710..34bd872 100644 --- a/src/Route4Me/Common.php +++ b/src/Route4Me/Common.php @@ -26,4 +26,15 @@ protected function fillFromArray(array $params) } } } + + public static function fromArray(array $params) + { + $_this = new static; + foreach ($params as $key => $value) { + if (property_exists($_this, $key)) { + $_this->{$key} = $value; + } + } + return $_this; + } } diff --git a/src/Route4Me/CustomNoteType.php b/src/Route4Me/CustomNoteType.php index 35914c3..9668af5 100644 --- a/src/Route4Me/CustomNoteType.php +++ b/src/Route4Me/CustomNoteType.php @@ -37,19 +37,4 @@ class CustomNoteType extends Common * Note custom type */ public $note_custom_type; - - public static function fromArray(array $params) - { - $customNoteType = new self(); - - foreach ($params as $key => $value) { - if (property_exists($customNoteType, $key)) { - $customNoteType->{$key} = $value; - } else { - throw new BadParam("Correct parameter must be provided. Wrong Parameter: $key"); - } - } - - return $customNoteType; - } -} \ No newline at end of file +} diff --git a/src/Route4Me/CustomNoteTypeResponse.php b/src/Route4Me/CustomNoteTypeResponse.php index 9717061..b8f78a4 100644 --- a/src/Route4Me/CustomNoteTypeResponse.php +++ b/src/Route4Me/CustomNoteTypeResponse.php @@ -29,19 +29,4 @@ class CustomNoteTypeResponse extends Common * @var array */ public $note_custom_type_values=[]; - - public static function fromArray(array $params) - { - $customNoteTypeResponse = new self(); - - foreach ($params as $key => $value) { - if (property_exists($customNoteTypeResponse, $key)) { - $customNoteTypeResponse->{$key} = $value; - } else { - throw new BadParam("Correct parameter must be provided. Wrong Parameter: $key"); - } - } - - return $customNoteTypeResponse; - } -} \ No newline at end of file +} diff --git a/src/Route4Me/Direction.php b/src/Route4Me/Direction.php index a9e3e85..794dc99 100644 --- a/src/Route4Me/Direction.php +++ b/src/Route4Me/Direction.php @@ -22,17 +22,4 @@ class Direction extends Common * @var DirectionStep[] */ public $steps = []; - - public static function fromArray(array $params) - { - $thisParams = new self(); - - foreach ($params as $key => $value) { - if (property_exists($thisParams, $key)) { - $thisParams->{$key} = $value; - } - } - - return $thisParams; - } -} \ No newline at end of file +} diff --git a/src/Route4Me/DirectionLocation.php b/src/Route4Me/DirectionLocation.php index 78c4c76..b59c0e7 100644 --- a/src/Route4Me/DirectionLocation.php +++ b/src/Route4Me/DirectionLocation.php @@ -52,17 +52,4 @@ class DirectionLocation extends Common * @var integer */ public $error_code; - - public static function fromArray(array $params) - { - $thisParams = new self(); - - foreach ($params as $key => $value) { - if (property_exists($thisParams, $key)) { - $thisParams->{$key} = $value; - } - } - - return $thisParams; - } -} \ No newline at end of file +} diff --git a/src/Route4Me/DirectionStep.php b/src/Route4Me/DirectionStep.php index d7ad6e5..240e65a 100644 --- a/src/Route4Me/DirectionStep.php +++ b/src/Route4Me/DirectionStep.php @@ -70,17 +70,4 @@ class DirectionStep extends Common * @var GeoPoint */ public $maneuverPoint; - - public static function fromArray(array $params) - { - $thisParams = new self(); - - foreach ($params as $key => $value) { - if (property_exists($thisParams, $key)) { - $thisParams->{$key} = $value; - } - } - - return $thisParams; - } -} \ No newline at end of file +} diff --git a/src/Route4Me/GeoPoint.php b/src/Route4Me/GeoPoint.php index 4d3128c..4a3fbfe 100644 --- a/src/Route4Me/GeoPoint.php +++ b/src/Route4Me/GeoPoint.php @@ -22,17 +22,4 @@ class GeoPoint extends Common * @var double */ public $lng; - - public static function fromArray(array $params) - { - $thisParams = new self(); - - foreach ($params as $key => $value) { - if (property_exists($thisParams, $key)) { - $thisParams->{$key} = $value; - } - } - - return $thisParams; - } -} \ No newline at end of file +} diff --git a/src/Route4Me/Geocoding.php b/src/Route4Me/Geocoding.php index 4c1d617..37819af 100644 --- a/src/Route4Me/Geocoding.php +++ b/src/Route4Me/Geocoding.php @@ -15,19 +15,6 @@ class Geocoding extends Common public $housenumber; public $zipcode; - public static function fromArray(array $params) - { - $geocoding = new self(); - - foreach ($params as $key => $value) { - if (property_exists($geocoding, $key)) { - $geocoding->{$key} = $value; - } - } - - return $geocoding; - } - public static function forwardGeocoding($params) { $allBodyFields = ['strExportFormat', 'addresses']; diff --git a/src/Route4Me/GeocodingResponse.php b/src/Route4Me/GeocodingResponse.php index 6411de5..d6f4269 100644 --- a/src/Route4Me/GeocodingResponse.php +++ b/src/Route4Me/GeocodingResponse.php @@ -45,17 +45,4 @@ class GeocodingResponse extends Common * @var Route */ public $original; - - public static function fromArray(array $params) - { - $geocodingResponse = new self(); - - foreach ($params as $key => $value) { - if (property_exists($geocodingResponse, $key)) { - $geocodingResponse->{$key} = $value; - } - } - - return $geocodingResponse; - } } diff --git a/src/Route4Me/Members/Member.php b/src/Route4Me/Members/Member.php index 0594feb..afb7426 100644 --- a/src/Route4Me/Members/Member.php +++ b/src/Route4Me/Members/Member.php @@ -71,19 +71,6 @@ public function __construct() Route4Me::setBaseUrl(Endpoint::BASE_URL); } - public static function fromArray(array $params) - { - $member = new self(); - - foreach ($params as $key => $value) { - if (property_exists($member, $key)) { - $member->{$key} = $value; - } - } - - return $member; - } - public static function getUsers() { $response = Route4Me::makeRequst([ @@ -206,7 +193,7 @@ public static function deleteMember($body, &$errorText) 'member_id' => isset($body->member_id) ? $body->member_id : null, ], ]); - } catch (Exception $ex) { + } catch (\Exception $ex) { $errorText = $ex->getMessage(); $response = null; } finally { @@ -231,7 +218,7 @@ public static function newAccountRegistration($params, &$errorText) 'body' => Route4Me::generateRequestParameters($allBodyFields, $params), 'HTTPHEADER' => 'Content-Type: multipart/form-data', ]); - } catch (Exception $ex) { + } catch (\Exception $ex) { $response = null; $errorText = "Cannot registrate new account
".$ex->getMessage(); } finally { @@ -279,7 +266,7 @@ public static function webinarRegistration($params) 'method' => 'POST', 'body' => Route4Me::generateRequestParameters($allBodyFields, $params), ]); - } catch (Exception $ex) { + } catch (\Exception $ex) { $response = null; } finally { return $response; diff --git a/src/Route4Me/Members/MemberAuthenticationResponse.php b/src/Route4Me/Members/MemberAuthenticationResponse.php index 48f6d9e..5d52438 100644 --- a/src/Route4Me/Members/MemberAuthenticationResponse.php +++ b/src/Route4Me/Members/MemberAuthenticationResponse.php @@ -187,17 +187,4 @@ class MemberAuthenticationResponse extends \Route4Me\Common * Last active timestamp */ public $last_active_timestamp; - - public static function fromArray(array $params) - { - $memberAurhenticateResponse = new self(); - - foreach ($params as $key => $value) { - if (property_exists($memberAurhenticateResponse, $key)) { - $memberAurhenticateResponse->{$key} = $value; - } - } - - return $memberAurhenticateResponse; - } -} \ No newline at end of file +} diff --git a/src/Route4Me/Members/MemberCapabilities.php b/src/Route4Me/Members/MemberCapabilities.php index 3f79667..b7db89e 100644 --- a/src/Route4Me/Members/MemberCapabilities.php +++ b/src/Route4Me/Members/MemberCapabilities.php @@ -41,17 +41,4 @@ class MemberCapabilities extends \Route4Me\Common * If true, the member subscription is commercial. */ public $commercial; - - public static function fromArray(array $params) - { - $memberCapabilities = new self(); - - foreach ($params as $key => $value) { - if (property_exists($memberCapabilities, $key)) { - $memberCapabilities->{$key} = $value; - } - } - - return $memberCapabilities; - } } diff --git a/src/Route4Me/Members/MemberConfiguration.php b/src/Route4Me/Members/MemberConfiguration.php index baaa9d1..ff6c4fb 100644 --- a/src/Route4Me/Members/MemberConfiguration.php +++ b/src/Route4Me/Members/MemberConfiguration.php @@ -43,21 +43,6 @@ public function __construct() Route4Me::setBaseUrl(Endpoint::BASE_URL); } - public static function fromArray(array $params) - { - $memberConfiguration = new Self(); - - foreach ($params as $key => $value) { - if (property_exists($memberConfiguration, $key)) { - $memberConfiguration->{$key} = $value; - } else { - throw new BadParam("Correct parameter must be provided. Wrong Parameter: $key"); - } - } - - return $memberConfiguration; - } - /* * Create new member configuration key-value pair. * @param array $params @@ -77,7 +62,7 @@ public function CreateNewConfigurationData($params, &$errorText) 'method' => 'POST', 'body' => Route4Me::generateRequestParameters($allBodyFields, $params), ]); - } catch (Exception $ex) { + } catch (\Exception $ex) { $errorText = $ex->getMessage(); } finally { return $response; @@ -103,7 +88,7 @@ public function UpdateConfigurationData($params, &$errorText) 'method' => 'PUT', 'body' => Route4Me::generateRequestParameters($allBodyFields, $params) ]); - } catch (Exception $ex) { + } catch (\Exception $ex) { $errorText = $ex->getMessage(); } finally { return $response; @@ -134,7 +119,7 @@ public function RemoveConfigurationData($params, &$errorText) 'config_key' => isset($params['config_key']) ? $params['config_key'] : null ], ]); - } catch (Exception $ex) { + } catch (\Exception $ex) { $errorText = $ex->getMessage(); } finally { return $response; @@ -147,7 +132,7 @@ public function RemoveConfigurationData($params, &$errorText) * If specified, it contains the key 'config_key' and retrieved only corresponding configuration data, * if not, all member configuration data retrieved. */ - public function GetConfigurationData($params=null) + public function GetConfigurationData($params = null) { $allQueryFields = ['config_key']; @@ -161,4 +146,4 @@ public function GetConfigurationData($params=null) return $response; } -} \ No newline at end of file +} diff --git a/src/Route4Me/Members/MemberResponse.php b/src/Route4Me/Members/MemberResponse.php index 8f51d41..4f6f284 100644 --- a/src/Route4Me/Members/MemberResponse.php +++ b/src/Route4Me/Members/MemberResponse.php @@ -402,18 +402,4 @@ class MemberResponse extends \Route4Me\Common * Time in seconds. A user will be logged out after been inactive during specified by this parameter seconds. */ public $auto_logout_ts; - - public static function fromArray(array $params) - { - $memberResponse = new self(); - - foreach ($params as $key => $value) { - if (property_exists($memberResponse, $key)) { - $memberResponse->{$key} = $value; - } - } - - return $memberResponse; - } - -} \ No newline at end of file +} diff --git a/src/Route4Me/Members/MemberResponseV4.php b/src/Route4Me/Members/MemberResponseV4.php index 5151643..7736c03 100644 --- a/src/Route4Me/Members/MemberResponseV4.php +++ b/src/Route4Me/Members/MemberResponseV4.php @@ -128,18 +128,4 @@ class MemberResponseV4 extends \Route4Me\Common /** @var string $api_key*/ public $api_key; - - public static function fromArray(array $params) - { - $memberResponseV4 = new self(); - - foreach ($params as $key => $value) { - if (property_exists($memberResponseV4, $key)) { - $memberResponseV4->{$key} = $value; - } - } - - return $memberResponseV4; - } - -} \ No newline at end of file +} diff --git a/src/Route4Me/Members/ResultsResponseV4.php b/src/Route4Me/Members/ResultsResponseV4.php index 0babe15..43e7ef1 100644 --- a/src/Route4Me/Members/ResultsResponseV4.php +++ b/src/Route4Me/Members/ResultsResponseV4.php @@ -14,17 +14,4 @@ class ResultsResponseV4 extends \Route4Me\Common /** @var int $total */ public $total; - - public static function fromArray(array $params) - { - $resultsResponseV4 = new self(); - - foreach ($params as $key => $value) { - if (property_exists($resultsResponseV4, $key)) { - $resultsResponseV4->{$key} = $value; - } - } - - return $resultsResponseV4; - } -} \ No newline at end of file +} diff --git a/src/Route4Me/Order.php b/src/Route4Me/Order.php index b7398c3..11b53a5 100644 --- a/src/Route4Me/Order.php +++ b/src/Route4Me/Order.php @@ -67,18 +67,6 @@ public function __construct() Route4Me::setBaseUrl(Endpoint::BASE_URL); } - public static function fromArray(array $params) - { - $order = new self(); - foreach ($params as $key => $value) { - if (property_exists($order, $key)) { - $order->{$key} = $value; - } - } - - return $order; - } - /** * @param Order $params */ @@ -233,18 +221,18 @@ public static function validateCoordinate($coord) } switch ($key) { - case 'cached_lat': - case 'curbside_lat': - if ($coord[$key] > 90 || $coord[$key] < -90) { - return false; - } - break; - case 'cached_lng': - case 'curbside_lng': - if ($coord[$key] > 180 || $coord[$key] < -180) { - return false; - } - break; + case 'cached_lat': + case 'curbside_lat': + if ($coord[$key] > 90 || $coord[$key] < -90) { + return false; + } + break; + case 'cached_lng': + case 'curbside_lng': + if ($coord[$key] > 180 || $coord[$key] < -180) { + return false; + } + break; } return true; @@ -286,12 +274,12 @@ public function addOrdersFromCsvFile($csvFileHandle, $ordersFieldsMapping) continue; } else { switch ($coord) { - case 'cached_lat': - $cached_lat = doubleval($rows[$ordersFieldsMapping[$coord]]); - break; - case 'cached_lng': - $cached_lng = doubleval($rows[$ordersFieldsMapping[$coord]]); - break; + case 'cached_lat': + $cached_lat = doubleval($rows[$ordersFieldsMapping[$coord]]); + break; + case 'cached_lng': + $cached_lng = doubleval($rows[$ordersFieldsMapping[$coord]]); + break; } } } diff --git a/src/Route4Me/OrderCustomField.php b/src/Route4Me/OrderCustomField.php index 91774c9..a3814e6 100644 --- a/src/Route4Me/OrderCustomField.php +++ b/src/Route4Me/OrderCustomField.php @@ -18,18 +18,6 @@ public function __construct() Route4Me::setBaseUrl(Endpoint::BASE_URL); } - public static function fromArray(array $params) - { - $orderCustomField = new self(); - foreach ($params as $key => $value) { - if (property_exists($orderCustomField, $key)) { - $orderCustomField->{$key} = $value; - } - } - - return $orderCustomField; - } - public static function addOrderCustomUserField($params) { $excludeFields = ['order_custom_field_id']; diff --git a/src/Route4Me/RapidAddressSearchResponse.php b/src/Route4Me/RapidAddressSearchResponse.php index 89e2919..082bbe4 100644 --- a/src/Route4Me/RapidAddressSearchResponse.php +++ b/src/Route4Me/RapidAddressSearchResponse.php @@ -4,22 +4,9 @@ use Route4Me\Exception\BadParam; -class RapidAddressSearchResponse +class RapidAddressSearchResponse extends Common { public $zipcode; public $street_name; public $county_no; - - public static function fromArray(array $params) - { - $rapidSearch = new self(); - - foreach ($params as $key => $value) { - if (property_exists($rapidSearch, $key)) { - $rapidSearch->{$key} = $value; - } - } - - return $rapidSearch; - } } diff --git a/src/Route4Me/RouteParameters.php b/src/Route4Me/RouteParameters.php index 9aa0203..fd6702a 100644 --- a/src/Route4Me/RouteParameters.php +++ b/src/Route4Me/RouteParameters.php @@ -518,18 +518,6 @@ class RouteParameters extends Common */ public $slowdowns; - public static function fromArray(array $params) - { - $routeParams = new self(); - foreach ($params as $key => $value) { - if (property_exists($routeParams, $key)) { - $routeParams->{$key} = $value; - } - } - - return $routeParams; - } - public function setAddressBundle($addressBundle) { $this->bundling = $addressBundle; diff --git a/src/Route4Me/RouteParametersQuery.php b/src/Route4Me/RouteParametersQuery.php index bc976f6..a01a4ed 100644 --- a/src/Route4Me/RouteParametersQuery.php +++ b/src/Route4Me/RouteParametersQuery.php @@ -154,17 +154,4 @@ class RouteParametersQuery extends Common public $bundling_items; public $device_type; - - public static function fromArray(array $params) - { - $routeQueryParams = new self(); - foreach ($params as $key => $value) { - if (property_exists($routeQueryParams, $key)) { - $routeQueryParams->{$key} = $value; - } - } - - return $routeQueryParams; - } - -} \ No newline at end of file +} diff --git a/src/Route4Me/ScheduleCalendarParameters.php b/src/Route4Me/ScheduleCalendarParameters.php index e0a5517..e78dc0d 100644 --- a/src/Route4Me/ScheduleCalendarParameters.php +++ b/src/Route4Me/ScheduleCalendarParameters.php @@ -64,22 +64,6 @@ public function __construct() Route4Me::setBaseUrl(Endpoint::BASE_URL); } - /** - * Convert an array to this object - */ - public static function fromArray(array $params) - { - $scheduleCalendarParameters = new self(); - - foreach ($params as $key => $value) { - if (property_exists($scheduleCalendarParameters, $key)) { - $scheduleCalendarParameters->{$key} = $value; - } - } - - return $scheduleCalendarParameters; - } - public function setTimezoneOffsetMinutes($tz) { $this->timezone_offset_minutes = -$tz; @@ -106,4 +90,4 @@ public function getScheduleCalendar($params) return $schedCalendar; } -} \ No newline at end of file +} diff --git a/src/Route4Me/ScheduleCalendarResponse.php b/src/Route4Me/ScheduleCalendarResponse.php index 445f800..d1fca77 100644 --- a/src/Route4Me/ScheduleCalendarResponse.php +++ b/src/Route4Me/ScheduleCalendarResponse.php @@ -30,16 +30,4 @@ class ScheduleCalendarResponse extends Common * @var array */ public $routes_count = []; - - public static function fromArray(array $params) - { - $order = new self(); - foreach ($params as $key => $value) { - if (property_exists($order, $key)) { - $order->{$key} = $value; - } - } - - return $order; - } } diff --git a/src/Route4Me/SearchResponse.php b/src/Route4Me/SearchResponse.php index d74cadf..240b6d7 100644 --- a/src/Route4Me/SearchResponse.php +++ b/src/Route4Me/SearchResponse.php @@ -8,7 +8,7 @@ * The class for a response from the address book contacts search request. * @package Route4Me */ -class SearchResponse +class SearchResponse extends Common { /** * An array of the AddressBookContact type objects. @@ -33,19 +33,4 @@ class SearchResponse * @var string */ public $index_query; - - public static function fromArray(array $params) - { - $searchResponse = new self(); - - foreach ($params as $key => $value) { - if (property_exists($searchResponse, $key)) { - $searchResponse->{$key} = $value; - } else { - throw new BadParam("Correct parameter must be provided. Wrong Parameter: $key"); - } - } - - return $searchResponse; - } } diff --git a/src/Route4Me/TelematicsGateway/CreateConnectionResponse.php b/src/Route4Me/TelematicsGateway/CreateConnectionResponse.php index 86cbe69..230f53f 100644 --- a/src/Route4Me/TelematicsGateway/CreateConnectionResponse.php +++ b/src/Route4Me/TelematicsGateway/CreateConnectionResponse.php @@ -102,17 +102,4 @@ class CreateConnectionResponse extends Common * @var integer */ public $vendor_id ; - - public static function fromArray(array $params) - { - $thisParams = new self(); - - foreach ($params as $key => $value) { - if (property_exists($thisParams, $key)) { - $thisParams->{$key} = $value; - } - } - - return $thisParams; - } -} \ No newline at end of file +} diff --git a/src/Route4Me/TelematicsGateway/TelematicsConnection.php b/src/Route4Me/TelematicsGateway/TelematicsConnection.php index 9fb447c..b502318 100644 --- a/src/Route4Me/TelematicsGateway/TelematicsConnection.php +++ b/src/Route4Me/TelematicsGateway/TelematicsConnection.php @@ -155,19 +155,6 @@ class TelematicsConnection extends \Route4Me\Common * @var Boolean */ public $validate_remote_credentials; - - public static function fromArray(array $params) - { - $thisParams = new self(); - - foreach ($params as $key => $value) { - if (property_exists($thisParams, $key)) { - $thisParams->{$key} = $value; - } - } - - return $thisParams; - } /** * Create a telematics connection. diff --git a/src/Route4Me/TelematicsGateway/TelematicsConnectionParameters.php b/src/Route4Me/TelematicsGateway/TelematicsConnectionParameters.php index bdf4dd1..336ca35 100644 --- a/src/Route4Me/TelematicsGateway/TelematicsConnectionParameters.php +++ b/src/Route4Me/TelematicsGateway/TelematicsConnectionParameters.php @@ -2,7 +2,7 @@ namespace Route4Me\TelematicsGateway; -use Route4Me\Common As Common; +use Route4Me\Common as Common; /** * Parameters for requesting the telematics connection. @@ -80,17 +80,4 @@ class TelematicsConnectionParameters extends Common * @var type Boolean */ public $validate_remote_credentials; - - public static function fromArray(array $params) - { - $thisParams = new self(); - - foreach ($params as $key => $value) { - if (property_exists($thisParams, $key)) { - $thisParams->{$key} = $value; - } - } - - return $thisParams; - } } diff --git a/src/Route4Me/TelematicsGateway/TelematicsRegisterMemberResponse.php b/src/Route4Me/TelematicsGateway/TelematicsRegisterMemberResponse.php index 0e8b933..8f1cbd2 100644 --- a/src/Route4Me/TelematicsGateway/TelematicsRegisterMemberResponse.php +++ b/src/Route4Me/TelematicsGateway/TelematicsRegisterMemberResponse.php @@ -9,7 +9,7 @@ class TelematicsRegisterMemberResponse extends \Route4Me\Common { /** * API token - * Use for the operations: + * Use for the operations: * Get Telematics Connections, Register Telematics Connection * @var type string */ @@ -32,17 +32,4 @@ class TelematicsRegisterMemberResponse extends \Route4Me\Common * @var type */ public $id; - - public static function fromArray(array $params) - { - $thisParams = new self(); - - foreach ($params as $key => $value) { - if (property_exists($thisParams, $key)) { - $thisParams->{$key} = $value; - } - } - - return $thisParams; - } } diff --git a/src/Route4Me/TelematicsGateway/TelematicsVendor.php b/src/Route4Me/TelematicsGateway/TelematicsVendor.php index 7947f38..5ac0529 100644 --- a/src/Route4Me/TelematicsGateway/TelematicsVendor.php +++ b/src/Route4Me/TelematicsGateway/TelematicsVendor.php @@ -3,8 +3,8 @@ namespace Route4Me\TelematicsGateway; use Route4Me\Enum\Endpoint; -use Route4Me\Common As Common; -use Route4Me\Route4Me As Route4Me; +use Route4Me\Common as Common; +use Route4Me\Route4Me as Route4Me; /** * Telematics vendor's data structure. @@ -24,7 +24,7 @@ class TelematicsVendor extends Common public $name; /** - * Vendor slug + * Vendor slug * @var string */ public $slug; @@ -78,19 +78,6 @@ class TelematicsVendor extends Common * @var TelematicsVendorFeature[] */ public $features = []; - - public static function fromArray(array $params) - { - $vendorsParameters = new self(); - - foreach ($params as $key => $value) { - if (property_exists($vendorsParameters, $key)) { - $vendorsParameters->{$key} = $value; - } - } - - return $vendorsParameters; - } /** * Get vendor(s), search for vendors, compare vendors. @@ -178,5 +165,4 @@ public static function getVendorById($vendorId) return null; } } - } diff --git a/src/Route4Me/TelematicsGateway/TelematicsVendorParameters.php b/src/Route4Me/TelematicsGateway/TelematicsVendorParameters.php index c80c66c..fcb68fc 100644 --- a/src/Route4Me/TelematicsGateway/TelematicsVendorParameters.php +++ b/src/Route4Me/TelematicsGateway/TelematicsVendorParameters.php @@ -2,7 +2,7 @@ namespace Route4Me\TelematicsGateway; -use Route4Me\Common As Common; +use Route4Me\Common as Common; /** * Parameters for requesting the telematics vendors. @@ -86,17 +86,4 @@ class TelematicsVendorParameters extends Common * @var type string */ public $api_token; - - public static function fromArray(array $params) - { - $thisParams = new self(); - - foreach ($params as $key => $value) { - if (property_exists($thisParams, $key)) { - $thisParams->{$key} = $value; - } - } - - return $thisParams; - } } diff --git a/src/Route4Me/TelematicsGateway/TelematicsVendors.php b/src/Route4Me/TelematicsGateway/TelematicsVendors.php index d40af5c..52b4550 100644 --- a/src/Route4Me/TelematicsGateway/TelematicsVendors.php +++ b/src/Route4Me/TelematicsGateway/TelematicsVendors.php @@ -3,8 +3,8 @@ namespace Route4Me\TelematicsGateway; use Route4Me\Enum\Endpoint; -use Route4Me\Common As Common; -use Route4Me\Route4Me As Route4Me; +use Route4Me\Common as Common; +use Route4Me\Route4Me as Route4Me; /** * Telematics vendors' list item data structure. @@ -24,7 +24,7 @@ class TelematicsVendors extends Common public $name; /** - * Vendor slug + * Vendor slug * @var type string */ public $slug; @@ -66,17 +66,4 @@ class TelematicsVendors extends Common * @var type string */ public $size; - - public static function fromArray(array $params) - { - $vendorsParameters = new self(); - - foreach ($params as $key => $value) { - if (property_exists($vendorsParameters, $key)) { - $vendorsParameters->{$key} = $value; - } - } - - return $vendorsParameters; - } } diff --git a/src/Route4Me/TelematicsVendor.php b/src/Route4Me/TelematicsVendor.php index acd9ea3..2aa4747 100644 --- a/src/Route4Me/TelematicsVendor.php +++ b/src/Route4Me/TelematicsVendor.php @@ -22,19 +22,6 @@ class TelematicsVendor extends Common public $search; // Searched text public $vendors; // Comma-delimited list of the vendors IDs. - public static function fromArray(array $params) - { - $vendorsParameters = new self(); - - foreach ($params as $key => $value) { - if (property_exists($vendorsParameters, $key)) { - $vendorsParameters->{$key} = $value; - } - } - - return $vendorsParameters; - } - public static function GetTelematicsVendors($params) { Route4Me::setBaseUrl(Endpoint::TELEMATICS_VENDORS); diff --git a/src/Route4Me/Territory.php b/src/Route4Me/Territory.php index a4fee32..65e1847 100644 --- a/src/Route4Me/Territory.php +++ b/src/Route4Me/Territory.php @@ -35,16 +35,7 @@ public static function fromArray(array $params) if (!isset($params['territory'])) { throw new BadParam('Territory must be provided'); } - - $territoryparameters = new self(); - - foreach ($params as $key => $value) { - if (property_exists($territoryparameters, $key)) { - $territoryparameters->{$key} = $value; - } - } - - return $territoryparameters; + return parent::fromArray($params); } public static function getTerritory($params) diff --git a/src/Route4Me/Tracking/FindAssetResponse.php b/src/Route4Me/Tracking/FindAssetResponse.php index e180f47..f49c8a9 100644 --- a/src/Route4Me/Tracking/FindAssetResponse.php +++ b/src/Route4Me/Tracking/FindAssetResponse.php @@ -69,8 +69,8 @@ class FindAssetResponse extends \Route4Me\Common public $customer_service_phone; /** - * If true, Covid19 warning hidden - * @var type + * If true, Covid19 warning hidden + * @var type */ public $hide_covid19_warning; @@ -141,21 +141,8 @@ class FindAssetResponse extends \Route4Me\Common public $custom_data; /** - * An array of the asset arrival times + * An array of the asset arrival times * @var type array */ public $arrival = []; - - public static function fromArray(array $params) - { - $findAssetResponse = new self(); - - foreach ($params as $key => $value) { - if (property_exists($findAssetResponse, $key)) { - $findAssetResponse->{$key} = $value; - } - } - - return $findAssetResponse; - } -} \ No newline at end of file +} diff --git a/src/Route4Me/Tracking/MemberData.php b/src/Route4Me/Tracking/MemberData.php index 660e1a0..21c92e4 100644 --- a/src/Route4Me/Tracking/MemberData.php +++ b/src/Route4Me/Tracking/MemberData.php @@ -1,9 +1,7 @@ $value) { - if (property_exists($memberData, $key)) { - $memberData->{$key} = $value; - } - } - - return $memberData; - } -} \ No newline at end of file +} diff --git a/src/Route4Me/Tracking/SetGpsResponse.php b/src/Route4Me/Tracking/SetGpsResponse.php index 64c78f0..4bb4da5 100644 --- a/src/Route4Me/Tracking/SetGpsResponse.php +++ b/src/Route4Me/Tracking/SetGpsResponse.php @@ -13,17 +13,4 @@ class SetGpsResponse extends \Route4Me\Common * Unique ID of the GPS points group. */ public $tx_id; - - public static function fromArray(array $params) - { - $gpsPosition = new self(); - - foreach ($params as $key => $value) { - if (property_exists($gpsPosition, $key)) { - $gpsPosition->{$key} = $value; - } - } - - return $gpsPosition; - } -} \ No newline at end of file +} diff --git a/src/Route4Me/Tracking/UserLocation.php b/src/Route4Me/Tracking/UserLocation.php index ec7b447..677c66f 100644 --- a/src/Route4Me/Tracking/UserLocation.php +++ b/src/Route4Me/Tracking/UserLocation.php @@ -17,17 +17,4 @@ class UserLocation extends \Route4Me\Common /** @var boolean $from_cache*/ public $from_cache; - - public static function fromArray(array $params) - { - $userLocation = new self(); - - foreach ($params as $key => $value) { - if (property_exists($userLocation, $key)) { - $userLocation->{$key} = $value; - } - } - - return $userLocation; - } -} \ No newline at end of file +} diff --git a/src/Route4Me/Tracking/UserTracking.php b/src/Route4Me/Tracking/UserTracking.php index 5909afb..4e51bda 100644 --- a/src/Route4Me/Tracking/UserTracking.php +++ b/src/Route4Me/Tracking/UserTracking.php @@ -1,9 +1,7 @@ $value) { - if (property_exists($userTracking, $key)) { - $userTracking->{$key} = $value; - } - } - - return $userTracking; - } -} \ No newline at end of file +} diff --git a/src/Route4Me/V5/AccountProfile.php b/src/Route4Me/V5/AccountProfile.php index c29a4ef..db9a1dc 100644 --- a/src/Route4Me/V5/AccountProfile.php +++ b/src/Route4Me/V5/AccountProfile.php @@ -2,7 +2,7 @@ namespace Route4Me\V5; -use Route4Me\Common As Common; +use Route4Me\Common as Common; /** * Account profile @@ -38,17 +38,4 @@ class AccountProfile extends Common * @var type string */ public $preferred_units; - - public static function fromArray(array $params) - { - $thisParams = new self(); - - foreach ($params as $key => $value) { - if (property_exists($thisParams, $key)) { - $thisParams->{$key} = $value; - } - } - - return $thisParams; - } } diff --git a/src/Route4Me/V5/Addresses/Address.php b/src/Route4Me/V5/Addresses/Address.php index 2c7c272..ea38c68 100644 --- a/src/Route4Me/V5/Addresses/Address.php +++ b/src/Route4Me/V5/Addresses/Address.php @@ -548,22 +548,7 @@ class Address extends \Route4Me\Common public function __construct() { // TO DO: replace with API 5 endpoint after finishing. - Route4Me::setBaseUrl( Endpoint4::BASE_URL); - } - - public static function fromArray(array $params) - { - $address = new self(); - - foreach ($params as $key => $value) { - if (property_exists($address, $key)) { - $address->{$key} = $value; - } else { - throw new BadParam("Correct parameter must be provided. Wrong Parameter: $key"); - } - } - - return $address; + Route4Me::setBaseUrl(Endpoint4::BASE_URL); } public static function getAddress($routeId, $addressId) diff --git a/src/Route4Me/V5/Addresses/AddressNote.php b/src/Route4Me/V5/Addresses/AddressNote.php index 4dd129d..1df3dfb 100644 --- a/src/Route4Me/V5/Addresses/AddressNote.php +++ b/src/Route4Me/V5/Addresses/AddressNote.php @@ -4,13 +4,14 @@ use Route4Me\Enum\Endpoint; use Route4Me\Exception\BadParam; +use Route4Me\Route4Me; /** * Class AddressNote * @package Route4Me\V5\Addresses * The class for address note */ -class AddressNote extends Common +class AddressNote extends \Route4Me\Common { /** An unique ID of a note * @var integer $note_id @@ -84,22 +85,6 @@ class AddressNote extends Common public function __construct() { - - } - - public static function fromArray(array $params) - { - $addressNote = new self(); - - foreach ($params as $key => $value) { - if (property_exists($addressNote, $key)) { - $addressNote->{$key} = $value; - } else { - throw new BadParam("Correct parameter must be provided. Wrong Parameter: $key"); - } - } - - return $addressNote; } /*Get notes from the specified route destination diff --git a/src/Route4Me/V5/Addresses/BundledItemResponse.php b/src/Route4Me/V5/Addresses/BundledItemResponse.php index d62d57c..06ee324 100644 --- a/src/Route4Me/V5/Addresses/BundledItemResponse.php +++ b/src/Route4Me/V5/Addresses/BundledItemResponse.php @@ -61,20 +61,4 @@ class BundledItemResponse extends \Route4Me\Common * @var integer[] $addresses_id */ public $addresses_id = []; - - public static function fromArray(array $params) - { - $boundedItemResp = new self(); - - foreach ($params as $key => $value) { - if (property_exists($boundedItemResp, $key)) { - $boundedItemResp->{$key} = $value; - } else { - throw new BadParam("Correct parameter must be provided. Wrong Parameter: $key"); - } - } - - return $boundedItemResp; - } - -} \ No newline at end of file +} diff --git a/src/Route4Me/V5/Addresses/RouteAdvancedConstraints.php b/src/Route4Me/V5/Addresses/RouteAdvancedConstraints.php index 13060ea..1cd82b4 100644 --- a/src/Route4Me/V5/Addresses/RouteAdvancedConstraints.php +++ b/src/Route4Me/V5/Addresses/RouteAdvancedConstraints.php @@ -67,16 +67,4 @@ class RouteAdvancedConstraints extends Common * @var string */ public $group; - - public static function fromArray(array $params) - { - $routeParams = new self(); - foreach ($params as $key => $value) { - if (property_exists($routeParams, $key)) { - $routeParams->{$key} = $value; - } - } - - return $routeParams; - } -} \ No newline at end of file +} diff --git a/src/Route4Me/V5/Country.php b/src/Route4Me/V5/Country.php index 0df6620..bf62239 100644 --- a/src/Route4Me/V5/Country.php +++ b/src/Route4Me/V5/Country.php @@ -2,7 +2,7 @@ namespace Route4Me\V5; -use Route4Me\Common As Common; +use Route4Me\Common as Common; /** * The Country class. @@ -26,17 +26,4 @@ class Country extends Common * @var type string */ public $country_name; - - public static function fromArray(array $params) - { - $thisParams = new self(); - - foreach ($params as $key => $value) { - if (property_exists($thisParams, $key)) { - $thisParams->{$key} = $value; - } - } - - return $thisParams; - } } diff --git a/src/Route4Me/V5/Members/DriverRatingApi/DriverReview.php b/src/Route4Me/V5/Members/DriverRatingApi/DriverReview.php index a25be22..90140c3 100644 --- a/src/Route4Me/V5/Members/DriverRatingApi/DriverReview.php +++ b/src/Route4Me/V5/Members/DriverRatingApi/DriverReview.php @@ -34,18 +34,4 @@ class DriverReview extends \Route4Me\Common * @var string $added_at */ public $added_at; - - public static function fromArray(array $params) - { - $driverReview = new self(); - - foreach ($params as $key => $value) { - if (property_exists($driverReview, $key)) { - $driverReview->{$key} = $value; - } - } - - return $driverReview; - } - -} \ No newline at end of file +} diff --git a/src/Route4Me/V5/Members/DriverRatingApi/SimplePaginationData.php b/src/Route4Me/V5/Members/DriverRatingApi/SimplePaginationData.php index 6ad6de0..a8caad6 100644 --- a/src/Route4Me/V5/Members/DriverRatingApi/SimplePaginationData.php +++ b/src/Route4Me/V5/Members/DriverRatingApi/SimplePaginationData.php @@ -39,17 +39,4 @@ class SimplePaginationData extends \Route4Me\Common * @var string $next */ public $next; - - public static function fromArray(array $params) - { - $spData = new self(); - - foreach ($params as $key => $value) { - if (property_exists($spData, $key)) { - $spData->{$key} = $value; - } - } - - return $spData; - } -} \ No newline at end of file +} diff --git a/src/Route4Me/V5/Orders/OrderInventoriesApi/OrderInventory.php b/src/Route4Me/V5/Orders/OrderInventoriesApi/OrderInventory.php index 1bd9da3..41d965e 100644 --- a/src/Route4Me/V5/Orders/OrderInventoriesApi/OrderInventory.php +++ b/src/Route4Me/V5/Orders/OrderInventoriesApi/OrderInventory.php @@ -59,18 +59,4 @@ class OrderInventory extends \Route4Me\Common * @var string $updated_at */ public $updated_at; - - public static function fromArray(array $params) - { - $orderInventory = new self(); - - foreach ($params as $key => $value) { - if (property_exists($orderInventory, $key)) { - $orderInventory->{$key} = $value; - } - } - - return $orderInventory; - } - -} \ No newline at end of file +} diff --git a/src/Route4Me/V5/ResultResponse.php b/src/Route4Me/V5/ResultResponse.php index acbed6c..b036f35 100644 --- a/src/Route4Me/V5/ResultResponse.php +++ b/src/Route4Me/V5/ResultResponse.php @@ -30,18 +30,4 @@ class ResultResponse extends \Route4Me\Common * @var Array $messages */ public $messages; - - public static function fromArray(array $params) - { - $resultResponse = new self(); - - foreach ($params as $key => $value) { - if (property_exists($resultResponse, $key)) { - $resultResponse->{$key} = $value; - } - } - - return $resultResponse; - } - -} \ No newline at end of file +} diff --git a/src/Route4Me/V5/Routes/AddonRoutesApi/ApiCapabilities.php b/src/Route4Me/V5/Routes/AddonRoutesApi/ApiCapabilities.php index 332b5ac..7b527a7 100644 --- a/src/Route4Me/V5/Routes/AddonRoutesApi/ApiCapabilities.php +++ b/src/Route4Me/V5/Routes/AddonRoutesApi/ApiCapabilities.php @@ -1,9 +1,7 @@ $value) { - if (property_exists($resultResponse, $key)) { - $resultResponse->{$key} = $value; - } - } - - return $resultResponse; - } -} \ No newline at end of file +} diff --git a/src/Route4Me/V5/Routes/AddonRoutesApi/ApiPreferences.php b/src/Route4Me/V5/Routes/AddonRoutesApi/ApiPreferences.php index ae68812..95c9c6e 100644 --- a/src/Route4Me/V5/Routes/AddonRoutesApi/ApiPreferences.php +++ b/src/Route4Me/V5/Routes/AddonRoutesApi/ApiPreferences.php @@ -18,17 +18,4 @@ class ApiPreferences extends \Route4Me\Common * @var boolean $simple_pagination */ public $simple_pagination; - - public static function fromArray(array $params) - { - $apiPrefer = new self(); - - foreach ($params as $key => $value) { - if (property_exists($apiPrefer, $key)) { - $apiPrefer->{$key} = $value; - } - } - - return $apiPrefer; - } -} \ No newline at end of file +} diff --git a/src/Route4Me/V5/Routes/AddonRoutesApi/RouteDataTableConfigResponse.php b/src/Route4Me/V5/Routes/AddonRoutesApi/RouteDataTableConfigResponse.php index 8fb6bd2..971f059 100644 --- a/src/Route4Me/V5/Routes/AddonRoutesApi/RouteDataTableConfigResponse.php +++ b/src/Route4Me/V5/Routes/AddonRoutesApi/RouteDataTableConfigResponse.php @@ -18,17 +18,4 @@ class RouteDataTableConfigResponse extends \Route4Me\Common * @var ApiPreferences $api_preferences */ public $api_preferences = []; - - public static function fromArray(array $params) - { - $configResponse = new self(); - - foreach ($params as $key => $value) { - if (property_exists($configResponse, $key)) { - $configResponse->{$key} = $value; - } - } - - return $configResponse; - } } diff --git a/src/Route4Me/V5/Routes/AddonRoutesApi/RouteDuplicateResponse.php b/src/Route4Me/V5/Routes/AddonRoutesApi/RouteDuplicateResponse.php index bbde631..8d1c095 100644 --- a/src/Route4Me/V5/Routes/AddonRoutesApi/RouteDuplicateResponse.php +++ b/src/Route4Me/V5/Routes/AddonRoutesApi/RouteDuplicateResponse.php @@ -24,17 +24,4 @@ class RouteDuplicateResponse extends \Route4Me\Common * @var string[] $route_ids */ public $route_ids = []; - - public static function fromArray(array $params) - { - $duplicateResponse = new self(); - - foreach ($params as $key => $value) { - if (property_exists($duplicateResponse, $key)) { - $duplicateResponse->{$key} = $value; - } - } - - return $duplicateResponse; - } -} \ No newline at end of file +} diff --git a/src/Route4Me/V5/Routes/AddonRoutesApi/RouteParametersQuery.php b/src/Route4Me/V5/Routes/AddonRoutesApi/RouteParametersQuery.php index 7536e66..3b65e33 100644 --- a/src/Route4Me/V5/Routes/AddonRoutesApi/RouteParametersQuery.php +++ b/src/Route4Me/V5/Routes/AddonRoutesApi/RouteParametersQuery.php @@ -139,20 +139,6 @@ class RouteParametersQuery extends Common */ public $per_page; - - public static function fromArray(array $params) - { - $routeQueryParams = new self(); - - foreach ($params as $key => $value) { - if (property_exists($routeQueryParams, $key)) { - $routeQueryParams->{$key} = $value; - } - } - - return $routeQueryParams; - } - public static function getAllProperties() { $routeQueryParams = new self(); @@ -161,5 +147,4 @@ public static function getAllProperties() return $fields; } - -} \ No newline at end of file +} diff --git a/src/Route4Me/V5/Routes/AddonRoutesApi/RoutesDeleteResponse.php b/src/Route4Me/V5/Routes/AddonRoutesApi/RoutesDeleteResponse.php index f478089..72df392 100644 --- a/src/Route4Me/V5/Routes/AddonRoutesApi/RoutesDeleteResponse.php +++ b/src/Route4Me/V5/Routes/AddonRoutesApi/RoutesDeleteResponse.php @@ -29,17 +29,4 @@ class RoutesDeleteResponse extends \Route4Me\Common * @var string[] $route_ids */ public $route_ids; - - public static function fromArray(array $params) - { - $deleteResponse = new self(); - - foreach ($params as $key => $value) { - if (property_exists($deleteResponse, $key)) { - $deleteResponse->{$key} = $value; - } - } - - return $deleteResponse; - } -} \ No newline at end of file +} diff --git a/src/Route4Me/V5/Routes/RouteAdvancedConstraints.php b/src/Route4Me/V5/Routes/RouteAdvancedConstraints.php index b8380a3..65874ba 100644 --- a/src/Route4Me/V5/Routes/RouteAdvancedConstraints.php +++ b/src/Route4Me/V5/Routes/RouteAdvancedConstraints.php @@ -59,16 +59,4 @@ class RouteAdvancedConstraints extends \Route4Me\Common * @var string */ public $group; - - public static function fromArray(array $params) - { - $routeParams = new self(); - foreach ($params as $key => $value) { - if (property_exists($routeParams, $key)) { - $routeParams->{$key} = $value; - } - } - - return $routeParams; - } } diff --git a/src/Route4Me/V5/Routes/RouteParameters.php b/src/Route4Me/V5/Routes/RouteParameters.php index b0642b7..9cced25 100644 --- a/src/Route4Me/V5/Routes/RouteParameters.php +++ b/src/Route4Me/V5/Routes/RouteParameters.php @@ -74,18 +74,6 @@ class RouteParameters extends Common public $is_dynamic_start_time; public $bundling; - public static function fromArray(array $params) - { - $routeParams = new self(); - foreach ($params as $key => $value) { - if (property_exists($routeParams, $key)) { - $routeParams->{$key} = $value; - } - } - - return $routeParams; - } - public function setAddressBundle($addressBundle) { $this->bundling = $addressBundle; diff --git a/src/Route4Me/V5/TelematicsPlatform/Connection.php b/src/Route4Me/V5/TelematicsPlatform/Connection.php index c239d6d..17c5266 100644 --- a/src/Route4Me/V5/TelematicsPlatform/Connection.php +++ b/src/Route4Me/V5/TelematicsPlatform/Connection.php @@ -2,7 +2,7 @@ namespace Route4Me\V5\TelematicsPlatform; -use Route4Me\Common As Common; +use Route4Me\Common as Common; /** * The response structure from the endpoint /connections @@ -122,17 +122,4 @@ class Connection extends Common * @var type array */ public $metadata = []; - - public static function fromArray(array $params) - { - $thisParams = new self(); - - foreach ($params as $key => $value) { - if (property_exists($thisParams, $key)) { - $thisParams->{$key} = $value; - } - } - - return $thisParams; - } } diff --git a/src/Route4Me/V5/TelematicsPlatform/ConnectionParameters.php b/src/Route4Me/V5/TelematicsPlatform/ConnectionParameters.php index fda3a53..218f104 100644 --- a/src/Route4Me/V5/TelematicsPlatform/ConnectionParameters.php +++ b/src/Route4Me/V5/TelematicsPlatform/ConnectionParameters.php @@ -2,7 +2,7 @@ namespace Route4Me\V5\TelematicsPlatform; -use Route4Me\Common As Common; +use Route4Me\Common as Common; /** * The telematics connection query parameters. @@ -89,17 +89,4 @@ class ConnectionParameters extends Common * @var type string */ public $connection_token; - - public static function fromArray(array $params) - { - $thisParams = new self(); - - foreach ($params as $key => $value) { - if (property_exists($thisParams, $key)) { - $thisParams->{$key} = $value; - } - } - - return $thisParams; - } } diff --git a/src/Route4Me/V5/TelematicsVendorFeature.php b/src/Route4Me/V5/TelematicsVendorFeature.php index 7e7e210..584ef67 100644 --- a/src/Route4Me/V5/TelematicsVendorFeature.php +++ b/src/Route4Me/V5/TelematicsVendorFeature.php @@ -2,7 +2,7 @@ namespace Route4Me\V5; -use Route4Me\Common As Common; +use Route4Me\Common as Common; /** * Telematics vendor's feature @@ -13,36 +13,23 @@ class TelematicsVendorFeature extends Common * Feature ID * @var type string */ - public $id; + public $id; /** * Feature name * @var type string */ - public $name; + public $name; /** * Feature slug * @var type string */ - public $slug; + public $slug; /** * Feature group * @var type string */ - public $feature_group; - - public static function fromArray(array $params) - { - $thisParams = new self(); - - foreach ($params as $key => $value) { - if (property_exists($thisParams, $key)) { - $thisParams->{$key} = $value; - } - } - - return $thisParams; - } + public $feature_group; }