add unit testing and some features

Author: peter279k

.travis.yml

@@ -1,33 +1,35 @@
 language: php
-#sudo: required
+
+sudo: false
 
 php:
   - 5.3
   - 5.4
   - 5.5
   - 5.6
-  - 7
-  - hhvm
+  - 7.0
+  - nightly
 
 matrix:
   fast_finish: true
+  allow_failures:
+    - php: nightly
 
-#addons:
-#  hosts:
-#    - api.openweathermap.org
-
-#before_install:
-#  - sudo apt-get -qq update
-#  - sudo apt-get install -y socat
-#  - cat /etc/hosts
-#  - sudo socat TCP-LISTEN:80,fork TCP:${RTCP_HOST}:${RTCP_PORT} > /tmp/socat.log 2>&1 &
+before_install:
+  - phpenv config-rm xdebug.ini
 
 install:
-  - composer install
+  - mkdir -p ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d && echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+  - mkdir -p build/logs
+  - composer global require satooshi/php-coveralls:@stable --no-update
+  - composer global update --prefer-dist --no-interaction
+  - composer update --prefer-dist --no-interaction $COMPOSER_FLAGS
+
+before_script:
+  - echo "zend_extension=xdebug.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
 
 script:
-  - phpunit --coverage-text --coverage-clover=coverage.clover
+  - vendor/bin/phpunit
 
-after_script:
-    - wget https://scrutinizer-ci.com/ocular.phar
-    - php ocular.phar code-coverage:upload --format=php-clover coverage.clover
+after_success:
+  - bash <(curl -s https://codecov.io/bash)

Cmfcmf/OpenWeatherMap.php

@@ -545,8 +545,8 @@ private function parseXML($answer)
             // 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);
-            if (isset($error['message'])) {
-                throw new OWMException($error['message'], $error['cod']);
+            if (json_last_error() !== JSON_ERROR_NONE) {
+                throw new OWMException('OpenWeatherMap returned an invalid json object: ' . json_last_error());
             } else {
                 throw new OWMException('Unknown fatal error: OpenWeatherMap returned the following json object: ' . $answer);
             }
@@ -563,7 +563,7 @@ private function parseJson($answer)
     {
         $json = json_decode($answer);
         if (json_last_error() !== JSON_ERROR_NONE) {
-            throw new OWMException('OpenWeatherMap returned an invalid json object: ' . json_last_error_msg());
+            throw new OWMException('OpenWeatherMap returned an invalid json object: ' . json_last_error());
         }
 
         return $json;

Cmfcmf/OpenWeatherMap/AbstractCache.php

@@ -57,6 +57,15 @@ abstract public function getCached($url);
      */
     abstract public function setCached($url, $content);
 
+    /**
+     * Specify the cached weather data file path.
+     *
+     * @param string $path     The cached file path.
+     *
+     * @return void.
+     */
+    abstract public function setTempPath($path);
+
     /**
      * Set after how much seconds the cache shall expire.
      *

Cmfcmf/OpenWeatherMap/Util/Weather.php

@@ -77,6 +77,6 @@ public function __toString()
      */
     public function getIconUrl()
     {
-        return str_replace("%s", $this->icon, $this->iconUrl);
+        return sprintf($this->iconUrl, $this->icon);
     }
 }

Cmfcmf/OpenWeatherMap/WeatherHistory.php

@@ -75,6 +75,9 @@ public function __construct($weatherHistory, $query)
 
         $utctz = new \DateTimeZone('UTC');
         foreach ($weatherHistory['list'] as $history) {
+            if (isset($history['city'])) {
+                continue;
+            }
             if (isset($history['rain'])) {
                 $units = array_keys($history['rain']);
             } else {

Examples/ApiKey.ini

@@ -1,4 +1,5 @@
 [OpenWeatherMap]
-# Get an API Key from http://home.openweathermap.org/
+; Get an API Key from http://home.openweathermap.org/
+; DO NOT use this API key for any production!
 api_key = 2f8796eefe67558dc205b09dd336d022
 

Examples/Cache.php

@@ -27,9 +27,11 @@
  */
 class ExampleCache extends AbstractCache
 {
+    protected $tmp;
+
     private function urlToPath($url)
     {
-        $tmp = sys_get_temp_dir();
+        $tmp = $this->tmp;
         $dir = $tmp . DIRECTORY_SEPARATOR . "OpenWeatherMapPHPAPI";
         if (!is_dir($dir)) {
             mkdir($dir);
@@ -72,6 +74,18 @@ public function setCached($url, $content)
     {
         file_put_contents($this->urlToPath($url), $content);
     }
+
+    /**
+     * @inheritdoc
+     */
+    public function setTempPath($path)
+    {
+        if (!is_dir($path)) {
+            mkdir($path);
+        }
+        
+        $this->tmp = $path;
+    }
 }
 
 // Language of data (try your own language here!):
@@ -81,7 +95,9 @@ public function setCached($url, $content)
 $units = 'metric';
 
 // Example 1: Use your own cache implementation. Cache for 10 seconds only in this example.
-$owm = new OpenWeatherMap($myApiKey, null, new ExampleCache(), 10);
+$cache = new ExampleCache();
+$cache->setTempPath(__DIR__.'/temps');
+$owm = new OpenWeatherMap($myApiKey, null, $cache, 10);
 
 $weather = $owm->getWeather('Berlin', $units, $lang);
 echo "EXAMPLE 1<hr />\n\n\n";

composer.json

@@ -17,7 +17,11 @@
         "source": "https://github.com/cmfcmf/OpenWeatherMap-PHP-Api.git"
     },
     "require": {
-        "php": ">=5.3.0"
+        "php": ">=5.3.0",
+        "ext-curl": "*"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^4.8 || ^5.0.5"
     },
     "autoload": {
         "psr-4": {