Reformatted code (PSR-2)

Author: cmfcmf

Cmfcmf/OpenWeatherMap.php

@@ -35,7 +35,7 @@ class OpenWeatherMap
      * @var string $weatherUrl The basic api url to fetch weather data from.
      */
     private $weatherUrl = "http://api.openweathermap.org/data/2.5/weather?";
-    
+
     /**
      * @var string $url The basic api url to fetch weekly forecast data from.
      */
@@ -101,7 +101,7 @@ public function __construct($fetcher = null, $cacheClass = false, $seconds = 600
         if ($seconds == 0) {
             $cacheClass = false;
         }
-        
+
         $this->cacheClass = $cacheClass;
         $this->seconds = $seconds;
         $this->fetcher = $fetcher;
@@ -156,7 +156,7 @@ public function getWeather($query, $units = 'imperial', $lang = 'en', $appid = '
 
         try {
             $xml = new \SimpleXMLElement($answer);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             // Invalid xml format. This happens in case OpenWeatherMap returns an error.
             // OpenWeatherMap always uses json for errors, even if one specifies xml as format.
             $error = json_decode($answer, true);
@@ -166,6 +166,7 @@ public function getWeather($query, $units = 'imperial', $lang = 'en', $appid = '
                 throw new OWMException('Unknown fatal error: OpenWeatherMap returned the following json object: ' . $answer);
             }
         }
+
         return new CurrentWeather($xml, $units);
     }
 
@@ -225,7 +226,7 @@ public function getWeatherForecast($query, $units = 'imperial', $lang = 'en', $a
 
         try {
             $xml = new \SimpleXMLElement($answer);
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             // Invalid xml format. This happens in case OpenWeatherMap returns an error.
             // OpenWeatherMap always uses json for errors, even if one specifies xml as format.
             $error = json_decode($answer, true);
@@ -295,23 +296,23 @@ public function getWeatherHistory($query, \DateTime $start, $endOrCount = 1, $ty
 
         return new WeatherHistory($xml, $query);
     }
-    
+
     /**
      * @deprecated Use {@link self::getRawWeatherData()} instead.
      */
     public function getRawData($query, $units = 'imperial', $lang = 'en', $appid = '', $mode = 'xml')
     {
-        return $this->getRawWeatherData($query, $units, $lang, $appid, $mode );
+        return $this->getRawWeatherData($query, $units, $lang, $appid, $mode);
     }
-    
+
     /**
      * Directly returns the xml/json/html string returned by OpenWeatherMap for the current weather.
      *
      * @param array|int|string $query The place to get weather information for. For possible values see below.
-     * @param string $units Can be either 'metric' or 'imperial' (default). This affects almost all units returned.
-     * @param string $lang The language to use for descriptions, default is 'en'. For possible values see below.
-     * @param string $appid Your app id, default ''. See http://openweathermap.org/appid for more details.
-     * @param string $mode The format of the data fetched. Possible values are 'json', 'html' and 'xml' (default).
+     * @param string           $units Can be either 'metric' or 'imperial' (default). This affects almost all units returned.
+     * @param string           $lang The language to use for descriptions, default is 'en'. For possible values see below.
+     * @param string           $appid Your app id, default ''. See http://openweathermap.org/appid for more details.
+     * @param string           $mode The format of the data fetched. Possible values are 'json', 'html' and 'xml' (default).
      *
      * @return string Returns false on failure and the fetched data in the format you specified on success.
      *
@@ -354,10 +355,10 @@ public function getRawWeatherData($query, $units = 'imperial', $lang = 'en', $ap
      * Directly returns the xml/json/html string returned by OpenWeatherMap for the hourly forecast.
      *
      * @param array|int|string $query The place to get weather information for. For possible values see below.
-     * @param string $units Can be either 'metric' or 'imperial' (default). This affects almost all units returned.
-     * @param string $lang The language to use for descriptions, default is 'en'. For possible values see below.
-     * @param string $appid Your app id, default ''. See http://openweathermap.org/appid for more details.
-     * @param string $mode The format of the data fetched. Possible values are 'json', 'html' and 'xml' (default).
+     * @param string           $units Can be either 'metric' or 'imperial' (default). This affects almost all units returned.
+     * @param string           $lang The language to use for descriptions, default is 'en'. For possible values see below.
+     * @param string           $appid Your app id, default ''. See http://openweathermap.org/appid for more details.
+     * @param string           $mode The format of the data fetched. Possible values are 'json', 'html' and 'xml' (default).
      *
      * @return string Returns false on failure and the fetched data in the format you specified on success.
      *
@@ -400,10 +401,10 @@ public function getRawHourlyForecastData($query, $units = 'imperial', $lang = 'e
      * Directly returns the xml/json/html string returned by OpenWeatherMap for the daily forecast.
      *
      * @param array|int|string $query The place to get weather information for. For possible values see below.
-     * @param string $units Can be either 'metric' or 'imperial' (default). This affects almost all units returned.
-     * @param string $lang The language to use for descriptions, default is 'en'. For possible values see below.
-     * @param string $appid Your app id, default ''. See http://openweathermap.org/appid for more details.
-     * @param string $mode The format of the data fetched. Possible values are 'json', 'html' and 'xml' (default).
+     * @param string           $units Can be either 'metric' or 'imperial' (default). This affects almost all units returned.
+     * @param string           $lang The language to use for descriptions, default is 'en'. For possible values see below.
+     * @param string           $appid Your app id, default ''. See http://openweathermap.org/appid for more details.
+     * @param string           $mode The format of the data fetched. Possible values are 'json', 'html' and 'xml' (default).
      *
      * @return string Returns false on failure and the fetched data in the format you specified on success.
      *
@@ -438,7 +439,7 @@ public function getRawHourlyForecastData($query, $units = 'imperial', $lang = 'e
     public function getRawDailyForecastData($query, $units = 'imperial', $lang = 'en', $appid = '', $mode = 'xml')
     {
         $url = $this->buildUrl($query, $units, $lang, $appid, $mode, $this->weatherDailyForecastUrl);
-        
+
         return $this->cacheOrFetchResult('dailyForecast', $query, $units, $lang, $mode, $url);
     }
 
@@ -449,7 +450,7 @@ public function getRawDailyForecastData($query, $units = 'imperial', $lang = 'en
      * @param \DateTime        $start The \DateTime object of the date to get the first weather information from.
      * @param \DateTime|int    $endOrCount Can be either a \DateTime object representing the end of the period to
      *                                     receive weather history data for or an integer counting the number of
-*                                          reports requested.
+     *                                          reports requested.
      * @param string           $type The period of the weather history requested. Can be either be either "tick",
      *                               "hour" or "day".
      * @param string           $units Can be either 'metric' or 'imperial' (default). This affects almost all units returned.
@@ -547,11 +548,11 @@ private function cacheOrFetchResult($type, $query, $units, $lang, $mode, $url)
     /**
      * Build the url to fetch weather data from.
      *
-     * @param $query
-     * @param $units
-     * @param $lang
-     * @param $appid
-     * @param $mode
+     * @param        $query
+     * @param        $units
+     * @param        $lang
+     * @param        $appid
+     * @param        $mode
      * @param string $url The url to prepend.
      *
      * @return bool|string The fetched url, false on failure.
@@ -566,7 +567,7 @@ private function buildUrl($query, $units, $lang, $appid, $mode, $url)
         if (!empty($appid)) {
             $url .= "&APPID=$appid";
         }
-        
+
         return $url;
     }
 
@@ -582,7 +583,7 @@ private function buildUrl($query, $units, $lang, $appid, $mode, $url)
      */
     private function buildQueryUrlParameter($query)
     {
-        switch($query) {
+        switch ($query) {
             case (is_array($query) && isset($query['lat']) && isset($query['lon']) && is_numeric($query['lat']) && is_numeric($query['lon'])):
                 return "lat={$query['lat']}&lon={$query['lon']}";
             case (is_numeric($query)):

Cmfcmf/OpenWeatherMap/AbstractCache.php

@@ -29,11 +29,11 @@ abstract class AbstractCache
     /**
      * Checks whether a cached weather data is available.
      *
-     * @param string $type The type of the cached data. Can be either 'weather', 'hourlyForecast' or 'dailyForecast'.
+     * @param string           $type The type of the cached data. Can be either 'weather', 'hourlyForecast' or 'dailyForecast'.
      * @param array|int|string $query The query parameters used.
-     * @param string $units The units requested.
-     * @param string $lang  The language requested.
-     * @param string $mode The mode requested ('xml' or'json').
+     * @param string           $units The units requested.
+     * @param string           $lang The language requested.
+     * @param string           $mode The mode requested ('xml' or'json').
      *
      * @return \DateTime|bool A \DateTime object containing the time when the weather information was last updated, false if no
      * cached information is available.
@@ -46,11 +46,11 @@ public abstract function isCached($type, $query, $units, $lang, $mode);
     /**
      * Returns cached weather data.
      *
-     * @param string $type The type of the cached data. Can be either 'weather', 'hourlyForecast' or 'dailyForecast'.
+     * @param string           $type The type of the cached data. Can be either 'weather', 'hourlyForecast' or 'dailyForecast'.
      * @param array|int|string $query The query parameters used.
-     * @param string $units The units requested.
-     * @param string $lang  The language requested.
-     * @param string $mode The mode requested ('xml' or'json').
+     * @param string           $units The units requested.
+     * @param string           $lang The language requested.
+     * @param string           $mode The mode requested ('xml' or'json').
      *
      * @return string|bool The cached data if it exists, false otherwise.
      */
@@ -59,19 +59,20 @@ public abstract function getCached($type, $query, $units, $lang, $mode);
     /**
      * Saves cached weather data.
      *
-     * @param string $type The type of the cached data. Can be either 'weather', 'hourlyForecast' or 'dailyForecast'.
-     * @param string $content The weather data to cache.
+     * @param string           $type The type of the cached data. Can be either 'weather', 'hourlyForecast' or 'dailyForecast'.
+     * @param string           $content The weather data to cache.
      * @param array|int|string $query The query parameters used.
-     * @param string $units The units requested.
-     * @param string $lang  The language requested.
-     * @param string $mode The mode requested ('xml' or'json').
+     * @param string           $units The units requested.
+     * @param string           $lang The language requested.
+     * @param string           $mode The mode requested ('xml' or'json').
      *
      * @return bool True on success, false on failure.
      */
     public abstract function setCached($type, $content, $query, $units, $lang, $mode);
 
     /**
      * Set after how much seconds the cache shall expire.
+     *
      * @param int $seconds
      */
     public function setSeconds($seconds)

Cmfcmf/OpenWeatherMap/CurrentWeather.php

@@ -16,13 +16,13 @@
 
 namespace Cmfcmf\OpenWeatherMap;
 
+use Cmfcmf\OpenWeatherMap;
 use Cmfcmf\OpenWeatherMap\Util\City;
 use Cmfcmf\OpenWeatherMap\Util\Sun;
 use Cmfcmf\OpenWeatherMap\Util\Temperature;
 use Cmfcmf\OpenWeatherMap\Util\Unit;
 use Cmfcmf\OpenWeatherMap\Util\Weather as WeatherObj;
 use Cmfcmf\OpenWeatherMap\Util\Wind;
-use Cmfcmf\OpenWeatherMap;
 
 /**
  * Weather class used to hold the current weather data.
@@ -105,7 +105,7 @@ public function __construct($xml, $units)
             $windSpeedUnit = 'mph';
         }
         $this->wind = new Wind(new Unit($xml->wind->speed['value'], $windSpeedUnit, $xml->wind->speed['name']), new Unit($xml->wind->direction['value'], $xml->wind->direction['code'], $xml->wind->direction['name']));
-        
+
         $this->clouds = new Unit($xml->clouds['value'], null, $xml->clouds['name']);
         $this->precipitation = new Unit($xml->precipitation['value'], $xml->precipitation['unit'], $xml->precipitation['mode']);
         $this->sun = new Sun(new \DateTime($xml->city->sun['rise']), new \DateTime($xml->city->sun['set']));

Cmfcmf/OpenWeatherMap/Fetcher/CurlFetcher.php

@@ -34,7 +34,7 @@ public function fetch($url)
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
         $content = curl_exec($ch);
-        curl_close( $ch );
+        curl_close($ch);
 
         return $content;
     }

Cmfcmf/OpenWeatherMap/Fetcher/FetcherInterface.php

@@ -32,5 +32,5 @@ interface FetcherInterface
      *
      * @api
      */
-    public function fetch ($url);
+    public function fetch($url);
 }

Cmfcmf/OpenWeatherMap/Forecast.php

@@ -16,14 +16,14 @@
 
 namespace Cmfcmf\OpenWeatherMap;
 
+use Cmfcmf\OpenWeatherMap;
 use Cmfcmf\OpenWeatherMap\Util\City;
 use Cmfcmf\OpenWeatherMap\Util\Sun;
 use Cmfcmf\OpenWeatherMap\Util\Temperature;
 use Cmfcmf\OpenWeatherMap\Util\Time;
 use Cmfcmf\OpenWeatherMap\Util\Unit;
 use Cmfcmf\OpenWeatherMap\Util\Weather as WeatherObj;
 use Cmfcmf\OpenWeatherMap\Util\Wind;
-use Cmfcmf\OpenWeatherMap;
 
 /**
  * Class Forecast.
@@ -37,15 +37,16 @@ class Forecast extends CurrentWeather
 
     /**
      * Create a new weather object for forecasts.
-     * @param \SimpleXMLElement $xml   The forecasts xml.
-     * @param string $units Ths units used.
+     *
+     * @param \SimpleXMLElement $xml The forecasts xml.
+     * @param string            $units Ths units used.
      *
      * @internal
      */
     public function __construct($xml, $units)
     {
         $this->city = new City($xml->city['id'], $xml->city['name'], $xml->city->coord['lon'], $xml->city->coord['lat'], $xml->city->country);
-        
+
         if ($units == 'metric') {
             $temperatureUnit = "\xB0C";
         } else {
@@ -71,7 +72,7 @@ public function __construct($xml, $units)
         $this->sun = new Sun(new \DateTime($xml->city->sun['rise']), new \DateTime($xml->city->sun['set']));
         $this->weather = new WeatherObj($xml->symbol['number'], $xml->symbol['name'], $xml->symbol['var']);
         $this->lastUpdate = new \DateTime($xml->lastupdate['value']);
-        
+
         if (isset($xml['from'])) {
             $this->time = new Time($xml['from'], $xml['to']);
         } else {

Cmfcmf/OpenWeatherMap/Util/SunTest.php

@@ -42,7 +42,6 @@ public function testSunSet()
     }
 
 
-
     private function givenThereIsASunObject($rise, $set)
     {
         $this->sun = new Sun($rise, $set);

Cmfcmf/OpenWeatherMap/Util/Temperature.php

@@ -38,6 +38,7 @@ class Temperature
 
     /**
      * Returns the current temperature as formatted string.
+     *
      * @return string The current temperature as a formatted string.
      */
     public function __toString()
@@ -47,6 +48,7 @@ public function __toString()
 
     /**
      * Returns the current temperature's unit.
+     *
      * @return string The current temperature's unit.
      */
     public function getUnit()
@@ -56,6 +58,7 @@ public function getUnit()
 
     /**
      * Returns the current temperature.
+     *
      * @return string The current temperature.
      */
     public function getValue()
@@ -65,6 +68,7 @@ public function getValue()
 
     /**
      * Returns the current temperature's description.
+     *
      * @return string The current temperature's description.
      */
     public function getDescription()
@@ -74,6 +78,7 @@ public function getDescription()
 
     /**
      * Returns the current temperature as formatted string.
+     *
      * @return string The current temperature as formatted string.
      */
     public function getFormatted()

Cmfcmf/OpenWeatherMap/Util/UnitTest.php

@@ -22,10 +22,15 @@ class UnitTest extends \PHPUnit_Framework_TestCase
     private $unit;
 
     const POSITIVE_INT_VALUE = 23;
+
     const POSITIVE_FLOAT_VALUE = 48.23534;
+
     const NEGATIVE_INT_VALUE = -30;
+
     const NEGATIVE_FLOAT_VALUE = -93.45839;
+
     const ZERO_INT_VALUE = 0;
+
     const ZERO_FLOAT_VALUE = 0.0;
 
     public function testGetValueWithPositiveIntValue()

Cmfcmf/OpenWeatherMap/Util/Weather.php

@@ -46,7 +46,7 @@ class Weather
     /**
      * Create a new weather object.
      *
-     * @param int $id The icon id.
+     * @param int    $id The icon id.
      * @param string $description The weather description.
      * @param string $icon The icon name.
      *