Add UTC timezone to all \DateTime instances (#120)

Author: cmfcmf

.gitignore

@@ -1,4 +1,3 @@
 /vendor
-.vagrant/
-.idea/
-ubuntu-*.log
+/.vagrant/
+/ubuntu-xenial-16.04-cloudimg-console.log

Cmfcmf/OpenWeatherMap/Forecast.php

@@ -43,6 +43,8 @@ class Forecast extends CurrentWeather
      */
     public function __construct(\SimpleXMLElement $xml, $units)
     {
+        $utctz = new \DateTimeZone('UTC');
+
         if ($units == 'metric') {
             $temperatureUnit = "°C";
         } else {
@@ -69,7 +71,7 @@ public function __construct(\SimpleXMLElement $xml, $units)
         $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 Weather($xml->symbol['number'], $xml->symbol['name'], $xml->symbol['var']);
-        $this->lastUpdate = new \DateTime($xml->lastupdate['value']);
+        $this->lastUpdate = new \DateTime($xml->lastupdate['value'], $utctz);
 
         if (isset($xml['from'])) {
             $this->time = new Time($xml['from'], $xml['to']);

Cmfcmf/OpenWeatherMap/UVIndex.php

@@ -48,7 +48,8 @@ class UVIndex
      */
     public function __construct($data)
     {
-        $this->time = new \DateTime($data->time);
+        $utctz = new \DateTimeZone('UTC');
+        $this->time = new \DateTime($data->time, $utctz);
         $this->location = new Location($data->location->latitude, $data->location->longitude);
         $this->uvIndex = (float)$data->data;
     }

Cmfcmf/OpenWeatherMap/Util/Time.php

@@ -47,13 +47,14 @@ class Time
      */
     public function __construct($from, $to = null)
     {
+        $utctz = new \DateTimeZone('UTC');
         if (isset($to)) {
-            $from = ($from instanceof \DateTime) ? $from : new \DateTime((string)$from);
-            $to = ($to instanceof \DateTime) ? $to : new \DateTime((string)$to);
-            $day = new \DateTime($from->format('Y-m-d'));
+            $from = ($from instanceof \DateTime) ? $from : new \DateTime((string)$from, $utctz);
+            $to = ($to instanceof \DateTime) ? $to : new \DateTime((string)$to, $utctz);
+            $day = new \DateTime($from->format('Y-m-d'), $utctz);
         } else {
-            $from = ($from instanceof \DateTime) ? $from : new \DateTime((string)$from);
-            $day = $from = new \DateTime($from->format('Y-m-d'));
+            $from = ($from instanceof \DateTime) ? $from : new \DateTime((string)$from, $utctz);
+            $day = $from = new \DateTime($from->format('Y-m-d'), $utctz);
             $to = clone $from;
             $to = $to->add(new \DateInterval('PT23H59M59S'));
         }

Cmfcmf/OpenWeatherMap/WeatherForecast.php

@@ -76,13 +76,13 @@ public function __construct($xml, $units, $days)
         $this->city = new City($xml->location->location['geobaseid'], $xml->location->name, $xml->location->location['latitude'], $xml->location->location['longitude'], $xml->location->country);
         $utctz = new \DateTimeZone('UTC');
         $this->sun = new Sun(new \DateTime($xml->sun['rise'], $utctz), new \DateTime($xml->sun['set'], $utctz));
-        $this->lastUpdate = new \DateTime($xml->meta->lastupdate);
+        $this->lastUpdate = new \DateTime($xml->meta->lastupdate, $utctz);
 
-        $today = new \DateTime();
+        $today = new \DateTime('now', $utctz);
         $today->setTime(0, 0, 0);
         $counter = 0;
         foreach ($xml->forecast->time as $time) {
-            $date = new \DateTime(isset($time['day']) ? $time['day'] : $time['to']);
+            $date = new \DateTime(isset($time['day']) ? $time['day'] : $time['to'], $utctz);
             if ($date < $today) {
                 // Sometimes OpenWeatherMap returns results which aren't real
                 // forecasts. The best we can do is to ignore them.

tests/Util/TimeTest.php

@@ -18,13 +18,18 @@
 
 class TimeTest extends \PHPUnit_Framework_TestCase
 {
+    private function createDateTime($time)
+    {
+        return new \DateTime($time, new \DateTimeZone('UTC'));
+    }
+
     public function testFromTo()
     {
         $fromS = '2014-01-01 08:00:00';
         $toS = '2014-01-01 20:00:00';
-        $from = new \DateTime($fromS);
-        $to = new \DateTime($toS);
-        $day = new \DateTime('2014-01-01');
+        $from = $this->createDateTime($fromS);
+        $to = $this->createDateTime($toS);
+        $day = $this->createDateTime('2014-01-01');
 
         $time = new Time($from, $to);
         $this->assertSame($from->format('c'), $time->from->format('c'));
@@ -39,9 +44,9 @@ public function testFromTo()
     public function testFrom()
     {
         $fromS = '2014-01-01 00:00:00';
-        $from = new \DateTime($fromS);
-        $day = new \DateTime('2014-01-01');
-        $to = new \DateTime('2014-01-01 23:59:59');
+        $from = $this->createDateTime($fromS);
+        $day = $this->createDateTime('2014-01-01');
+        $to = $this->createDateTime('2014-01-01 23:59:59');
 
         $time = new Time($from);
         $this->assertSame($from->format('c'), $time->from->format('c'));