Remove deprecated constructor and methods

Author: cmfcmf

Cmfcmf/OpenWeatherMap.php

@@ -101,7 +101,7 @@ class OpenWeatherMap
     /**
      * Constructs the OpenWeatherMap object.
      *
-     * @param string                $apiKey  The OpenWeatherMap API key. Required and only optional for BC.
+     * @param string                $apiKey  The OpenWeatherMap API key. Required.
      * @param null|FetcherInterface $fetcher The interface to fetch the data from OpenWeatherMap. Defaults to
      *                                       CurlFetcher() if cURL is available. Otherwise defaults to
      *                                       FileGetContentsFetcher() using 'file_get_contents()'.
@@ -113,17 +113,14 @@ class OpenWeatherMap
      *
      * @api
      */
-    public function __construct($apiKey = '', $fetcher = null, $cache = false, $seconds = 600)
+    public function __construct($apiKey, $fetcher = null, $cache = false, $seconds = 600)
     {
         if (!is_string($apiKey) || empty($apiKey)) {
-            // BC
-            $seconds = $cache !== false ? $cache : 600;
-            $cache = $fetcher !== null ? $fetcher : false;
-            $fetcher = $apiKey !== '' ? $apiKey : null;
-        } else {
-            $this->apiKey = $apiKey;
+            throw new \InvalidArgumentException("You must provide an API key.");
         }
 
+        $this->apiKey = $apiKey;
+
         if ($cache !== false && !($cache instanceof AbstractCache)) {
             throw new \InvalidArgumentException('The cache class must implement the FetcherInterface!');
         }
@@ -554,14 +551,6 @@ public function wasCached()
         return $this->wasCached;
     }
 
-    /**
-     * @deprecated Use {@link self::getRawWeatherData()} instead.
-     */
-    public function getRawData($query, $units = 'imperial', $lang = 'en', $appid = '', $mode = 'xml')
-    {
-        return $this->getRawWeatherData($query, $units, $lang, $appid, $mode);
-    }
-
     /**
      * Fetches the result or delivers a cached version of the result.
      *

tests/OpenWeatherMapTest.php

@@ -61,15 +61,6 @@ protected function tearDown()
         @rmdir(__DIR__.'/temps');
     }
 
-    public function testApiKeyIsEmpty()
-    {
-        $expectApiKey = '';
-        $weather = new OpenWeatherMap($expectApiKey, null, false, 600);
-        $apiKey = $weather->getApiKey();
-
-        $this->assertSame($expectApiKey, $apiKey);
-    }
-
     public function testApiKeyNotNull()
     {
         $weather = $this->owm;