Some more CS fixes.

cmfcmf · cmfcmf · commit 8cf6da57a3d8 · 2014-05-27T22:14:15.000+02:00
diff --git a/Cmfcmf/OpenWeatherMap.php b/Cmfcmf/OpenWeatherMap.php
@@ -7,7 +7,9 @@
  * 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.
+ * 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/about
  * @see http://www.OpenWeatherMap.org/copyright
@@ -521,11 +523,6 @@ public function getRawWeatherHistory($query, \DateTime $start, $endOrCount = 1,
     /**
      * Fetches the result or delivers a cached version of the result.
      *
-     * @param $type
-     * @param $query
-     * @param $units
-     * @param $lang
-     * @param $mode
      * @param $url
      *
      * @return string
diff --git a/Cmfcmf/OpenWeatherMap/AbstractCache.php b/Cmfcmf/OpenWeatherMap/AbstractCache.php
@@ -7,7 +7,9 @@
  * 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.
+ * 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/about
  * @see http://www.OpenWeatherMap.org/copyright
diff --git a/Cmfcmf/OpenWeatherMap/CurrentWeather.php b/Cmfcmf/OpenWeatherMap/CurrentWeather.php
@@ -7,7 +7,9 @@
  * 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.
+ * 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/about
  * @see http://www.OpenWeatherMap.org/copyright
diff --git a/Cmfcmf/OpenWeatherMap/Exception.php b/Cmfcmf/OpenWeatherMap/Exception.php
@@ -7,7 +7,9 @@
  * 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.
+ * 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/about
  * @see http://www.OpenWeatherMap.org/copyright
diff --git a/Cmfcmf/OpenWeatherMap/Fetcher/CurlFetcher.php b/Cmfcmf/OpenWeatherMap/Fetcher/CurlFetcher.php
@@ -7,7 +7,9 @@
  * 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.
+ * 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/about
  * @see http://www.OpenWeatherMap.org/copyright
@@ -38,4 +40,4 @@ public function fetch($url)
 
         return $content;
     }
-}
+}
diff --git a/Cmfcmf/OpenWeatherMap/Fetcher/CurlFetcherTest.php b/Cmfcmf/OpenWeatherMap/Fetcher/CurlFetcherTest.php
@@ -7,7 +7,9 @@
  * 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.
+ * 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/about
  * @see http://www.OpenWeatherMap.org/copyright
@@ -47,4 +49,4 @@ public function testValidUrl()
 
         $this->assertContains('Herman Melville', $content);
     }
-}
+}
diff --git a/Cmfcmf/OpenWeatherMap/Fetcher/FetcherInterface.php b/Cmfcmf/OpenWeatherMap/Fetcher/FetcherInterface.php
@@ -7,7 +7,9 @@
  * 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.
+ * 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/about
  * @see http://www.OpenWeatherMap.org/copyright
@@ -33,4 +35,4 @@ interface FetcherInterface
      * @api
      */
     public function fetch($url);
-}
+}
diff --git a/Cmfcmf/OpenWeatherMap/Fetcher/FileGetContentsFetcher.php b/Cmfcmf/OpenWeatherMap/Fetcher/FileGetContentsFetcher.php
@@ -7,7 +7,9 @@
  * 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.
+ * 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/about
  * @see http://www.OpenWeatherMap.org/copyright
@@ -30,4 +32,4 @@ public function fetch($url)
     {
         return file_get_contents($url);
     }
-}
+}
diff --git a/Cmfcmf/OpenWeatherMap/Fetcher/FileGetContentsFetcherTest.php b/Cmfcmf/OpenWeatherMap/Fetcher/FileGetContentsFetcherTest.php
@@ -7,7 +7,9 @@
  * 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.
+ * 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/about
  * @see http://www.OpenWeatherMap.org/copyright
@@ -53,4 +55,4 @@ public function testValidUrl()
 
         $this->assertContains('Herman Melville', $content);
     }
-}
+}
diff --git a/Cmfcmf/OpenWeatherMap/Forecast.php b/Cmfcmf/OpenWeatherMap/Forecast.php
@@ -7,7 +7,9 @@
  * 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.
+ * 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/about
  * @see http://www.OpenWeatherMap.org/copyright
diff --git a/Cmfcmf/OpenWeatherMap/History.php b/Cmfcmf/OpenWeatherMap/History.php
@@ -7,7 +7,9 @@
  * 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.
+ * 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/about
  * @see http://www.OpenWeatherMap.org/copyright
@@ -100,4 +102,4 @@ public function __construct($city, $weather, $temperature, $pressure, $humidity,
         $this->wind = new Wind(new Unit($wind['speed']), new Unit($wind['deg']));
         $this->time = $time;
     }
-}
+}
diff --git a/Cmfcmf/OpenWeatherMap/Util/City.php b/Cmfcmf/OpenWeatherMap/Util/City.php
@@ -7,7 +7,9 @@
  * 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.
+ * 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/about
  * @see http://www.OpenWeatherMap.org/copyright
diff --git a/Cmfcmf/OpenWeatherMap/Util/Sun.php b/Cmfcmf/OpenWeatherMap/Util/Sun.php
@@ -7,7 +7,9 @@
  * 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.
+ * 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/about
  * @see http://www.OpenWeatherMap.org/copyright
diff --git a/Cmfcmf/OpenWeatherMap/Util/SunTest.php b/Cmfcmf/OpenWeatherMap/Util/SunTest.php
@@ -57,4 +57,4 @@ public function testSunSetBeforeSunRiseException()
 
         $this->givenThereIsASunObject($rise, $set);
     }
-}
+}
diff --git a/Cmfcmf/OpenWeatherMap/Util/Temperature.php b/Cmfcmf/OpenWeatherMap/Util/Temperature.php
@@ -7,7 +7,9 @@
  * 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.
+ * 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/about
  * @see http://www.OpenWeatherMap.org/copyright
diff --git a/Cmfcmf/OpenWeatherMap/Util/Time.php b/Cmfcmf/OpenWeatherMap/Util/Time.php
@@ -7,7 +7,9 @@
  * 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.
+ * 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/about
  * @see http://www.OpenWeatherMap.org/copyright
diff --git a/Cmfcmf/OpenWeatherMap/Util/Unit.php b/Cmfcmf/OpenWeatherMap/Util/Unit.php
@@ -7,7 +7,9 @@
  * 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.
+ * 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/about
  * @see http://www.OpenWeatherMap.org/copyright
@@ -125,4 +127,3 @@ public function getFormatted()
         }
     }
 }
-
diff --git a/Cmfcmf/OpenWeatherMap/Util/UnitTest.php b/Cmfcmf/OpenWeatherMap/Util/UnitTest.php
@@ -154,4 +154,4 @@ public function testToString()
 
         $this->assertEquals($this->unit->getFormatted(), $this->unit);
     }
-}
+}
diff --git a/Cmfcmf/OpenWeatherMap/Util/Weather.php b/Cmfcmf/OpenWeatherMap/Util/Weather.php
@@ -7,7 +7,9 @@
  * 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.
+ * 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/about
  * @see http://www.OpenWeatherMap.org/copyright
diff --git a/Cmfcmf/OpenWeatherMap/Util/Wind.php b/Cmfcmf/OpenWeatherMap/Util/Wind.php
@@ -7,7 +7,9 @@
  * 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.
+ * 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/about
  * @see http://www.OpenWeatherMap.org/copyright
diff --git a/Cmfcmf/OpenWeatherMap/WeatherForecast.php b/Cmfcmf/OpenWeatherMap/WeatherForecast.php
@@ -7,7 +7,9 @@
  * 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.
+ * 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/about
  * @see http://www.OpenWeatherMap.org/copyright
diff --git a/Cmfcmf/OpenWeatherMap/WeatherHistory.php b/Cmfcmf/OpenWeatherMap/WeatherHistory.php
@@ -7,7 +7,9 @@
  * 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.
+ * 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/about
  * @see http://www.OpenWeatherMap.org/copyright
@@ -67,6 +69,8 @@ public function __construct($weatherHistory, $query)
         foreach ($weatherHistory['list'] as $history) {
             if (isset($history['rain'])) {
                 $units = array_keys($history['rain']);
+            } else {
+                $units = array(0 => null);
             }
 
             $this->histories[] = new History($this->city, $history['weather'][0], array('now' => $history['main']['temp'], 'min' => $history['main']['temp_min'], 'max' => $history['main']['temp_max']), $history['main']['pressure'], $history['main']['humidity'], $history['clouds']['all'], isset($history['rain']) ? array('val' => $history['rain'][($units[0])], 'unit' => $units[0]) : null, $history['wind'], \DateTime::createFromFormat('U', $history['dt']));
@@ -112,4 +116,4 @@ public function valid()
     {
         return isset($this->histories[$this->position]);
     }
-} 
+}
diff --git a/Examples/Cache.php b/Examples/Cache.php
@@ -7,7 +7,9 @@
  * 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.
+ * 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/about
  * @see http://www.OpenWeatherMap.org/copyright
@@ -22,6 +24,7 @@
     require('../vendor/autoload.php');
 } else {
     // Library is part of a project.
+    /** @noinspection PhpIncludeInspection */
     require('../../../autoload.php');
 }
 
diff --git a/Examples/CurrentWeather.php b/Examples/CurrentWeather.php
@@ -7,7 +7,9 @@
  * 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.
+ * 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/about
  * @see http://www.OpenWeatherMap.org/copyright
@@ -22,6 +24,7 @@
     require('../vendor/autoload.php');
 } else {
     // Library is part of a project.
+    /** @noinspection PhpIncludeInspection */
     require('../../../autoload.php');
 }
 
diff --git a/Examples/WeatherForecast.php b/Examples/WeatherForecast.php
@@ -7,7 +7,9 @@
  * 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.
+ * 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/about
  * @see http://www.OpenWeatherMap.org/copyright
@@ -21,6 +23,7 @@
     require('../vendor/autoload.php');
 } else {
     // Library is part of a project.
+    /** @noinspection PhpIncludeInspection */
     require('../../../autoload.php');
 }
 
diff --git a/Examples/WeatherHistory.php b/Examples/WeatherHistory.php
@@ -7,7 +7,9 @@
  * 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.
+ * 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/about
  * @see http://www.OpenWeatherMap.org/copyright
@@ -21,6 +23,7 @@
     require('../vendor/autoload.php');
 } else {
     // Library is part of a project.
+    /** @noinspection PhpIncludeInspection */
     require('../../../autoload.php');
 }
 
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--suppress XmlUnboundNsPrefix -->
 <phpunit bootstrap="./tests/bootstrap.php" colors="true">
 
     <testsuites>
@@ -18,4 +19,4 @@
             </exclude>
         </whitelist>
     </filter>
-</phpunit>
+</phpunit>
diff --git a/tests/bootstrap.php b/tests/bootstrap.php

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,9 @@`
`7`	`7`	`* Please see the LICENSE file distributed with this source code for further`
`8`	`8`	`* information regarding copyright and licensing.`
`9`	`9`	`*`
`10`		`- * Please visit the following links to read about the usage policies and the license of OpenWeatherMap before using this class.`
	`10`	`+ * Please visit the following links to read about the usage policies and the license of`
	`11`	`+ * OpenWeatherMap before using this class:`
	`12`	`+ *`
`11`	`13`	`* @see http://www.OpenWeatherMap.org`
`12`	`14`	`* @see http://www.OpenWeatherMap.org/about`
`13`	`15`	`* @see http://www.OpenWeatherMap.org/copyright`
`@@ -30,4 +32,4 @@ public function fetch($url)`
`30`	`32`	`{`
`31`	`33`	`return file_get_contents($url);`
`32`	`34`	`}`
`33`		`-}`
	`35`	`+}`