Merge pull request #9 from attogram/v2

cleanups

Author: attogram

public/example.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * Example of using the Weatherbit API Wrapper
- * 
+ *
  * @see https://github.com/attogram/weatherbit-api-wrapper
  */
 declare(strict_types = 1);
@@ -50,7 +50,6 @@
 $weatherbit = new Weatherbit();
 
 try {
-
     $weatherbit->setKey($data['key']);
 
     if (!empty($data['units'] && $data['units'] != 'M')) {
@@ -128,9 +127,10 @@ function printForm()
 
         <dl>
             <dt>Location by City:</dt>
-                <dd> City: <input name="city" type="text" value="' . htmlentities($data['city']) . '" size="20" /></dd>
-                <dd>Country: <input name="country" type="text" value="' . htmlentities($data['country']) . '" size="2" maxlength="2" />
-                    (2 Letter Country Code) (optional)</dd>
+                <dd> City: <input name="city" type="text" value="' . htmlentities($data['city'])
+                    . '" size="20" /></dd>
+                <dd>Country: <input name="country" type="text" value="' . htmlentities($data['country'])
+                    . '" size="2" maxlength="2" /> (2 Letter Country Code) (optional)</dd>
             <br />
             <dt>Location By Latitude / Longitude:</dt>
                 <dd>Latitude: <input name="lat" type="text" value="' . $data['latitude'] . '" size="20" /></dd>
@@ -143,17 +143,16 @@ function printForm()
         Forecast Days (1-16): <input name="days" type="text" value="' . $data['days'] . '" size="2" maxlength="2" />
         <br />
         
-        Language: <input name="language" type="text" value="' . htmlentities($data['language']) . '" size="2" maxlength="2" />
-            (2 Letter Language code)
-
+        Language: <input name="language" type="text" value="' . htmlentities($data['language'])
+            . '" size="2" maxlength="2" /> (2 Letter Language code)
         <br />
 
         Units:
-            <input type="radio" name="units" value="M"' . $data['units_M'] . '>M - Metric (Celcius, m/s, mm)</input>
-            &nbsp;
-            <input type="radio" name="units" value="I"' . $data['units_I'] . '>I - Imperial (Fahrenheit, mph, in)</input>
-            &nbsp;
-            <input type="radio" name="units" value="S"' . $data['units_S'] . '>S - Scientific (Kelvin, m/s, mm)</input>
+        <input type="radio" name="units" value="M"' . $data['units_M'] . '>M - Metric (Celcius, m/s, mm)</input>
+        &nbsp;
+        <input type="radio" name="units" value="I"' . $data['units_I'] . '>I - Imperial (Fahrenheit, mph, in)</input>
+        &nbsp;
+        <input type="radio" name="units" value="S"' . $data['units_S'] . '>S - Scientific (Kelvin, m/s, mm)</input>
         </select>
         <br />
         <br />

src/Weatherbit.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * Weatherbit API Wrapper
- * 
+ *
  * @see https://github.com/attogram/weatherbit-api-wrapper
  */
 declare(strict_types = 1);
@@ -21,7 +21,7 @@
 
 class Weatherbit
 {
-    const VERSION = '2.0.0';
+    const VERSION = '2.0.1';
 
     /**
      * @var string - user agent for API requests
@@ -74,7 +74,7 @@ class Weatherbit
     private $language = '';
 
     /**
-     * @var string - Units for API Response 
+     * @var string - Units for API Response
      *               M = [DEFAULT] Metric (Celcius, m/s, mm)
      *               S = Scientific (Kelvin, m/s, mm)
      *               I = Imperial (Fahrenheit, mph, in)
@@ -124,7 +124,7 @@ public function setLanguage(string $languageCode)
     /**
      * Set Units
      * @see https://www.weatherbit.io/api/requests
-     * 
+     *
      * @param string $unitsCode - 1 letter units code
      */
     public function setUnits(string $unitsCode)
@@ -137,7 +137,7 @@ public function setUnits(string $unitsCode)
 
     /**
      * Set Location by Latitude/Longitude
-     * 
+     *
      * @param string $latitude
      * @param string $longitude
      */
@@ -155,7 +155,7 @@ public function setLocationByLatitudeLongitude(string $latitude, string $longitu
 
     /**
      * Set Location by City Name
-     * 
+     *
      * @param string $city
      * @param string $country (optional) 2 letter country code
      */
@@ -177,7 +177,7 @@ public function setLocationByCity(string $city, string $country = '')
 
     /**
      * Set Location by City ID
-     * 
+     *
      * @param string $cityId
      */
     public function setLocationByCityId(string $cityId)
@@ -189,7 +189,7 @@ public function setLocationByCityId(string $cityId)
 
     /**
      * Set Location to a List of Cities IDs
-     * 
+     *
      * @param array $cityIds
      */
     public function setLocationByCityIds(array $cityIds)
@@ -202,7 +202,7 @@ public function setLocationByCityIds(array $cityIds)
 
     /**
      * Set Location by Postal Code
-     * 
+     *
      * @param string $postalCode
      */
     public function setLocationByPostalCode(string $postalCode)
@@ -214,7 +214,7 @@ public function setLocationByPostalCode(string $postalCode)
 
     /**
      * Set Location by IP Address
-     * 
+     *
      * @param string $ipAddress - Ip Address, or 'auto'
      */
     public function setLocationByIp(string $ipAddress = 'auto')
@@ -226,7 +226,7 @@ public function setLocationByIp(string $ipAddress = 'auto')
 
     /**
      * Set Location by Weather Station
-     * 
+     *
      * @param string $weatherStations
      */
     public function setLocationByStation(string $weatherStation)
@@ -238,6 +238,8 @@ public function setLocationByStation(string $weatherStation)
 
     /**
      * Set Location to List of Weather Stations
+     *
+     * @param array $weatherStations
      */
     public function setLocationByStations(array $weatherStations)
     {
@@ -260,7 +262,7 @@ public function getDailyForecast($days = 10): array
         }
 
         $this->setUrl(
-            self::POSTFIX_FORECAST_DAILY, 
+            self::POSTFIX_FORECAST_DAILY,
             ['days' => $days]
         );
 
@@ -294,7 +296,7 @@ public function getUsage(): array
 
     /**
      * Get current API Call URL
-     * 
+     *
      * @return string - The Current URL
      */
     public function getUrl(): string
@@ -304,7 +306,7 @@ public function getUrl(): string
 
     /**
      * Set the URL string for the API Call
-     * 
+     *
      * @param string $prefix - URL Prefix
      * @param array $additional - array of name/value pairs for additional URL values
      * @throws Exception

tests/WeatherbitTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * Weatherbits API Wrapper Tests
- * 
+ *
  * @see https://github.com/attogram/weatherbit-api-wrapper
  */
 declare(strict_types=1);