Skip to content

Commit 192b5a3

Browse files
author
Peter Ton
committed
Applied auto formatting
1 parent 7e075df commit 192b5a3

File tree

10 files changed

+923
-922
lines changed

10 files changed

+923
-922
lines changed

‎src/ClientAdapterInterface.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@
1717
*/
1818
interface ClientAdapterInterface
1919
{
20-
/**
21-
* Returns the response data from the Forecast.io in the
22-
* form of an array
23-
*
24-
* @param float $latitude
25-
* @param float $longitude
26-
* @param \DateTime $time
27-
* @param array $parameters
28-
*
29-
* @return array
30-
*/
31-
public function getForecast($latitude, $longitude, \DateTime $time = null, array $parameters = null);
20+
/**
21+
* Returns the response data from the Forecast.io in the
22+
* form of an array
23+
*
24+
* @param float $latitude
25+
* @param float $longitude
26+
* @param \DateTime $time
27+
* @param array $parameters
28+
*
29+
* @return array
30+
*/
31+
public function getForecast($latitude, $longitude, \DateTime $time = null, array $parameters = null);
3232

33-
/**
34-
* Returns the relevant response headers from the Forecast.io API
35-
*
36-
* @return array
37-
*/
38-
public function getHeaders();
33+
/**
34+
* Returns the relevant response headers from the Forecast.io API
35+
*
36+
* @return array
37+
*/
38+
public function getHeaders();
3939
}

‎src/ClientAdapters/FileGetContentsClientAdapter.php‎

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -21,84 +21,84 @@
2121
*/
2222
class FileGetContentsClientAdapter implements ClientAdapterInterface
2323
{
24-
private $requestedUrl = null;
25-
private $response = null;
26-
private $responseHeaders = [];
24+
private $requestedUrl = null;
25+
private $response = null;
26+
private $responseHeaders = [];
2727

28-
/**
29-
* Returns the response data from the Forecast.io in the
30-
* form of an array
31-
*
32-
* @param float $latitude
33-
* @param float $longitude
34-
* @param \DateTime $time
35-
* @param array $parameters
36-
*
37-
* @return array
38-
*/
39-
public function getForecast($latitude, $longitude, \DateTime $time = null, array $parameters = null)
40-
{
41-
$this->requestedUrl = Overcast::API_ENDPOINT.Overcast::getApiKey().'/'.$latitude.','.$longitude;
28+
/**
29+
* Returns the response data from the Forecast.io in the
30+
* form of an array
31+
*
32+
* @param float $latitude
33+
* @param float $longitude
34+
* @param \DateTime $time
35+
* @param array $parameters
36+
*
37+
* @return array
38+
*/
39+
public function getForecast($latitude, $longitude, \DateTime $time = null, array $parameters = null)
40+
{
41+
$this->requestedUrl = Overcast::API_ENDPOINT . Overcast::getApiKey() . '/' . $latitude . ',' . $longitude;
4242

4343
if (!is_null($time)) {
44-
$this->requestedUrl .= ','.$time->getTimestamp();
44+
$this->requestedUrl .= ',' . $time->getTimestamp();
4545
}
4646

4747
if (!is_null($parameters)) {
4848
$this->requestedUrl .= '?' . http_build_query($parameters);
4949
}
5050

51-
$this->response = json_decode(file_get_contents($this->requestedUrl),true);
52-
$this->responseHeaders = $this->parseForecastResponseHeaders($http_response_header);
51+
$this->response = json_decode(file_get_contents($this->requestedUrl), true);
52+
$this->responseHeaders = $this->parseForecastResponseHeaders($http_response_header);
5353

54-
return $this->response;
55-
}
54+
return $this->response;
55+
}
5656

57-
/**
58-
* Returns the relevant response headers from the Forecast.io API
59-
*
60-
* @return array
61-
*/
62-
public function getHeaders()
63-
{
64-
return $this->responseHeaders;
65-
}
57+
/**
58+
* Returns the relevant response headers from the Forecast.io API
59+
*
60+
* @return array
61+
*/
62+
public function getHeaders()
63+
{
64+
return $this->responseHeaders;
65+
}
6666

67-
/**
68-
* Parses the response headers
69-
*
70-
* @param array $headers
71-
*
72-
* @return array
73-
*/
74-
private function parseForecastResponseHeaders($headers)
75-
{
76-
$responseHeaders = [
77-
'cache' => [
78-
'maxAge'=>null,
79-
'expires'=>null
80-
],
81-
'responseTime'=>null,
82-
'apiCalls'=>null
83-
];
84-
foreach ($headers as $header) {
85-
switch (true) {
86-
case (substr($header,0,14) === 'Cache-Control:'):
87-
$responseHeaders['cache']['maxAge'] = trim(substr($header,strrpos($header,'=')+1));
88-
break;
89-
case (substr($header,0,8) === 'Expires:'):
90-
$responseHeaders['cache']['expires'] = trim(substr($header,8));
91-
break;
92-
case (substr($header,0,21) === 'X-Forecast-API-Calls:'):
93-
$responseHeaders['apiCalls'] = trim(substr($header,21));
94-
break;
95-
case (substr($header,0,16) === 'X-Response-Time:'):
96-
$responseHeaders['responseTime'] = (int)trim(substr($header,16));
97-
break;
98-
default:
99-
break;
100-
}
101-
}
102-
return $responseHeaders;
103-
}
67+
/**
68+
* Parses the response headers
69+
*
70+
* @param array $headers
71+
*
72+
* @return array
73+
*/
74+
private function parseForecastResponseHeaders($headers)
75+
{
76+
$responseHeaders = [
77+
'cache' => [
78+
'maxAge' => null,
79+
'expires' => null
80+
],
81+
'responseTime' => null,
82+
'apiCalls' => null
83+
];
84+
foreach ($headers as $header) {
85+
switch (true) {
86+
case (substr($header, 0, 14) === 'Cache-Control:'):
87+
$responseHeaders['cache']['maxAge'] = trim(substr($header, strrpos($header, '=') + 1));
88+
break;
89+
case (substr($header, 0, 8) === 'Expires:'):
90+
$responseHeaders['cache']['expires'] = trim(substr($header, 8));
91+
break;
92+
case (substr($header, 0, 21) === 'X-Forecast-API-Calls:'):
93+
$responseHeaders['apiCalls'] = trim(substr($header, 21));
94+
break;
95+
case (substr($header, 0, 16) === 'X-Response-Time:'):
96+
$responseHeaders['responseTime'] = (int)trim(substr($header, 16));
97+
break;
98+
default:
99+
break;
100+
}
101+
}
102+
return $responseHeaders;
103+
}
104104
}

‎src/ClientAdapters/GuzzleClientAdapter.php‎

Lines changed: 57 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -21,66 +21,67 @@
2121
*/
2222
class GuzzleClientAdapter implements ClientAdapterInterface
2323
{
24-
/**
25-
* @var Client
26-
*/
27-
private $guzzleClient;
28-
private $requestedUrl = null;
29-
private $responseHeaders = [];
24+
/**
25+
* @var Client
26+
*/
27+
private $guzzleClient;
28+
private $requestedUrl = null;
29+
private $responseHeaders = [];
3030

31-
/**
32-
* @param Client $guzzleClient
33-
*/
34-
public function __construct(Client $guzzleClient = null)
35-
{
36-
if (is_null($guzzleClient)){
37-
$guzzleClient = new Client();
38-
}
39-
$this->guzzleClient = $guzzleClient;
40-
}
31+
/**
32+
* @param Client $guzzleClient
33+
*/
34+
public function __construct(Client $guzzleClient = null)
35+
{
36+
if (is_null($guzzleClient)) {
37+
$guzzleClient = new Client();
38+
}
39+
$this->guzzleClient = $guzzleClient;
40+
}
4141

42-
/**
43-
* Returns the response data from the Forecast.io in the
44-
* form of an array
45-
*
46-
* @param float $latitude
47-
* @param float $longitude
48-
* @param \DateTime $time
49-
* @param array $parameters
50-
*
51-
* @return array
52-
*/
53-
public function getForecast($latitude, $longitude, \DateTime $time = null, array $parameters = null)
54-
{
55-
$this->requestedUrl = Overcast::API_ENDPOINT.Overcast::getApiKey().'/'.$latitude.','.$longitude;
42+
/**
43+
* Returns the response data from the Forecast.io in the
44+
* form of an array
45+
*
46+
* @param float $latitude
47+
* @param float $longitude
48+
* @param \DateTime $time
49+
* @param array $parameters
50+
*
51+
* @return array
52+
*/
53+
public function getForecast($latitude, $longitude, \DateTime $time = null, array $parameters = null)
54+
{
55+
$this->requestedUrl = Overcast::API_ENDPOINT . Overcast::getApiKey() . '/' . $latitude . ',' . $longitude;
5656

57-
if (!is_null($time)) {
58-
$this->requestedUrl .= ','.$time->getTimestamp();
59-
}
57+
if (!is_null($time)) {
58+
$this->requestedUrl .= ',' . $time->getTimestamp();
59+
}
6060

61-
if (!is_null($parameters)) {
62-
$this->requestedUrl .= '?' . http_build_query($parameters);
63-
}
61+
if (!is_null($parameters)) {
62+
$this->requestedUrl .= '?' . http_build_query($parameters);
63+
}
6464

65-
$response = $this->guzzleClient->get($this->requestedUrl);
66-
$this->responseHeaders = [
67-
'cache' => [
68-
'maxAge'=>(int)trim(substr($response->getHeader('cache-control'),strrpos($response->getHeader('cache-control'),'=')+1)),
69-
'expires'=>$response->getHeader('expires')
70-
],
71-
'responseTime'=>(int)$response->getHeader('x-response-time'),
72-
'apiCalls'=>(int)$response->getHeader('x-forecast-api-calls')
73-
];
74-
return $response->json();
75-
}
65+
$response = $this->guzzleClient->get($this->requestedUrl);
66+
$this->responseHeaders = [
67+
'cache' => [
68+
'maxAge' => (int)trim(substr($response->getHeader('cache-control'),
69+
strrpos($response->getHeader('cache-control'), '=') + 1)),
70+
'expires' => $response->getHeader('expires')
71+
],
72+
'responseTime' => (int)$response->getHeader('x-response-time'),
73+
'apiCalls' => (int)$response->getHeader('x-forecast-api-calls')
74+
];
75+
return $response->json();
76+
}
7677

77-
/**
78-
* Returns the relevant response headers from the Forecast.io API
79-
*
80-
* @return array
81-
*/
82-
public function getHeaders()
83-
{
84-
return $this->responseHeaders;
85-
}
78+
/**
79+
* Returns the relevant response headers from the Forecast.io API
80+
*
81+
* @return array
82+
*/
83+
public function getHeaders()
84+
{
85+
return $this->responseHeaders;
86+
}
8687
}

0 commit comments

Comments
 (0)