Adding exception handling

Autoloading Guzzle client if it exists
jaimz22 · Jun 8, 2015 · 41fb2dd · 41fb2dd
1 parent 1ab852f
commit 41fb2dd
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/Overcast.php b/src/Overcast.php
@@ -59,7 +59,7 @@ public function __construct($apiKey, ClientAdapterInterface $adapter = null)
 	{
 		self::$apiKey = $apiKey;
 		if (is_null($adapter)) {
-			if (class_exists('GuzzleHttp\Client',false)) {
+			if (class_exists('GuzzleHttp\Client',true)) {
 				$adapter = new GuzzleClientAdapter();
 			}else{
 				$adapter = new FileGetContentsClientAdapter();
@@ -80,8 +80,9 @@ public function __construct($apiKey, ClientAdapterInterface $adapter = null)
 	 */
 	public function getForecast($latitude, $longitude, \DateTime $time = null)
 	{
-		$response = $this->adapter->getForecast($latitude,$longitude, $time);
-		$responseHeaders = $this->adapter->getHeaders();
+		try{
+			$response = $this->adapter->getForecast($latitude, $longitude, $time);
+			$responseHeaders = $this->adapter->getHeaders();
 
 		if (!is_null($responseHeaders['apiCalls'])) {
 			$this->apiCalls = $responseHeaders['apiCalls'];
@@ -94,7 +95,10 @@ public function getForecast($latitude, $longitude, \DateTime $time = null)
 			$cacheAge = (new \DateTime())->getTimestamp() - (new \DateTime($responseHeaders['cache']['expires']))->getTimestamp();
 		}
 
-		return new Forecast($response,$cacheAge, $responseHeaders['responseTime']);
+			return new Forecast($response, $cacheAge, $responseHeaders['responseTime']);
+		}catch(\Exception $e) {
+			return null;
+		}
 	}
 
 	/**