#55

Author: cmfcmf

Cmfcmf/OpenWeatherMap.php

@@ -155,7 +155,7 @@ public function getApiKey()
     }
 
     /**
-     * Returns the current weather at the place you specified as an object.
+     * Returns the current weather at the place you specified.
      *
      * @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.
@@ -183,7 +183,8 @@ public function getWeather($query, $units = 'imperial', $lang = 'en', $appid = '
     }
 
     /**
-     * Returns the current weather at the place you specified as an object.
+     * Returns the forecast for the place you specified. DANGER: Might return
+     * fewer results than requested due to a bug in the OpenWeatherMap API!
      *
      * @param array|int|string $query The place to get weather information for. For possible values see ::getWeather.
      * @param string           $units Can be either 'metric' or 'imperial' (default). This affects almost all units returned.
@@ -213,7 +214,7 @@ public function getWeatherForecast($query, $units = 'imperial', $lang = 'en', $a
     }
 
     /**
-     * Returns the weather history for the place you specified as an object.
+     * Returns the weather history for the place you specified.
      *
      * @param array|int|string $query      The place to get weather information for. For possible values see ::getWeather.
      * @param \DateTime        $start

Cmfcmf/OpenWeatherMap/WeatherForecast.php

@@ -78,8 +78,16 @@ public function __construct($xml, $units, $days)
         $this->sun = new Sun(new \DateTime($xml->sun['rise']), new \DateTime($xml->sun['set']));
         $this->lastUpdate = new \DateTime($xml->meta->lastupdate);
 
+        $today = new \DateTime();
+        $today->setTime(0, 0, 0);
         $counter = 0;
         foreach ($xml->forecast->time as $time) {
+            $date = new \DateTime(isset($time['day']) ? $time['day'] : $time['to']);
+            if ($date < $today) {
+                // Sometimes OpenWeatherMap returns results which aren't real
+                // forecasts. The best we can do is to ignore them.
+                continue;
+            }
             $forecast = new Forecast($time, $units);
             $forecast->city = $this->city;
             $this->forecasts[] = $forecast;