Updated dependencies.

Updated readme.
Refactored some code.

Author: Martin Brecht-Precht

README.md

@@ -15,7 +15,7 @@ A PHP library to query Google's location service for geolocation and reverse loo
 ```{json}
 {
    	"require": {
-        "markenwerk/google-geocoder": "~2.0"
+        "markenwerk/google-geocoder": "~3.0"
     }
 }
 ```
@@ -35,20 +35,20 @@ require_once('path/to/vendor/autoload.php');
 #### Resolving an address
 
 ```{php}
-use CommonException;
+use Markenwerk\CommonException;
 
 try{
 	// Perform lookup
-	$addressLookup = new GoogleGeocode\AddressLookup();
+	$addressLookup = new Markenwerk\GoogleGeocode\Lookup\AddressLookup();
 	$addressLookup->lookup('Germany, 24105 Kiel, Lornsenstraße 43');
 
-	// Retrieving the lookup as an array of GoogleGeocode\GeoLookupResult instances
+	// Retrieving the lookup as an array of Markenwerk\GoogleGeocode\Result\GeoLookupResult instances
 	$lookupResults = $addressLookup->getResults();
 
 	// Get the number of lookup results
 	$lookupResultCount = $addressLookup->getResultCount();
 
-	// Retrieving the first lookup result as GoogleGeocode\GeoLookupResult instance
+	// Retrieving the first lookup result as Markenwerk\GoogleGeocode\Result\GeoLookupResult instance
 	$firstResult = $addressLookup->getFirstResult();
 
 } catch (CommonException\NetworkException\CurlException $exception) {
@@ -66,20 +66,20 @@ try{
 #### Resolving a geo location
 
 ```{php}
-use CommonException;
+use Markenwerk\CommonException;
 
 try{
 	// Perform lookup
-	$geoLocationLookup = new GoogleGeocode\GeoLocationLookup();
+	$geoLocationLookup = new Markenwerk\GoogleGeocode\Lookup\GeoLocationLookup();
 	$geoLocationLookup->lookup(54.334123, 10.1364007);
 
-	// Retrieving the lookup as an array of GoogleGeocode\GeoLookupResult instances
+	// Retrieving the lookup as an array of Markenwerk\GoogleGeocode\Result\GeoLookupResult instances
 	$lookupResults = $geoLocationLookup->getResults();
 
 	// Get the number of lookup results
 	$lookupResultCount = $geoLocationLookup->getResultCount();
 
-	// Retrieving the first lookup result as GoogleGeocode\AddressLookupResult instance
+	// Retrieving the first lookup result as Markenwerk\GoogleGeocode\Result\AddressLookupResult instance
 	$firstResult = $geoLocationLookup->getFirstResult();
 
 } catch (CommonException\NetworkException\CurlException $exception) {
@@ -99,22 +99,22 @@ try{
 Resolving Google Places IDs utilizes the Google Places API. Therefore a Places API key is mandatory for performing a lookup. Please visit the [Google API console](https://console.developers.google.com/apis/api/geocoding_backend?project=_) to receive an API key.
 
 ```{php}
-use CommonException;
+use Markenwerk\CommonException;
 
 try{
 	// Perform lookup
-	$googlePlacesLookup = new GoogleGeocode\GooglePlacesLookup();
+	$googlePlacesLookup = new GoogleGeocode\Lookup\GooglePlacesLookup();
 	$googlePlacesLookup
 		->setApiKey('MY_GOOGLE_PLACES_API_KEY')
 		->lookup('ChIJ_zNzWmpWskcRP8DWT5eX5jQ');
 
-	// Retrieving the lookup as an array of GoogleGeocode\GeoLookupResult instances
+	// Retrieving the lookup as an array of Markenwerk\GoogleGeocode\Result\GeoLookupResult instances
 	$lookupResults = $googlePlacesLookup->getResults();
 
 	// Get the number of lookup results
 	$lookupResultCount = $googlePlacesLookup->getResultCount();
 
-	// Retrieving the first lookup result as GoogleGeocode\AddressLookupResult instance
+	// Retrieving the first lookup result as Markenwerk\GoogleGeocode\Result\AddressLookupResult instance
 	$firstResult = $googlePlacesLookup->getFirstResult();
 
 } catch (CommonException\NetworkException\CurlException $exception) {
@@ -138,10 +138,10 @@ try{
 **Attention:** Plaese note that all getter methods on the `GeoLocationAddress` return a `GeoLocationAddressComponent` instance or `null`. For preventing calls on non-objects the `GeoLocationAddress` class provides methods to check whether the address components exists. 
 
 ```{php}
-// Retrieving the first lookup result as GoogleGeocode\GeoLookupResult instance
+// Retrieving the first lookup result as Markenwerk\GoogleGeocode\Result\GeoLookupResult instance
 $firstResult = $addressLookup->getFirstResult();
 
-// Retieving address information as GoogleGeocode\GeoLocation\GeoLocationAddress
+// Retieving address information as Markenwerk\GoogleGeocode\GeoLocation\GeoLocationAddress
 $geoLocationAddress = $firstResult->getAddress();
 
 if($firstResult->hasAddress()) {

composer.json

@@ -18,14 +18,14 @@
   ],
   "autoload": {
     "psr-4": {
-      "GoogleGeocode\\": "src/"
+      "Markenwerk\\GoogleGeocode\\": "src/"
     }
   },
   "require": {
     "php": ">=5.3",
     "lib-curl": "*",
-    "markenwerk/common-exceptions": "~2.0",
-    "markenwerk/google-datastructures": "~1.0"
+    "markenwerk/common-exceptions": "~3.0",
+    "markenwerk/google-datastructures": "~2.0"
   },
   "require-dev":{
     "phpunit/phpunit": "~4.8",

src/Base/BaseApiKeyGatedLookup.php renamed to src/Lookup/AbstractApiKeyGatedLookup.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace GoogleGeocode\Base;
+namespace Markenwerk\GoogleGeocode\Lookup;
 
-use GoogleGeocode;
+use Markenwerk\GoogleGeocode;
 
 /**
- * Class BaseApiKeyGatedLookup
+ * Class AbstractApiKeyGatedLookup
  *
- * @package GoogleGeocode\Base
+ * @package Markenwerk\GoogleGeocode\Lookup
  */
-abstract class BaseApiKeyGatedLookup extends BaseLookup
+abstract class AbstractApiKeyGatedLookup extends AbstractLookup
 {
 
 	/**

src/Base/BaseLookup.php renamed to src/Lookup/AbstractLookup.php

@@ -1,31 +1,31 @@
 <?php
 
-namespace GoogleGeocode\Base;
+namespace Markenwerk\GoogleGeocode\Lookup;
 
-use CommonException;
-use GoogleGeocode;
-use GoogleDataStructure;
+use Markenwerk\CommonException;
+use Markenwerk\GoogleGeocode;
+use Markenwerk\GoogleDataStructure;
 
 /**
- * Class BaseLookup
+ * Class AbstractLookup
  *
- * @package GoogleGeocode\Base
+ * @package Markenwerk\GoogleGeocode\Lookup
  */
-abstract class BaseLookup
+abstract class AbstractLookup
 {
 
 	const API_BASE_URL = 'https://maps.google.com/maps/api/geocode/json?sensor=false';
 
 	/**
-	 * @var GoogleGeocode\GeoLookupResult[]
+	 * @var GoogleGeocode\Result\GeoLookupResult[]
 	 */
 	private $results = array();
 
 	/**
-	 * @param GoogleGeocode\GeoLookupResult $result
+	 * @param GoogleGeocode\Result\GeoLookupResult $result
 	 * @return $this
 	 */
-	protected function addResult(GoogleGeocode\GeoLookupResult $result)
+	protected function addResult(GoogleGeocode\Result\GeoLookupResult $result)
 	{
 		$this->results[] = $result;
 		return $this;
@@ -41,7 +41,7 @@ protected function clearResults()
 	}
 
 	/**
-	 * @return GoogleGeocode\GeoLookupResult[]
+	 * @return GoogleGeocode\Result\GeoLookupResult[]
 	 */
 	public function getResults()
 	{
@@ -57,7 +57,7 @@ public function getResultCount()
 	}
 
 	/**
-	 * @return GoogleGeocode\GeoLookupResult
+	 * @return GoogleGeocode\Result\GeoLookupResult
 	 */
 	public function getFirstResult()
 	{
@@ -147,7 +147,7 @@ protected function addResultsFromResponse($responseData)
 			$locationAddress->setFromServiceResult($address);
 			$locationGeometry = new GoogleDataStructure\GeoLocation\GeoLocationGeometry();
 			$locationGeometry->setFromServiceResult($geometry);
-			$this->addResult(new GoogleGeocode\GeoLookupResult($locationAddress, $locationGeometry, $placesId));
+			$this->addResult(new GoogleGeocode\Result\GeoLookupResult($locationAddress, $locationGeometry, $placesId));
 		}
 		return $this;
 	}

src/AddressLookup.php renamed to src/Lookup/AddressLookup.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace GoogleGeocode;
+namespace Markenwerk\GoogleGeocode\Lookup;
 
-use CommonException;
+use Markenwerk\CommonException;
 
 /**
  * Class AddressLookup
  *
- * @package GoogleGeocode
+ * @package Markenwerk\GoogleGeocode\Lookup
  */
-class AddressLookup extends Base\BaseLookup
+class AddressLookup extends AbstractLookup
 {
 
 	/**

src/GeoLocationLookup.php renamed to src/Lookup/GeoLocationLookup.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace GoogleGeocode;
+namespace Markenwerk\GoogleGeocode\Lookup;
 
-use CommonException;
+use Markenwerk\CommonException;
 
 /**
  * Class GeoLocationLookup
  *
- * @package GoogleGeocode
+ * @package Markenwerk\GoogleGeocode\Lookup
  */
-class GeoLocationLookup extends Base\BaseLookup
+class GeoLocationLookup extends AbstractLookup
 {
 
 	/**

src/GooglePlacesLookup.php renamed to src/Lookup/GooglePlacesLookup.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace GoogleGeocode;
+namespace Markenwerk\GoogleGeocode\Lookup;
 
-use CommonException;
+use Markenwerk\CommonException;
 
 /**
  * Class GooglePlacesLookup
  *
- * @package GoogleGeocode
+ * @package Markenwerk\GoogleGeocode\Lookup
  */
-class GooglePlacesLookup extends Base\BaseApiKeyGatedLookup
+class GooglePlacesLookup extends AbstractApiKeyGatedLookup
 {
 
 	/**

src/GeoLookupResult.php renamed to src/Result/GeoLookupResult.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace GoogleGeocode;
+namespace Markenwerk\GoogleGeocode\Result;
 
-use GoogleDataStructure\GeoLocation;
+use Markenwerk\GoogleDataStructure\GeoLocation;
 
 /**
- * Class AddressLookupResult
+ * Class GeoLookupResult
  *
- * @package GoogleGeocode
+ * @package Markenwerk\GoogleGeocode\Result
  */
 class GeoLookupResult
 {

test/AddressLookupTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace GoogleGeocode;
+namespace Markenwerk\GoogleGeocode\Lookup;
 
-use CommonException;
+use Markenwerk\CommonException;
 
 /**
  * Class AddressLookupTest
  *
- * @package GoogleGeocode
+ * @package Markenwerk\GoogleGeocode
  */
 class AddressLookupTest extends \PHPUnit_Framework_TestCase
 {
@@ -21,7 +21,7 @@ public function testLookupSuccess()
 		// Validate results
 		$this->assertEquals(1, $addressLookup->getResultCount());
 		$firstResult = $addressLookup->getFirstResult();
-		$this->assertInstanceOf('GoogleGeocode\\GeoLookupResult', $firstResult);
+		$this->assertInstanceOf('Markenwerk\\GoogleGeocode\\Result\\GeoLookupResult', $firstResult);
 
 		// Address result
 		$this->assertTrue($firstResult->hasAddress());

test/GeoLocationLookupTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace GoogleGeocode;
+namespace Markenwerk\GoogleGeocode\Lookup;
 
-use CommonException;
+use Markenwerk\CommonException;
 
 /**
  * Class GeoLocationLookupTest
  *
- * @package GoogleGeocode
+ * @package Markenwerk\GoogleGeocode
  */
 class GeoLocationLookupTest extends \PHPUnit_Framework_TestCase
 {
@@ -21,7 +21,7 @@ public function testLookupSuccess()
 		// Validate results
 		$this->assertEquals(7, $geoLocationLookup->getResultCount());
 		$firstResult = $geoLocationLookup->getFirstResult();
-		$this->assertInstanceOf('GoogleGeocode\\GeoLookupResult', $firstResult);
+		$this->assertInstanceOf('Markenwerk\\GoogleGeocode\\Result\\GeoLookupResult', $firstResult);
 
 		// Address result
 		$this->assertTrue($firstResult->hasAddress());

test/GooglePlacesLookupTest.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace GoogleGeocode;
+namespace Markenwerk\GoogleGeocode\Lookup;
 
-use CommonException;
+use Markenwerk\CommonException;
 
 /**
  * Class GooglePlacesLookupTest
  *
- * @package GoogleGeocode
+ * @package Markenwerk\GoogleGeocode
  */
 class GooglePlacesLookupTest extends \PHPUnit_Framework_TestCase
 {
@@ -42,7 +42,7 @@ public function testLookupSuccess()
 		// Validate results
 		$this->assertEquals(1, $googlePlacesLookup->getResultCount());
 		$firstResult = $googlePlacesLookup->getFirstResult();
-		$this->assertInstanceOf('GoogleGeocode\\GeoLookupResult', $firstResult);
+		$this->assertInstanceOf('Markenwerk\\GoogleGeocode\\Result\\GeoLookupResult', $firstResult);
 
 		// Address result
 		$this->assertTrue($firstResult->hasAddress());