@@ -15,8 +15,7 @@ |
||
15 | 15 | * KeyMeta constructor. |
16 | 16 | * @param string $key |
17 | 17 | */ |
18 | - public function __construct(string $key) |
|
19 | - { |
|
18 | + public function __construct(string $key) { |
|
20 | 19 | $this->key = $key; |
21 | 20 | } |
22 | 21 |
@@ -6,7 +6,6 @@ |
||
6 | 6 | * Class UnableToFindKeyException |
7 | 7 | * @package LunixREST\Server\AccessControl\KeyRepository\Exceptions |
8 | 8 | */ |
9 | -class UnableToFindKeyException extends \Exception |
|
10 | -{ |
|
9 | +class UnableToFindKeyException extends \Exception { |
|
11 | 10 | |
12 | 11 | } |
@@ -18,9 +18,9 @@ |
||
18 | 18 | public function __construct(Configuration $config, string $namespace, string $configKey = 'keys') |
19 | 19 | { |
20 | 20 | $keys = []; |
21 | - if($config->has($configKey, $namespace)){ |
|
21 | + if ($config->has($configKey, $namespace)) { |
|
22 | 22 | $configKeys = $config->get($configKey, $namespace); |
23 | - if(is_array($configKeys)) { |
|
23 | + if (is_array($configKeys)) { |
|
24 | 24 | $keys = $configKeys; |
25 | 25 | } |
26 | 26 | } |
@@ -8,17 +8,15 @@ |
||
8 | 8 | * Class ConfigurationKeyRepository |
9 | 9 | * @package LunixREST\Server\AccessControl\KeyRepository |
10 | 10 | */ |
11 | -class ConfigurationKeyRepository extends ArrayKeyRepository |
|
12 | -{ |
|
11 | +class ConfigurationKeyRepository extends ArrayKeyRepository { |
|
13 | 12 | /** |
14 | 13 | * @param Configuration $config a config that has a list of valid keys in the stored $configKey |
15 | 14 | * @param $namespace |
16 | 15 | * @param string $configKey key to use when accessing the list of valid keys from the $config |
17 | 16 | */ |
18 | - public function __construct(Configuration $config, string $namespace, string $configKey = 'keys') |
|
19 | - { |
|
17 | + public function __construct(Configuration $config, string $namespace, string $configKey = 'keys') { |
|
20 | 18 | $keys = []; |
21 | - if($config->has($configKey, $namespace)){ |
|
19 | + if($config->has($configKey, $namespace)) { |
|
22 | 20 | $configKeys = $config->get($configKey, $namespace); |
23 | 21 | if(is_array($configKeys)) { |
24 | 22 | $keys = $configKeys; |
@@ -31,7 +31,7 @@ |
||
31 | 31 | */ |
32 | 32 | public function findKey(string $key): KeyMeta |
33 | 33 | { |
34 | - if($this->hasKey($key)) { |
|
34 | + if ($this->hasKey($key)) { |
|
35 | 35 | return new KeyMeta($key); |
36 | 36 | } else { |
37 | 37 | throw new UnableToFindKeyException("Unable to find API key in array."); |
@@ -8,8 +8,7 @@ discard block |
||
8 | 8 | * Class ArrayKeyRepository |
9 | 9 | * @package LunixREST\Server\AccessControl\KeyRepository |
10 | 10 | */ |
11 | -class ArrayKeyRepository implements KeyRepository |
|
12 | -{ |
|
11 | +class ArrayKeyRepository implements KeyRepository { |
|
13 | 12 | /** |
14 | 13 | * @var |
15 | 14 | */ |
@@ -19,8 +18,7 @@ discard block |
||
19 | 18 | * ArrayKeyRepository constructor. |
20 | 19 | * @param $arrayOfKeys |
21 | 20 | */ |
22 | - public function __construct($arrayOfKeys) |
|
23 | - { |
|
21 | + public function __construct($arrayOfKeys) { |
|
24 | 22 | $this->arrayOfKeys = $arrayOfKeys; |
25 | 23 | } |
26 | 24 |
@@ -8,8 +8,7 @@ discard block |
||
8 | 8 | * Class KeyRepositoryAccessControl |
9 | 9 | * @package LunixREST\Server\AccessControl |
10 | 10 | */ |
11 | -abstract class KeyRepositoryAccessControl implements AccessControl |
|
12 | -{ |
|
11 | +abstract class KeyRepositoryAccessControl implements AccessControl { |
|
13 | 12 | /** |
14 | 13 | * @var KeyRepository |
15 | 14 | */ |
@@ -19,8 +18,7 @@ discard block |
||
19 | 18 | * KeyRepositoryAccessControl constructor. |
20 | 19 | * @param KeyRepository $keyRepository |
21 | 20 | */ |
22 | - public function __construct(KeyRepository $keyRepository) |
|
23 | - { |
|
21 | + public function __construct(KeyRepository $keyRepository) { |
|
24 | 22 | $this->keyRepository = $keyRepository; |
25 | 23 | } |
26 | 24 |
@@ -28,8 +28,7 @@ |
||
28 | 28 | * Class GenericRouterGenericServer |
29 | 29 | * @package LunixREST\Server |
30 | 30 | */ |
31 | -class GenericRouterGenericServer extends GenericServer |
|
32 | -{ |
|
31 | +class GenericRouterGenericServer extends GenericServer { |
|
33 | 32 | /** |
34 | 33 | * GenericRouterGenericServer constructor. |
35 | 34 | * @param AccessControl $accessControl |
@@ -28,11 +28,11 @@ discard block |
||
28 | 28 | |
29 | 29 | protected function handleServerException(UnableToHandleRequestException $exception, ResponseInterface $response): ResponseInterface |
30 | 30 | { |
31 | - if($exception instanceof InvalidRequestException) { |
|
31 | + if ($exception instanceof InvalidRequestException) { |
|
32 | 32 | $this->logCaughtThrowableResultingInHTTPCode(400, $exception, LogLevel::INFO); |
33 | 33 | return $response->withStatus(400, "Bad Request"); |
34 | 34 | |
35 | - } elseif( |
|
35 | + } elseif ( |
|
36 | 36 | $exception instanceof ElementNotFoundException || |
37 | 37 | $exception instanceof UnsupportedMethodException || |
38 | 38 | $exception instanceof UnableToCreateEndpointException |
@@ -40,11 +40,11 @@ discard block |
||
40 | 40 | $this->logCaughtThrowableResultingInHTTPCode(404, $exception, LogLevel::INFO); |
41 | 41 | return $response->withStatus(404, "Not Found"); |
42 | 42 | |
43 | - } elseif($exception instanceof ElementConflictException) { |
|
43 | + } elseif ($exception instanceof ElementConflictException) { |
|
44 | 44 | $this->logCaughtThrowableResultingInHTTPCode(409, $exception, LogLevel::NOTICE); |
45 | 45 | return $response->withStatus(409, "Conflict"); |
46 | 46 | |
47 | - } elseif( |
|
47 | + } elseif ( |
|
48 | 48 | $exception instanceof MethodNotFoundException || |
49 | 49 | $exception instanceof EndpointExecutionException |
50 | 50 | ) { |
@@ -19,10 +19,8 @@ |
||
19 | 19 | * Class GenericRouterGenericServerHTTPServer |
20 | 20 | * @package LunixREST |
21 | 21 | */ |
22 | -class GenericRouterGenericServerHTTPServer extends GenericServerHTTPServer |
|
23 | -{ |
|
24 | - public function __construct(GenericRouterGenericServer $server, RequestFactory $requestFactory, LoggerInterface $logger) |
|
25 | - { |
|
22 | +class GenericRouterGenericServerHTTPServer extends GenericServerHTTPServer { |
|
23 | + public function __construct(GenericRouterGenericServer $server, RequestFactory $requestFactory, LoggerInterface $logger) { |
|
26 | 24 | parent::__construct($server, $requestFactory, $logger); |
27 | 25 | } |
28 | 26 |
@@ -39,19 +39,19 @@ |
||
39 | 39 | */ |
40 | 40 | protected function handleServerException(UnableToHandleRequestException $exception, ResponseInterface $response): ResponseInterface |
41 | 41 | { |
42 | - if($exception instanceof InvalidAPIKeyException || $exception instanceof AccessDeniedException) { |
|
42 | + if ($exception instanceof InvalidAPIKeyException || $exception instanceof AccessDeniedException) { |
|
43 | 43 | $this->logCaughtThrowableResultingInHTTPCode(403, $exception, LogLevel::NOTICE); |
44 | 44 | return $response->withStatus(403, "Access Denied"); |
45 | 45 | |
46 | - } elseif($exception instanceof ThrottleLimitExceededException) { |
|
46 | + } elseif ($exception instanceof ThrottleLimitExceededException) { |
|
47 | 47 | $this->logCaughtThrowableResultingInHTTPCode(429, $exception, LogLevel::WARNING); |
48 | 48 | return $response->withStatus(429, "Too Many Requests"); |
49 | 49 | |
50 | - } elseif($exception instanceof NotAcceptableResponseTypeException) { |
|
50 | + } elseif ($exception instanceof NotAcceptableResponseTypeException) { |
|
51 | 51 | $this->logCaughtThrowableResultingInHTTPCode(406, $exception, LogLevel::INFO); |
52 | 52 | return $response->withStatus(406, "Not Acceptable"); |
53 | 53 | |
54 | - } elseif( |
|
54 | + } elseif ( |
|
55 | 55 | $exception instanceof UnableToCreateAPIResponseException || |
56 | 56 | $exception instanceof UnableToRouteRequestException |
57 | 57 | ) { |
@@ -19,16 +19,14 @@ |
||
19 | 19 | * Class GenericServerHTTPServer |
20 | 20 | * @package LunixREST |
21 | 21 | */ |
22 | -class GenericServerHTTPServer extends HTTPServer |
|
23 | -{ |
|
22 | +class GenericServerHTTPServer extends HTTPServer { |
|
24 | 23 | /** |
25 | 24 | * GenericServerHTTPServer constructor. |
26 | 25 | * @param GenericServer $server |
27 | 26 | * @param RequestFactory $requestFactory |
28 | 27 | * @param LoggerInterface $logger |
29 | 28 | */ |
30 | - public function __construct(GenericServer $server, RequestFactory $requestFactory, LoggerInterface $logger) |
|
31 | - { |
|
29 | + public function __construct(GenericServer $server, RequestFactory $requestFactory, LoggerInterface $logger) { |
|
32 | 30 | parent::__construct($server, $requestFactory, $logger); |
33 | 31 | } |
34 | 32 |
@@ -52,7 +52,7 @@ |
||
52 | 52 | */ |
53 | 53 | private static function checkRequestDataIsArray($requestData): void |
54 | 54 | { |
55 | - if(!is_array($requestData)) { |
|
55 | + if (!is_array($requestData)) { |
|
56 | 56 | throw new UnableToCreateResourceParametersException("Unable to read request as array or null"); |
57 | 57 | } |
58 | 58 | } |
@@ -9,8 +9,7 @@ |
||
9 | 9 | * Class ArrayResourceParametersFactory |
10 | 10 | * @package LunixREST\Server\Router\Endpoint\ResourceEndpoint |
11 | 11 | */ |
12 | -abstract class ArrayResourceParametersFactory implements ResourceParametersFactory |
|
13 | -{ |
|
12 | +abstract class ArrayResourceParametersFactory implements ResourceParametersFactory { |
|
14 | 13 | /** |
15 | 14 | * @param APIRequest $request |
16 | 15 | * @return ResourceParameters |