Completed
Branch master (73f336)
by John
01:59
created
src/AccessControl/MultiAccessControl.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
src/AccessControl/PublicAccessControl.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.
src/AccessControl/AllAccessConfigurationListAccessControl.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.
src/AccessControl/AllAccessListAccessControl.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
Please login to merge, or discard this patch.
src/AccessControl/MultiAndAccessControl.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -11,9 +11,9 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
         }
Please login to merge, or discard this patch.
src/Configuration/INIConfiguration.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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){
40
-			throw new INIParseException('Could not parse: ' . $this->filename, true);
39
+		if ($config === false) {
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
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
src/Response/DefaultResponseFactory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
      * @throws UnknownResponseTypeException
12 12
      */
13 13
     public function getResponse(ResponseData $data, string $type): Response {
14
-        switch(strtolower($type)) {
14
+        switch (strtolower($type)) {
15 15
             case "json":
16 16
                 return new JSONResponse($data);
17 17
             default:
Please login to merge, or discard this patch.
src/Endpoint/DoctrineEndpoint.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
 class DoctrineEndpoint extends DefaultEndpoint {
10 10
     protected $entityManager;
11 11
 
12
-    public function __construct(EntityManager $em){
12
+    public function __construct(EntityManager $em) {
13 13
         $this->entityManager = $em;
14 14
     }
15 15
 }
Please login to merge, or discard this patch.
src/Router/Router.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
      * @param ResponseFactory $responseFactory
44 44
      * @param EndpointFactory $endpointFactory
45 45
      */
46
-    public function __construct(AccessControl $accessControl, Throttle $throttle, ResponseFactory $responseFactory, EndpointFactory $endpointFactory){
46
+    public function __construct(AccessControl $accessControl, Throttle $throttle, ResponseFactory $responseFactory, EndpointFactory $endpointFactory) {
47 47
         $this->accessControl = $accessControl;
48 48
         $this->throttle = $throttle;
49 49
         $this->responseFactory = $responseFactory;
@@ -66,11 +66,11 @@  discard block
 block discarded – undo
66 66
 
67 67
         $endpoint = $this->endpointFactory->getEndpoint($request->getEndpoint(), $request->getVersion());
68 68
 
69
-        if($this->throttle->shouldThrottle($request)) {
69
+        if ($this->throttle->shouldThrottle($request)) {
70 70
             throw new ThrottleLimitExceededException('Request limit exceeded');
71 71
         }
72 72
 
73
-        if(!$this->accessControl->validateAccess($request)) {
73
+        if (!$this->accessControl->validateAccess($request)) {
74 74
             throw new AccessDeniedException("API key does not have the required permissions to access requested resource");
75 75
         }
76 76
 
@@ -85,8 +85,8 @@  discard block
 block discarded – undo
85 85
      * @param Request $request
86 86
      * @throws InvalidAPIKeyException
87 87
      */
88
-    protected function validateKey(Request $request){
89
-        if(!$this->accessControl->validateKey($request->getApiKey())){
88
+    protected function validateKey(Request $request) {
89
+        if (!$this->accessControl->validateKey($request->getApiKey())) {
90 90
             throw new InvalidAPIKeyException('Invalid API key');
91 91
         }
92 92
     }
@@ -97,8 +97,8 @@  discard block
 block discarded – undo
97 97
      */
98 98
     protected function validateExtension(Request $request) {
99 99
         $formats = $this->responseFactory->getSupportedTypes();
100
-        if(!$formats || !in_array($request->getExtension(), $formats)){
101
-            throw new UnknownResponseTypeException('Unknown response format: ' . $request->getExtension());
100
+        if (!$formats || !in_array($request->getExtension(), $formats)) {
101
+            throw new UnknownResponseTypeException('Unknown response format: '.$request->getExtension());
102 102
         }
103 103
     }
104 104
 
Please login to merge, or discard this patch.