Merge remote-tracking branch 'origin/master'

# Conflicts:
#	README.md
#	composer.json
#	src/Lookup/AbstractLookup.php

Author: Martin Brecht-Precht

.codeclimate.yml

@@ -25,4 +25,4 @@ ratings:
   - "**.rb"
 exclude_paths:
 - test/
-- vendor/
+- vendor/

.travis.yml

@@ -9,6 +9,7 @@ php:
   - '5.4'
   - '5.5'
   - '7.0'
+  - '7.1'
   - hhvm
 
 matrix:

README.md

@@ -34,12 +34,20 @@ require_once('path/to/vendor/autoload.php');
 
 #### Resolving an address
 
+The API provides an optional usage of an API key to circumvent API quota limits. Please visit the [Google API console](https://console.developers.google.com/apis/api/geocoding_backend?project=_) to receive an API key.
+
 ```{php}
 use ChromaX\CommonException;
 
 try{
 	// Perform lookup
 	$addressLookup = new ChromaX\GoogleGeocode\Lookup\AddressLookup();
+	$addressLookup = new Markenwerk\GoogleGeocode\Lookup\AddressLookup();
+
+	// Optional adding an API key
+	$addressLookup->setApiKey('MY_GOOGLE_GEOCODING_API_KEY');
+
+	// Submit lookup
 	$addressLookup->lookup('Germany, 24105 Kiel, Lornsenstraße 43');
 
 	// Retrieving the lookup as an array of ChromaX\GoogleGeocode\Result\GeoLookupResult instances
@@ -65,12 +73,20 @@ try{
 
 #### Resolving a geo location
 
+The API provides an optional usage of an API key to circumvent API quota limits. Please visit the [Google API console](https://console.developers.google.com/apis/api/geocoding_backend?project=_) to receive an API key.
+
 ```{php}
 use ChromaX\CommonException;
 
 try{
 	// Perform lookup
 	$geoLocationLookup = new ChromaX\GoogleGeocode\Lookup\GeoLocationLookup();
+	$geoLocationLookup = new Markenwerk\GoogleGeocode\Lookup\GeoLocationLookup();
+
+	// Optional adding an API key
+	$geoLocationLookup->setApiKey('MY_GOOGLE_GEOCODING_API_KEY');
+
+	// Submit lookup
 	$geoLocationLookup->lookup(54.334123, 10.1364007);
 
 	// Retrieving the lookup as an array of ChromaX\GoogleGeocode\Result\GeoLookupResult instances

phpunit.xml.dist

@@ -14,4 +14,4 @@
 			</exclude>
 		</whitelist>
 	</filter>
-</phpunit>
+</phpunit>

src/Lookup/AbstractApiKeyGatedLookup.php

@@ -25,6 +25,14 @@ public function getApiKey()
 		return $this->apiKey;
 	}
 
+	/**
+	 * @return bool
+	 */
+	public function hasApiKey()
+	{
+		return !is_null($this->apiKey);
+	}
+
 	/**
 	 * @param string $apiKey
 	 * @return $this
@@ -43,6 +51,9 @@ public function setApiKey($apiKey)
 	 */
 	protected function addApiKey($url)
 	{
+		if (!$this->hasApiKey()) {
+			return $url;
+		}
 		return $url . '&key=' . $this->getApiKey();
 	}
 

src/Lookup/AddressLookup.php

@@ -9,7 +9,7 @@
  *
  * @package ChromaX\GoogleGeocode\Lookup
  */
-class AddressLookup extends AbstractLookup
+class AddressLookup extends AbstractApiKeyGatedLookup
 {
 
 	/**
@@ -24,6 +24,7 @@ class AddressLookup extends AbstractLookup
 	public function lookup($address)
 	{
 		$requestUrl = self::API_BASE_URL . $this->encodeUrlParameter($address);
+		$requestUrl = $this->addApiKey($requestUrl);
 		$responseData = $this->request($requestUrl);
 		$this
 			->clearResults()

src/Lookup/GeoLocationLookup.php

@@ -9,7 +9,7 @@
  *
  * @package ChromaX\GoogleGeocode\Lookup
  */
-class GeoLocationLookup extends AbstractLookup
+class GeoLocationLookup extends AbstractApiKeyGatedLookup
 {
 
 	/**
@@ -25,6 +25,7 @@ class GeoLocationLookup extends AbstractLookup
 	public function lookup($latitude, $longitude)
 	{
 		$requestUrl = self::API_BASE_URL . $this->encodeUrlParameter($latitude . ',' . $longitude);
+		$requestUrl = $this->addApiKey($requestUrl);
 		$responseData = $this->request($requestUrl);
 		$this
 			->clearResults()