Merge pull request #71 from cmfcmf/release-2.1

cmfcmf · cmfcmf · commit f4fc509afef5 · 2016-04-12T19:36:06.000+02:00
Release 2.1
diff --git a/.travis.yml b/.travis.yml
@@ -23,7 +23,7 @@ before_install:
   - sudo socat TCP-LISTEN:80,fork TCP:184.170.226.124:3128 > /tmp/socat.log 2>&1 &
 
 install:
-  - composer install --dev
+  - composer install
 
 script:
   - phpunit --coverage-text --coverage-clover=coverage.clover
diff --git a/Cmfcmf/OpenWeatherMap/Forecast.php b/Cmfcmf/OpenWeatherMap/Forecast.php
@@ -54,7 +54,7 @@ public function __construct(\SimpleXMLElement $xml, $units)
             $temperatureUnit = 'F';
         }
 
-        $xml->temperature['value'] = ($xml->temperature['max'] + $xml->temperature['min']) / 2;
+        $xml->temperature['value'] = round((floatval($xml->temperature['max']) + floatval($xml->temperature['min'])) / 2, 2);
 
         $this->temperature = new Temperature(new Unit($xml->temperature['value'], $temperatureUnit), new Unit($xml->temperature['min'], $temperatureUnit), new Unit($xml->temperature['max'], $temperatureUnit), new Unit($xml->temperature['day'], $temperatureUnit), new Unit($xml->temperature['morn'], $temperatureUnit), new Unit($xml->temperature['eve'], $temperatureUnit), new Unit($xml->temperature['night'], $temperatureUnit));
         $this->humidity = new Unit($xml->humidity['value'], $xml->humidity['unit']);
diff --git a/Cmfcmf/OpenWeatherMap/WeatherForecast.php b/Cmfcmf/OpenWeatherMap/WeatherForecast.php
@@ -74,7 +74,7 @@ class WeatherForecast implements \Iterator
      */
     public function __construct($xml, $units, $days)
     {
-        $this->city = new City(-1, $xml->location->name, $xml->location->location['longitude'], $xml->location->location['latitude'], $xml->location->country);
+        $this->city = new City($xml->location->location['geobaseid'], $xml->location->name, $xml->location->location['longitude'], $xml->location->location['latitude'], $xml->location->country);
         $this->sun = new Sun(new \DateTime($xml->sun['rise']), new \DateTime($xml->sun['set']));
         $this->lastUpdate = new \DateTime($xml->meta->lastupdate);
 
diff --git a/Examples/Cache.php b/Examples/Cache.php
@@ -18,14 +18,7 @@
 use Cmfcmf\OpenWeatherMap;
 use Cmfcmf\OpenWeatherMap\AbstractCache;
 
-if (file_exists('../vendor/autoload.php')) {
-    // Library is not part of a project. "composer install" was executed directly on this library's composer file.
-    require('../vendor/autoload.php');
-} else {
-    // Library is part of a project.
-    /** @noinspection PhpIncludeInspection */
-    require('../../../autoload.php');
-}
+require_once __DIR__ . '/bootstrap.php';
 
 /**
  * Example cache implementation.
@@ -81,10 +74,6 @@ public function setCached($url, $content)
     }
 }
 
-// Load the api key.
-$ini = parse_ini_file('ApiKey.ini');
-$myApiKey = $ini['api_key'];
-
 // Language of data (try your own language here!):
 $lang = 'de';
 
diff --git a/Examples/CurrentWeather.php b/Examples/CurrentWeather.php
@@ -17,18 +17,7 @@
 use Cmfcmf\OpenWeatherMap;
 use Cmfcmf\OpenWeatherMap\Exception as OWMException;
 
-if (file_exists('../vendor/autoload.php')) {
-    // Library is not part of a project. "composer install" was executed directly on this library's composer file.
-    require '../vendor/autoload.php';
-} else {
-    // Library is part of a project.
-    /** @noinspection PhpIncludeInspection */
-    require '../../../autoload.php';
-}
-
-// Load the api key.
-$ini = parse_ini_file('ApiKey.ini');
-$myApiKey = $ini['api_key'];
+require_once __DIR__ . '/bootstrap.php';
 
 // Language of data (try your own language here!):
 $lang = 'de';
diff --git a/Examples/WeatherForecast.php b/Examples/WeatherForecast.php
@@ -17,18 +17,7 @@
 
 use Cmfcmf\OpenWeatherMap;
 
-if (file_exists('../vendor/autoload.php')) {
-    // Library is not part of a project. "composer install" was executed directly on this library's composer file.
-    require('../vendor/autoload.php');
-} else {
-    // Library is part of a project.
-    /** @noinspection PhpIncludeInspection */
-    require('../../../autoload.php');
-}
-
-// Load the api key.
-$ini = parse_ini_file('ApiKey.ini');
-$myApiKey = $ini['api_key'];
+require_once __DIR__ . '/bootstrap.php';
 
 // Language of data (try your own language here!):
 $lang = 'de';
diff --git a/Examples/WeatherHistory.php b/Examples/WeatherHistory.php
@@ -16,18 +16,7 @@
  */
 use Cmfcmf\OpenWeatherMap;
 
-if (file_exists('../vendor/autoload.php')) {
-    // Library is not part of a project. "composer install" was executed directly on this library's composer file.
-    require '../vendor/autoload.php';
-} else {
-    // Library is part of a project.
-    /** @noinspection PhpIncludeInspection */
-    require '../../../autoload.php';
-}
-
-// Load the api key.
-$ini = parse_ini_file('ApiKey.ini');
-$myApiKey = $ini['api_key'];
+require_once __DIR__ . '/bootstrap.php';
 
 // Language of data (try your own language here!):
 $lang = 'en';
diff --git a/Examples/bootstrap.php b/Examples/bootstrap.php
@@ -0,0 +1,17 @@
+<?php
+
+call_user_func(function () {
+    if (!is_file($autoloadFile = __DIR__ . '/../vendor/autoload.php')) {
+        throw new \RuntimeException('Did not find vendor/autoload.php. Did you run "composer install --dev"?');
+    }
+
+    /** @noinspection PhpIncludeInspection */
+    require_once $autoloadFile;
+
+    ini_set('date.timezone', 'Europe/Berlin');
+});
+
+
+// Load the api key.
+$ini = parse_ini_file('ApiKey.ini');
+$myApiKey = $ini['api_key'];
diff --git a/README.md b/README.md
@@ -14,8 +14,9 @@ Installation
 ============
 This library can be found on [Packagist](https://packagist.org/packages/cmfcmf/openweathermap-php-api).
 The recommended way to install and use this is through [Composer](http://getcomposer.org).
-Execute `composer require "cmfcmf/openweathermap-php-api": "~2.0"` in your
-project root.
+
+    composer require "cmfcmf/openweathermap-php-api"
+
 
 Example call
 ============
diff --git a/composer.json b/composer.json
@@ -20,8 +20,8 @@
         "php": ">=5.3.0"
     },
     "autoload": {
-        "psr-0": {
-            "Cmfcmf\\": ""
+        "psr-4": {
+            "Cmfcmf\\": "Cmfcmf"
         }
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/integTests/ConnectionTest.php b/integTests/ConnectionTest.php
@@ -23,24 +23,19 @@
 class ConnectionTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \OpenWeatherMap
+     * @var OpenWeatherMap
      */
     protected $owm;
 
     protected function setUp()
     {
-
-        // Load the app configuration
-        $ini = parse_ini_file(__DIR__ . '/ApiKey.ini');
-        $apiKey = $ini['api_key'];
-
         $this->owm = new OpenWeatherMap();
     }
 
     public function testUnauthorizedAccess()
     {
         try {
-            $weather = $this->owm->getWeather('Paris');
+            $this->owm->getWeather('Paris');
         } catch (OWMException $e) {
             $this->assertEquals(401, $e->getCode());
             $this->assertRegExp('/^Invalid API key/', $e->getMessage());
diff --git a/integTests/CurrentWeatherTest.php b/integTests/CurrentWeatherTest.php
@@ -23,13 +23,12 @@
 class CurrentWeatherTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \OpenWeatherMap
+     * @var OpenWeatherMap
      */
     protected $owm;
 
     protected function setUp()
     {
-
         // Load the app configuration
         $ini = parse_ini_file(__DIR__ . '/ApiKey.ini');
         $apiKey = $ini['api_key'];
@@ -64,7 +63,7 @@ public function testCityNotFound()
     {
         // City doesn't exist
         try {
-            $weather = $this->owm->getWeather('InvalidCity');
+            $this->owm->getWeather('InvalidCity');
         } catch (OWMException $e) {
             $this->assertEquals(404, $e->getCode());
             $this->assertEquals('Error: Not found city', $e->getMessage());
diff --git a/integTests/ForecastDailyTest.php b/integTests/ForecastDailyTest.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * OpenWeatherMap-PHP-API — A php api to parse weather data from http://www.OpenWeatherMap.org .
+ *
+ * @license MIT
+ *
+ * Please see the LICENSE file distributed with this source code for further
+ * information regarding copyright and licensing.
+ *
+ * Please visit the following links to read about the usage policies and the license of
+ * OpenWeatherMap before using this class:
+ *
+ * @see http://www.OpenWeatherMap.org
+ * @see http://www.OpenWeatherMap.org/terms
+ * @see http://openweathermap.org/appid
+ */
+
+namespace Cmfcmf\OpenWeatherMap\IntegTests;
+
+use Cmfcmf\OpenWeatherMap;
+
+class ForecastDailyTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var OpenWeatherMap
+     */
+    protected $owm;
+
+    protected function setUp()
+    {
+        $ini = parse_ini_file(__DIR__ . '/ApiKey.ini');
+        $apiKey = $ini['api_key'];
+
+        $this->owm = new OpenWeatherMap($apiKey);
+    }
+
+    public function testTemperatureMetric()
+    {
+        $forecast = $this->owm->getWeatherForecast('Berlin', 'metric', 'de', '', 10);
+
+        $now = new \DateTime();
+        $this->assertEquals($now->format('d.m.Y H:i'), $forecast->lastUpdate->format('d.m.Y H:i'));
+
+        $this->assertEquals('Berlin', $forecast->city->name);
+        $this->assertEquals('05:00:53', $forecast->sun->rise->format("H:i:s"));
+        $this->assertEquals('17:25:40', $forecast->sun->set->format("H:i:s"));
+
+        $this->assertEquals(10, iterator_count($forecast));
+
+        $forecast_arr = iterator_to_array($forecast);
+
+        $this->assertEquals('4.59 &deg;C', $forecast_arr[0]->temperature);
+        $this->assertEquals('7.34 &deg;C', $forecast_arr[1]->temperature);
+        $this->assertEquals('5.58 &deg;C', $forecast_arr[2]->temperature->now);
+        $this->assertEquals('6.14 &deg;C', $forecast_arr[3]->temperature);
+        $this->assertEquals('7.56 &deg;C', $forecast_arr[4]->temperature);
+        $this->assertEquals('10.24 &deg;C', $forecast_arr[5]->temperature);
+        $this->assertEquals('9.34 &deg;C', $forecast_arr[6]->temperature);
+        $this->assertEquals('10.93 &deg;C', $forecast_arr[7]->temperature->now);
+        $this->assertEquals('8.8 &deg;C', $forecast_arr[8]->temperature);
+        $this->assertEquals('8.02 &deg;C', $forecast_arr[9]->temperature);
+
+        $this->assertEquals('2.71 &deg;C', $forecast_arr[0]->temperature->min);
+        $this->assertEquals('9.07 &deg;C', $forecast_arr[1]->temperature->max);
+        $this->assertEquals('8.31 &deg;C', $forecast_arr[2]->temperature->day);
+        $this->assertEquals('2.93 &deg;C', $forecast_arr[3]->temperature->morning);
+        $this->assertEquals('8.99 &deg;C', $forecast_arr[4]->temperature->evening);
+        $this->assertEquals('8.91 &deg;C', $forecast_arr[5]->temperature->night);
+
+        $this->assertEquals('&deg;C', $forecast_arr[6]->temperature->getUnit());
+        $this->assertEquals('10.93', $forecast_arr[7]->temperature->getValue());
+        $this->assertEmpty($forecast_arr[8]->temperature->getDescription());
+        $this->assertEquals('8.02 &deg;C', $forecast_arr[9]->temperature->getFormatted());
+    }
+
+    public function testTemperatureImperial()
+    {
+        $forecast = $this->owm->getWeatherForecast('New York', 'imperial', 'en', '', 10);
+
+        $now = new \DateTime();
+        $this->assertEquals($now->format('m-d-Y H:i'), $forecast->lastUpdate->format('m-d-Y H:i'));
+
+        $this->assertEquals('New York', $forecast->city->name);
+        $this->assertEquals('10:53:25', $forecast->sun->rise->format("H:i:s"));
+        $this->assertEquals('23:11:57', $forecast->sun->set->format("H:i:s"));
+
+        $this->assertEquals(10, iterator_count($forecast));
+
+        $forecast_arr = iterator_to_array($forecast);
+
+        $this->assertEquals('48.88 F', $forecast_arr[0]->temperature);
+        $this->assertEquals('55.56 F', $forecast_arr[1]->temperature);
+        $this->assertEquals('57.08 F', $forecast_arr[2]->temperature->now);
+        $this->assertEquals('50.85 F', $forecast_arr[3]->temperature);
+        $this->assertEquals('47.79 F', $forecast_arr[4]->temperature);
+        $this->assertEquals('46.21 F', $forecast_arr[5]->temperature);
+        $this->assertEquals('47.73 F', $forecast_arr[6]->temperature);
+        $this->assertEquals('43.52 F', $forecast_arr[7]->temperature->now);
+        $this->assertEquals('34.79 F', $forecast_arr[8]->temperature);
+        $this->assertEquals('30.35 F', $forecast_arr[9]->temperature);
+
+        $this->assertEquals('47.75 F', $forecast_arr[0]->temperature->min);
+        $this->assertEquals('64.53 F', $forecast_arr[1]->temperature->max);
+        $this->assertEquals('69.4 F', $forecast_arr[2]->temperature->day);
+        $this->assertEquals('58.71 F', $forecast_arr[3]->temperature->morning);
+        $this->assertEquals('49.5 F', $forecast_arr[4]->temperature->evening);
+        $this->assertEquals('43.63 F', $forecast_arr[5]->temperature->night);
+
+        $this->assertEquals('F', $forecast_arr[6]->temperature->getUnit());
+        $this->assertEquals('43.52', $forecast_arr[7]->temperature->getValue());
+        $this->assertEmpty($forecast_arr[8]->temperature->getDescription());
+        $this->assertEquals('30.35 F', $forecast_arr[9]->temperature->getFormatted());
+    }
+
+    public function testWindMetric()
+    {
+        $forecast = $this->owm->getWeatherForecast('Moscow', 'metric', 'ru', '', 9);
+
+        $this->assertEquals('Moscow', $forecast->city->name);
+        $this->assertEquals('RU', $forecast->city->country);
+        $this->assertEquals(524901, $forecast->city->id);
+        $this->assertEquals('37.615555', $forecast->city->lon);
+        $this->assertEquals('55.75222', $forecast->city->lat);
+
+        $this->assertEquals('03:22:56', $forecast->sun->rise->format("H:i:s"));
+        $this->assertEquals('15:50:08', $forecast->sun->set->format("H:i:s"));
+
+        $this->assertEquals(9, iterator_count($forecast));
+
+        $forecast_arr = iterator_to_array($forecast);
+
+        $this->assertEquals('5.41 m/s', $forecast_arr[0]->wind->speed);
+        $this->assertEquals('61 ENE', $forecast_arr[1]->wind->direction);
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function __construct(\SimpleXMLElement $xml, $units)`
`54`	`54`	`$temperatureUnit = 'F';`
`55`	`55`	`}`
`56`	`56`
`57`		`- $xml->temperature['value'] = ($xml->temperature['max'] + $xml->temperature['min']) / 2;`
	`57`	`+ $xml->temperature['value'] = round((floatval($xml->temperature['max']) + floatval($xml->temperature['min'])) / 2, 2);`
`58`	`58`
`59`	`59`	`$this->temperature = new Temperature(new Unit($xml->temperature['value'], $temperatureUnit), new Unit($xml->temperature['min'], $temperatureUnit), new Unit($xml->temperature['max'], $temperatureUnit), new Unit($xml->temperature['day'], $temperatureUnit), new Unit($xml->temperature['morn'], $temperatureUnit), new Unit($xml->temperature['eve'], $temperatureUnit), new Unit($xml->temperature['night'], $temperatureUnit));`
`60`	`60`	`$this->humidity = new Unit($xml->humidity['value'], $xml->humidity['unit']);`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ class WeatherForecast implements \Iterator`
`74`	`74`	`*/`
`75`	`75`	`public function __construct($xml, $units, $days)`
`76`	`76`	`{`
`77`		`- $this->city = new City(-1, $xml->location->name, $xml->location->location['longitude'], $xml->location->location['latitude'], $xml->location->country);`
	`77`	`+ $this->city = new City($xml->location->location['geobaseid'], $xml->location->name, $xml->location->location['longitude'], $xml->location->location['latitude'], $xml->location->country);`
`78`	`78`	`$this->sun = new Sun(new \DateTime($xml->sun['rise']), new \DateTime($xml->sun['set']));`
`79`	`79`	`$this->lastUpdate = new \DateTime($xml->meta->lastupdate);`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@`
`20`	`20`	`"php": ">=5.3.0"`
`21`	`21`	`},`
`22`	`22`	`"autoload": {`
`23`		`- "psr-0": {`
`24`		`- "Cmfcmf\\": ""`
	`23`	`+ "psr-4": {`
	`24`	`+ "Cmfcmf\\": "Cmfcmf"`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`	`}`