biscolab / google-maps-php-sdk

src/Abstracts/AbstractObject.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 		foreach ($this->typeCheck as $field_name => $field_type) {
 			if (empty($args[$field_name]) || is_null($args[$field_name])) {
 				if ($this->isFieldRequired($field_name)) {
-					$this->addError('Missing "' . $field_name . '" in ' . static::class);
+					$this->addError('Missing "'.$field_name.'" in '.static::class);
 				}
 			} else {
 				$this->$field_name = $this->parseFieldValue($field_type, $args[$field_name]);

Indentation +180 added lines, -180 removed lines

@@ -21,184 +21,184 @@
 abstract class AbstractObject
 {
 
-	/**
-	 * @var array
-	 */
-	protected $typeCheck = [];
-
-	/**
-	 * @var array
-	 */
-	protected $required = [];
-
-	/**
-	 * @var array
-	 */
-	protected $errors = [];
-
-	/**
-	 * AbstractObject constructor.
-	 *
-	 * @param array $args
-	 */
-	public function __construct(?array $args = [])
-	{
-
-		if (is_null($args)) {
-			$args = [];
-		}
-
-		$this->setArgs($args);
-	}
-
-	/**
-	 * @param array $args
-	 *
-	 * @throws Exception
-	 */
-	protected function setArgs(array $args)
-	{
-
-		foreach ($this->typeCheck as $field_name => $field_type) {
-			if (empty($args[$field_name]) || is_null($args[$field_name])) {
-				if ($this->isFieldRequired($field_name)) {
-					$this->addError('Missing "' . $field_name . '" in ' . static::class);
-				}
-			} else {
-				$this->$field_name = $this->parseFieldValue($field_type, $args[$field_name]);
-			}
-		}
-		$this->throwErrors();
-	}
-
-	/**
-	 * @param string $field_name
-	 *
-	 * @return bool
-	 */
-	protected function isFieldRequired(string $field_name): bool
-	{
-
-		return in_array($field_name, $this->required);
-	}
-
-	/**
-	 * @param string $error
-	 *
-	 * @return array
-	 */
-	protected function addError(string $error): array
-	{
-
-		array_push($this->errors, $error);
-
-		return $this->errors;
-	}
-
-	/**
-	 * @param string $field_type
-	 * @param string $field_value
-	 *
-	 * @return mixed
-	 */
-	protected function parseFieldValue(string $field_type, $field_value)
-	{
-
-		switch ($field_type) {
-			case 'string':
-			case 'int':
-			case 'float':
-			case 'array':
-			case 'json':
-			case 'bool':
-				return $field_value;
-			default:
-				return ($field_value instanceof $field_type) ? $field_value : new $field_type($field_value);
-		}
-	}
-
-	/**
-	 * @throws Exception
-	 */
-	protected function throwErrors()
-	{
-
-		if (count($this->errors)) {
-			throw new Exception(implode(', ', $this->errors));
-		}
-	}
-
-	/**
-	 * @return string
-	 */
-	public function toJson(): string
-	{
-
-		return json_encode($this->toArray());
-	}
-
-	/**
-	 * @return array
-	 */
-	public function toArray(): array
-	{
-
-		$fields = get_object_vars($this);
-
-		foreach ($fields as $field_name => $field_value) {
-
-			if (!is_scalar($field_value) && method_exists($field_value, 'toJson')) {
-				$fields[$field_name] = $field_value->toArray();
-			}
-		}
-
-		return $fields;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function __toString(): string
-	{
-
-		return implode(',', $this->toArray());
-	}
-
-	/**
-	 * @param $name
-	 * @param $arguments
-	 *
-	 * @return mixed
-	 */
-	public function __call($name, $arguments)
-	{
-
-		preg_match('/(?<=(g|s)et)([A-Za-z0-9])\w+/', $name, $match);
-
-		$camel_field = (empty($match[0])) ? '' : $match[0];
-
-		$snake_field = $this->getFieldName($camel_field);
-
-		$field_type = (empty($this->typeCheck[$snake_field])) ? null : $this->typeCheck[$snake_field];
-
-		if (!empty($match[1]) && $field_type) {
-			switch ($match[1]) {
-				case 's':
-					return $this->$snake_field = $this->parseFieldValue($field_type, current($arguments));
-				case 'g':
-					return $this->$snake_field;
-			}
-		}
-	}
-
-	/**
-	 * @param string $initial_field_name
-	 *
-	 * @return string
-	 */
-	protected function getFieldName(string $initial_field_name): string
-	{
-
-		return camel2Snake($initial_field_name);
-	}
+    /**
+     * @var array
+     */
+    protected $typeCheck = [];
+
+    /**
+     * @var array
+     */
+    protected $required = [];
+
+    /**
+     * @var array
+     */
+    protected $errors = [];
+
+    /**
+     * AbstractObject constructor.
+     *
+     * @param array $args
+     */
+    public function __construct(?array $args = [])
+    {
+
+        if (is_null($args)) {
+            $args = [];
+        }
+
+        $this->setArgs($args);
+    }
+
+    /**
+     * @param array $args
+     *
+     * @throws Exception
+     */
+    protected function setArgs(array $args)
+    {
+
+        foreach ($this->typeCheck as $field_name => $field_type) {
+            if (empty($args[$field_name]) || is_null($args[$field_name])) {
+                if ($this->isFieldRequired($field_name)) {
+                    $this->addError('Missing "' . $field_name . '" in ' . static::class);
+                }
+            } else {
+                $this->$field_name = $this->parseFieldValue($field_type, $args[$field_name]);
+            }
+        }
+        $this->throwErrors();
+    }
+
+    /**
+     * @param string $field_name
+     *
+     * @return bool
+     */
+    protected function isFieldRequired(string $field_name): bool
+    {
+
+        return in_array($field_name, $this->required);
+    }
+
+    /**
+     * @param string $error
+     *
+     * @return array
+     */
+    protected function addError(string $error): array
+    {
+
+        array_push($this->errors, $error);
+
+        return $this->errors;
+    }
+
+    /**
+     * @param string $field_type
+     * @param string $field_value
+     *
+     * @return mixed
+     */
+    protected function parseFieldValue(string $field_type, $field_value)
+    {
+
+        switch ($field_type) {
+            case 'string':
+            case 'int':
+            case 'float':
+            case 'array':
+            case 'json':
+            case 'bool':
+                return $field_value;
+            default:
+                return ($field_value instanceof $field_type) ? $field_value : new $field_type($field_value);
+        }
+    }
+
+    /**
+     * @throws Exception
+     */
+    protected function throwErrors()
+    {
+
+        if (count($this->errors)) {
+            throw new Exception(implode(', ', $this->errors));
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function toJson(): string
+    {
+
+        return json_encode($this->toArray());
+    }
+
+    /**
+     * @return array
+     */
+    public function toArray(): array
+    {
+
+        $fields = get_object_vars($this);
+
+        foreach ($fields as $field_name => $field_value) {
+
+            if (!is_scalar($field_value) && method_exists($field_value, 'toJson')) {
+                $fields[$field_name] = $field_value->toArray();
+            }
+        }
+
+        return $fields;
+    }
+
+    /**
+     * @return string
+     */
+    public function __toString(): string
+    {
+
+        return implode(',', $this->toArray());
+    }
+
+    /**
+     * @param $name
+     * @param $arguments
+     *
+     * @return mixed
+     */
+    public function __call($name, $arguments)
+    {
+
+        preg_match('/(?<=(g|s)et)([A-Za-z0-9])\w+/', $name, $match);
+
+        $camel_field = (empty($match[0])) ? '' : $match[0];
+
+        $snake_field = $this->getFieldName($camel_field);
+
+        $field_type = (empty($this->typeCheck[$snake_field])) ? null : $this->typeCheck[$snake_field];
+
+        if (!empty($match[1]) && $field_type) {
+            switch ($match[1]) {
+                case 's':
+                    return $this->$snake_field = $this->parseFieldValue($field_type, current($arguments));
+                case 'g':
+                    return $this->$snake_field;
+            }
+        }
+    }
+
+    /**
+     * @param string $initial_field_name
+     *
+     * @return string
+     */
+    protected function getFieldName(string $initial_field_name): string
+    {
+
+        return camel2Snake($initial_field_name);
+    }
 }

src/Http/GoogleMapsRequest.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
 		$params = [];
 
 		foreach ($this->params as $param_name => $param_value) {
-			$params[$param_name] = (string)$param_value;
+			$params[$param_name] = (string) $param_value;
 		}
 
 		return http_build_query($params);

Indentation +75 added lines, -75 removed lines

@@ -17,80 +17,80 @@
 class GoogleMapsRequest
 {
 
-	/**
-	 * @var string
-	 * @since 0.5.0
-	 */
-	protected $endpoint = null;
-
-	/**
-	 * @var array
-	 */
-	private $params = [];
-
-	/**
-	 * GoogleMapsRequest constructor.
-	 *
-	 * @param array       $params
-	 * @param null|string $endpoint
-	 */
-	public function __construct(array $params = [], ?string $endpoint = null)
-	{
-
-		if ($params) {
-			foreach ($params as $param_name => $param_value) {
-				$this->setParam($param_name, $param_value);
-			}
-		}
-
-		$this->endpoint = $endpoint;
-	}
-
-	/**
-	 * @param string $param_name
-	 * @param mixed  $param_value
-	 *
-	 * @return GoogleMapsRequest
-	 */
-	public function setParam(string $param_name, $param_value): GoogleMapsRequest
-	{
-
-		$this->params[$param_name] = $param_value;
-
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getQuery(): string
-	{
-
-		$params = [];
-
-		foreach ($this->params as $param_name => $param_value) {
-			$params[$param_name] = (string)$param_value;
-		}
-
-		return http_build_query($params);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getParams(): array
-	{
-
-		return $this->params;
-	}
-
-	/**
-	 * @return null|string
-	 */
-	public function getEndpoint(): ?string
-	{
-
-		return $this->endpoint;
-	}
+    /**
+     * @var string
+     * @since 0.5.0
+     */
+    protected $endpoint = null;
+
+    /**
+     * @var array
+     */
+    private $params = [];
+
+    /**
+     * GoogleMapsRequest constructor.
+     *
+     * @param array       $params
+     * @param null|string $endpoint
+     */
+    public function __construct(array $params = [], ?string $endpoint = null)
+    {
+
+        if ($params) {
+            foreach ($params as $param_name => $param_value) {
+                $this->setParam($param_name, $param_value);
+            }
+        }
+
+        $this->endpoint = $endpoint;
+    }
+
+    /**
+     * @param string $param_name
+     * @param mixed  $param_value
+     *
+     * @return GoogleMapsRequest
+     */
+    public function setParam(string $param_name, $param_value): GoogleMapsRequest
+    {
+
+        $this->params[$param_name] = $param_value;
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getQuery(): string
+    {
+
+        $params = [];
+
+        foreach ($this->params as $param_name => $param_value) {
+            $params[$param_name] = (string)$param_value;
+        }
+
+        return http_build_query($params);
+    }
+
+    /**
+     * @return array
+     */
+    public function getParams(): array
+    {
+
+        return $this->params;
+    }
+
+    /**
+     * @return null|string
+     */
+    public function getEndpoint(): ?string
+    {
+
+        return $this->endpoint;
+    }
 
 }
\ No newline at end of file

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/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/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/Elevation.php

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

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