@@ -10,8 +10,6 @@ |
||
| 10 | 10 | |
| 11 | 11 | namespace Th3Mouk\YahooWeatherAPI; |
| 12 | 12 | |
| 13 | -use Psr\Http\Message\ServerRequestInterface as Request; |
|
| 14 | -use Psr\Http\Message\ResponseInterface as Response; |
|
| 15 | 13 | use GuzzleHttp\Client; |
| 16 | 14 | use Th3Mouk\YahooWeatherAPI\Query\Query; |
| 17 | 15 | |
@@ -139,13 +139,13 @@ discard block |
||
| 139 | 139 | { |
| 140 | 140 | $service = new YahooWeatherAPI(); |
| 141 | 141 | $yql = 'select * from weather.forecast where woeid in (select woeid from geo.places(1) where text="123456789")'; |
| 142 | - $url = 'https://query.yahooapis.com/v1/public/yql?q=' . $yql . '&format=json&env=store://datatables.org/alltableswithkeys'; |
|
| 142 | + $url = 'https://query.yahooapis.com/v1/public/yql?q='.$yql.'&format=json&env=store://datatables.org/alltableswithkeys'; |
|
| 143 | 143 | $url = $this->encodeURI($url); |
| 144 | 144 | $response = $service->callApi($url); |
| 145 | 145 | $this->assertSame($response, false); |
| 146 | 146 | |
| 147 | 147 | $yql = 'select * from weather.forecast where woeid in (select woeid from geo.places(1) where text="Taipei")'; |
| 148 | - $url = 'https://query.yahooapis.com/v1/public/yql?q=' . $yql . '&format=json&env=store://datatables.org/alltableswithkeys'; |
|
| 148 | + $url = 'https://query.yahooapis.com/v1/public/yql?q='.$yql.'&format=json&env=store://datatables.org/alltableswithkeys'; |
|
| 149 | 149 | $url = $this->encodeURI($url); |
| 150 | 150 | $response = $service->callApi($url); |
| 151 | 151 | $city = str_replace(' ', '', $response['location']['city']); |
@@ -305,8 +305,8 @@ discard block |
||
| 305 | 305 | '%2A' => '*', '%27' => "'", '%28' => '(', '%29' => ')', |
| 306 | 306 | ); |
| 307 | 307 | $reserved = array( |
| 308 | - '%3B' => ';','%2C' => ',','%2F' => '/','%3F' => '?','%3A' => ':', |
|
| 309 | - '%40' => '@','%26' => '&','%3D' => '=','%2B' => '+','%24' => '$', |
|
| 308 | + '%3B' => ';', '%2C' => ',', '%2F' => '/', '%3F' => '?', '%3A' => ':', |
|
| 309 | + '%40' => '@', '%26' => '&', '%3D' => '=', '%2B' => '+', '%24' => '$', |
|
| 310 | 310 | ); |
| 311 | 311 | $score = array( |
| 312 | 312 | '%23' => '#', |