Removed exceptions and use markenwerk/common-exceptions instead.

Martin Brecht-Precht · Martin Brecht-Precht · commit 34b44d758206 · 2016-04-25T14:20:33.000+02:00
diff --git a/composer.json b/composer.json
@@ -23,6 +23,7 @@
   },
   "require": {
     "php": ">=5.3",
+    "markenwerk/common-exceptions": "*",
     "markenwerk/google-datastructures": "*"
   },
   "require-dev":{
diff --git a/src/AddressLookup.php b/src/AddressLookup.php
@@ -2,6 +2,8 @@
 
 namespace GoogleGeocode;
 
+use CommonException;
+
 /**
  * Class AddressLookup
  *
@@ -13,10 +15,10 @@ class AddressLookup extends Base\BaseLookup
 	/**
 	 * @param string $address
 	 * @return $this
-	 * @throws Exception\ApiException
-	 * @throws Exception\ApiLimitException
-	 * @throws Exception\ApiNoResultsException
-	 * @throws Exception\NetworkException
+	 * @throws CommonException\ApiException\ApiException
+	 * @throws CommonException\ApiException\ApiLimitException
+	 * @throws CommonException\ApiException\ApiNoResultsException
+	 * @throws CommonException\ApiException\NetworkException
 	 */
 	public function lookup($address)
 	{
diff --git a/src/Base/BaseLookup.php b/src/Base/BaseLookup.php
@@ -2,6 +2,7 @@
 
 namespace GoogleGeocode\Base;
 
+use CommonException;
 use GoogleGeocode;
 use GoogleDataStructure;
 
@@ -71,10 +72,10 @@ public function getFirstResult()
 	 *
 	 * @param string
 	 * @return string
-	 * @throws GoogleGeocode\Exception\ApiException
-	 * @throws GoogleGeocode\Exception\ApiLimitException
-	 * @throws GoogleGeocode\Exception\ApiNoResultsException
-	 * @throws GoogleGeocode\Exception\NetworkException
+	 * @throws CommonException\ApiException\ApiException
+	 * @throws CommonException\ApiException\ApiLimitException
+	 * @throws CommonException\ApiException\ApiNoResultsException
+	 * @throws CommonException\ApiException\NetworkException
 	 */
 	protected function request($url)
 	{
@@ -84,7 +85,7 @@ protected function request($url)
 		$response = curl_exec($curl);
 		curl_close($curl);
 		if (!$response) {
-			throw new GoogleGeocode\Exception\NetworkException('Curling the API endpoint ' . $url . ' failed.');
+			throw new CommonException\ApiException\NetworkException('Curling the API endpoint ' . $url . ' failed.');
 		}
 		$responseData = @json_decode($response, true);
 		$this->validateResponse($response, $responseData);
@@ -94,26 +95,26 @@ protected function request($url)
 	/**
 	 * @param string $rawResponse
 	 * @param array|string $responseData
-	 * @throws GoogleGeocode\Exception\ApiException
-	 * @throws GoogleGeocode\Exception\ApiLimitException
-	 * @throws GoogleGeocode\Exception\ApiNoResultsException
+	 * @throws CommonException\ApiException\ApiException
+	 * @throws CommonException\ApiException\ApiLimitException
+	 * @throws CommonException\ApiException\ApiNoResultsException
 	 */
 	private function validateResponse($rawResponse, $responseData)
 	{
 		if (is_null($responseData) || !is_array($responseData) || !isset($responseData['status'])) {
-			throw new GoogleGeocode\Exception\ApiException('Parsing the API response from body failed: ' . $rawResponse);
+			throw new CommonException\ApiException\ApiException('Parsing the API response from body failed: ' . $rawResponse);
 		}
 
 		$responseStatus = mb_strtoupper($responseData['status']);
 		if ($responseStatus == 'OVER_QUERY_LIMIT') {
 			$exceptionMessage = $this->buildExceptionMessage('Google Geocoder request limit reached', $responseData);
-			throw new GoogleGeocode\Exception\ApiLimitException($exceptionMessage);
+			throw new CommonException\ApiException\ApiLimitException($exceptionMessage);
 		} else if ($responseStatus == 'REQUEST_DENIED') {
 			$exceptionMessage = $this->buildExceptionMessage('Google Geocoder request was denied', $responseData);
-			throw new GoogleGeocode\Exception\ApiException($exceptionMessage);
+			throw new CommonException\ApiException\ApiException($exceptionMessage);
 		} else if ($responseStatus != 'OK') {
 			$exceptionMessage = $this->buildExceptionMessage('Google Geocoder no results', $responseData);
-			throw new GoogleGeocode\Exception\ApiNoResultsException($exceptionMessage);
+			throw new CommonException\ApiException\ApiNoResultsException($exceptionMessage);
 		}
 	}
 
diff --git a/src/Exception/ApiException.php b/src/Exception/ApiException.php
diff --git a/src/Exception/ApiLimitException.php b/src/Exception/ApiLimitException.php
diff --git a/src/Exception/ApiNoResultsException.php b/src/Exception/ApiNoResultsException.php
diff --git a/src/Exception/NetworkException.php b/src/Exception/NetworkException.php
diff --git a/src/GeoLocationLookup.php b/src/GeoLocationLookup.php
@@ -2,6 +2,8 @@
 
 namespace GoogleGeocode;
 
+use CommonException;
+
 /**
  * Class GeoLocationLookup
  *
@@ -14,10 +16,10 @@ class GeoLocationLookup extends Base\BaseLookup
 	 * @param float $latitude
 	 * @param float $longitude
 	 * @return $this
-	 * @throws Exception\ApiException
-	 * @throws Exception\ApiLimitException
-	 * @throws Exception\ApiNoResultsException
-	 * @throws Exception\NetworkException
+	 * @throws CommonException\ApiException\ApiException
+	 * @throws CommonException\ApiException\ApiLimitException
+	 * @throws CommonException\ApiException\ApiNoResultsException
+	 * @throws CommonException\ApiException\NetworkException
 	 */
 	public function lookup($latitude, $longitude)
 	{
diff --git a/src/GooglePlacesLookup.php b/src/GooglePlacesLookup.php
@@ -2,6 +2,8 @@
 
 namespace GoogleGeocode;
 
+use CommonException;
+
 /**
  * Class GooglePlacesLookup
  *
@@ -13,10 +15,10 @@ class GooglePlacesLookup extends Base\BaseApiKeyGatedLookup
 	/**
 	 * @param string $googlePlacesId
 	 * @return $this
-	 * @throws Exception\ApiException
-	 * @throws Exception\ApiLimitException
-	 * @throws Exception\ApiNoResultsException
-	 * @throws Exception\NetworkException
+	 * @throws CommonException\ApiException\ApiException
+	 * @throws CommonException\ApiException\ApiLimitException
+	 * @throws CommonException\ApiException\ApiNoResultsException
+	 * @throws CommonException\ApiException\NetworkException
 	 */
 	public function lookup($googlePlacesId)
 	{
diff --git a/test/AddressLookupTest.php b/test/AddressLookupTest.php
@@ -2,6 +2,8 @@
 
 namespace GoogleGeocode;
 
+use CommonException;
+
 /**
  * Class AddressLookupTest
  *
@@ -20,7 +22,7 @@ public function testLookupSuccess()
 		$this->assertEquals(1, $addressLookup->getResultCount());
 		$firstResult = $addressLookup->getFirstResult();
 		$this->assertInstanceOf('GoogleGeocode\\GeoLookupResult', $firstResult);
-		print_r($firstResult);
+
 		// Address result
 		$this->assertTrue($firstResult->hasAddress());
 		$addressResult = $firstResult->getAddress();
@@ -72,7 +74,7 @@ public function testLookupSuccess()
 
 	public function testLookupFailure()
 	{
-		$this->setExpectedException(get_class(new Exception\ApiNoResultsException()));
+		$this->setExpectedException(get_class(new CommonException\ApiException\ApiNoResultsException()));
 		$addressLookup = new AddressLookup();
 		$addressLookup->lookup('China, Bejing, Lornsenstraße 43');
 	}
diff --git a/test/GeoLocationLookupTest.php b/test/GeoLocationLookupTest.php
@@ -2,6 +2,8 @@
 
 namespace GoogleGeocode;
 
+use CommonException;
+
 /**
  * Class GeoLocationLookupTest
  *
@@ -72,7 +74,7 @@ public function testLookupSuccess()
 
 	public function testLookupFailure()
 	{
-		$this->setExpectedException(get_class(new Exception\ApiNoResultsException()));
+		$this->setExpectedException(get_class(new CommonException\ApiException\ApiNoResultsException()));
 		$geoLocationLookup = new GeoLocationLookup();
 		$geoLocationLookup->lookup(1000000, 1000000);
 	}
diff --git a/test/GooglePlacesLookupTest.php b/test/GooglePlacesLookupTest.php
@@ -2,6 +2,8 @@
 
 namespace GoogleGeocode;
 
+use CommonException;
+
 /**
  * Class GooglePlacesLookupTest
  *
@@ -89,7 +91,7 @@ public function testLookupSuccess()
 
 	public function testLookupNoResults()
 	{
-		$this->setExpectedException(get_class(new Exception\ApiNoResultsException()));
+		$this->setExpectedException(get_class(new CommonException\ApiException\ApiNoResultsException()));
 		$googlePlacesLookup = new GooglePlacesLookup();
 		$googlePlacesLookup
 			->setApiKey($this->googlePlacesApiKey)
@@ -98,7 +100,7 @@ public function testLookupNoResults()
 
 	public function testLookupApiKey()
 	{
-		$this->setExpectedException(get_class(new Exception\ApiException()));
+		$this->setExpectedException(get_class(new CommonException\ApiException\ApiException()));
 		$googlePlacesLookup = new GooglePlacesLookup();
 		$googlePlacesLookup
 			->setApiKey('INVALID_API_KEY')
