Merge branch 'master' into master

Author: cmfcmf

Cmfcmf/OpenWeatherMap.php

@@ -40,7 +40,7 @@ class OpenWeatherMap
      *
      * @var string $copyright
      */
-    const COPYRIGHT = "Weather data from <a href=\"http://www.openweathermap.org\">OpenWeatherMap.org</a>";
+    const COPYRIGHT = "Weather data from <a href=\"http://openweathermap.org\">OpenWeatherMap.org</a>";
 
     /**
      * @var string The basic api url to fetch weather data from.
@@ -199,7 +199,7 @@ public function getWeather($query, $units = 'imperial', $lang = 'en', $appid = '
      * @throws OpenWeatherMap\Exception  If OpenWeatherMap returns an error.
      * @throws \InvalidArgumentException If an argument error occurs.
      *
-     * @return Array Array of CurrentWeather objects.
+     * @return CurrentWeatherGroup
      *
      * @api
      */

Cmfcmf/OpenWeatherMap/CurrentWeather.php

@@ -17,12 +17,11 @@
 
 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\Weather;
 use Cmfcmf\OpenWeatherMap\Util\Wind;
 
 /**
@@ -112,7 +111,7 @@ public function __construct($data, $units)
             $this->clouds = new Unit($data->clouds['value'], null, $data->clouds['name']);
             $this->precipitation = new Unit($data->precipitation['value'], $data->precipitation['unit'], $data->precipitation['mode']);
             $this->sun = new Sun(new \DateTime($data->city->sun['rise'], $utctz), new \DateTime($data->city->sun['set'], $utctz));
-            $this->weather = new WeatherObj($data->weather['number'], $data->weather['value'], $data->weather['icon']);
+            $this->weather = new Weather($data->weather['number'], $data->weather['value'], $data->weather['icon']);
             $this->lastUpdate = new \DateTime($data->lastupdate['value'], $utctz);
         } else {
             $this->city = new City($data->id, $data->name, $data->coord->lon, $data->coord->lat, $data->sys->country);
@@ -130,7 +129,7 @@ public function __construct($data, $units)
             $this->precipitation = new Unit($rainValue, $rainUnit);
 
             $this->sun = new Sun(\DateTime::createFromFormat('U', $data->sys->sunrise, $utctz), \DateTime::createFromFormat('U', $data->sys->sunset, $utctz));
-            $this->weather = new WeatherObj($data->weather[0]->id, $data->weather[0]->description, $data->weather[0]->icon);
+            $this->weather = new Weather($data->weather[0]->id, $data->weather[0]->description, $data->weather[0]->icon);
             $this->lastUpdate = \DateTime::createFromFormat('U', $data->dt, $utctz);
         }
     }

Cmfcmf/OpenWeatherMap/Forecast.php

@@ -20,7 +20,7 @@
 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\Weather;
 use Cmfcmf\OpenWeatherMap\Util\Wind;
 
 /**
@@ -65,7 +65,7 @@ public function __construct(\SimpleXMLElement $xml, $units)
         $this->wind = new Wind(new Unit($xml->windSpeed['mps'], $windSpeedUnit, $xml->windSpeed['name']), new Unit($xml->windDirection['deg'], $xml->windDirection['code'], $xml->windDirection['name']));
         $this->clouds = new Unit($xml->clouds['all'], $xml->clouds['unit'], $xml->clouds['value']);
         $this->precipitation = new Unit($xml->precipitation['value'], null, $xml->precipitation['type']);
-        $this->weather = new WeatherObj($xml->symbol['number'], $xml->symbol['name'], $xml->symbol['var']);
+        $this->weather = new Weather($xml->symbol['number'], $xml->symbol['name'], $xml->symbol['var']);
         $this->lastUpdate = new \DateTime($xml->lastupdate['value']);
 
         if (isset($xml['from'])) {

Cmfcmf/OpenWeatherMap/Util/Weather.php

@@ -42,7 +42,7 @@ class Weather
      *
      * @see self::getIconUrl() to see how it is used.
      */
-    private $iconUrl = "http://openweathermap.org/img/w/%s.png";
+    private static $iconUrl = "//openweathermap.org/img/w/%s.png";
 
     /**
      * Create a new weather object.
@@ -77,6 +77,17 @@ public function __toString()
      */
     public function getIconUrl()
     {
-        return sprintf($this->iconUrl, $this->icon);
+        return sprintf(self::$iconUrl, $this->icon);
+    }
+
+    /**
+     * Change the url template for icon urls. Please note: This will change the url template for
+     * all instances of this library.
+     *
+     * @param string $iconUrl The url template to build the icon urls.
+     */
+    public static function setIconUrlTemplate($iconUrl)
+    {
+        self::$iconUrl = $iconUrl;
     }
 }