Fix 404 Not Found detection (#151)

robjuz · web-flow · commit bf32d213ffd8 · 2020-07-30T09:25:25.000+02:00
diff --git a/Cmfcmf/OpenWeatherMap.php b/Cmfcmf/OpenWeatherMap.php
@@ -584,7 +584,7 @@ private function cacheOrFetchResult($url)
         $response = $this->httpClient->sendRequest($this->httpRequestFactory->createRequest("GET", $url));
         $result = $response->getBody()->getContents();
         if ($response->getStatusCode() !== 200) {
-            if ($result === "{\"message\":\"not found\"}\n" && $response->getStatusCode() === 404) {
+            if (false !== strpos($result, 'not found') && $response->getStatusCode() === 404) {
                 throw new OWMNotFoundException();
             }
             throw new OWMException('OpenWeatherMap returned a response with status code ' . $response->getStatusCode() . ' and the following content `'. $result . '`');

Original file line number	Diff line number	Diff line change
`@@ -584,7 +584,7 @@ private function cacheOrFetchResult($url)`
`584`	`584`	`$response = $this->httpClient->sendRequest($this->httpRequestFactory->createRequest("GET", $url));`
`585`	`585`	`$result = $response->getBody()->getContents();`
`586`	`586`	`if ($response->getStatusCode() !== 200) {`
`587`		`- if ($result === "{\"message\":\"not found\"}\n" && $response->getStatusCode() === 404) {`
	`587`	`+ if (false !== strpos($result, 'not found') && $response->getStatusCode() === 404) {`
`588`	`588`	`throw new OWMNotFoundException();`
`589`	`589`	`}`
`590`	`590`	throw new OWMException('OpenWeatherMap returned a response with status code ' . $response->getStatusCode() . ' and the following content `'. $result . '`');