@@ -57,7 +57,7 @@ |
||
57 | 57 | $parsedData = $bodyParser->parse($data); |
58 | 58 | |
59 | 59 | $apiKey = $parsedURL->getAPIKey(); |
60 | - if($apiKey === null) { |
|
60 | + if ($apiKey === null) { |
|
61 | 61 | $apiKey = $parsedHeaders->getAPIKey(); |
62 | 62 | } |
63 | 63 |
@@ -40,28 +40,28 @@ |
||
40 | 40 | |
41 | 41 | try { |
42 | 42 | $response = $this->server->handleRequest($request); |
43 | - header("Content-Type: " . $response->getMIMEType()); |
|
43 | + header("Content-Type: ".$response->getMIMEType()); |
|
44 | 44 | echo $response->getAsString(); |
45 | - } catch(InvalidAPIKeyException $e){ |
|
45 | + } catch (InvalidAPIKeyException $e) { |
|
46 | 46 | header('400 Bad Request', true, 400); |
47 | - } catch(UnknownEndpointException $e){ |
|
47 | + } catch (UnknownEndpointException $e) { |
|
48 | 48 | header('404 Not Found', true, 404); |
49 | - } catch(NotAcceptableResponseTypeException $e){ |
|
49 | + } catch (NotAcceptableResponseTypeException $e) { |
|
50 | 50 | header('406 Not Acceptable', true, 406); |
51 | - } catch(AccessDeniedException $e){ |
|
51 | + } catch (AccessDeniedException $e) { |
|
52 | 52 | header('403 Access Denied', true, 403); |
53 | - } catch(ThrottleLimitExceededException $e){ |
|
53 | + } catch (ThrottleLimitExceededException $e) { |
|
54 | 54 | header('429 Too Many Requests', true, 429); |
55 | 55 | } catch (\Exception $e) { |
56 | 56 | header('500 Internal Server Error', true, 500); |
57 | 57 | } |
58 | - } catch(InvalidRequestURLException $e){ |
|
58 | + } catch (InvalidRequestURLException $e) { |
|
59 | 59 | header('400 Bad Request', true, 400); |
60 | - } catch(UnknownContentTypeException $e){ |
|
60 | + } catch (UnknownContentTypeException $e) { |
|
61 | 61 | header('400 Bad Request', true, 400); |
62 | - } catch(InvalidRequestDataException $e){ |
|
62 | + } catch (InvalidRequestDataException $e) { |
|
63 | 63 | header('400 Bad Request', true, 400); |
64 | - } catch(\Exception $e){ |
|
64 | + } catch (\Exception $e) { |
|
65 | 65 | header('500 Internal Server Error', true, 500); |
66 | 66 | } |
67 | 67 | } |
@@ -42,26 +42,26 @@ |
||
42 | 42 | $response = $this->server->handleRequest($request); |
43 | 43 | header("Content-Type: " . $response->getMIMEType()); |
44 | 44 | echo $response->getAsString(); |
45 | - } catch(InvalidAPIKeyException $e){ |
|
45 | + } catch(InvalidAPIKeyException $e) { |
|
46 | 46 | header('400 Bad Request', true, 400); |
47 | - } catch(UnknownEndpointException $e){ |
|
47 | + } catch(UnknownEndpointException $e) { |
|
48 | 48 | header('404 Not Found', true, 404); |
49 | - } catch(NotAcceptableResponseTypeException $e){ |
|
49 | + } catch(NotAcceptableResponseTypeException $e) { |
|
50 | 50 | header('406 Not Acceptable', true, 406); |
51 | - } catch(AccessDeniedException $e){ |
|
51 | + } catch(AccessDeniedException $e) { |
|
52 | 52 | header('403 Access Denied', true, 403); |
53 | - } catch(ThrottleLimitExceededException $e){ |
|
53 | + } catch(ThrottleLimitExceededException $e) { |
|
54 | 54 | header('429 Too Many Requests', true, 429); |
55 | 55 | } catch (\Exception $e) { |
56 | 56 | header('500 Internal Server Error', true, 500); |
57 | 57 | } |
58 | - } catch(InvalidRequestURLException $e){ |
|
58 | + } catch(InvalidRequestURLException $e) { |
|
59 | 59 | header('400 Bad Request', true, 400); |
60 | - } catch(UnknownContentTypeException $e){ |
|
60 | + } catch(UnknownContentTypeException $e) { |
|
61 | 61 | header('400 Bad Request', true, 400); |
62 | - } catch(InvalidRequestDataException $e){ |
|
62 | + } catch(InvalidRequestDataException $e) { |
|
63 | 63 | header('400 Bad Request', true, 400); |
64 | - } catch(\Exception $e){ |
|
64 | + } catch(\Exception $e) { |
|
65 | 65 | header('500 Internal Server Error', true, 500); |
66 | 66 | } |
67 | 67 | } |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | * @param \LunixREST\Request\Request $request |
12 | 12 | * @return bool |
13 | 13 | */ |
14 | - public function validateAccess(Request $request){ |
|
14 | + public function validateAccess(Request $request) { |
|
15 | 15 | return true; |
16 | 16 | } |
17 | 17 | |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | * @param $apiKey |
20 | 20 | * @return bool |
21 | 21 | */ |
22 | - public function validateKey($apiKey){ |
|
22 | + public function validateKey($apiKey) { |
|
23 | 23 | return true; |
24 | 24 | } |
25 | 25 | } |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | * @param \LunixREST\Request\Request $request |
12 | 12 | * @return bool |
13 | 13 | */ |
14 | - public function validateAccess(Request $request){ |
|
14 | + public function validateAccess(Request $request) { |
|
15 | 15 | return true; |
16 | 16 | } |
17 | 17 | |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | * @param $apiKey |
20 | 20 | * @return bool |
21 | 21 | */ |
22 | - public function validateKey($apiKey){ |
|
22 | + public function validateKey($apiKey) { |
|
23 | 23 | return true; |
24 | 24 | } |
25 | 25 | } |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | /** |
16 | 16 | * @param string $key |
17 | 17 | */ |
18 | - public function __construct($key){ |
|
18 | + public function __construct($key) { |
|
19 | 19 | $this->key = $key; |
20 | 20 | } |
21 | 21 | |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | * @param \LunixREST\Request\Request $request |
24 | 24 | * @return bool true if key is valid |
25 | 25 | */ |
26 | - public function validateAccess(Request $request){ |
|
26 | + public function validateAccess(Request $request) { |
|
27 | 27 | return $this->validateKey($request->getApiKey()); |
28 | 28 | } |
29 | 29 | |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | * @param $apiKey |
32 | 32 | * @return bool true if key is the key specified in the constructor |
33 | 33 | */ |
34 | - public function validateKey($apiKey){ |
|
34 | + public function validateKey($apiKey) { |
|
35 | 35 | return $apiKey === $this->key; |
36 | 36 | } |
37 | 37 | } |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | /** |
16 | 16 | * @param string $key |
17 | 17 | */ |
18 | - public function __construct($key){ |
|
18 | + public function __construct($key) { |
|
19 | 19 | $this->key = $key; |
20 | 20 | } |
21 | 21 | |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | * @param \LunixREST\Request\Request $request |
24 | 24 | * @return bool true if key is valid |
25 | 25 | */ |
26 | - public function validateAccess(Request $request){ |
|
26 | + public function validateAccess(Request $request) { |
|
27 | 27 | return $this->validateKey($request->getApiKey()); |
28 | 28 | } |
29 | 29 | |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | * @param $apiKey |
32 | 32 | * @return bool true if key is the key specified in the constructor |
33 | 33 | */ |
34 | - public function validateKey($apiKey){ |
|
34 | + public function validateKey($apiKey) { |
|
35 | 35 | return $apiKey === $this->key; |
36 | 36 | } |
37 | 37 | } |
@@ -24,12 +24,12 @@ discard block |
||
24 | 24 | protected function findAcceptableMIMETypes(array $headers): array{ |
25 | 25 | //TODO: follow RFC2616 order |
26 | 26 | $acceptedMIMETypes = []; |
27 | - foreach($headers as $key => $value) { |
|
28 | - if(strtolower($key) == 'http-accept'){ |
|
27 | + foreach ($headers as $key => $value) { |
|
28 | + if (strtolower($key) == 'http-accept') { |
|
29 | 29 | $values = explode(',', $value); |
30 | - foreach($values as $acceptedType) { |
|
30 | + foreach ($values as $acceptedType) { |
|
31 | 31 | $typeParts = explode(';', $acceptedType); |
32 | - if(count($typeParts) > 0 ){ |
|
32 | + if (count($typeParts) > 0) { |
|
33 | 33 | $acceptedMIMETypes[] = trim($typeParts[0]); |
34 | 34 | } |
35 | 35 | } |
@@ -39,18 +39,18 @@ discard block |
||
39 | 39 | return $acceptedMIMETypes; |
40 | 40 | } |
41 | 41 | |
42 | - protected function findAPIKey(array $headers){ |
|
43 | - foreach($headers as $key => $value) { |
|
44 | - if(strtolower($key) == strtolower($this->apiKeyHeaderKey)){ |
|
42 | + protected function findAPIKey(array $headers) { |
|
43 | + foreach ($headers as $key => $value) { |
|
44 | + if (strtolower($key) == strtolower($this->apiKeyHeaderKey)) { |
|
45 | 45 | return $value; |
46 | 46 | } |
47 | 47 | } |
48 | 48 | return null; |
49 | 49 | } |
50 | 50 | |
51 | - protected function getContentType(array $headers){ |
|
52 | - foreach($headers as $key => $value) { |
|
53 | - if(strtolower($key) == 'content-type'){ |
|
51 | + protected function getContentType(array $headers) { |
|
52 | + foreach ($headers as $key => $value) { |
|
53 | + if (strtolower($key) == 'content-type') { |
|
54 | 54 | return $value; |
55 | 55 | } |
56 | 56 | } |
@@ -25,11 +25,11 @@ discard block |
||
25 | 25 | //TODO: follow RFC2616 order |
26 | 26 | $acceptedMIMETypes = []; |
27 | 27 | foreach($headers as $key => $value) { |
28 | - if(strtolower($key) == 'http-accept'){ |
|
28 | + if(strtolower($key) == 'http-accept') { |
|
29 | 29 | $values = explode(',', $value); |
30 | 30 | foreach($values as $acceptedType) { |
31 | 31 | $typeParts = explode(';', $acceptedType); |
32 | - if(count($typeParts) > 0 ){ |
|
32 | + if(count($typeParts) > 0 ) { |
|
33 | 33 | $acceptedMIMETypes[] = trim($typeParts[0]); |
34 | 34 | } |
35 | 35 | } |
@@ -39,18 +39,18 @@ discard block |
||
39 | 39 | return $acceptedMIMETypes; |
40 | 40 | } |
41 | 41 | |
42 | - protected function findAPIKey(array $headers){ |
|
42 | + protected function findAPIKey(array $headers) { |
|
43 | 43 | foreach($headers as $key => $value) { |
44 | - if(strtolower($key) == strtolower($this->apiKeyHeaderKey)){ |
|
44 | + if(strtolower($key) == strtolower($this->apiKeyHeaderKey)) { |
|
45 | 45 | return $value; |
46 | 46 | } |
47 | 47 | } |
48 | 48 | return null; |
49 | 49 | } |
50 | 50 | |
51 | - protected function getContentType(array $headers){ |
|
51 | + protected function getContentType(array $headers) { |
|
52 | 52 | foreach($headers as $key => $value) { |
53 | - if(strtolower($key) == 'content-type'){ |
|
53 | + if(strtolower($key) == 'content-type') { |
|
54 | 54 | return $value; |
55 | 55 | } |
56 | 56 | } |
@@ -13,23 +13,23 @@ |
||
13 | 13 | |
14 | 14 | //Borrowed from http://stackoverflow.com/a/1147952 |
15 | 15 | public function getAll(): array { |
16 | - if($this->cache){ |
|
16 | + if ($this->cache) { |
|
17 | 17 | return $this->cache; |
18 | 18 | } |
19 | 19 | |
20 | 20 | # Returns the system MIME type mapping of extensions to MIME types, as defined in /etc/mime.types. |
21 | 21 | $out = array(); |
22 | - while(($line = fgets($this->file)) !== false) { |
|
22 | + while (($line = fgets($this->file)) !== false) { |
|
23 | 23 | $line = trim(preg_replace('/#.*/', '', $line)); |
24 | - if(!$line) { |
|
24 | + if (!$line) { |
|
25 | 25 | continue; |
26 | 26 | } |
27 | 27 | $parts = preg_split('/\s+/', $line); |
28 | - if(count($parts) == 1) { |
|
28 | + if (count($parts) == 1) { |
|
29 | 29 | continue; |
30 | 30 | } |
31 | 31 | $type = array_shift($parts); |
32 | - foreach($parts as $part) { |
|
32 | + foreach ($parts as $part) { |
|
33 | 33 | $out[$part] = $type; |
34 | 34 | } |
35 | 35 | } |
@@ -13,7 +13,7 @@ |
||
13 | 13 | |
14 | 14 | //Borrowed from http://stackoverflow.com/a/1147952 |
15 | 15 | public function getAll(): array { |
16 | - if($this->cache){ |
|
16 | + if($this->cache) { |
|
17 | 17 | return $this->cache; |
18 | 18 | } |
19 | 19 |