Th3Mouk / YahooWeatherAPI

src/YahooWeatherAPI.php

Doc Comments +1 added lines, -1 removed lines

@@ -211,7 +211,7 @@
     }
 
     /**
-     * @param GoutteClient $client
+     * @param Client $client
      */
     public function setClient(Client $client)
     {

Unused Use Statements -2 removed lines

@@ -10,8 +10,6 @@
 
 namespace Th3Mouk\YahooWeatherAPI;
 
-use Psr\Http\Message\ServerRequestInterface as Request;
-use Psr\Http\Message\ResponseInterface as Response;
 use GuzzleHttp\Client;
 use Th3Mouk\YahooWeatherAPI\Query\Query;
 

Spacing +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
             } else {
                 $this->lastResponse = $response['query']['results']['channel'];
             }
-        } catch(\Exception $e) {
+        } catch (\Exception $e) {
             throw new \Exception("Something error happen, please check your request url whether it's correct.", 400);
         }
 

tests/YahooWeatherClientTests.php

Doc Comments +3 added lines

@@ -302,6 +302,9 @@
         return $service->getYql();
     }
 
+    /**
+     * @param string $url
+     */
     public function encodeURI($url)
     {
         $unescaped = array(

Indentation +4 added lines, -4 removed lines

@@ -33,7 +33,7 @@ 
             $response = $service->callApiWoeid(null);
         }
         catch(\Exception $e) {
-           throw $e;
+            throw $e;
         }
     }
 
@@ -48,7 +48,7 @@ 
             $response = $service->callApiCityName(null);
         }
         catch(\Exception $e) {
-           throw $e;
+            throw $e;
         }
     }
 
@@ -63,7 +63,7 @@ 
             $response = $service->callApi(null);
         }
         catch(\Exception $e) {
-           throw $e;
+            throw $e;
         }
     }
 
@@ -80,7 +80,7 @@ 
             $response = $service->callApi($errYql);
         }
         catch(\Exception $e) {
-          throw $e;
+            throw $e;
         }
     }
 

Spacing +12 added lines, -12 removed lines

@@ -32,7 +32,7 @@ 
         try {
             $response = $service->callApiWoeid(null);
         }
-        catch(\Exception $e) {
+        catch (\Exception $e) {
            throw $e;
         }
     }
@@ -47,7 +47,7 @@ 
         try {
             $response = $service->callApiCityName(null);
         }
-        catch(\Exception $e) {
+        catch (\Exception $e) {
            throw $e;
         }
     }
@@ -62,7 +62,7 @@ 
         try {
             $response = $service->callApi(null);
         }
-        catch(\Exception $e) {
+        catch (\Exception $e) {
            throw $e;
         }
     }
@@ -79,7 +79,7 @@ 
         try {
             $response = $service->callApi($errYql);
         }
-        catch(\Exception $e) {
+        catch (\Exception $e) {
           throw $e;
         }
     }
@@ -143,13 +143,13 @@ 
     {
         $service = new YahooWeatherAPI();
         $yql = 'select * from weather.forecast where woeid in (select woeid from geo.places(1) where text="123456789")';
-        $url = "https://query.yahooapis.com/v1/public/yql?q=" . $yql . "&format=json&env=store://datatables.org/alltableswithkeys";
+        $url = "https://query.yahooapis.com/v1/public/yql?q=".$yql."&format=json&env=store://datatables.org/alltableswithkeys";
         $url = $this->encodeURI($url);
         $response = $service->callApi($url);
         $this->assertSame($response, false);
 
         $yql = 'select * from weather.forecast where woeid in (select woeid from geo.places(1) where text="Taipei")';
-        $url = "https://query.yahooapis.com/v1/public/yql?q=" . $yql . "&format=json&env=store://datatables.org/alltableswithkeys";
+        $url = "https://query.yahooapis.com/v1/public/yql?q=".$yql."&format=json&env=store://datatables.org/alltableswithkeys";
         $url = $this->encodeURI($url);
         $response = $service->callApi($url);
         $city = str_replace(" ", "", $response["location"]["city"]);
@@ -200,7 +200,7 @@ 
         $this->assertSame(is_string($response), true);
 
         $response = $service->getTemperature(false);
-        $this->assertSame(is_string((int)$response), false);
+        $this->assertSame(is_string((int) $response), false);
     }
 
     /** @test */
@@ -274,7 +274,7 @@ 
         );
 
         $response = $service->getWind(true);
-        $expectRes['speed'] .= ' ' . $storeRes['units']['speed'];
+        $expectRes['speed'] .= ' '.$storeRes['units']['speed'];
         $this->assertSame($response['speed'], $expectRes['speed']);
 
         $expectRes = array(
@@ -305,17 +305,17 @@ 
     public function encodeURI($url)
     {
         $unescaped = array(
-            '%2D'=>'-','%5F'=>'_','%2E'=>'.','%21'=>'!', '%7E'=>'~',
+            '%2D'=>'-', '%5F'=>'_', '%2E'=>'.', '%21'=>'!', '%7E'=>'~',
             '%2A'=>'*', '%27'=>"'", '%28'=>'(', '%29'=>')'
         );
         $reserved = array(
-            '%3B'=>';','%2C'=>',','%2F'=>'/','%3F'=>'?','%3A'=>':',
-            '%40'=>'@','%26'=>'&','%3D'=>'=','%2B'=>'+','%24'=>'$'
+            '%3B'=>';', '%2C'=>',', '%2F'=>'/', '%3F'=>'?', '%3A'=>':',
+            '%40'=>'@', '%26'=>'&', '%3D'=>'=', '%2B'=>'+', '%24'=>'$'
         );
         $score = array(
             '%23'=>'#'
         );
-        return strtr(rawurlencode($url), array_merge($reserved,$unescaped,$score));
+        return strtr(rawurlencode($url), array_merge($reserved, $unescaped, $score));
     }
 
     public function getResponseData()

Braces +4 added lines, -8 removed lines

@@ -31,8 +31,7 @@ 
 
         try {
             $response = $service->callApiWoeid(null);
-        }
-        catch(\Exception $e) {
+        } catch(\Exception $e) {
            throw $e;
         }
     }
@@ -46,8 +45,7 @@ 
 
         try {
             $response = $service->callApiCityName(null);
-        }
-        catch(\Exception $e) {
+        } catch(\Exception $e) {
            throw $e;
         }
     }
@@ -61,8 +59,7 @@ 
 
         try {
             $response = $service->callApi(null);
-        }
-        catch(\Exception $e) {
+        } catch(\Exception $e) {
            throw $e;
         }
     }
@@ -78,8 +75,7 @@ 
         
         try {
             $response = $service->callApi($errYql);
-        }
-        catch(\Exception $e) {
+        } catch(\Exception $e) {
           throw $e;
         }
     }