biscolab / google-maps-php-sdk

src/Api/Places.php

Indentation +195 added lines, -195 removed lines

@@ -32,206 +32,206 @@
 class Places extends Api
 {
 
-	/**
-	 * @var string
-	 */
-	const SERVICE_ENDPOINT = 'place';
-
-	/**
-	 * @var string
-	 */
-	protected $result_collection = PlaceResultsCollection::class;
-
-	/**
-	 * @param string     $query
-	 * @param array|null $params
-	 * @param array|null $fields
-	 *
-	 * @return GoogleMapsResultsCollection
-	 * @see https://developers.google.com/places/web-service/search#FindPlaceRequests
-	 */
-	public function findPlaceByText(
-		string $query,
-		?array $params = [],
-		?array $fields = []
-	): GoogleMapsResultsCollection {
-
-		$params = array_merge($params, [
-			GoogleMapsRequestFields::INPUT  => $query,
-			GoogleMapsRequestFields::FIELDS => implode(',', $fields)
-		]);
-
-		return $this->findPlace($params);
-
-	}
-
-	/**
-	 * Find Places requests
-	 *
-	 * @param array $params
-	 *        GoogleMapsRequestFields::INPUT required
-	 *
-	 * @see     https://developers.google.com/places/web-service/search#FindPlaceRequests
-	 * @return GoogleMapsResultsCollection
-	 * @throws InvalidArgumentException
-	 * @since   0.5.0
-	 */
-	public function findPlace(array $params): GoogleMapsResultsCollection
-	{
-
-		// see \Biscolab\GoogleMaps\Values\PlaceInputTypeValues
-		if (empty($params[GoogleMapsRequestFields::INPUTTYPE])) {
-			$params[GoogleMapsRequestFields::INPUTTYPE] = PlaceInputTypeValues::TEXTQUERY;
-		}
-
-		if (empty($params[GoogleMapsRequestFields::INPUT])) {
-			throw new InvalidArgumentException(GoogleMapsRequestFields::INPUT . " field is required");
-		}
-
-		return $this->makeApiCall($params, PlaceServicesEndpoints::FINDPLACEFROMTEXT);
-	}
-
-	/**
-	 * @param array  $params
-	 * @param string $endpoint
-	 *
-	 * @return GoogleMapsResultsCollection
-	 * @since   0.5.0
-	 */
-	public function makeApiCall(array $params, string $endpoint): GoogleMapsResultsCollection
-	{
-
-		return $this->callApi($params, $endpoint);
-	}
-
-	/**
-	 * @param string     $number
-	 * @param array|null $params
-	 * @param array|null $fields
-	 *
-	 * @return GoogleMapsResultsCollection
-	 */
-	public function findPlaceByPhoneNumber(
-		string $number,
-		?array $params = [],
-		?array $fields = []
-	): GoogleMapsResultsCollection {
-
-		$params = array_merge($params, [
-			GoogleMapsRequestFields::INPUT     => $number,
-			GoogleMapsRequestFields::INPUTTYPE => PlaceInputTypeValues::PHONENUMBER,
-			GoogleMapsRequestFields::FIELDS    => implode(',', $fields)
-		]);
-
-		return $this->findPlace($params);
-
-	}
-
-	/**
-	 * @param Location   $location
-	 * @param int        $radius
-	 * @param array|null $params
-	 *
-	 * @return GoogleMapsResultsCollection
-	 */
-	public function findNearbyPlaceByRadius(Location $location, int $radius, ?array $params = []): GoogleMapsResultsCollection
-	{
-
-		$params = array_merge($params, [
-			GoogleMapsRequestFields::LOCATION => $location,
-			GoogleMapsRequestFields::RADIUS => $radius
-		]);
-
-		return $this->findNearbyPlace($params);
-	}
-
-	/**
-	 * @param Location $location
-	 * @param array    $params
-	 *
-	 * @return GoogleMapsResultsCollection
-	 */
-	public function findNearbyPlaceByDistance(Location $location, array $params): GoogleMapsResultsCollection
-	{
-
-		$params = array_merge($params, [
-			GoogleMapsRequestFields::LOCATION => $location,
-			GoogleMapsRequestFields::RANKBY => RankByValues::DISTANCE
-		]);
-
-		return $this->findNearbyPlace($params);
-	}
-
-	/**
-	 * Nearby Search requests
-	 *
-	 * @param array $params
-	 *
-	 * @return GoogleMapsResultsCollection
-	 *
-	 * @throws InvalidArgumentException
-	 * @see     https://developers.google.com/places/web-service/search#PlaceSearchRequests
-	 * @since   0.5.0
-	 */
-	public function findNearbyPlace(array $params): GoogleMapsResultsCollection
-	{
-
-		if (!empty($params[GoogleMapsRequestFields::LOCATION])) {//-33.8670522,151.1957362
-			$location = $params[GoogleMapsRequestFields::LOCATION];
-			if (!$location instanceof Location) {
-				throw new InvalidArgumentException(GoogleMapsRequestFields::LOCATION . ' field must be instance of ' . Location::class . ' class');
-			}
-			$params[GoogleMapsRequestFields::LOCATION] = (string)$params[GoogleMapsRequestFields::LOCATION];
-		} else {
-			throw new InvalidArgumentException(GoogleMapsResultFields::LOCATION . ' field is required');
-		}
-
-		if (!empty($params[GoogleMapsRequestFields::RANKBY]) &&
-			$params[GoogleMapsRequestFields::RANKBY] === RankByValues::DISTANCE
-		) {
-			if (empty($params[GoogleMapsRequestFields::KEYWORD]) &&
-				empty($params[GoogleMapsRequestFields::NAME]) &&
-				empty($params[GoogleMapsRequestFields::TYPE])) {
+    /**
+     * @var string
+     */
+    const SERVICE_ENDPOINT = 'place';
+
+    /**
+     * @var string
+     */
+    protected $result_collection = PlaceResultsCollection::class;
+
+    /**
+     * @param string     $query
+     * @param array|null $params
+     * @param array|null $fields
+     *
+     * @return GoogleMapsResultsCollection
+     * @see https://developers.google.com/places/web-service/search#FindPlaceRequests
+     */
+    public function findPlaceByText(
+        string $query,
+        ?array $params = [],
+        ?array $fields = []
+    ): GoogleMapsResultsCollection {
+
+        $params = array_merge($params, [
+            GoogleMapsRequestFields::INPUT  => $query,
+            GoogleMapsRequestFields::FIELDS => implode(',', $fields)
+        ]);
+
+        return $this->findPlace($params);
+
+    }
+
+    /**
+     * Find Places requests
+     *
+     * @param array $params
+     *        GoogleMapsRequestFields::INPUT required
+     *
+     * @see     https://developers.google.com/places/web-service/search#FindPlaceRequests
+     * @return GoogleMapsResultsCollection
+     * @throws InvalidArgumentException
+     * @since   0.5.0
+     */
+    public function findPlace(array $params): GoogleMapsResultsCollection
+    {
+
+        // see \Biscolab\GoogleMaps\Values\PlaceInputTypeValues
+        if (empty($params[GoogleMapsRequestFields::INPUTTYPE])) {
+            $params[GoogleMapsRequestFields::INPUTTYPE] = PlaceInputTypeValues::TEXTQUERY;
+        }
+
+        if (empty($params[GoogleMapsRequestFields::INPUT])) {
+            throw new InvalidArgumentException(GoogleMapsRequestFields::INPUT . " field is required");
+        }
+
+        return $this->makeApiCall($params, PlaceServicesEndpoints::FINDPLACEFROMTEXT);
+    }
+
+    /**
+     * @param array  $params
+     * @param string $endpoint
+     *
+     * @return GoogleMapsResultsCollection
+     * @since   0.5.0
+     */
+    public function makeApiCall(array $params, string $endpoint): GoogleMapsResultsCollection
+    {
+
+        return $this->callApi($params, $endpoint);
+    }
+
+    /**
+     * @param string     $number
+     * @param array|null $params
+     * @param array|null $fields
+     *
+     * @return GoogleMapsResultsCollection
+     */
+    public function findPlaceByPhoneNumber(
+        string $number,
+        ?array $params = [],
+        ?array $fields = []
+    ): GoogleMapsResultsCollection {
+
+        $params = array_merge($params, [
+            GoogleMapsRequestFields::INPUT     => $number,
+            GoogleMapsRequestFields::INPUTTYPE => PlaceInputTypeValues::PHONENUMBER,
+            GoogleMapsRequestFields::FIELDS    => implode(',', $fields)
+        ]);
+
+        return $this->findPlace($params);
+
+    }
+
+    /**
+     * @param Location   $location
+     * @param int        $radius
+     * @param array|null $params
+     *
+     * @return GoogleMapsResultsCollection
+     */
+    public function findNearbyPlaceByRadius(Location $location, int $radius, ?array $params = []): GoogleMapsResultsCollection
+    {
+
+        $params = array_merge($params, [
+            GoogleMapsRequestFields::LOCATION => $location,
+            GoogleMapsRequestFields::RADIUS => $radius
+        ]);
+
+        return $this->findNearbyPlace($params);
+    }
+
+    /**
+     * @param Location $location
+     * @param array    $params
+     *
+     * @return GoogleMapsResultsCollection
+     */
+    public function findNearbyPlaceByDistance(Location $location, array $params): GoogleMapsResultsCollection
+    {
+
+        $params = array_merge($params, [
+            GoogleMapsRequestFields::LOCATION => $location,
+            GoogleMapsRequestFields::RANKBY => RankByValues::DISTANCE
+        ]);
+
+        return $this->findNearbyPlace($params);
+    }
+
+    /**
+     * Nearby Search requests
+     *
+     * @param array $params
+     *
+     * @return GoogleMapsResultsCollection
+     *
+     * @throws InvalidArgumentException
+     * @see     https://developers.google.com/places/web-service/search#PlaceSearchRequests
+     * @since   0.5.0
+     */
+    public function findNearbyPlace(array $params): GoogleMapsResultsCollection
+    {
+
+        if (!empty($params[GoogleMapsRequestFields::LOCATION])) {//-33.8670522,151.1957362
+            $location = $params[GoogleMapsRequestFields::LOCATION];
+            if (!$location instanceof Location) {
+                throw new InvalidArgumentException(GoogleMapsRequestFields::LOCATION . ' field must be instance of ' . Location::class . ' class');
+            }
+            $params[GoogleMapsRequestFields::LOCATION] = (string)$params[GoogleMapsRequestFields::LOCATION];
+        } else {
+            throw new InvalidArgumentException(GoogleMapsResultFields::LOCATION . ' field is required');
+        }
+
+        if (!empty($params[GoogleMapsRequestFields::RANKBY]) &&
+            $params[GoogleMapsRequestFields::RANKBY] === RankByValues::DISTANCE
+        ) {
+            if (empty($params[GoogleMapsRequestFields::KEYWORD]) &&
+                empty($params[GoogleMapsRequestFields::NAME]) &&
+                empty($params[GoogleMapsRequestFields::TYPE])) {
 //				If rankby=distance (described under Optional parameters below) is specified,
 // 				then one or more of keyword, name, or type is required.
-				throw new InvalidArgumentException('If ' . GoogleMapsRequestFields::RANKBY . ' is set as "' . RankByValues::DISTANCE . '" one or more of ' . GoogleMapsRequestFields::KEYWORD . ', ' . GoogleMapsRequestFields::NAME . ', ' . GoogleMapsRequestFields::TYPE . ' fields are required');
-			}
-			if (!empty($params[GoogleMapsRequestFields::RADIUS])) {
+                throw new InvalidArgumentException('If ' . GoogleMapsRequestFields::RANKBY . ' is set as "' . RankByValues::DISTANCE . '" one or more of ' . GoogleMapsRequestFields::KEYWORD . ', ' . GoogleMapsRequestFields::NAME . ', ' . GoogleMapsRequestFields::TYPE . ' fields are required');
+            }
+            if (!empty($params[GoogleMapsRequestFields::RADIUS])) {
 // 				Note that radius must not be included if rankby=distance (described under Optional parameters below) is specified.
-				throw new InvalidArgumentException(GoogleMapsRequestFields::RADIUS . ' must not be included if ' . GoogleMapsRequestFields::RANKBY . ' = ' . RankByValues::DISTANCE);
-			}
-		} elseif (empty($params[GoogleMapsRequestFields::RADIUS])) {
+                throw new InvalidArgumentException(GoogleMapsRequestFields::RADIUS . ' must not be included if ' . GoogleMapsRequestFields::RANKBY . ' = ' . RankByValues::DISTANCE);
+            }
+        } elseif (empty($params[GoogleMapsRequestFields::RADIUS])) {
 //			radius — Defines the distance (in meters) within which to return place results.
-			throw new InvalidArgumentException(GoogleMapsRequestFields::RADIUS . ' field is required');
-		}
+            throw new InvalidArgumentException(GoogleMapsRequestFields::RADIUS . ' field is required');
+        }
 
-		if (!empty($params[GoogleMapsRequestFields::RADIUS]) && floatval($params[GoogleMapsRequestFields::RADIUS]) > Util::MAX_PLACE_RADIUS_VALUE) {
+        if (!empty($params[GoogleMapsRequestFields::RADIUS]) && floatval($params[GoogleMapsRequestFields::RADIUS]) > Util::MAX_PLACE_RADIUS_VALUE) {
 // 			The maximum allowed radius is 50 000 meters.
-			throw new InvalidArgumentException(GoogleMapsRequestFields::RADIUS . ' must be lower than ' . Util::MAX_PLACE_RADIUS_VALUE);
-		}
-
-		return $this->makeApiCall($params, PlaceServicesEndpoints::NEARBYSEARCH);
-	}
-
-	/**
-	 * Nearby Search requests
-	 *
-	 * @param string     $query
-	 * @param array|null $params
-	 *
-	 * @see     https://developers.google.com/places/web-service/search#TextSearchRequests
-	 * @return GoogleMapsResultsCollection
-	 * @throws InvalidArgumentException
-	 * @since   0.5.0
-	 */
-	public function textSearch(string $query, ?array $params = []): GoogleMapsResultsCollection
-	{
-
-		$params = array_merge($params, [
-			GoogleMapsRequestFields::QUERY => $query
-		]);
-
-		return $this->makeApiCall($params, PlaceServicesEndpoints::TEXTSEARCH);
-	}
+            throw new InvalidArgumentException(GoogleMapsRequestFields::RADIUS . ' must be lower than ' . Util::MAX_PLACE_RADIUS_VALUE);
+        }
+
+        return $this->makeApiCall($params, PlaceServicesEndpoints::NEARBYSEARCH);
+    }
+
+    /**
+     * Nearby Search requests
+     *
+     * @param string     $query
+     * @param array|null $params
+     *
+     * @see     https://developers.google.com/places/web-service/search#TextSearchRequests
+     * @return GoogleMapsResultsCollection
+     * @throws InvalidArgumentException
+     * @since   0.5.0
+     */
+    public function textSearch(string $query, ?array $params = []): GoogleMapsResultsCollection
+    {
+
+        $params = array_merge($params, [
+            GoogleMapsRequestFields::QUERY => $query
+        ]);
+
+        return $this->makeApiCall($params, PlaceServicesEndpoints::TEXTSEARCH);
+    }
 
 }
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -85,7 +85,7 @@ 
 		}
 
 		if (empty($params[GoogleMapsRequestFields::INPUT])) {
-			throw new InvalidArgumentException(GoogleMapsRequestFields::INPUT . " field is required");
+			throw new InvalidArgumentException(GoogleMapsRequestFields::INPUT." field is required");
 		}
 
 		return $this->makeApiCall($params, PlaceServicesEndpoints::FINDPLACEFROMTEXT);
@@ -179,11 +179,11 @@ 
 		if (!empty($params[GoogleMapsRequestFields::LOCATION])) {//-33.8670522,151.1957362
 			$location = $params[GoogleMapsRequestFields::LOCATION];
 			if (!$location instanceof Location) {
-				throw new InvalidArgumentException(GoogleMapsRequestFields::LOCATION . ' field must be instance of ' . Location::class . ' class');
+				throw new InvalidArgumentException(GoogleMapsRequestFields::LOCATION.' field must be instance of '.Location::class.' class');
 			}
-			$params[GoogleMapsRequestFields::LOCATION] = (string)$params[GoogleMapsRequestFields::LOCATION];
+			$params[GoogleMapsRequestFields::LOCATION] = (string) $params[GoogleMapsRequestFields::LOCATION];
 		} else {
-			throw new InvalidArgumentException(GoogleMapsResultFields::LOCATION . ' field is required');
+			throw new InvalidArgumentException(GoogleMapsResultFields::LOCATION.' field is required');
 		}
 
 		if (!empty($params[GoogleMapsRequestFields::RANKBY]) &&
@@ -194,20 +194,20 @@ 
 				empty($params[GoogleMapsRequestFields::TYPE])) {
 //				If rankby=distance (described under Optional parameters below) is specified,
 // 				then one or more of keyword, name, or type is required.
-				throw new InvalidArgumentException('If ' . GoogleMapsRequestFields::RANKBY . ' is set as "' . RankByValues::DISTANCE . '" one or more of ' . GoogleMapsRequestFields::KEYWORD . ', ' . GoogleMapsRequestFields::NAME . ', ' . GoogleMapsRequestFields::TYPE . ' fields are required');
+				throw new InvalidArgumentException('If '.GoogleMapsRequestFields::RANKBY.' is set as "'.RankByValues::DISTANCE.'" one or more of '.GoogleMapsRequestFields::KEYWORD.', '.GoogleMapsRequestFields::NAME.', '.GoogleMapsRequestFields::TYPE.' fields are required');
 			}
 			if (!empty($params[GoogleMapsRequestFields::RADIUS])) {
 // 				Note that radius must not be included if rankby=distance (described under Optional parameters below) is specified.
-				throw new InvalidArgumentException(GoogleMapsRequestFields::RADIUS . ' must not be included if ' . GoogleMapsRequestFields::RANKBY . ' = ' . RankByValues::DISTANCE);
+				throw new InvalidArgumentException(GoogleMapsRequestFields::RADIUS.' must not be included if '.GoogleMapsRequestFields::RANKBY.' = '.RankByValues::DISTANCE);
 			}
 		} elseif (empty($params[GoogleMapsRequestFields::RADIUS])) {
 //			radius — Defines the distance (in meters) within which to return place results.
-			throw new InvalidArgumentException(GoogleMapsRequestFields::RADIUS . ' field is required');
+			throw new InvalidArgumentException(GoogleMapsRequestFields::RADIUS.' field is required');
 		}
 
 		if (!empty($params[GoogleMapsRequestFields::RADIUS]) && floatval($params[GoogleMapsRequestFields::RADIUS]) > Util::MAX_PLACE_RADIUS_VALUE) {
 // 			The maximum allowed radius is 50 000 meters.
-			throw new InvalidArgumentException(GoogleMapsRequestFields::RADIUS . ' must be lower than ' . Util::MAX_PLACE_RADIUS_VALUE);
+			throw new InvalidArgumentException(GoogleMapsRequestFields::RADIUS.' must be lower than '.Util::MAX_PLACE_RADIUS_VALUE);
 		}
 
 		return $this->makeApiCall($params, PlaceServicesEndpoints::NEARBYSEARCH);

src/Api/Geocoding.php

Indentation +41 added lines, -41 removed lines

@@ -25,53 +25,53 @@
 class Geocoding extends Api
 {
 
-	/**
-	 * @var string
-	 */
-	const SERVICE_ENDPOINT = 'geocode';
+    /**
+     * @var string
+     */
+    const SERVICE_ENDPOINT = 'geocode';
 
-	/**
-	 * @var string
-	 */
-	protected $result_collection = GeocodingResultsCollection::class;
+    /**
+     * @var string
+     */
+    protected $result_collection = GeocodingResultsCollection::class;
 
-	/**
-	 * @param string $literal_address
-	 *
-	 * @return GoogleMapsResultsCollection
-	 */
-	public function getByAddress(string $literal_address): GoogleMapsResultsCollection
-	{
+    /**
+     * @param string $literal_address
+     *
+     * @return GoogleMapsResultsCollection
+     */
+    public function getByAddress(string $literal_address): GoogleMapsResultsCollection
+    {
 
-		return $this->callApi([
-			GoogleMapsRequestFields::ADDRESS => $literal_address
-		]);
-	}
+        return $this->callApi([
+            GoogleMapsRequestFields::ADDRESS => $literal_address
+        ]);
+    }
 
-	/**
-	 * @param LatLng $latlng
-	 *
-	 * @return GoogleMapsResultsCollection
-	 */
-	public function getReverse(LatLng $latlng): GoogleMapsResultsCollection
-	{
+    /**
+     * @param LatLng $latlng
+     *
+     * @return GoogleMapsResultsCollection
+     */
+    public function getReverse(LatLng $latlng): GoogleMapsResultsCollection
+    {
 
-		return $this->callApi([
-			GoogleMapsRequestFields::LATLNG => $latlng
-		]);
-	}
+        return $this->callApi([
+            GoogleMapsRequestFields::LATLNG => $latlng
+        ]);
+    }
 
-	/**
-	 * @param string $place_id
-	 *
-	 * @return GoogleMapsResultsCollection
-	 */
-	public function getByPlaceId(string $place_id): GoogleMapsResultsCollection
-	{
+    /**
+     * @param string $place_id
+     *
+     * @return GoogleMapsResultsCollection
+     */
+    public function getByPlaceId(string $place_id): GoogleMapsResultsCollection
+    {
 
-		return $this->callApi([
-			GoogleMapsRequestFields::PLACE_ID => $place_id
-		]);
-	}
+        return $this->callApi([
+            GoogleMapsRequestFields::PLACE_ID => $place_id
+        ]);
+    }
 
 }
\ No newline at end of file

src/Api/Elevation.php

Indentation +87 added lines, -87 removed lines

@@ -28,92 +28,92 @@
 class Elevation extends Api
 {
 
-	/**
-	 * @var string
-	 */
-	const SERVICE_ENDPOINT = 'elevation';
-
-	/**
-	 * @var string
-	 */
-	protected $result_collection = ElevationResultsCollection::class;
-
-	/**
-	 * Positional Requests
-	 *
-	 * @param LatLng|string|array $locations
-	 * This parameter takes either a single location or multiple locations passed as an array or as an encoded polyline
-	 *
-	 * @return GoogleMapsResultsCollection
-	 *
-	 * @since 0.3.0
-	 */
-	public function getByLocations($locations): GoogleMapsResultsCollection
-	{
-
-		$locations = $this->parseLocations($locations);
-
-		return $this->callApi([
-			GoogleMapsRequestFields::LOCATIONS => $locations
-		]);
-	}
-
-	/**
-	 * @param array|string $locations
-	 *
-	 * @return string
-	 *
-	 * @since   0.3.0
-	 */
-	public function parseLocations($locations): string
-	{
-
-		if ($locations instanceof Path) {
-			$locations = $locations->toArray();
-		}
-
-		if (is_array($locations)) {
-			$locations = implode('|', array_map(function ($item) {
-
-				return (string)$item;
-			}, $locations));
-		}
-
-		return (string)$locations;
-	}
-
-	/**
-	 * Sampled Path Requests
-	 *
-	 * @param array|string $path
-	 * This parameter takes either a multiple locations passed as an array or as an encoded polyline
-	 *
-	 * @param int          $samples
-	 * This will be the number of results as well
-	 *
-	 * @throws InvalidArgumentException
-	 * @return GoogleMapsResultsCollection
-	 *
-	 * @since 0.4.0
-	 */
-	public function getBySampledPath($path, int $samples): GoogleMapsResultsCollection
-	{
-
-		if ((is_array($path) && count($path) < 2) ||
-			$path instanceof Path && $path->count() < 2) {
-			throw new InvalidArgumentException('The number of items provided in the path must be greater than 1 (One)');
-		}
-
-		if ($samples <= 0) {
-			throw new InvalidArgumentException('The number of samples must be greater than 0 (Zero)');
-		}
-
-		$path = $this->parseLocations($path);
-
-		return $this->callApi([
-			GoogleMapsRequestFields::PATH    => $path,
-			GoogleMapsRequestFields::SAMPLES => $samples,
-		]);
-	}
+    /**
+     * @var string
+     */
+    const SERVICE_ENDPOINT = 'elevation';
+
+    /**
+     * @var string
+     */
+    protected $result_collection = ElevationResultsCollection::class;
+
+    /**
+     * Positional Requests
+     *
+     * @param LatLng|string|array $locations
+     * This parameter takes either a single location or multiple locations passed as an array or as an encoded polyline
+     *
+     * @return GoogleMapsResultsCollection
+     *
+     * @since 0.3.0
+     */
+    public function getByLocations($locations): GoogleMapsResultsCollection
+    {
+
+        $locations = $this->parseLocations($locations);
+
+        return $this->callApi([
+            GoogleMapsRequestFields::LOCATIONS => $locations
+        ]);
+    }
+
+    /**
+     * @param array|string $locations
+     *
+     * @return string
+     *
+     * @since   0.3.0
+     */
+    public function parseLocations($locations): string
+    {
+
+        if ($locations instanceof Path) {
+            $locations = $locations->toArray();
+        }
+
+        if (is_array($locations)) {
+            $locations = implode('|', array_map(function ($item) {
+
+                return (string)$item;
+            }, $locations));
+        }
+
+        return (string)$locations;
+    }
+
+    /**
+     * Sampled Path Requests
+     *
+     * @param array|string $path
+     * This parameter takes either a multiple locations passed as an array or as an encoded polyline
+     *
+     * @param int          $samples
+     * This will be the number of results as well
+     *
+     * @throws InvalidArgumentException
+     * @return GoogleMapsResultsCollection
+     *
+     * @since 0.4.0
+     */
+    public function getBySampledPath($path, int $samples): GoogleMapsResultsCollection
+    {
+
+        if ((is_array($path) && count($path) < 2) ||
+            $path instanceof Path && $path->count() < 2) {
+            throw new InvalidArgumentException('The number of items provided in the path must be greater than 1 (One)');
+        }
+
+        if ($samples <= 0) {
+            throw new InvalidArgumentException('The number of samples must be greater than 0 (Zero)');
+        }
+
+        $path = $this->parseLocations($path);
+
+        return $this->callApi([
+            GoogleMapsRequestFields::PATH    => $path,
+            GoogleMapsRequestFields::SAMPLES => $samples,
+        ]);
+    }
 
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -73,13 +73,13 @@
 		}
 
 		if (is_array($locations)) {
-			$locations = implode('|', array_map(function ($item) {
+			$locations = implode('|', array_map(function($item) {
 
-				return (string)$item;
+				return (string) $item;
 			}, $locations));
 		}
 
-		return (string)$locations;
+		return (string) $locations;
 	}
 
 	/**

src/GoogleMapsApi.php

Indentation +274 added lines, -274 removed lines

@@ -25,279 +25,279 @@
 class GoogleMapsApi
 {
 
-	/**
-	 * @var GoogleMapsApi
-	 */
-	protected static $instance = null;
-
-	/**
-	 * @var GoogleMapsRequest
-	 */
-	protected $request = null;
-
-	/**
-	 * Google Maps Geocode Service API url
-	 * @var string
-	 */
-	private $api_url = "https://maps.googleapis.com/maps/api/";
-
-	/**
-	 * your own Google Maps API key
-	 * @var string
-	 * @see https://developers.google.com/maps/documentation/javascript/get-api-key
-	 */
-	private $key = '';
-
-	/**
-	 * Google Maps API sensor
-	 * @var string - true|false
-	 */
-	private $sensor = 'false';
-
-	/**
-	 * Google Maps API service name
-	 * @var string
-	 */
-	private $service_endpoint = '';
-
-	/**
-	 * @var string
-	 */
-	private $response = null;
-
-	/**
-	 * @var GoogleMapsClient
-	 */
-	private $client = null;
-
-	/**
-	 * @var string
-	 */
-	private $type = null;
-
-	/**
-	 * GoogleMapsApi constructor.
-	 *
-	 * @param array $config
-	 */
-	public function __construct(array $config = [])
-	{
-
-		// Set "API key"
-		$key = (empty($config[GoogleMapsApiConfigFields::KEY])) ? '' : $config[GoogleMapsApiConfigFields::KEY];
-		$this->setKey($key);
-
-		// Set "sensor"
-		$sensor = (empty($config[GoogleMapsApiConfigFields::SENSOR])) ? SensorValues::FALSE : $config[GoogleMapsApiConfigFields::SENSOR];
-		$this->setSensor($sensor);
-
-		// Set the endpoint
-		$service_endpoint = (empty($config[GoogleMapsApiConfigFields::SERVICE_ENDPOINT])) ? '' : $config[GoogleMapsApiConfigFields::SERVICE_ENDPOINT];
-		$this->setServiceEndpoint($service_endpoint);
-
-		// Set Client
-		$this->setClient();
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getApiUrl(): string
-	{
-
-		return $this->api_url;
-	}
-
-	/**
-	 * Perform the Google Maps API call
-	 *
-	 * @param GoogleMapsRequest $request
-	 *
-	 * @return Http\GoogleMapsResponse|string
-	 */
-	public function get(GoogleMapsRequest $request)
-	{
-
-		$this->setRequest($request);
-
-		$url = $this->getUrl();
-
-		$query = $this->getQuery();
-
-		$this->response = $this->getClient()->get($url, $query);
-
-		return $this->response;
-	}
-
-	/**
-	 * @return string
-	 * @throws RequestException
-	 */
-	public function getUrl(): string
-	{
-
-		$url_chunks = [];
-		$service_endpoint = $this->getServiceEndpoint();
-		if (!$service_endpoint) {
-			throw new RequestException('Service name missing!');
-		}
-
-		$request_endpoint = $this->request->getEndpoint();
-		array_push($url_chunks, $this->api_url . $service_endpoint);
-
-		if($request_endpoint) {
-			array_push($url_chunks, $request_endpoint);
-		}
-
-		array_push($url_chunks, GoogleMapsResponseFormat::JSON);
-		return implode("/", $url_chunks);
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getServiceEndpoint(): string
-	{
-
-		return $this->service_endpoint;
-	}
-
-	/**
-	 * @param string $service_endpoint
-	 *
-	 * @return GoogleMapsApi
-	 */
-	public function setServiceEndpoint(string $service_endpoint): GoogleMapsApi
-	{
-
-		$this->service_endpoint = $service_endpoint;
-
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getQuery(): string
-	{
-
-		$api_query = http_build_query([
-			GoogleMapsRequestFields::KEY    => $this->getKey(),
-			GoogleMapsRequestFields::SENSOR => $this->getSensor(),
-		]);
-
-		$request_query = $this->getRequest()->getQuery();
-
-		return implode('&', [
-			$api_query,
-			$request_query
-		]);
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getKey(): string
-	{
-
-		return $this->key;
-	}
-
-	/**
-	 * @param string $key
-	 *
-	 * @return GoogleMapsApi
-	 */
-	public function setKey(string $key): GoogleMapsApi
-	{
-
-		$this->key = $key;
-
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getSensor(): string
-	{
-
-		return $this->sensor ? 'true' : 'false';
-	}
-
-	/**
-	 * Set sensor parameter
-	 *
-	 * @param bool|string $sensor
-	 *
-	 * @return GoogleMapsApi
-	 */
-	public function setSensor($sensor): GoogleMapsApi
-	{
-
-		if ($sensor !== SensorValues::FALSE) {
-			$sensor = SensorValues::TRUE;
-		}
-		$this->sensor = $sensor;
-
-		return $this;
-	}
-
-	/**
-	 * @return GoogleMapsRequest
-	 */
-	public function getRequest(): GoogleMapsRequest
-	{
-
-		return $this->request;
-	}
-
-	/**
-	 * @param GoogleMapsRequest $request
-	 *
-	 * @return GoogleMapsApi
-	 */
-	public function setRequest(GoogleMapsRequest $request)
-	{
-
-		$this->request = $request;
-
-		return $this;
-	}
-
-	/**
-	 * @return GoogleMapsClient
-	 */
-	public function getClient()
-	{
-
-		return $this->client;
-	}
-
-	/**
-	 * @param GoogleMapsClient|null $client
-	 *
-	 * @return GoogleMapsApi
-	 */
-	public function setClient(?GoogleMapsClient $client = null): GoogleMapsApi
-	{
-
-		$this->client = $client ?? new GoogleMapsClient();
-
-		return $this;
-	}
-
-	/**
-	 * @param string $type
-	 *
-	 * @return GoogleMapsApi
-	 */
-	protected function setType(string $type): GoogleMapsApi
-	{
-
-		$this->type = $type;
-
-		return $this;
-	}
+    /**
+     * @var GoogleMapsApi
+     */
+    protected static $instance = null;
+
+    /**
+     * @var GoogleMapsRequest
+     */
+    protected $request = null;
+
+    /**
+     * Google Maps Geocode Service API url
+     * @var string
+     */
+    private $api_url = "https://maps.googleapis.com/maps/api/";
+
+    /**
+     * your own Google Maps API key
+     * @var string
+     * @see https://developers.google.com/maps/documentation/javascript/get-api-key
+     */
+    private $key = '';
+
+    /**
+     * Google Maps API sensor
+     * @var string - true|false
+     */
+    private $sensor = 'false';
+
+    /**
+     * Google Maps API service name
+     * @var string
+     */
+    private $service_endpoint = '';
+
+    /**
+     * @var string
+     */
+    private $response = null;
+
+    /**
+     * @var GoogleMapsClient
+     */
+    private $client = null;
+
+    /**
+     * @var string
+     */
+    private $type = null;
+
+    /**
+     * GoogleMapsApi constructor.
+     *
+     * @param array $config
+     */
+    public function __construct(array $config = [])
+    {
+
+        // Set "API key"
+        $key = (empty($config[GoogleMapsApiConfigFields::KEY])) ? '' : $config[GoogleMapsApiConfigFields::KEY];
+        $this->setKey($key);
+
+        // Set "sensor"
+        $sensor = (empty($config[GoogleMapsApiConfigFields::SENSOR])) ? SensorValues::FALSE : $config[GoogleMapsApiConfigFields::SENSOR];
+        $this->setSensor($sensor);
+
+        // Set the endpoint
+        $service_endpoint = (empty($config[GoogleMapsApiConfigFields::SERVICE_ENDPOINT])) ? '' : $config[GoogleMapsApiConfigFields::SERVICE_ENDPOINT];
+        $this->setServiceEndpoint($service_endpoint);
+
+        // Set Client
+        $this->setClient();
+    }
+
+    /**
+     * @return string
+     */
+    public function getApiUrl(): string
+    {
+
+        return $this->api_url;
+    }
+
+    /**
+     * Perform the Google Maps API call
+     *
+     * @param GoogleMapsRequest $request
+     *
+     * @return Http\GoogleMapsResponse|string
+     */
+    public function get(GoogleMapsRequest $request)
+    {
+
+        $this->setRequest($request);
+
+        $url = $this->getUrl();
+
+        $query = $this->getQuery();
+
+        $this->response = $this->getClient()->get($url, $query);
+
+        return $this->response;
+    }
+
+    /**
+     * @return string
+     * @throws RequestException
+     */
+    public function getUrl(): string
+    {
+
+        $url_chunks = [];
+        $service_endpoint = $this->getServiceEndpoint();
+        if (!$service_endpoint) {
+            throw new RequestException('Service name missing!');
+        }
+
+        $request_endpoint = $this->request->getEndpoint();
+        array_push($url_chunks, $this->api_url . $service_endpoint);
+
+        if($request_endpoint) {
+            array_push($url_chunks, $request_endpoint);
+        }
+
+        array_push($url_chunks, GoogleMapsResponseFormat::JSON);
+        return implode("/", $url_chunks);
+    }
+
+    /**
+     * @return string
+     */
+    public function getServiceEndpoint(): string
+    {
+
+        return $this->service_endpoint;
+    }
+
+    /**
+     * @param string $service_endpoint
+     *
+     * @return GoogleMapsApi
+     */
+    public function setServiceEndpoint(string $service_endpoint): GoogleMapsApi
+    {
+
+        $this->service_endpoint = $service_endpoint;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getQuery(): string
+    {
+
+        $api_query = http_build_query([
+            GoogleMapsRequestFields::KEY    => $this->getKey(),
+            GoogleMapsRequestFields::SENSOR => $this->getSensor(),
+        ]);
+
+        $request_query = $this->getRequest()->getQuery();
+
+        return implode('&', [
+            $api_query,
+            $request_query
+        ]);
+    }
+
+    /**
+     * @return string
+     */
+    public function getKey(): string
+    {
+
+        return $this->key;
+    }
+
+    /**
+     * @param string $key
+     *
+     * @return GoogleMapsApi
+     */
+    public function setKey(string $key): GoogleMapsApi
+    {
+
+        $this->key = $key;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSensor(): string
+    {
+
+        return $this->sensor ? 'true' : 'false';
+    }
+
+    /**
+     * Set sensor parameter
+     *
+     * @param bool|string $sensor
+     *
+     * @return GoogleMapsApi
+     */
+    public function setSensor($sensor): GoogleMapsApi
+    {
+
+        if ($sensor !== SensorValues::FALSE) {
+            $sensor = SensorValues::TRUE;
+        }
+        $this->sensor = $sensor;
+
+        return $this;
+    }
+
+    /**
+     * @return GoogleMapsRequest
+     */
+    public function getRequest(): GoogleMapsRequest
+    {
+
+        return $this->request;
+    }
+
+    /**
+     * @param GoogleMapsRequest $request
+     *
+     * @return GoogleMapsApi
+     */
+    public function setRequest(GoogleMapsRequest $request)
+    {
+
+        $this->request = $request;
+
+        return $this;
+    }
+
+    /**
+     * @return GoogleMapsClient
+     */
+    public function getClient()
+    {
+
+        return $this->client;
+    }
+
+    /**
+     * @param GoogleMapsClient|null $client
+     *
+     * @return GoogleMapsApi
+     */
+    public function setClient(?GoogleMapsClient $client = null): GoogleMapsApi
+    {
+
+        $this->client = $client ?? new GoogleMapsClient();
+
+        return $this;
+    }
+
+    /**
+     * @param string $type
+     *
+     * @return GoogleMapsApi
+     */
+    protected function setType(string $type): GoogleMapsApi
+    {
+
+        $this->type = $type;
+
+        return $this;
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -143,9 +143,9 @@
 		}
 
 		$request_endpoint = $this->request->getEndpoint();
-		array_push($url_chunks, $this->api_url . $service_endpoint);
+		array_push($url_chunks, $this->api_url.$service_endpoint);
 
-		if($request_endpoint) {
+		if ($request_endpoint) {
 			array_push($url_chunks, $request_endpoint);
 		}
 

src/Abstracts/AbstractCollection.php

Indentation +222 added lines, -222 removed lines

@@ -17,227 +17,227 @@
 abstract class AbstractCollection implements \Iterator, \Countable
 {
 
-	/**
-	 * @var array
-	 */
-	protected $items = [];
-
-	/**
-	 * @var int
-	 */
-	protected $index = 0;
-
-	/**
-	 * AbstractCollection constructor.
-	 *
-	 * @param null|array $items
-	 */
-	public function __construct(?array $items = [])
-	{
-
-		$this->setItems($items);
-	}
-
-	/**
-	 * @param array $items
-	 *
-	 * @return AbstractCollection
-	 */
-	protected function setItems(?array $items = [])
-	{
-
-		if (is_array($items) && count($items)) {
-			foreach ($items as $item) {
-				$this->addItem($item);
-			}
-		}
-
-		return $this;
-	}
-
-	/**
-	 * @param $item
-	 *
-	 * @return AbstractCollection
-	 */
-	public function addItem($item)
-	{
-
-		$item = $this->parseItem($item);
-		array_push($this->items, $item);
-
-		return $this;
-	}
-
-	/**
-	 * @param $item
-	 *
-	 * @return mixed
-	 */
-	protected function parseItem($item)
-	{
-
-		return $item;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function toJson(): string
-	{
-
-		return json_encode($this->toArray());
-	}
-
-	/**
-	 * @return array
-	 */
-	public function toArray(): array
-	{
-
-		return $this->items;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function __toString(): string
-	{
-
-		return implode(',', $this->toArray());
-	}
-
-	/**
-	 * Return the current position of the index
-	 *
-	 * @return int
-	 */
-	public function position(): int
-	{
-
-		return $this->index;
-	}
-
-	/**
-	 * Move index to first position and return current element
-	 *
-	 * @return mixed|null
-	 */
-	public function first()
-	{
-
-		return $this->get(0);
-	}
-
-	/**
-	 * @param $index
-	 *
-	 * @return mixed|null
-	 */
-	public function get(int $index)
-	{
-
-		return isset($this->items[$index]) ? $this->items[$index] : null;
-	}
-
-	/**
-	 * Move the index at the specified position
-	 *
-	 * @param int|null $index
-	 *
-	 * @return mixed|null
-	 */
-	public function seek(?int $index = 0)
-	{
-
-		$this->index = ($index < $this->count()) ? $index : $this->getLastIndex();
-
-		return $this->get(intval($this->index));
-	}
-
-	/**
-	 * @return int
-	 */
-	public function count(): int
-	{
-
-		return count($this->items);
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getLastIndex(): int
-	{
-
-		$last_position = $this->count() - 1;
-
-		return ($last_position) < 0 ? 0 : $last_position;
-	}
-
-	/**
-	 * Move index at the end of collection and return current element
-	 *
-	 * @return mixed|null
-	 */
-	public function last()
-	{
-
-		return $this->get($this->getLastIndex());
-	}
-
-	/**
-	 *
-	 * @return mixed|null
-	 */
-	public function current()
-	{
-
-		return $this->get($this->index);
-	}
-
-	/**
-	 * Move index to next position and return current element
-	 *
-	 * @return mixed|null
-	 */
-	public function next()
-	{
-
-		++$this->index;
-	}
-
-	/**
-	 * Return current key/index
-	 *
-	 * @return mixed|null
-	 */
-	public function key()
-	{
-
-		return $this->index;
-	}
-
-	/**
-	 * Return current key/index
-	 *
-	 * @return mixed|null
-	 */
-	public function valid()
-	{
-
-		return !empty($this->current());
-	}
-
-	/**
-	 * Move index to first position and return current element
-	 *
-	 * @return mixed|null
-	 */
-	public function rewind()
-	{
-
-		return $this->index = 0;
-	}
+    /**
+     * @var array
+     */
+    protected $items = [];
+
+    /**
+     * @var int
+     */
+    protected $index = 0;
+
+    /**
+     * AbstractCollection constructor.
+     *
+     * @param null|array $items
+     */
+    public function __construct(?array $items = [])
+    {
+
+        $this->setItems($items);
+    }
+
+    /**
+     * @param array $items
+     *
+     * @return AbstractCollection
+     */
+    protected function setItems(?array $items = [])
+    {
+
+        if (is_array($items) && count($items)) {
+            foreach ($items as $item) {
+                $this->addItem($item);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param $item
+     *
+     * @return AbstractCollection
+     */
+    public function addItem($item)
+    {
+
+        $item = $this->parseItem($item);
+        array_push($this->items, $item);
+
+        return $this;
+    }
+
+    /**
+     * @param $item
+     *
+     * @return mixed
+     */
+    protected function parseItem($item)
+    {
+
+        return $item;
+    }
+
+    /**
+     * @return string
+     */
+    public function toJson(): string
+    {
+
+        return json_encode($this->toArray());
+    }
+
+    /**
+     * @return array
+     */
+    public function toArray(): array
+    {
+
+        return $this->items;
+    }
+
+    /**
+     * @return string
+     */
+    public function __toString(): string
+    {
+
+        return implode(',', $this->toArray());
+    }
+
+    /**
+     * Return the current position of the index
+     *
+     * @return int
+     */
+    public function position(): int
+    {
+
+        return $this->index;
+    }
+
+    /**
+     * Move index to first position and return current element
+     *
+     * @return mixed|null
+     */
+    public function first()
+    {
+
+        return $this->get(0);
+    }
+
+    /**
+     * @param $index
+     *
+     * @return mixed|null
+     */
+    public function get(int $index)
+    {
+
+        return isset($this->items[$index]) ? $this->items[$index] : null;
+    }
+
+    /**
+     * Move the index at the specified position
+     *
+     * @param int|null $index
+     *
+     * @return mixed|null
+     */
+    public function seek(?int $index = 0)
+    {
+
+        $this->index = ($index < $this->count()) ? $index : $this->getLastIndex();
+
+        return $this->get(intval($this->index));
+    }
+
+    /**
+     * @return int
+     */
+    public function count(): int
+    {
+
+        return count($this->items);
+    }
+
+    /**
+     * @return int
+     */
+    public function getLastIndex(): int
+    {
+
+        $last_position = $this->count() - 1;
+
+        return ($last_position) < 0 ? 0 : $last_position;
+    }
+
+    /**
+     * Move index at the end of collection and return current element
+     *
+     * @return mixed|null
+     */
+    public function last()
+    {
+
+        return $this->get($this->getLastIndex());
+    }
+
+    /**
+     *
+     * @return mixed|null
+     */
+    public function current()
+    {
+
+        return $this->get($this->index);
+    }
+
+    /**
+     * Move index to next position and return current element
+     *
+     * @return mixed|null
+     */
+    public function next()
+    {
+
+        ++$this->index;
+    }
+
+    /**
+     * Return current key/index
+     *
+     * @return mixed|null
+     */
+    public function key()
+    {
+
+        return $this->index;
+    }
+
+    /**
+     * Return current key/index
+     *
+     * @return mixed|null
+     */
+    public function valid()
+    {
+
+        return !empty($this->current());
+    }
+
+    /**
+     * Move index to first position and return current element
+     *
+     * @return mixed|null
+     */
+    public function rewind()
+    {
+
+        return $this->index = 0;
+    }
 
 }
\ No newline at end of file

src/Abstracts/Api.php

Indentation +154 added lines, -154 removed lines

@@ -24,158 +24,158 @@
 abstract class Api
 {
 
-	/**
-	 * @var string
-	 */
-	const SERVICE_ENDPOINT = null;
-
-	/**
-	 * @var GoogleMapsApi
-	 */
-	protected $google_maps_api = null;
-
-	/**
-	 * @var string
-	 */
-	protected $result_collection = '';
-
-	/**
-	 * @var GoogleMapsResponse
-	 */
-	protected $response;
-
-	/**
-	 * @var GoogleMapsRequest
-	 */
-	protected $request;
-
-	/**
-	 * Api constructor.
-	 *
-	 * @param array $config
-	 */
-	public function __construct(array $config = [])
-	{
-
-		$service_config = $this->getServiceConfig($config);
-		$this->setGoogleMapsApi(new GoogleMapsApi($service_config));
-	}
-
-	/**
-	 * @param array $config
-	 *
-	 * @return array
-	 */
-	protected function getServiceConfig(array $config = []): array
-	{
-
-		return array_merge($config, [
-			GoogleMapsApiConfigFields::SERVICE_ENDPOINT => $this->getServiceEndpoint()
-		]);
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getServiceEndpoint(): string
-	{
-
-		return static::SERVICE_ENDPOINT ?? '';
-	}
-
-	/**
-	 * @param array       $params
-	 * @param null|string $endpoint
-	 *
-	 * @return GoogleMapsResultsCollection
-	 */
-	public function callApi(array $params, ?string $endpoint = null): GoogleMapsResultsCollection
-	{
-
-		$this->createRequest($params, $endpoint);
-
-		return $this->getResultsCollections();
-	}
-
-	/**
-	 * @param array       $params
-	 * @param null|string $endpoint since 0.5.0
-	 *
-	 * @return GoogleMapsRequest
-	 */
-	public function createRequest(array $params, ?string $endpoint = null): GoogleMapsRequest
-	{
-
-		$this->request = new GoogleMapsRequest($params, $endpoint);;
-
-		return $this->request;
-	}
-
-	/**
-	 * @return GoogleMapsResultsCollection
-	 */
-	public function getResultsCollections(): GoogleMapsResultsCollection
-	{
-
-		$results = $this->getResponse()->getResults();
-
-		$result_collection_class = $this->result_collection;
-
-		return new $result_collection_class($results);
-	}
-
-	/**
-	 * @return GoogleMapsResponse
-	 */
-	public function getResponse(): GoogleMapsResponse
-	{
-
-		$this->response = $this->getGoogleMapsApi()->get($this->request);
-
-		return $this->response;
-	}
-
-	/**
-	 * @return GoogleMapsApi
-	 */
-	public function getGoogleMapsApi(): GoogleMapsApi
-	{
-
-		return $this->google_maps_api;
-	}
-
-	/**
-	 * @param GoogleMapsApi $google_maps_api
-	 *
-	 * @return Api
-	 */
-	public function setGoogleMapsApi(GoogleMapsApi $google_maps_api): Api
-	{
-
-		$this->google_maps_api = $google_maps_api;
-
-		return $this;
-	}
-
-	/**
-	 * @return GoogleMapsResultsCollection
-	 */
-	public function getNextPage(): GoogleMapsResultsCollection
-	{
-
-		if ($this->responseHasNewPage()) {
-			$this->request->setParam(GoogleMapsRequestFields::NEXT_PAGE_TOKEN, $this->response->getNextPageToken());
-		}
-
-		return $this->getResultsCollections();
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function responseHasNewPage(): bool
-	{
-
-		return ($this->response instanceof GoogleMapsResponse) ? $this->response->getNextPageToken() : false;
-	}
+    /**
+     * @var string
+     */
+    const SERVICE_ENDPOINT = null;
+
+    /**
+     * @var GoogleMapsApi
+     */
+    protected $google_maps_api = null;
+
+    /**
+     * @var string
+     */
+    protected $result_collection = '';
+
+    /**
+     * @var GoogleMapsResponse
+     */
+    protected $response;
+
+    /**
+     * @var GoogleMapsRequest
+     */
+    protected $request;
+
+    /**
+     * Api constructor.
+     *
+     * @param array $config
+     */
+    public function __construct(array $config = [])
+    {
+
+        $service_config = $this->getServiceConfig($config);
+        $this->setGoogleMapsApi(new GoogleMapsApi($service_config));
+    }
+
+    /**
+     * @param array $config
+     *
+     * @return array
+     */
+    protected function getServiceConfig(array $config = []): array
+    {
+
+        return array_merge($config, [
+            GoogleMapsApiConfigFields::SERVICE_ENDPOINT => $this->getServiceEndpoint()
+        ]);
+    }
+
+    /**
+     * @return string
+     */
+    public function getServiceEndpoint(): string
+    {
+
+        return static::SERVICE_ENDPOINT ?? '';
+    }
+
+    /**
+     * @param array       $params
+     * @param null|string $endpoint
+     *
+     * @return GoogleMapsResultsCollection
+     */
+    public function callApi(array $params, ?string $endpoint = null): GoogleMapsResultsCollection
+    {
+
+        $this->createRequest($params, $endpoint);
+
+        return $this->getResultsCollections();
+    }
+
+    /**
+     * @param array       $params
+     * @param null|string $endpoint since 0.5.0
+     *
+     * @return GoogleMapsRequest
+     */
+    public function createRequest(array $params, ?string $endpoint = null): GoogleMapsRequest
+    {
+
+        $this->request = new GoogleMapsRequest($params, $endpoint);;
+
+        return $this->request;
+    }
+
+    /**
+     * @return GoogleMapsResultsCollection
+     */
+    public function getResultsCollections(): GoogleMapsResultsCollection
+    {
+
+        $results = $this->getResponse()->getResults();
+
+        $result_collection_class = $this->result_collection;
+
+        return new $result_collection_class($results);
+    }
+
+    /**
+     * @return GoogleMapsResponse
+     */
+    public function getResponse(): GoogleMapsResponse
+    {
+
+        $this->response = $this->getGoogleMapsApi()->get($this->request);
+
+        return $this->response;
+    }
+
+    /**
+     * @return GoogleMapsApi
+     */
+    public function getGoogleMapsApi(): GoogleMapsApi
+    {
+
+        return $this->google_maps_api;
+    }
+
+    /**
+     * @param GoogleMapsApi $google_maps_api
+     *
+     * @return Api
+     */
+    public function setGoogleMapsApi(GoogleMapsApi $google_maps_api): Api
+    {
+
+        $this->google_maps_api = $google_maps_api;
+
+        return $this;
+    }
+
+    /**
+     * @return GoogleMapsResultsCollection
+     */
+    public function getNextPage(): GoogleMapsResultsCollection
+    {
+
+        if ($this->responseHasNewPage()) {
+            $this->request->setParam(GoogleMapsRequestFields::NEXT_PAGE_TOKEN, $this->response->getNextPageToken());
+        }
+
+        return $this->getResultsCollections();
+    }
+
+    /**
+     * @return bool
+     */
+    public function responseHasNewPage(): bool
+    {
+
+        return ($this->response instanceof GoogleMapsResponse) ? $this->response->getNextPageToken() : false;
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
 	public function createRequest(array $params, ?string $endpoint = null): GoogleMapsRequest
 	{
 
-		$this->request = new GoogleMapsRequest($params, $endpoint);;
+		$this->request = new GoogleMapsRequest($params, $endpoint); ;
 
 		return $this->request;
 	}

src/Enum/GoogleMapsResponseFormat.php

Indentation +9 added lines, -9 removed lines

@@ -17,15 +17,15 @@
 class GoogleMapsResponseFormat
 {
 
-	/**
-	 * string: json
-	 */
-	const JSON = 'json';
+    /**
+     * string: json
+     */
+    const JSON = 'json';
 
-	/**
-	 * string: xml
-	 * NOT supported in this version
-	 */
-	const XML = 'xml';
+    /**
+     * string: xml
+     * NOT supported in this version
+     */
+    const XML = 'xml';
 
 }
\ No newline at end of file

src/Enum/PlaceServicesEndpoints.php

Indentation +12 added lines, -12 removed lines

@@ -17,18 +17,18 @@
 class PlaceServicesEndpoints
 {
 
-	/**
-	 * @var string
-	 */
-	const FINDPLACEFROMTEXT = "findplacefromtext";
+    /**
+     * @var string
+     */
+    const FINDPLACEFROMTEXT = "findplacefromtext";
 
-	/**
-	 * @var string
-	 */
-	const NEARBYSEARCH = "nearbysearch";
+    /**
+     * @var string
+     */
+    const NEARBYSEARCH = "nearbysearch";
 
-	/**
-	 * @var string
-	 */
-	const TEXTSEARCH = "textsearch";
+    /**
+     * @var string
+     */
+    const TEXTSEARCH = "textsearch";
 }
\ No newline at end of file

src/Enum/GoogleMapsApiConfigFields.php

Indentation +12 added lines, -12 removed lines

@@ -17,18 +17,18 @@
 class GoogleMapsApiConfigFields
 {
 
-	/**
-	 * string: key
-	 */
-	const KEY = 'key';
+    /**
+     * string: key
+     */
+    const KEY = 'key';
 
-	/**
-	 * string: sensor
-	 */
-	const SENSOR = 'sensor';
+    /**
+     * string: sensor
+     */
+    const SENSOR = 'sensor';
 
-	/**
-	 * string: service_endpoint
-	 */
-	const SERVICE_ENDPOINT = 'service_endpoint';
+    /**
+     * string: service_endpoint
+     */
+    const SERVICE_ENDPOINT = 'service_endpoint';
 }
\ No newline at end of file