Merge pull request #10 from attogram/exceptions

attogram · web-flow · commit 22e8adf8e45e · 2020-03-10T11:21:15.000+01:00
WeatherbitException
diff --git a/public/example.php b/public/example.php
@@ -12,7 +12,7 @@
 ini_set('display_startup_errors', '1');
 error_reporting(E_ALL);
 
-require('../src/Weatherbit.php'); // or: require('path/to/vendor/autoload.php');
+require('../vendor/autoload.php');
 
 $data = [];
 
@@ -83,7 +83,7 @@
             break;
     }
 } catch (Exception $error) {
-    $error = $error->getMessage();
+    $error = get_class($error) . ': ' . $error->getMessage();
 }
 
 printResults($response, $error);
diff --git a/src/Weatherbit.php b/src/Weatherbit.php
@@ -8,7 +8,6 @@
 
 namespace Attogram\Weatherbit;
 
-use Exception;
 use function curl_close;
 use function curl_exec;
 use function curl_getinfo;
@@ -21,7 +20,7 @@
 
 class Weatherbit
 {
-    const VERSION = '2.0.1';
+    const VERSION = '2.1.0';
 
     /**
      * @var string - user agent for API requests
@@ -96,13 +95,13 @@ class Weatherbit
      * Set Weatherbit API access key
      *
      * @param string $key
-     * @throws Exception
+     * @throws WeatherbitException
      * @return void
      */
     public function setKey(string $key)
     {
         if (empty($key)) {
-            throw new Exception('Missing API Key');
+            throw new WeatherbitException('Missing API Key');
         }
         $this->key = $key;
     }
@@ -112,11 +111,13 @@ public function setKey(string $key)
      * @see https://www.weatherbit.io/api/requests
      *
      * @param string $languageCode - 2 letter language code
+     * @throws WeatherbitException
+     * @return void
      */
     public function setLanguage(string $languageCode)
     {
         if (empty($languageCode) || strlen($languageCode) != 2) {
-            throw new Exception('Invalid Language Code');
+            throw new WeatherbitException('Invalid Language Code');
         }
         $this->language = $languageCode;
     }
@@ -126,11 +127,13 @@ public function setLanguage(string $languageCode)
      * @see https://www.weatherbit.io/api/requests
      *
      * @param string $unitsCode - 1 letter units code
+     * @throws WeatherbitException
+     * @return void
      */
     public function setUnits(string $unitsCode)
     {
         if (empty($unitsCode) || !in_array($unitsCode, ['M', 'S', 'I'])) {
-            throw new Exception('Invalid Units value.  Please use: M, S, or I');
+            throw new WeatherbitException('Invalid Units value.  Please use: M, S, or I');
         }
         $this->units = $unitsCode;
     }
@@ -140,11 +143,13 @@ public function setUnits(string $unitsCode)
      *
      * @param string $latitude
      * @param string $longitude
+     * @throws WeatherbitException
+     * @return void
      */
     public function setLocationByLatitudeLongitude(string $latitude, string $longitude)
     {
         if (empty($latitude) || empty($longitude)) {
-            throw new Exception('Missing latitude and/or longitude');
+            throw new WeatherbitException('Missing latitude and/or longitude');
         }
 
         $this->location = [
@@ -158,15 +163,17 @@ public function setLocationByLatitudeLongitude(string $latitude, string $longitu
      *
      * @param string $city
      * @param string $country (optional) 2 letter country code
+     * @throws WeatherbitException
+     * @return void
      */
     public function setLocationByCity(string $city, string $country = '')
     {
         if (empty($city)) {
-            throw new Exception('Invalid City');
+            throw new WeatherbitException('Invalid City');
         }
 
         if (!empty($country) && strlen($country) != 2) {
-            throw new Exception('Invalid Country Code');
+            throw new WeatherbitException('Invalid Country Code');
         }
     
         $this->location['city'] = $city;
@@ -252,13 +259,13 @@ public function setLocationByStations(array $weatherStations)
      * Get Daily Weather Forecast for 1-16 days in future
      *
      * @param int $days - Number of days to forecast (optional, default 10)
-     * @throws Exception
+     * @throws WeatherbitException
      * @return array - array of weather forecast data
      */
     public function getDailyForecast($days = 10): array
     {
         if ($days < 1 || $days > 16) {
-            throw new Exception('Forecast Days must between 1 and 16');
+            throw new WeatherbitException('Forecast Days must between 1 and 16');
         }
 
         $this->setUrl(
@@ -309,12 +316,13 @@ public function getUrl(): string
      *
      * @param string $prefix - URL Prefix
      * @param array $additional - array of name/value pairs for additional URL values
-     * @throws Exception
+     * @throws WeatherbitException
+     * @return void
      */
     private function setUrl($prefix, $additional = [])
     {
         if (empty($this->key)) {
-            throw new Exception('Missing API Key');
+            throw new WeatherbitException('Missing API Key');
         }
     
         $this->url = self::PREFIX_API . $prefix . '?key=' .  urlencode($this->key);
@@ -330,25 +338,27 @@ private function setUrl($prefix, $additional = [])
                 $this->url .= '&' . $name . '=' . urlencode((string) $value);
             }
         }
-        if (!empty($additional)) {
-            foreach ($additional as $name => $value) {
-                if (!empty($value)) {
-                    $this->url .= '&' . $name . '=' . urlencode((string) $value);
-                }
+    
+        if (empty($additional)) {
+            return;
+        }
+        foreach ($additional as $name => $value) {
+            if (!empty($value)) {
+                $this->url .= '&' . $name . '=' . urlencode((string) $value);
             }
         }
     }
 
     /**
      * Get Weather Data from the API
      *
-     * @throws Exception
+     * @throws WeatherbitException
      * @return array - array of weather data
      */
     private function get()
     {
         if (empty($this->url)) {
-            throw new Exception('Missing URL for API Call');
+            throw new WeatherbitException('Missing URL for API Call');
         }
     
         $curl = curl_init($this->url);
@@ -360,16 +370,16 @@ private function get()
         curl_close($curl);
 
         if ($status != '200') {
-            throw new Exception('API Failure - status code: ' . $status . ' - data: ' . print_r($jsonData, true));
+            throw new WeatherbitException('API Failure - status code: ' . $status . ' - data: ' . print_r($jsonData, true));
         }
 
         if (empty($jsonData)) {
-            throw new Exception('No data from API');
+            throw new WeatherbitException('No data from API');
         }
 
         $data = @json_decode($jsonData, true); // @silently ignore decode errors
         if (!is_array($data)) {
-            throw new Exception('Unable to decode response from API');
+            throw new WeatherbitException('Unable to decode response from API');
         }
 
         return $data;
diff --git a/src/WeatherbitException.php b/src/WeatherbitException.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Custom Exception for Weatherbit
+ */
+declare(strict_types = 1);
+
+namespace Attogram\Weatherbit;
+
+class WeatherbitException extends \Exception
+{
+}
diff --git a/tests/WeatherbitTest.php b/tests/WeatherbitTest.php
@@ -8,6 +8,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Attogram\Weatherbit\Weatherbit;
+use Attogram\Weatherbit\WeatherbitException;
 
 final class WeatherbitTest extends TestCase
 {
@@ -16,15 +17,17 @@ final class WeatherbitTest extends TestCase
      */
     protected $weatherbit;
 
+    // @TODO test setUp() against phpunit 6
     protected function setWeatherbit()
     {
         if (!$this->weatherbit) {
             $this->weatherbit = new Weatherbit();
         }
     }
 
-    public function testClass()
+    public function testWeatherbitClass()
     {
+        $this->assertTrue(class_exists('Attogram\Weatherbit\Weatherbit'));
         $this->setWeatherbit();
         $this->assertInstanceOf(Weatherbit::class, $this->weatherbit);
         $this->assertTrue(is_string(Weatherbit::VERSION));
@@ -41,6 +44,13 @@ public function testClass()
         $this->assertClassHasAttribute('url', Weatherbit::class);
     }
 
+    public function testClassWeatherbitException()
+    {
+        $this->assertTrue(class_exists('\Attogram\Weatherbit\WeatherbitException'));
+        $this->expectException(WeatherbitException::class);
+        throw new WeatherbitException();
+    }
+
     public function testSetKey()
     {
         $this->setWeatherbit();
@@ -51,7 +61,7 @@ public function testSetKey()
     public function testSetKeyEmptyString()
     {
         $this->setWeatherbit();
-        $this->expectException(Exception::class);
+        $this->expectException(WeatherbitException::class);
         $this->weatherbit->setKey('');
     }
 
@@ -72,7 +82,7 @@ public function testSetLanguage()
     public function testSetLanguageEmptyString()
     {
         $this->setWeatherbit();
-        $this->expectException(Exception::class);
+        $this->expectException(WeatherbitException::class);
         $this->weatherbit->setLanguage('');
     }
 
@@ -86,14 +96,14 @@ public function testSetLanguageNotString()
     public function testSetLanguageTooShort()
     {
         $this->setWeatherbit();
-        $this->expectException(Exception::class);
+        $this->expectException(WeatherbitException::class);
         $this->weatherbit->setLanguage('a');
     }
 
     public function testSetLanguageTooLong()
     {
         $this->setWeatherbit();
-        $this->expectException(Exception::class);
+        $this->expectException(WeatherbitException::class);
         $this->weatherbit->setLanguage('abc');
     }
 
@@ -109,7 +119,7 @@ public function testSetUnits()
     public function testSetUnitsEmptyString()
     {
         $this->setWeatherbit();
-        $this->expectException(Exception::class);
+        $this->expectException(WeatherbitException::class);
         $this->weatherbit->setUnits('');
     }
 
@@ -123,7 +133,7 @@ public function testSetUnitsNotString()
     public function testSetUnitsNonCode()
     {
         $this->setWeatherbit();
-        $this->expectException(Exception::class);
+        $this->expectException(WeatherbitException::class);
         $this->weatherbit->setUnits('X');
     }
 
@@ -137,7 +147,7 @@ public function testSetLocationByLatitudeLongitude()
     public function testSetLocationByLatitudeLongitudeEmptyStrings()
     {
         $this->setWeatherbit();
-        $this->expectException(Exception::class);
+        $this->expectException(WeatherbitException::class);
         $this->weatherbit->setLocationByLatitudeLongitude('', '');
     }
 
@@ -172,14 +182,14 @@ public function testSetLocationByCityStateCountry()
     public function testSetLocationByCityEmptyString()
     {
         $this->setWeatherbit();
-        $this->expectException(Exception::class);
+        $this->expectException(WeatherbitException::class);
         $this->weatherbit->setLocationByCity('');
     }
 
     public function testSetLocationByCityEmptyStrings()
     {
         $this->setWeatherbit();
-        $this->expectException(Exception::class);
+        $this->expectException(WeatherbitException::class);
         $this->weatherbit->setLocationByCity('', '');
     }
 
@@ -200,7 +210,7 @@ public function testSetLocationByCityNotStrings()
     public function testSetLocationByCityInvalidCountry()
     {
         $this->setWeatherbit();
-        $this->expectException(Exception::class);
+        $this->expectException(WeatherbitException::class);
         $this->weatherbit->setLocationByCity('Amsterdam', 'NLD');
     }
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`ini_set('display_startup_errors', '1');`
`13`	`13`	`error_reporting(E_ALL);`
`14`	`14`
`15`		`-require('../src/Weatherbit.php'); // or: require('path/to/vendor/autoload.php');`
	`15`	`+require('../vendor/autoload.php');`
`16`	`16`
`17`	`17`	`$data = [];`
`18`	`18`
`@@ -83,7 +83,7 @@`
`83`	`83`	`break;`
`84`	`84`	`}`
`85`	`85`	`} catch (Exception $error) {`
`86`		`- $error = $error->getMessage();`
	`86`	`+ $error = get_class($error) . ': ' . $error->getMessage();`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`printResults($response, $error);`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@`
`8`	`8`
`9`	`9`	`namespace Attogram\Weatherbit;`
`10`	`10`
`11`		`-use Exception;`
`12`	`11`	`use function curl_close;`
`13`	`12`	`use function curl_exec;`
`14`	`13`	`use function curl_getinfo;`
`@@ -21,7 +20,7 @@`
`21`	`20`
`22`	`21`	`class Weatherbit`
`23`	`22`	`{`
`24`		`- const VERSION = '2.0.1';`
	`23`	`+ const VERSION = '2.1.0';`
`25`	`24`
`26`	`25`	`/**`
`27`	`26`	`* @var string - user agent for API requests`
`@@ -96,13 +95,13 @@ class Weatherbit`
`96`	`95`	`* Set Weatherbit API access key`
`97`	`96`	`*`
`98`	`97`	`* @param string $key`
`99`		`- * @throws Exception`
	`98`	`+ * @throws WeatherbitException`
`100`	`99`	`* @return void`
`101`	`100`	`*/`
`102`	`101`	`public function setKey(string $key)`
`103`	`102`	`{`
`104`	`103`	`if (empty($key)) {`
`105`		`- throw new Exception('Missing API Key');`
	`104`	`+ throw new WeatherbitException('Missing API Key');`
`106`	`105`	`}`
`107`	`106`	`$this->key = $key;`
`108`	`107`	`}`
`@@ -112,11 +111,13 @@ public function setKey(string $key)`
`112`	`111`	`* @see https://www.weatherbit.io/api/requests`
`113`	`112`	`*`
`114`	`113`	`* @param string $languageCode - 2 letter language code`
	`114`	`+ * @throws WeatherbitException`
	`115`	`+ * @return void`
`115`	`116`	`*/`
`116`	`117`	`public function setLanguage(string $languageCode)`
`117`	`118`	`{`
`118`	`119`	`if (empty($languageCode) \|\| strlen($languageCode) != 2) {`
`119`		`- throw new Exception('Invalid Language Code');`
	`120`	`+ throw new WeatherbitException('Invalid Language Code');`
`120`	`121`	`}`
`121`	`122`	`$this->language = $languageCode;`
`122`	`123`	`}`
`@@ -126,11 +127,13 @@ public function setLanguage(string $languageCode)`
`126`	`127`	`* @see https://www.weatherbit.io/api/requests`
`127`	`128`	`*`
`128`	`129`	`* @param string $unitsCode - 1 letter units code`
	`130`	`+ * @throws WeatherbitException`
	`131`	`+ * @return void`
`129`	`132`	`*/`
`130`	`133`	`public function setUnits(string $unitsCode)`
`131`	`134`	`{`
`132`	`135`	`if (empty($unitsCode) \|\| !in_array($unitsCode, ['M', 'S', 'I'])) {`
`133`		`- throw new Exception('Invalid Units value. Please use: M, S, or I');`
	`136`	`+ throw new WeatherbitException('Invalid Units value. Please use: M, S, or I');`
`134`	`137`	`}`
`135`	`138`	`$this->units = $unitsCode;`
`136`	`139`	`}`
`@@ -140,11 +143,13 @@ public function setUnits(string $unitsCode)`
`140`	`143`	`*`
`141`	`144`	`* @param string $latitude`
`142`	`145`	`* @param string $longitude`
	`146`	`+ * @throws WeatherbitException`
	`147`	`+ * @return void`
`143`	`148`	`*/`
`144`	`149`	`public function setLocationByLatitudeLongitude(string $latitude, string $longitude)`
`145`	`150`	`{`
`146`	`151`	`if (empty($latitude) \|\| empty($longitude)) {`
`147`		`- throw new Exception('Missing latitude and/or longitude');`
	`152`	`+ throw new WeatherbitException('Missing latitude and/or longitude');`
`148`	`153`	`}`
`149`	`154`
`150`	`155`	`$this->location = [`
`@@ -158,15 +163,17 @@ public function setLocationByLatitudeLongitude(string $latitude, string $longitu`
`158`	`163`	`*`
`159`	`164`	`* @param string $city`
`160`	`165`	`* @param string $country (optional) 2 letter country code`
	`166`	`+ * @throws WeatherbitException`
	`167`	`+ * @return void`
`161`	`168`	`*/`
`162`	`169`	`public function setLocationByCity(string $city, string $country = '')`
`163`	`170`	`{`
`164`	`171`	`if (empty($city)) {`
`165`		`- throw new Exception('Invalid City');`
	`172`	`+ throw new WeatherbitException('Invalid City');`
`166`	`173`	`}`
`167`	`174`
`168`	`175`	`if (!empty($country) && strlen($country) != 2) {`
`169`		`- throw new Exception('Invalid Country Code');`
	`176`	`+ throw new WeatherbitException('Invalid Country Code');`
`170`	`177`	`}`
`171`	`178`
`172`	`179`	`$this->location['city'] = $city;`
`@@ -252,13 +259,13 @@ public function setLocationByStations(array $weatherStations)`
`252`	`259`	`* Get Daily Weather Forecast for 1-16 days in future`
`253`	`260`	`*`
`254`	`261`	`* @param int $days - Number of days to forecast (optional, default 10)`
`255`		`- * @throws Exception`
	`262`	`+ * @throws WeatherbitException`
`256`	`263`	`* @return array - array of weather forecast data`
`257`	`264`	`*/`
`258`	`265`	`public function getDailyForecast($days = 10): array`
`259`	`266`	`{`
`260`	`267`	`if ($days < 1 \|\| $days > 16) {`
`261`		`- throw new Exception('Forecast Days must between 1 and 16');`
	`268`	`+ throw new WeatherbitException('Forecast Days must between 1 and 16');`
`262`	`269`	`}`
`263`	`270`
`264`	`271`	`$this->setUrl(`
`@@ -309,12 +316,13 @@ public function getUrl(): string`
`309`	`316`	`*`
`310`	`317`	`* @param string $prefix - URL Prefix`
`311`	`318`	`* @param array $additional - array of name/value pairs for additional URL values`
`312`		`- * @throws Exception`
	`319`	`+ * @throws WeatherbitException`
	`320`	`+ * @return void`
`313`	`321`	`*/`
`314`	`322`	`private function setUrl($prefix, $additional = [])`
`315`	`323`	`{`
`316`	`324`	`if (empty($this->key)) {`
`317`		`- throw new Exception('Missing API Key');`
	`325`	`+ throw new WeatherbitException('Missing API Key');`
`318`	`326`	`}`
`319`	`327`
`320`	`328`	`$this->url = self::PREFIX_API . $prefix . '?key=' . urlencode($this->key);`
`@@ -330,25 +338,27 @@ private function setUrl($prefix, $additional = [])`
`330`	`338`	`$this->url .= '&' . $name . '=' . urlencode((string) $value);`
`331`	`339`	`}`
`332`	`340`	`}`
`333`		`- if (!empty($additional)) {`
`334`		`- foreach ($additional as $name => $value) {`
`335`		`- if (!empty($value)) {`
`336`		`- $this->url .= '&' . $name . '=' . urlencode((string) $value);`
`337`		`- }`
	`341`	`+`
	`342`	`+ if (empty($additional)) {`
	`343`	`+ return;`
	`344`	`+ }`
	`345`	`+ foreach ($additional as $name => $value) {`
	`346`	`+ if (!empty($value)) {`
	`347`	`+ $this->url .= '&' . $name . '=' . urlencode((string) $value);`
`338`	`348`	`}`
`339`	`349`	`}`
`340`	`350`	`}`
`341`	`351`
`342`	`352`	`/**`
`343`	`353`	`* Get Weather Data from the API`
`344`	`354`	`*`
`345`		`- * @throws Exception`
	`355`	`+ * @throws WeatherbitException`
`346`	`356`	`* @return array - array of weather data`
`347`	`357`	`*/`
`348`	`358`	`private function get()`
`349`	`359`	`{`
`350`	`360`	`if (empty($this->url)) {`
`351`		`- throw new Exception('Missing URL for API Call');`
	`361`	`+ throw new WeatherbitException('Missing URL for API Call');`
`352`	`362`	`}`
`353`	`363`
`354`	`364`	`$curl = curl_init($this->url);`
`@@ -360,16 +370,16 @@ private function get()`
`360`	`370`	`curl_close($curl);`
`361`	`371`
`362`	`372`	`if ($status != '200') {`
`363`		`- throw new Exception('API Failure - status code: ' . $status . ' - data: ' . print_r($jsonData, true));`
	`373`	`+ throw new WeatherbitException('API Failure - status code: ' . $status . ' - data: ' . print_r($jsonData, true));`
`364`	`374`	`}`
`365`	`375`
`366`	`376`	`if (empty($jsonData)) {`
`367`		`- throw new Exception('No data from API');`
	`377`	`+ throw new WeatherbitException('No data from API');`
`368`	`378`	`}`
`369`	`379`
`370`	`380`	`$data = @json_decode($jsonData, true); // @silently ignore decode errors`
`371`	`381`	`if (!is_array($data)) {`
`372`		`- throw new Exception('Unable to decode response from API');`
	`382`	`+ throw new WeatherbitException('Unable to decode response from API');`
`373`	`383`	`}`
`374`	`384`
`375`	`385`	`return $data;`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`
`9`	`9`	`use PHPUnit\Framework\TestCase;`
`10`	`10`	`use Attogram\Weatherbit\Weatherbit;`
	`11`	`+use Attogram\Weatherbit\WeatherbitException;`
`11`	`12`
`12`	`13`	`final class WeatherbitTest extends TestCase`
`13`	`14`	`{`
`@@ -16,15 +17,17 @@ final class WeatherbitTest extends TestCase`
`16`	`17`	`*/`
`17`	`18`	`protected $weatherbit;`
`18`	`19`
	`20`	`+ // @TODO test setUp() against phpunit 6`
`19`	`21`	`protected function setWeatherbit()`
`20`	`22`	`{`
`21`	`23`	`if (!$this->weatherbit) {`
`22`	`24`	`$this->weatherbit = new Weatherbit();`
`23`	`25`	`}`
`24`	`26`	`}`
`25`	`27`
`26`		`- public function testClass()`
	`28`	`+ public function testWeatherbitClass()`
`27`	`29`	`{`
	`30`	`+ $this->assertTrue(class_exists('Attogram\Weatherbit\Weatherbit'));`
`28`	`31`	`$this->setWeatherbit();`
`29`	`32`	`$this->assertInstanceOf(Weatherbit::class, $this->weatherbit);`
`30`	`33`	`$this->assertTrue(is_string(Weatherbit::VERSION));`
`@@ -41,6 +44,13 @@ public function testClass()`
`41`	`44`	`$this->assertClassHasAttribute('url', Weatherbit::class);`
`42`	`45`	`}`
`43`	`46`
	`47`	`+ public function testClassWeatherbitException()`
	`48`	`+ {`
	`49`	`+ $this->assertTrue(class_exists('\Attogram\Weatherbit\WeatherbitException'));`
	`50`	`+ $this->expectException(WeatherbitException::class);`
	`51`	`+ throw new WeatherbitException();`
	`52`	`+ }`
	`53`	`+`
`44`	`54`	`public function testSetKey()`
`45`	`55`	`{`
`46`	`56`	`$this->setWeatherbit();`
`@@ -51,7 +61,7 @@ public function testSetKey()`
`51`	`61`	`public function testSetKeyEmptyString()`
`52`	`62`	`{`
`53`	`63`	`$this->setWeatherbit();`
`54`		`- $this->expectException(Exception::class);`
	`64`	`+ $this->expectException(WeatherbitException::class);`
`55`	`65`	`$this->weatherbit->setKey('');`
`56`	`66`	`}`
`57`	`67`
`@@ -72,7 +82,7 @@ public function testSetLanguage()`
`72`	`82`	`public function testSetLanguageEmptyString()`
`73`	`83`	`{`
`74`	`84`	`$this->setWeatherbit();`
`75`		`- $this->expectException(Exception::class);`
	`85`	`+ $this->expectException(WeatherbitException::class);`
`76`	`86`	`$this->weatherbit->setLanguage('');`
`77`	`87`	`}`
`78`	`88`
`@@ -86,14 +96,14 @@ public function testSetLanguageNotString()`
`86`	`96`	`public function testSetLanguageTooShort()`
`87`	`97`	`{`
`88`	`98`	`$this->setWeatherbit();`
`89`		`- $this->expectException(Exception::class);`
	`99`	`+ $this->expectException(WeatherbitException::class);`
`90`	`100`	`$this->weatherbit->setLanguage('a');`
`91`	`101`	`}`
`92`	`102`
`93`	`103`	`public function testSetLanguageTooLong()`
`94`	`104`	`{`
`95`	`105`	`$this->setWeatherbit();`
`96`		`- $this->expectException(Exception::class);`
	`106`	`+ $this->expectException(WeatherbitException::class);`
`97`	`107`	`$this->weatherbit->setLanguage('abc');`
`98`	`108`	`}`
`99`	`109`
`@@ -109,7 +119,7 @@ public function testSetUnits()`
`109`	`119`	`public function testSetUnitsEmptyString()`
`110`	`120`	`{`
`111`	`121`	`$this->setWeatherbit();`
`112`		`- $this->expectException(Exception::class);`
	`122`	`+ $this->expectException(WeatherbitException::class);`
`113`	`123`	`$this->weatherbit->setUnits('');`
`114`	`124`	`}`
`115`	`125`
`@@ -123,7 +133,7 @@ public function testSetUnitsNotString()`
`123`	`133`	`public function testSetUnitsNonCode()`
`124`	`134`	`{`
`125`	`135`	`$this->setWeatherbit();`
`126`		`- $this->expectException(Exception::class);`
	`136`	`+ $this->expectException(WeatherbitException::class);`
`127`	`137`	`$this->weatherbit->setUnits('X');`
`128`	`138`	`}`
`129`	`139`
`@@ -137,7 +147,7 @@ public function testSetLocationByLatitudeLongitude()`
`137`	`147`	`public function testSetLocationByLatitudeLongitudeEmptyStrings()`
`138`	`148`	`{`
`139`	`149`	`$this->setWeatherbit();`
`140`		`- $this->expectException(Exception::class);`
	`150`	`+ $this->expectException(WeatherbitException::class);`
`141`	`151`	`$this->weatherbit->setLocationByLatitudeLongitude('', '');`
`142`	`152`	`}`
`143`	`153`
`@@ -172,14 +182,14 @@ public function testSetLocationByCityStateCountry()`
`172`	`182`	`public function testSetLocationByCityEmptyString()`
`173`	`183`	`{`
`174`	`184`	`$this->setWeatherbit();`
`175`		`- $this->expectException(Exception::class);`
	`185`	`+ $this->expectException(WeatherbitException::class);`
`176`	`186`	`$this->weatherbit->setLocationByCity('');`
`177`	`187`	`}`
`178`	`188`
`179`	`189`	`public function testSetLocationByCityEmptyStrings()`
`180`	`190`	`{`
`181`	`191`	`$this->setWeatherbit();`
`182`		`- $this->expectException(Exception::class);`
	`192`	`+ $this->expectException(WeatherbitException::class);`
`183`	`193`	`$this->weatherbit->setLocationByCity('', '');`
`184`	`194`	`}`
`185`	`195`
`@@ -200,7 +210,7 @@ public function testSetLocationByCityNotStrings()`
`200`	`210`	`public function testSetLocationByCityInvalidCountry()`
`201`	`211`	`{`
`202`	`212`	`$this->setWeatherbit();`
`203`		`- $this->expectException(Exception::class);`
	`213`	`+ $this->expectException(WeatherbitException::class);`
`204`	`214`	`$this->weatherbit->setLocationByCity('Amsterdam', 'NLD');`
`205`	`215`	`}`
`206`	`216`