biscolab / google-maps-php-sdk

src/Fields/LatLngBoundsFields.php

Indentation +8 added lines, -8 removed lines

@@ -17,13 +17,13 @@
 class LatLngBoundsFields
 {
 
-	/**
-	 * string : northeast
-	 */
-	const NORTHEAST = 'northeast';
+    /**
+     * string : northeast
+     */
+    const NORTHEAST = 'northeast';
 
-	/**
-	 * string : southwest
-	 */
-	const SOUTHWEST = 'southwest';
+    /**
+     * string : southwest
+     */
+    const SOUTHWEST = 'southwest';
 }
\ No newline at end of file

src/Fields/GoogleMapsRequestFields.php

Indentation +141 added lines, -141 removed lines

@@ -17,145 +17,145 @@
 class GoogleMapsRequestFields
 {
 
-	/**
-	 * @var string key
-	 */
-	const KEY = 'key';
-
-	/**
-	 * @var string sensor
-	 */
-	const SENSOR = 'sensor';
-
-	/**
-	 * @var string latlng
-	 */
-	const LATLNG = 'latlng';
-
-	/**
-	 * @var string address
-	 */
-	const ADDRESS = 'address';
-
-	/**
-	 * @var string place_id
-	 */
-	const PLACE_ID = 'place_id';
-
-	/**
-	 * @var string location
-	 * @since 0.5.0
-	 */
-	const LOCATION = 'location';
-
-	/**
-	 * @var string locations
-	 */
-	const LOCATIONS = 'locations';
-
-	/**
-	 * @var string path
-	 */
-	const PATH = 'path';
-
-	/**
-	 * @var string samples
-	 */
-	const SAMPLES = 'samples';
-
-	/**
-	 * @var string input
-	 * @since 0.5.0
-	 */
-	const INPUT = 'input';
-
-	/**
-	 * @var string inputtype
-	 * @since 0.5.0
-	 */
-	const INPUTTYPE = 'inputtype';
-
-	/**
-	 * @var string language
-	 * @since 0.5.0
-	 */
-	const LANGUAGE = 'language';
-
-	/**
-	 * @var string fields
-	 * @since 0.5.0
-	 */
-	const FIELDS = 'fields';
-
-	/**
-	 * @var string locationbias
-	 * @since 0.5.0
-	 */
-	const LOCATIONBIAS = 'locationbias';
-
-	/**
-	 * @var string radius
-	 * @since 0.5.0
-	 */
-	const RADIUS = 'radius';
-
-	/**
-	 * @var string rankby
-	 * @since 0.5.0
-	 */
-	const RANKBY = 'rankby';
-
-	/**
-	 * @var string keyword
-	 * @since 0.5.0
-	 */
-	const KEYWORD = 'keyword';
-
-	/**
-	 * @var string minprice
-	 * @since 0.5.0
-	 */
-	const MINPRICE = 'minprice';
-
-	/**
-	 * @var string maxprice
-	 * @since 0.5.0
-	 */
-	const MAXPRICE = 'maxprice';
-
-	/**
-	 * @var string name
-	 * @since 0.5.0
-	 */
-	const NAME = 'name';
-
-	/**
-	 * @var string opennow
-	 * @since 0.5.0
-	 */
-	const OPENNOW = 'opennow';
-
-	/**
-	 * @var string pagetoken
-	 * @since 0.5.0
-	 */
-	const PAGETOKEN = 'pagetoken';
-
-	/**
-	 * @var string type
-	 * @since 0.5.0
-	 */
-	const TYPE = 'type';
-
-	/**
-	 * @var string query
-	 * @since 0.5.0
-	 */
-	const QUERY = 'query';
-
-	/**
-	 * @var string next_page_token
-	 * @since 0.5.0
-	 */
-	const NEXT_PAGE_TOKEN = 'next_page_token';
+    /**
+     * @var string key
+     */
+    const KEY = 'key';
+
+    /**
+     * @var string sensor
+     */
+    const SENSOR = 'sensor';
+
+    /**
+     * @var string latlng
+     */
+    const LATLNG = 'latlng';
+
+    /**
+     * @var string address
+     */
+    const ADDRESS = 'address';
+
+    /**
+     * @var string place_id
+     */
+    const PLACE_ID = 'place_id';
+
+    /**
+     * @var string location
+     * @since 0.5.0
+     */
+    const LOCATION = 'location';
+
+    /**
+     * @var string locations
+     */
+    const LOCATIONS = 'locations';
+
+    /**
+     * @var string path
+     */
+    const PATH = 'path';
+
+    /**
+     * @var string samples
+     */
+    const SAMPLES = 'samples';
+
+    /**
+     * @var string input
+     * @since 0.5.0
+     */
+    const INPUT = 'input';
+
+    /**
+     * @var string inputtype
+     * @since 0.5.0
+     */
+    const INPUTTYPE = 'inputtype';
+
+    /**
+     * @var string language
+     * @since 0.5.0
+     */
+    const LANGUAGE = 'language';
+
+    /**
+     * @var string fields
+     * @since 0.5.0
+     */
+    const FIELDS = 'fields';
+
+    /**
+     * @var string locationbias
+     * @since 0.5.0
+     */
+    const LOCATIONBIAS = 'locationbias';
+
+    /**
+     * @var string radius
+     * @since 0.5.0
+     */
+    const RADIUS = 'radius';
+
+    /**
+     * @var string rankby
+     * @since 0.5.0
+     */
+    const RANKBY = 'rankby';
+
+    /**
+     * @var string keyword
+     * @since 0.5.0
+     */
+    const KEYWORD = 'keyword';
+
+    /**
+     * @var string minprice
+     * @since 0.5.0
+     */
+    const MINPRICE = 'minprice';
+
+    /**
+     * @var string maxprice
+     * @since 0.5.0
+     */
+    const MAXPRICE = 'maxprice';
+
+    /**
+     * @var string name
+     * @since 0.5.0
+     */
+    const NAME = 'name';
+
+    /**
+     * @var string opennow
+     * @since 0.5.0
+     */
+    const OPENNOW = 'opennow';
+
+    /**
+     * @var string pagetoken
+     * @since 0.5.0
+     */
+    const PAGETOKEN = 'pagetoken';
+
+    /**
+     * @var string type
+     * @since 0.5.0
+     */
+    const TYPE = 'type';
+
+    /**
+     * @var string query
+     * @since 0.5.0
+     */
+    const QUERY = 'query';
+
+    /**
+     * @var string next_page_token
+     * @since 0.5.0
+     */
+    const NEXT_PAGE_TOKEN = 'next_page_token';
 }
\ No newline at end of file

src/Fields/GoogleMapsResultFields.php

Indentation +121 added lines, -121 removed lines

@@ -17,126 +17,126 @@
 class GoogleMapsResultFields
 {
 
-	/**
-	 * @var string address_components
-	 */
-	const ADDRESS_COMPONENTS = 'address_components';
-
-	/**
-	 * @var string formatted_address
-	 */
-	const FORMATTED_ADDRESS = 'formatted_address';
-
-	/**
-	 * @var string geometry
-	 */
-	const GEOMETRY = 'geometry';
-
-	/**
-	 * @var string viewport
-	 */
-	const VIEWPORT = 'viewport';
-
-	/**
-	 * @var string place_id
-	 */
-	const PLACE_ID = 'place_id';
-
-	/**
-	 * @var string location_type
-	 */
-	const LOCATION_TYPE = 'location_type';
-
-	/**
-	 * @var string types
-	 */
-	const TYPES = 'types';
-
-	/**
-	 * @var string location
-	 */
-	const LOCATION = 'location';
-
-	/**
-	 * @var string elevation
-	 */
-	const ELEVATION = 'elevation';
-
-	/**
-	 * @var string resolution
-	 */
-	const RESOLUTION = 'resolution';
-
-	/**
-	 * @var string icon
-	 * @since 0.5.0
-	 */
-	const ICON = 'icon';
-
-	/**
-	 * @var string id
-	 * @since 0.5.0
-	 */
-	const ID = 'id';
-
-	/**
-	 * @var string name
-	 * @since 0.5.0
-	 */
-	const NAME = 'name';
-
-	/**
-	 * @var string photos
-	 * @since 0.5.0
-	 */
-	const PHOTOS = 'photos';
-
-	/**
-	 * @var string reference
-	 * @since 0.5.0
-	 */
-	const REFERENCE = 'reference';
-
-	/**
-	 * @var string vicinity
-	 * @since 0.5.0
-	 */
-	const VICINITY = 'vicinity';
-
-	/**
-	 * @var string opening_hours
-	 * @since 0.5.0
-	 */
-	const OPENING_HOURS = 'opening_hours';
-
-	/**
-	 * @var string price_level
-	 * @since 0.5.0
-	 */
-	const PRICE_LEVEL = 'price_level';
-
-	/**
-	 * @var string rating
-	 * @since 0.5.0
-	 */
-	const RATING = 'rating';
-
-	/**
-	 * @var string permanently_closed
-	 * @since 0.5.0
-	 */
-	const PERMANENTLY_CLOSED = 'permanently_closed';
-
-	/**
-	 * @var string plus_code
-	 * @since 0.5.0
-	 */
-	const PLUS_CODE = 'plus_code';
-
-	/**
-	 * @var string next_page_token
-	 * @since 0.5.0
-	 */
-	const NEXT_PAGE_TOKEN = 'next_page_token';
+    /**
+     * @var string address_components
+     */
+    const ADDRESS_COMPONENTS = 'address_components';
+
+    /**
+     * @var string formatted_address
+     */
+    const FORMATTED_ADDRESS = 'formatted_address';
+
+    /**
+     * @var string geometry
+     */
+    const GEOMETRY = 'geometry';
+
+    /**
+     * @var string viewport
+     */
+    const VIEWPORT = 'viewport';
+
+    /**
+     * @var string place_id
+     */
+    const PLACE_ID = 'place_id';
+
+    /**
+     * @var string location_type
+     */
+    const LOCATION_TYPE = 'location_type';
+
+    /**
+     * @var string types
+     */
+    const TYPES = 'types';
+
+    /**
+     * @var string location
+     */
+    const LOCATION = 'location';
+
+    /**
+     * @var string elevation
+     */
+    const ELEVATION = 'elevation';
+
+    /**
+     * @var string resolution
+     */
+    const RESOLUTION = 'resolution';
+
+    /**
+     * @var string icon
+     * @since 0.5.0
+     */
+    const ICON = 'icon';
+
+    /**
+     * @var string id
+     * @since 0.5.0
+     */
+    const ID = 'id';
+
+    /**
+     * @var string name
+     * @since 0.5.0
+     */
+    const NAME = 'name';
+
+    /**
+     * @var string photos
+     * @since 0.5.0
+     */
+    const PHOTOS = 'photos';
+
+    /**
+     * @var string reference
+     * @since 0.5.0
+     */
+    const REFERENCE = 'reference';
+
+    /**
+     * @var string vicinity
+     * @since 0.5.0
+     */
+    const VICINITY = 'vicinity';
+
+    /**
+     * @var string opening_hours
+     * @since 0.5.0
+     */
+    const OPENING_HOURS = 'opening_hours';
+
+    /**
+     * @var string price_level
+     * @since 0.5.0
+     */
+    const PRICE_LEVEL = 'price_level';
+
+    /**
+     * @var string rating
+     * @since 0.5.0
+     */
+    const RATING = 'rating';
+
+    /**
+     * @var string permanently_closed
+     * @since 0.5.0
+     */
+    const PERMANENTLY_CLOSED = 'permanently_closed';
+
+    /**
+     * @var string plus_code
+     * @since 0.5.0
+     */
+    const PLUS_CODE = 'plus_code';
+
+    /**
+     * @var string next_page_token
+     * @since 0.5.0
+     */
+    const NEXT_PAGE_TOKEN = 'next_page_token';
 
 }
\ No newline at end of file

src/Fields/LatLngFields.php

Indentation +8 added lines, -8 removed lines

@@ -17,13 +17,13 @@
 class LatLngFields
 {
 
-	/**
-	 * string - latitude
-	 */
-	const LAT = 'lat';
+    /**
+     * string - latitude
+     */
+    const LAT = 'lat';
 
-	/**
-	 * string - longitude
-	 */
-	const LNG = 'lng';
+    /**
+     * string - longitude
+     */
+    const LNG = 'lng';
 }
\ No newline at end of file

src/Fields/PhotoFields.php

Indentation +16 added lines, -16 removed lines

@@ -17,23 +17,23 @@
 class PhotoFields
 {
 
-	/**
-	 * @var string
-	 */
-	const HEIGHT = "height";
+    /**
+     * @var string
+     */
+    const HEIGHT = "height";
 
-	/**
-	 * @var string
-	 */
-	const WIDTH = "width";
+    /**
+     * @var string
+     */
+    const WIDTH = "width";
 
-	/**
-	 * @var string
-	 */
-	const PHOTO_REFERENCE = "photo_reference";
+    /**
+     * @var string
+     */
+    const PHOTO_REFERENCE = "photo_reference";
 
-	/**
-	 * @var string
-	 */
-	const HTML_ATTRIBUTIONS = "html_attributions";
+    /**
+     * @var string
+     */
+    const HTML_ATTRIBUTIONS = "html_attributions";
 }
\ No newline at end of file

src/Fields/GoogleMapsResponseFields.php

Indentation +32 added lines, -32 removed lines

@@ -17,37 +17,37 @@
 class GoogleMapsResponseFields
 {
 
-	/**
-	 * @var string results
-	 */
-	const RESULTS = 'results';
-
-	/**
-	 * @var string status
-	 */
-	const STATUS = 'status';
-
-	/**
-	 * @var string error_message
-	 */
-	const ERROR_MESSAGE = 'error_message';
-
-	/**
-	 * @var string candidates
-	 * @since 0.5.0
-	 */
-	const CANDIDATES = 'candidates';
-
-	/**
-	 * @var string html_attributions
-	 * @since 0.5.0
-	 */
-	const HTML_ATTRIBUTIONS = 'html_attributions';
-
-	/**
-	 * @var string next_page_token
-	 * @since 0.5.0
-	 */
-	const NEXT_PAGE_TOKEN = 'next_page_token';
+    /**
+     * @var string results
+     */
+    const RESULTS = 'results';
+
+    /**
+     * @var string status
+     */
+    const STATUS = 'status';
+
+    /**
+     * @var string error_message
+     */
+    const ERROR_MESSAGE = 'error_message';
+
+    /**
+     * @var string candidates
+     * @since 0.5.0
+     */
+    const CANDIDATES = 'candidates';
+
+    /**
+     * @var string html_attributions
+     * @since 0.5.0
+     */
+    const HTML_ATTRIBUTIONS = 'html_attributions';
+
+    /**
+     * @var string next_page_token
+     * @since 0.5.0
+     */
+    const NEXT_PAGE_TOKEN = 'next_page_token';
 
 }
\ No newline at end of file

src/Fields/GeometryFields.php

Indentation +12 added lines, -12 removed lines

@@ -17,19 +17,19 @@
 class GeometryFields
 {
 
-	/**
-	 * string: location
-	 */
-	const LOCATION = 'location';
+    /**
+     * string: location
+     */
+    const LOCATION = 'location';
 
-	/**
-	 * string: location_type
-	 */
-	const LOCATION_TYPE = 'location_type';
+    /**
+     * string: location_type
+     */
+    const LOCATION_TYPE = 'location_type';
 
-	/**
-	 * string: viewport
-	 */
-	const VIEWPORT = 'viewport';
+    /**
+     * string: viewport
+     */
+    const VIEWPORT = 'viewport';
 
 }
\ No newline at end of file

src/Fields/AddressComponentFields.php

Indentation +12 added lines, -12 removed lines

@@ -17,19 +17,19 @@
 class AddressComponentFields
 {
 
-	/**
-	 * string: long_name
-	 */
-	const LONG_NAME = 'long_name';
+    /**
+     * string: long_name
+     */
+    const LONG_NAME = 'long_name';
 
-	/**
-	 * string: short_name
-	 */
-	const SHORT_NAME = 'short_name';
+    /**
+     * string: short_name
+     */
+    const SHORT_NAME = 'short_name';
 
-	/**
-	 * string: types
-	 */
-	const TYPES = 'types';
+    /**
+     * string: types
+     */
+    const TYPES = 'types';
 
 }
\ No newline at end of file

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