biscolab / google-maps-php-sdk

src/Abstracts/Api.php

Indentation +176 added lines, -176 removed lines

@@ -25,182 +25,182 @@
 abstract class Api
 {
 
-	/**
-	 * @var string
-	 */
-	const SERVICE_ENDPOINT = null;
-
-	/**
-	 * @var GoogleMapsApi
-	 */
-	protected $google_maps_api = null;
-
-	/**
-	 * @var string
-	 */
-	protected $result_type = '';
-
-	/**
-	 * @var string
-	 */
-	protected $result_collection_type = '';
-
-	/**
-	 * @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 GoogleMapsResult|GoogleMapsResultsCollection
-	 */
-	public function callApi(array $params, ?string $endpoint = null)
-	{
-
-		$this->createRequest($params, $endpoint);
-
-		return $this->getResponseResult();
-	}
-
-	/**
-	 * @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 GoogleMapsResult|GoogleMapsResultsCollection
-	 */
-	public function getResponseResult()
-	{
-
-		$result = $this->getResponse()->getResult();
-		if ($result) {
-			$result_type = $this->result_type;
-
-			return new $result_type($result);
-		}
-		$results = $this->getResponse()->getResults();
-
-		$result_collection_type_class = $this->result_collection_type;
-
-		return new $result_collection_type_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 getSingleResult(): GoogleMapsResultsCollection
-	{
-
-		$results = $this->getResponse()->getResults();
-
-		$result_collection_type_class = $this->result_collection_type;
-
-		return new $result_collection_type_class($results);
-	}
-
-	/**
-	 * @return GoogleMapsResultsCollection
-	 */
-	public function getNextPage(): GoogleMapsResultsCollection
-	{
-
-		if ($this->responseHasNewPage()) {
-			$this->request->setParam(GoogleMapsRequestFields::NEXT_PAGE_TOKEN, $this->response->getNextPageToken());
-		}
-
-		return $this->getResponseResult();
-	}
+    /**
+     * @var string
+     */
+    const SERVICE_ENDPOINT = null;
+
+    /**
+     * @var GoogleMapsApi
+     */
+    protected $google_maps_api = null;
+
+    /**
+     * @var string
+     */
+    protected $result_type = '';
+
+    /**
+     * @var string
+     */
+    protected $result_collection_type = '';
+
+    /**
+     * @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 GoogleMapsResult|GoogleMapsResultsCollection
+     */
+    public function callApi(array $params, ?string $endpoint = null)
+    {
+
+        $this->createRequest($params, $endpoint);
+
+        return $this->getResponseResult();
+    }
+
+    /**
+     * @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 GoogleMapsResult|GoogleMapsResultsCollection
+     */
+    public function getResponseResult()
+    {
+
+        $result = $this->getResponse()->getResult();
+        if ($result) {
+            $result_type = $this->result_type;
+
+            return new $result_type($result);
+        }
+        $results = $this->getResponse()->getResults();
+
+        $result_collection_type_class = $this->result_collection_type;
+
+        return new $result_collection_type_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 getSingleResult(): GoogleMapsResultsCollection
+    {
+
+        $results = $this->getResponse()->getResults();
+
+        $result_collection_type_class = $this->result_collection_type;
+
+        return new $result_collection_type_class($results);
+    }
+
+    /**
+     * @return GoogleMapsResultsCollection
+     */
+    public function getNextPage(): GoogleMapsResultsCollection
+    {
+
+        if ($this->responseHasNewPage()) {
+            $this->request->setParam(GoogleMapsRequestFields::NEXT_PAGE_TOKEN, $this->response->getNextPageToken());
+        }
+
+        return $this->getResponseResult();
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function responseHasNewPage(): bool
-	{
+    /**
+     * @return bool
+     */
+    public function responseHasNewPage(): bool
+    {
 
-		return ($this->response instanceof GoogleMapsResponse) ? $this->response->getNextPageToken() : false;
-	}
+        return ($this->response instanceof GoogleMapsResponse) ? $this->response->getNextPageToken() : false;
+    }
 }
\ No newline at end of file

src/Object/Review.php

Indentation +33 added lines, -33 removed lines

@@ -21,37 +21,37 @@
 class Review extends AbstractObject
 {
 
-	/**
-	 * @var null|int
-	 */
-	protected $height = null;
-
-	/**
-	 * @var null|int
-	 */
-	protected $width = null;
-
-	/**
-	 * @var null|string
-	 */
-	protected $photo_reference = null;
-
-	/**
-	 * @var null|string
-	 */
-	protected $html_attributions = null;
-
-	/**
-	 * @var array
-	 */
-	protected $typeCheck = [
-		ReviewFields::AUTHOR_NAME               => 'string',
-		ReviewFields::AUTHOR_URL                => 'string',
-		ReviewFields::LANGUAGE                  => 'string',
-		ReviewFields::PROFILE_PHOTO_URL         => 'string',
-		ReviewFields::RATING                    => 'int',
-		ReviewFields::RELATIVE_TIME_DESCRIPTION => 'string',
-		ReviewFields::TEXT                      => 'string',
-		ReviewFields::TIME                      => 'int',
-	];
+    /**
+     * @var null|int
+     */
+    protected $height = null;
+
+    /**
+     * @var null|int
+     */
+    protected $width = null;
+
+    /**
+     * @var null|string
+     */
+    protected $photo_reference = null;
+
+    /**
+     * @var null|string
+     */
+    protected $html_attributions = null;
+
+    /**
+     * @var array
+     */
+    protected $typeCheck = [
+        ReviewFields::AUTHOR_NAME               => 'string',
+        ReviewFields::AUTHOR_URL                => 'string',
+        ReviewFields::LANGUAGE                  => 'string',
+        ReviewFields::PROFILE_PHOTO_URL         => 'string',
+        ReviewFields::RATING                    => 'int',
+        ReviewFields::RELATIVE_TIME_DESCRIPTION => 'string',
+        ReviewFields::TEXT                      => 'string',
+        ReviewFields::TIME                      => 'int',
+    ];
 }
\ No newline at end of file

src/Object/ReviewCollection.php

Indentation +13 added lines, -13 removed lines

@@ -20,19 +20,19 @@
 class ReviewCollection extends AbstractCollection
 {
 
-	/**
-	 * @var string
-	 */
-	protected $item_class = Review::class;
+    /**
+     * @var string
+     */
+    protected $item_class = Review::class;
 
-	/**
-	 * @param $item
-	 *
-	 * @return Review
-	 */
-	protected function parseItem($item): Review
-	{
+    /**
+     * @param $item
+     *
+     * @return Review
+     */
+    protected function parseItem($item): Review
+    {
 
-		return ($item instanceof $this->item_class) ? $item : new $this->item_class($item);
-	}
+        return ($item instanceof $this->item_class) ? $item : new $this->item_class($item);
+    }
 }
\ 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_type = 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_type = 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

src/Api/Places.php

Indentation +222 added lines, -222 removed lines

@@ -34,233 +34,233 @@
 class Places extends Api
 {
 
-	/**
-	 * @var string
-	 */
-	const SERVICE_ENDPOINT = 'place';
-
-	/**
-	 * @var string
-	 */
-	protected $result_type = PlacesResult::class;
-
-	/**
-	 * @var string
-	 */
-	protected $result_collection_type = 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 GoogleMapsResult|GoogleMapsResultsCollection
-	 * @since   0.5.0
-	 */
-	public function makeApiCall(array $params, string $endpoint)
-	{
-
-		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);
-	}
-
-	/**
-	 * 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_type = PlacesResult::class;
+
+    /**
+     * @var string
+     */
+    protected $result_collection_type = 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 GoogleMapsResult|GoogleMapsResultsCollection
+     * @since   0.5.0
+     */
+    public function makeApiCall(array $params, string $endpoint)
+    {
+
+        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);
+    }
+
+    /**
+     * 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]) > Config::MAX_PLACE_RADIUS_VALUE) {
+        if (!empty($params[GoogleMapsRequestFields::RADIUS]) && floatval($params[GoogleMapsRequestFields::RADIUS]) > Config::MAX_PLACE_RADIUS_VALUE) {
 // 			The maximum allowed radius is 50 000 meters.
-			throw new InvalidArgumentException(GoogleMapsRequestFields::RADIUS . ' must be lower than ' . Config::MAX_PLACE_RADIUS_VALUE);
-		}
-
-		return $this->makeApiCall($params, PlaceServicesEndpoints::NEARBYSEARCH);
-	}
-
-	/**
-	 * @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 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);
-	}
-
-	/**
-	 * @param string     $place_id
-	 * @param array|null $params
-	 *
-	 * @return GoogleMapsResult
-	 * @see https://developers.google.com/places/web-service/details
-	 * @since v0.6.0
-	 */
-	public function details(string $place_id, ?array $params = []): GoogleMapsResult
-	{
-
-		$params = array_merge($params, [
-			GoogleMapsRequestFields::PLACE_ID => $place_id
-		]);
-
-		return $this->makeApiCall($params, PlaceServicesEndpoints::DETAILS);
-
-	}
+            throw new InvalidArgumentException(GoogleMapsRequestFields::RADIUS . ' must be lower than ' . Config::MAX_PLACE_RADIUS_VALUE);
+        }
+
+        return $this->makeApiCall($params, PlaceServicesEndpoints::NEARBYSEARCH);
+    }
+
+    /**
+     * @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 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);
+    }
+
+    /**
+     * @param string     $place_id
+     * @param array|null $params
+     *
+     * @return GoogleMapsResult
+     * @see https://developers.google.com/places/web-service/details
+     * @since v0.6.0
+     */
+    public function details(string $place_id, ?array $params = []): GoogleMapsResult
+    {
+
+        $params = array_merge($params, [
+            GoogleMapsRequestFields::PLACE_ID => $place_id
+        ]);
+
+        return $this->makeApiCall($params, PlaceServicesEndpoints::DETAILS);
+
+    }
 
 }
\ No newline at end of file

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_type = GeocodingResultsCollection::class;
+    /**
+     * @var string
+     */
+    protected $result_collection_type = 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/Http/GoogleMapsResponse.php

Indentation +336 added lines, -336 removed lines

@@ -23,341 +23,341 @@
 class GoogleMapsResponse
 {
 
-	/**
-	 * @var Response
-	 */
-	protected $response = null;
-
-	/**
-	 * Single result
-	 * When the Places service returns results from a details request, it places them within a single result
-	 *
-	 * @var array
-	 * @see https://developers.google.com/places/web-service/details#PlaceDetailsResults
-	 */
-	protected $result = null;
-
-	/**
-	 * contains an array of places, with information about each.
-	 * The Places API returns up to 20 establishment results per query.
-	 * Additionally, political results may be returned which serve to identify the area of the request.
-	 *
-	 * @var array
-	 * @see https://developers.google.com/places/web-service/search#PlaceSearchResults
-	 */
-	protected $results = null;
-
-	/**
-	 * contains metadata on the request.
-	 *
-	 * @var string
-	 * @see https://developers.google.com/places/web-service/search#PlaceSearchStatusCodes
-	 */
-	protected $status = null;
-
-	/**
-	 * @var string
-	 */
-	protected $error_message = null;
-
-	/**
-	 * @var array
-	 */
-	protected $array_response = null;
-
-	/**
-	 * @var null|array
-	 */
-	protected $http_status_code = null;
-
-	/**
-	 * may contain a set of attributions about this listing which must be displayed to the user (some listings may not have attribution).
-	 *
-	 * @var null|array
-	 * @since 0.5.0
-	 */
-	protected $html_attributions = null;
-
-	/**
-	 * @var null|string
-	 * @since 0.5.0
-	 */
-	protected $next_page_token = null;
-
-	/**
-	 * GoogleMapsResponse constructor.
-	 *
-	 * @param Response $response
-	 */
-	public function __construct(Response $response)
-	{
-
-		$this->setResponse($response);
-
-		$this->parseResponse();
-
-		$this->checkHttpStatusCode();
-	}
-
-	/**
-	 * @param Response $response
-	 *
-	 * @return GoogleMapsResponse
-	 */
-	public function setResponse(Response $response): GoogleMapsResponse
-	{
-
-		$this->response = $response;
-
-		return $this;
-	}
-
-	/**
-	 * @return GoogleMapsResponse
-	 *
-	 * @throws RequestException
-	 * @throws ResponseException
-	 */
-	protected function parseResponse(): GoogleMapsResponse
-	{
-
-		$json_response = $this->response->getBody()->getContents();
-		$array_response = $this->toArray($json_response);
-		$result = null;
-		$results = null;
-
-		if (empty($array_response[GoogleMapsResponseFields::STATUS])) {
-			throw new ResponseException('Missing "status" in GoogleMapsApi Response');
-		}
-		$this->setStatus($array_response[GoogleMapsResponseFields::STATUS]);
-
-		if ($this->getStatus() != GoogleMapsResponseStatusValues::OK) {
-			$error_message = 'Something went wrong';
-			if (!empty($array_response[GoogleMapsResponseFields::ERROR_MESSAGE])) {
-				$error_message = $array_response[GoogleMapsResponseFields::ERROR_MESSAGE];
-				$this->setErrorMessage($error_message);
-			} elseif (!empty($array_response[GoogleMapsResponseFields::STATUS])) {
-				$error_message .= ': ' . $array_response[GoogleMapsResponseFields::STATUS];
-				$this->setErrorMessage($error_message);
-			}
-			throw new RequestException($error_message);
-
-		}
-
-		if (!empty($array_response[GoogleMapsResponseFields::RESULTS])) {
-			$results = $array_response[GoogleMapsResponseFields::RESULTS];
-
-		} elseif (!empty($array_response[GoogleMapsResponseFields::CANDIDATES])) {
-			$results = $array_response[GoogleMapsResponseFields::CANDIDATES];
-
-		}elseif (!empty($array_response[GoogleMapsResponseFields::RESULT])) {
-			$result = $array_response[GoogleMapsResponseFields::RESULT];
-
-		} else {
-			throw new ResponseException('Missing "results" in GoogleMapsApi Response');
-		}
-		$this->setResult($result);
-		$this->setResults($results);
-
-		if (!empty($array_response[GoogleMapsResponseFields::HTML_ATTRIBUTIONS])) {
-			$this->setHtmlAttributions($array_response[GoogleMapsResponseFields::HTML_ATTRIBUTIONS]);
-		}
-
-		if (!empty($array_response[GoogleMapsResponseFields::NEXT_PAGE_TOKEN])) {
-			$this->setNextPageToken($array_response[GoogleMapsResponseFields::NEXT_PAGE_TOKEN]);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * @param string $json_response
-	 *
-	 * @return array
-	 */
-	public function toArray(string $json_response): array
-	{
-
-		$this->array_response = json_decode($json_response, true);
-
-		return $this->array_response;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getStatus(): string
-	{
-
-		return $this->status;
-	}
-
-	/**
-	 * @param string $status
-	 *
-	 * @return GoogleMapsResponse
-	 */
-	public function setStatus(string $status)
-	{
-
-		$this->status = $status;
-
-		return $this;
-	}
-
-	/**
-	 * Check HTTP status code (silent/No exceptions!)
-	 * @return int
-	 */
-	protected function checkHttpStatusCode(): int
-	{
-
-		$this->http_status_code = $this->response->getStatusCode();
-
-		return $this->http_status_code;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getResults()
-	{
-
-		return $this->results;
-	}
-
-	/**
-	 * @param array $results
-	 *
-	 * @return $this
-	 */
-	public function setResults(?array $results)
-	{
-
-		$this->results = $results;
-
-		return $this;
-	}
-
-	/**
-	 * @return array
-	 * @since v0.6.0
-	 */
-	public function getResult()
-	{
-
-		return $this->result;
-	}
-
-	/**
-	 * @param array $result
-	 *
-	 * @return $this
-	 * @since v0.6.0
-	 */
-	public function setResult(?array $result)
-	{
-
-		$this->result = $result;
-
-		return $this;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getArrayResponse(): array
-	{
-
-		return $this->array_response;
-	}
-
-	/**
-	 * @param array $array_response
-	 *
-	 * @return GoogleMapsResponse
-	 */
-	public function setArrayResponse(array $array_response): GoogleMapsResponse
-	{
-
-		$this->array_response = $array_response;
-
-		return $this;
-	}
-
-	/**
-	 * @return mixed
-	 */
-	public function getErrorMessage()
-	{
-
-		return $this->error_message;
-	}
-
-	/**
-	 * @param $error_message
-	 *
-	 * @return GoogleMapsResponse
-	 */
-	public function setErrorMessage($error_message): GoogleMapsResponse
-	{
-
-		$this->error_message = $error_message;
-
-		return $this;
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getHttpStatusCode(): int
-	{
-
-		return intval($this->http_status_code);
-	}
-
-	/**
-	 * @return array|null
-	 */
-	public function getHtmlAttributions(): ?array
-	{
-
-		return $this->html_attributions;
-	}
-
-	/**
-	 * @param array|null $html_attributions
-	 *
-	 * @return GoogleMapsResponse
-	 */
-	public function setHtmlAttributions(?array $html_attributions): GoogleMapsResponse
-	{
-
-		$this->html_attributions = $html_attributions;
-
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getNextPageToken(): string
-	{
-
-		return $this->next_page_token ?? '';
-	}
-
-	/**
-	 * @param $next_page_token
-	 *
-	 * @return GoogleMapsResponse
-	 */
-	public function setNextPageToken($next_page_token): GoogleMapsResponse
-	{
-
-		$this->next_page_token = $next_page_token;
-
-		return $this;
-	}
+    /**
+     * @var Response
+     */
+    protected $response = null;
+
+    /**
+     * Single result
+     * When the Places service returns results from a details request, it places them within a single result
+     *
+     * @var array
+     * @see https://developers.google.com/places/web-service/details#PlaceDetailsResults
+     */
+    protected $result = null;
+
+    /**
+     * contains an array of places, with information about each.
+     * The Places API returns up to 20 establishment results per query.
+     * Additionally, political results may be returned which serve to identify the area of the request.
+     *
+     * @var array
+     * @see https://developers.google.com/places/web-service/search#PlaceSearchResults
+     */
+    protected $results = null;
+
+    /**
+     * contains metadata on the request.
+     *
+     * @var string
+     * @see https://developers.google.com/places/web-service/search#PlaceSearchStatusCodes
+     */
+    protected $status = null;
+
+    /**
+     * @var string
+     */
+    protected $error_message = null;
+
+    /**
+     * @var array
+     */
+    protected $array_response = null;
+
+    /**
+     * @var null|array
+     */
+    protected $http_status_code = null;
+
+    /**
+     * may contain a set of attributions about this listing which must be displayed to the user (some listings may not have attribution).
+     *
+     * @var null|array
+     * @since 0.5.0
+     */
+    protected $html_attributions = null;
+
+    /**
+     * @var null|string
+     * @since 0.5.0
+     */
+    protected $next_page_token = null;
+
+    /**
+     * GoogleMapsResponse constructor.
+     *
+     * @param Response $response
+     */
+    public function __construct(Response $response)
+    {
+
+        $this->setResponse($response);
+
+        $this->parseResponse();
+
+        $this->checkHttpStatusCode();
+    }
+
+    /**
+     * @param Response $response
+     *
+     * @return GoogleMapsResponse
+     */
+    public function setResponse(Response $response): GoogleMapsResponse
+    {
+
+        $this->response = $response;
+
+        return $this;
+    }
+
+    /**
+     * @return GoogleMapsResponse
+     *
+     * @throws RequestException
+     * @throws ResponseException
+     */
+    protected function parseResponse(): GoogleMapsResponse
+    {
+
+        $json_response = $this->response->getBody()->getContents();
+        $array_response = $this->toArray($json_response);
+        $result = null;
+        $results = null;
+
+        if (empty($array_response[GoogleMapsResponseFields::STATUS])) {
+            throw new ResponseException('Missing "status" in GoogleMapsApi Response');
+        }
+        $this->setStatus($array_response[GoogleMapsResponseFields::STATUS]);
+
+        if ($this->getStatus() != GoogleMapsResponseStatusValues::OK) {
+            $error_message = 'Something went wrong';
+            if (!empty($array_response[GoogleMapsResponseFields::ERROR_MESSAGE])) {
+                $error_message = $array_response[GoogleMapsResponseFields::ERROR_MESSAGE];
+                $this->setErrorMessage($error_message);
+            } elseif (!empty($array_response[GoogleMapsResponseFields::STATUS])) {
+                $error_message .= ': ' . $array_response[GoogleMapsResponseFields::STATUS];
+                $this->setErrorMessage($error_message);
+            }
+            throw new RequestException($error_message);
+
+        }
+
+        if (!empty($array_response[GoogleMapsResponseFields::RESULTS])) {
+            $results = $array_response[GoogleMapsResponseFields::RESULTS];
+
+        } elseif (!empty($array_response[GoogleMapsResponseFields::CANDIDATES])) {
+            $results = $array_response[GoogleMapsResponseFields::CANDIDATES];
+
+        }elseif (!empty($array_response[GoogleMapsResponseFields::RESULT])) {
+            $result = $array_response[GoogleMapsResponseFields::RESULT];
+
+        } else {
+            throw new ResponseException('Missing "results" in GoogleMapsApi Response');
+        }
+        $this->setResult($result);
+        $this->setResults($results);
+
+        if (!empty($array_response[GoogleMapsResponseFields::HTML_ATTRIBUTIONS])) {
+            $this->setHtmlAttributions($array_response[GoogleMapsResponseFields::HTML_ATTRIBUTIONS]);
+        }
+
+        if (!empty($array_response[GoogleMapsResponseFields::NEXT_PAGE_TOKEN])) {
+            $this->setNextPageToken($array_response[GoogleMapsResponseFields::NEXT_PAGE_TOKEN]);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param string $json_response
+     *
+     * @return array
+     */
+    public function toArray(string $json_response): array
+    {
+
+        $this->array_response = json_decode($json_response, true);
+
+        return $this->array_response;
+    }
+
+    /**
+     * @return string
+     */
+    public function getStatus(): string
+    {
+
+        return $this->status;
+    }
+
+    /**
+     * @param string $status
+     *
+     * @return GoogleMapsResponse
+     */
+    public function setStatus(string $status)
+    {
+
+        $this->status = $status;
+
+        return $this;
+    }
+
+    /**
+     * Check HTTP status code (silent/No exceptions!)
+     * @return int
+     */
+    protected function checkHttpStatusCode(): int
+    {
+
+        $this->http_status_code = $this->response->getStatusCode();
+
+        return $this->http_status_code;
+    }
+
+    /**
+     * @return array
+     */
+    public function getResults()
+    {
+
+        return $this->results;
+    }
+
+    /**
+     * @param array $results
+     *
+     * @return $this
+     */
+    public function setResults(?array $results)
+    {
+
+        $this->results = $results;
+
+        return $this;
+    }
+
+    /**
+     * @return array
+     * @since v0.6.0
+     */
+    public function getResult()
+    {
+
+        return $this->result;
+    }
+
+    /**
+     * @param array $result
+     *
+     * @return $this
+     * @since v0.6.0
+     */
+    public function setResult(?array $result)
+    {
+
+        $this->result = $result;
+
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function getArrayResponse(): array
+    {
+
+        return $this->array_response;
+    }
+
+    /**
+     * @param array $array_response
+     *
+     * @return GoogleMapsResponse
+     */
+    public function setArrayResponse(array $array_response): GoogleMapsResponse
+    {
+
+        $this->array_response = $array_response;
+
+        return $this;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getErrorMessage()
+    {
+
+        return $this->error_message;
+    }
+
+    /**
+     * @param $error_message
+     *
+     * @return GoogleMapsResponse
+     */
+    public function setErrorMessage($error_message): GoogleMapsResponse
+    {
+
+        $this->error_message = $error_message;
+
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getHttpStatusCode(): int
+    {
+
+        return intval($this->http_status_code);
+    }
+
+    /**
+     * @return array|null
+     */
+    public function getHtmlAttributions(): ?array
+    {
+
+        return $this->html_attributions;
+    }
+
+    /**
+     * @param array|null $html_attributions
+     *
+     * @return GoogleMapsResponse
+     */
+    public function setHtmlAttributions(?array $html_attributions): GoogleMapsResponse
+    {
+
+        $this->html_attributions = $html_attributions;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getNextPageToken(): string
+    {
+
+        return $this->next_page_token ?? '';
+    }
+
+    /**
+     * @param $next_page_token
+     *
+     * @return GoogleMapsResponse
+     */
+    public function setNextPageToken($next_page_token): GoogleMapsResponse
+    {
+
+        $this->next_page_token = $next_page_token;
+
+        return $this;
+    }
 
 }
\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -150,7 +150,7 @@
 		} elseif (!empty($array_response[GoogleMapsResponseFields::CANDIDATES])) {
 			$results = $array_response[GoogleMapsResponseFields::CANDIDATES];
 
-		}elseif (!empty($array_response[GoogleMapsResponseFields::RESULT])) {
+		} elseif (!empty($array_response[GoogleMapsResponseFields::RESULT])) {
 			$result = $array_response[GoogleMapsResponseFields::RESULT];
 
 		} else {

src/Http/Result/PlacesResult.php

Indentation +130 added lines, -130 removed lines

@@ -38,135 +38,135 @@
 class PlacesResult extends GoogleMapsResult
 {
 
-	/**
-	 * @var null|string
-	 */
-	protected $formatted_address = null;
-
-	/**
-	 * @var string
-	 */
-	protected $name = '';
-
-	/**
-	 * @var Geometry
-	 */
-	protected $geometry = null;
-
-	/**
-	 * @var string
-	 */
-	protected $icon = '';
-
-	/**
-	 * @var string
-	 */
-	protected $id = '';
-
-	/**
-	 * @var PhotoCollection
-	 */
-	protected $photos = null;
-
-	/**
-	 * @var string
-	 */
-	protected $place_id = '';
-
-	/**
-	 * @var string
-	 */
-	protected $reference = '';
-
-	/**
-	 * @var string
-	 */
-	protected $vicinity = '';
-
-	/**
-	 * @var array
-	 */
-	protected $types = [];
-
-	/**
-	 * @var array
-	 */
-	protected $opening_hours = [];
-
-	/**
-	 * @var int
-	 */
-	protected $price_level = 0;
-
-	/**
-	 * @var bool
-	 */
-	protected $permanently_closed = false;
-
-	/**
-	 * @var ReviewCollection
-	 */
-	protected $reviews = null;
-
-	/**
-	 * @var int
-	 */
-	protected $utc_offset = 0;
-
-	/**
-	 * @var string
-	 */
-	protected $website = '';
-
-	/**
-	 * @var string
-	 */
-	protected $international_phone_number = '';
-
-	/**
-	 * @var string
-	 */
-	protected $formatted_phone_number = '';
-
-	/**
-	 * @var string
-	 */
-	protected $adr_address = '';
-
-	/**
-	 * @var array
-	 */
-	protected $typeCheck = [
-		GoogleMapsResultFields::FORMATTED_ADDRESS          => 'string',
-		GoogleMapsResultFields::NAME                       => 'string',
-		GoogleMapsResultFields::GEOMETRY                   => Geometry::class,
-		GoogleMapsResultFields::ICON                       => 'string',
-		GoogleMapsResultFields::ID                         => 'string',
-		GoogleMapsResultFields::PHOTOS                     => PhotoCollection::class,
-		GoogleMapsResultFields::PLACE_ID                   => 'string',
-		GoogleMapsResultFields::REFERENCE                  => 'string',
-		GoogleMapsResultFields::VICINITY                   => 'string',
-		GoogleMapsResultFields::TYPES                      => 'array',
-		GoogleMapsResultFields::OPENING_HOURS              => 'json',
-		GoogleMapsResultFields::PRICE_LEVEL                => 'int',
-		GoogleMapsResultFields::RATING                     => 'float',
-		GoogleMapsResultFields::PERMANENTLY_CLOSED         => 'bool',
-		GoogleMapsResultFields::PLUS_CODE                  => 'array',
-		GoogleMapsResultFields::REVIEWS                    => ReviewCollection::class,
-		GoogleMapsResultFields::UTC_OFFSET                 => 'int',
-		GoogleMapsResultFields::WEBSITE                    => 'string',
-		GoogleMapsResultFields::INTERNATIONAL_PHONE_NUMBER => 'string',
-		GoogleMapsResultFields::FORMATTED_PHONE_NUMBER     => 'string',
-		GoogleMapsResultFields::ADR_ADDRESS                => 'string',
-	];
-
-	/**
-	 * @return bool|null
-	 */
-	public function getPermanentlyClose(): bool
-	{
-
-		return $this->permanently_closed ?? false;
-	}
+    /**
+     * @var null|string
+     */
+    protected $formatted_address = null;
+
+    /**
+     * @var string
+     */
+    protected $name = '';
+
+    /**
+     * @var Geometry
+     */
+    protected $geometry = null;
+
+    /**
+     * @var string
+     */
+    protected $icon = '';
+
+    /**
+     * @var string
+     */
+    protected $id = '';
+
+    /**
+     * @var PhotoCollection
+     */
+    protected $photos = null;
+
+    /**
+     * @var string
+     */
+    protected $place_id = '';
+
+    /**
+     * @var string
+     */
+    protected $reference = '';
+
+    /**
+     * @var string
+     */
+    protected $vicinity = '';
+
+    /**
+     * @var array
+     */
+    protected $types = [];
+
+    /**
+     * @var array
+     */
+    protected $opening_hours = [];
+
+    /**
+     * @var int
+     */
+    protected $price_level = 0;
+
+    /**
+     * @var bool
+     */
+    protected $permanently_closed = false;
+
+    /**
+     * @var ReviewCollection
+     */
+    protected $reviews = null;
+
+    /**
+     * @var int
+     */
+    protected $utc_offset = 0;
+
+    /**
+     * @var string
+     */
+    protected $website = '';
+
+    /**
+     * @var string
+     */
+    protected $international_phone_number = '';
+
+    /**
+     * @var string
+     */
+    protected $formatted_phone_number = '';
+
+    /**
+     * @var string
+     */
+    protected $adr_address = '';
+
+    /**
+     * @var array
+     */
+    protected $typeCheck = [
+        GoogleMapsResultFields::FORMATTED_ADDRESS          => 'string',
+        GoogleMapsResultFields::NAME                       => 'string',
+        GoogleMapsResultFields::GEOMETRY                   => Geometry::class,
+        GoogleMapsResultFields::ICON                       => 'string',
+        GoogleMapsResultFields::ID                         => 'string',
+        GoogleMapsResultFields::PHOTOS                     => PhotoCollection::class,
+        GoogleMapsResultFields::PLACE_ID                   => 'string',
+        GoogleMapsResultFields::REFERENCE                  => 'string',
+        GoogleMapsResultFields::VICINITY                   => 'string',
+        GoogleMapsResultFields::TYPES                      => 'array',
+        GoogleMapsResultFields::OPENING_HOURS              => 'json',
+        GoogleMapsResultFields::PRICE_LEVEL                => 'int',
+        GoogleMapsResultFields::RATING                     => 'float',
+        GoogleMapsResultFields::PERMANENTLY_CLOSED         => 'bool',
+        GoogleMapsResultFields::PLUS_CODE                  => 'array',
+        GoogleMapsResultFields::REVIEWS                    => ReviewCollection::class,
+        GoogleMapsResultFields::UTC_OFFSET                 => 'int',
+        GoogleMapsResultFields::WEBSITE                    => 'string',
+        GoogleMapsResultFields::INTERNATIONAL_PHONE_NUMBER => 'string',
+        GoogleMapsResultFields::FORMATTED_PHONE_NUMBER     => 'string',
+        GoogleMapsResultFields::ADR_ADDRESS                => 'string',
+    ];
+
+    /**
+     * @return bool|null
+     */
+    public function getPermanentlyClose(): bool
+    {
+
+        return $this->permanently_closed ?? false;
+    }
 
 }
\ No newline at end of file

src/Fields/GoogleMapsResponseFields.php

Indentation +38 added lines, -38 removed lines

@@ -17,43 +17,43 @@
 class GoogleMapsResponseFields
 {
 
-	/**
-	 * @var string results
-	 */
-	const RESULTS = 'results';
-
-	/**
-	 * @var string result
-	 * @since v0.6.0
-	 */
-	const RESULT = 'result';
-
-	/**
-	 * @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 result
+     * @since v0.6.0
+     */
+    const RESULT = 'result';
+
+    /**
+     * @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