Merge pull request #29 from route4me/code_refactoring_v1.2.9

Code refactoring v1.2.9

UnitTestFiles/Test/AddressBookGroupUnitTests.php

@@ -189,14 +189,14 @@ public function testSearchAddressBookGroups()
 
  $this->assertNotNull($addressBookGroups);
  $this->assertTrue(sizeof($addressBookGroups->fields)==3);
- $this->assertContains('address_id',$addressBookGroups->fields);
- $this->assertContains('address_1',$addressBookGroups->fields);
- $this->assertContains('address_group',$addressBookGroups->fields);
+ $this->assertContains('address_id', $addressBookGroups->fields);
+ $this->assertContains('address_1', $addressBookGroups->fields);
+ $this->assertContains('address_group', $addressBookGroups->fields);
 
  $this->assertNotNull($addressBookGroups->results);
 
  if (sizeof($addressBookGroups->results)>0) {
- $this->assertContains('Louisville', implode (", ", $addressBookGroups->results[0]));
+ $this->assertContains('Louisville', implode(", ", $addressBookGroups->results[0]));
  }
  }
 
@@ -260,7 +260,7 @@ public function testGetAddressBookGroupIdByName()
  $groupIds = AddressBookGroup::getAddressBookGroupIdByName($firstGroup->group_name);
 
  $this->assertNotNull($groupIds);
- $this->assertTrue(in_array($firstGroup->group_id,$groupIds ));
+ $this->assertTrue(in_array($firstGroup->group_id, $groupIds));
  }
 
  public static function tearDownAfterClass()
@@ -281,4 +281,4 @@ public static function tearDownAfterClass()
  }
  }
  }
-}
+}

composer.json

@@ -2,7 +2,7 @@
  "name": "route4me/route4me-php",
  "description": "Access Route4Me's logistics-as-a-service API using our PHP SDK",
  "minimum-stability": "stable",
- "version": "1.2.8",
+ "version": "1.2.9",
  "authors": [
  {
  "name": "Igor Route4Me",

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.
  */

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([

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);

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()

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;
- }
-}
+}

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;
  }
 
  /**

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;
- }
-}
+}

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)

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;
+ }
 }

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;
- }
-}
+}

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;
- }
-}
+}

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;
- }
-}
+}

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;
- }
-}
+}

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;
- }
-}
+}

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;
- }
-}
+}

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'];