@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | * @param Configuration $config a config that has a list of valid keys in the stored $configKey |
| 23 | 23 | * @param string $configKey key to use when accessing the list of valid keys from the $config |
| 24 | 24 | */ |
| 25 | - public function __construct(Configuration $config, $configKey = 'keys'){ |
|
| 25 | + public function __construct(Configuration $config, $configKey = 'keys') { |
|
| 26 | 26 | $this->config = $config; |
| 27 | 27 | $this->configKey = $configKey; |
| 28 | 28 | } |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | * @param \LunixREST\Request\Request $request |
| 32 | 32 | * @return bool true if this key is valid |
| 33 | 33 | */ |
| 34 | - public function validateAccess(Request $request){ |
|
| 34 | + public function validateAccess(Request $request) { |
|
| 35 | 35 | return $this->validateKey($request->getApiKey()); |
| 36 | 36 | } |
| 37 | 37 | |
@@ -39,7 +39,7 @@ discard block |
||
| 39 | 39 | * @param $apiKey |
| 40 | 40 | * @return bool true if the key is found inside of the array returned by the config when $config->get is called with the key from the constructor |
| 41 | 41 | */ |
| 42 | - public function validateKey($apiKey){ |
|
| 42 | + public function validateKey($apiKey) { |
|
| 43 | 43 | return in_array($apiKey, $this->config->get($this->configKey)); |
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | \ No newline at end of file |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | /** |
| 16 | 16 | * @param array $keys |
| 17 | 17 | */ |
| 18 | - public function __construct(Array $keys){ |
|
| 18 | + public function __construct(Array $keys) { |
|
| 19 | 19 | $this->keys = $keys; |
| 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 in the array passed to this object in it's construction |
| 33 | 33 | */ |
| 34 | - public function validateKey($apiKey){ |
|
| 34 | + public function validateKey($apiKey) { |
|
| 35 | 35 | return in_array($apiKey, $this->keys); |
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | 38 | \ No newline at end of file |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | /** |
| 16 | 16 | * @param AccessControl[] $accessControls array of access controls to use based on implmentation |
| 17 | 17 | */ |
| 18 | - public function __construct(array $accessControls){ |
|
| 18 | + public function __construct(array $accessControls) { |
|
| 19 | 19 | $this->accessControls = $accessControls; |
| 20 | 20 | } |
| 21 | 21 | } |
| 22 | 22 | \ No newline at end of file |
@@ -11,9 +11,9 @@ discard block |
||
| 11 | 11 | * @param \LunixREST\Request\Request $request |
| 12 | 12 | * @return bool true if all of the $accessControls' validate access methods returned true for the given request |
| 13 | 13 | */ |
| 14 | - public function validateAccess(Request $request){ |
|
| 15 | - foreach($this->accessControls as $accessControl){ |
|
| 16 | - if(!$accessControl->validateAccess($request)){ |
|
| 14 | + public function validateAccess(Request $request) { |
|
| 15 | + foreach ($this->accessControls as $accessControl) { |
|
| 16 | + if (!$accessControl->validateAccess($request)) { |
|
| 17 | 17 | return false; |
| 18 | 18 | } |
| 19 | 19 | } |
@@ -24,9 +24,9 @@ discard block |
||
| 24 | 24 | * @param $apiKey |
| 25 | 25 | * @return bool true if all of the $accessControls' validate key methods returned true for the given request |
| 26 | 26 | */ |
| 27 | - public function validateKey($apiKey){ |
|
| 28 | - foreach($this->accessControls as $accessControl){ |
|
| 29 | - if(!$accessControl->validateKey($apiKey)){ |
|
| 27 | + public function validateKey($apiKey) { |
|
| 28 | + foreach ($this->accessControls as $accessControl) { |
|
| 29 | + if (!$accessControl->validateKey($apiKey)) { |
|
| 30 | 30 | return false; |
| 31 | 31 | } |
| 32 | 32 | } |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | /** |
| 16 | 16 | * @param string $publicKey |
| 17 | 17 | */ |
| 18 | - public function __construct($publicKey = 'public'){ |
|
| 18 | + public function __construct($publicKey = 'public') { |
|
| 19 | 19 | $this->publicKey = $publicKey; |
| 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->publicKey; |
| 36 | 36 | } |
| 37 | 37 | } |
| 38 | 38 | \ No newline at end of file |
@@ -22,7 +22,7 @@ discard block |
||
| 22 | 22 | * @param string $filename |
| 23 | 23 | * @param string $nameSpace |
| 24 | 24 | */ |
| 25 | - public function __construct($filename, $nameSpace = null){ |
|
| 25 | + public function __construct($filename, $nameSpace = null) { |
|
| 26 | 26 | $this->filename = $filename; |
| 27 | 27 | $this->nameSpace = $nameSpace; |
| 28 | 28 | } |
@@ -33,15 +33,15 @@ discard block |
||
| 33 | 33 | * @throws INIKeyNotFoundException |
| 34 | 34 | * @throws INIParseException |
| 35 | 35 | */ |
| 36 | - public function get($key){ |
|
| 37 | - $config = parse_ini_file($this->filename, (bool)$this->nameSpace); |
|
| 36 | + public function get($key) { |
|
| 37 | + $config = parse_ini_file($this->filename, (bool) $this->nameSpace); |
|
| 38 | 38 | |
| 39 | - if($config === false){ |
|
| 39 | + if ($config === false) { |
|
| 40 | 40 | throw new INIParseException('Could not parse: ' . $this->filename, true); |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | - if($this->nameSpace) { |
|
| 44 | - if(isset($config[$this->nameSpace])) { |
|
| 43 | + if ($this->nameSpace) { |
|
| 44 | + if (isset($config[$this->nameSpace])) { |
|
| 45 | 45 | $config = $config[$this->nameSpace]; |
| 46 | 46 | } else { |
| 47 | 47 | throw new INIKeyNotFoundException(); |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | /** |
| 55 | 55 | * @param $key |
| 56 | 56 | */ |
| 57 | - public function set($key){ |
|
| 57 | + public function set($key) { |
|
| 58 | 58 | //TODO write this |
| 59 | 59 | } |
| 60 | 60 | } |
@@ -59,19 +59,19 @@ discard block |
||
| 59 | 59 | * @param string $instance |
| 60 | 60 | * @throws InvalidRequestFormatException |
| 61 | 61 | */ |
| 62 | - public function __construct($method, array $headers, array $data, $ip, $url, $version = '', $apiKey = '', $endpoint = '', $extension = '', $instance = ''){ |
|
| 62 | + public function __construct($method, array $headers, array $data, $ip, $url, $version = '', $apiKey = '', $endpoint = '', $extension = '', $instance = '') { |
|
| 63 | 63 | $this->method = strtolower($method); |
| 64 | 64 | $this->headers = $headers; |
| 65 | 65 | $this->data = $data; |
| 66 | 66 | $this->ip = $ip; |
| 67 | 67 | |
| 68 | - if($version && $apiKey && $endpoint && $extension){ |
|
| 68 | + if ($version && $apiKey && $endpoint && $extension) { |
|
| 69 | 69 | $this->version = $version; |
| 70 | 70 | $this->apiKey = $apiKey; |
| 71 | 71 | $this->endpoint = $endpoint; |
| 72 | 72 | $this->extension = $extension; |
| 73 | 73 | $this->instance = $instance; |
| 74 | - } elseif($url !== false) { |
|
| 74 | + } elseif ($url !== false) { |
|
| 75 | 75 | $this->parseURL($url); |
| 76 | 76 | } else { |
| 77 | 77 | throw new InvalidRequestFormatException('Either URL or the rest of the parameters MUST be set'); |
@@ -154,9 +154,9 @@ discard block |
||
| 154 | 154 | * @param string $url |
| 155 | 155 | * @throws InvalidRequestFormatException |
| 156 | 156 | */ |
| 157 | - private function parseURL($url){ |
|
| 157 | + private function parseURL($url) { |
|
| 158 | 158 | $splitURL = explode('/', trim($url, '/')); |
| 159 | - if(count($splitURL) < 3){ |
|
| 159 | + if (count($splitURL) < 3) { |
|
| 160 | 160 | throw new InvalidRequestFormatException(); |
| 161 | 161 | } |
| 162 | 162 | //Find endpoint |
@@ -167,7 +167,7 @@ discard block |
||
| 167 | 167 | $splitExtension = explode('.', $splitURL[count($splitURL) - 1]); |
| 168 | 168 | $this->extension = array_pop($splitExtension); |
| 169 | 169 | |
| 170 | - if(count($splitURL) == 4){ |
|
| 170 | + if (count($splitURL) == 4) { |
|
| 171 | 171 | $this->instance = implode('.', $splitExtension); |
| 172 | 172 | } else { |
| 173 | 173 | $this->endpoint = implode('.', $splitExtension); |
@@ -9,7 +9,7 @@ |
||
| 9 | 9 | /** |
| 10 | 10 | * @return string |
| 11 | 11 | */ |
| 12 | - public function output(){ |
|
| 12 | + public function output() { |
|
| 13 | 13 | return json_encode($this->data); |
| 14 | 14 | } |
| 15 | 15 | } |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | /** |
| 15 | 15 | * @param array $data |
| 16 | 16 | */ |
| 17 | - public function __construct(array $data){ |
|
| 17 | + public function __construct(array $data) { |
|
| 18 | 18 | $this->data = $data; |
| 19 | 19 | } |
| 20 | 20 | |