Completed
Branch master (73f336)
by John
01:59
created
examples/helloworld/index.php 3 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 		header('404 Not Found', 404);
22 22
 	} catch(\LunixREST\Exceptions\AccessDeniedException $e){
23 23
 		header('403 Access Denied', 403);
24
-	}  catch(\LunixREST\Exceptions\ThrottleLimitExceededException $e){
24
+	} catch(\LunixREST\Exceptions\ThrottleLimitExceededException $e){
25 25
 		header('429 Too Many Requests', 429);
26 26
 	} catch(\LunixREST\Exceptions\InvalidResponseFormatException $e){
27 27
 		header('500 Internal Server Error', 500);
Please login to merge, or discard this patch.
Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -11,26 +11,26 @@
 block discarded – undo
11 11
 $router = new \LunixREST\Router\Router($accessControl, $throttle, $responseFactory, $endpointFactory);
12 12
 
13 13
 try {
14
-	$request =  \LunixREST\Request\Request::createFromURL("GET", [], [], '127.0.0.1', "/1.0/public/helloworld.json");// \LunixREST\Request\Request::createFromURL($_SERVER['REQUEST_METHOD'], getallheaders(), $_REQUEST, $_SERVER['REMOTE_ADDR'], $_SERVER['REQUEST_URI']);
14
+    $request =  \LunixREST\Request\Request::createFromURL("GET", [], [], '127.0.0.1', "/1.0/public/helloworld.json");// \LunixREST\Request\Request::createFromURL($_SERVER['REQUEST_METHOD'], getallheaders(), $_REQUEST, $_SERVER['REMOTE_ADDR'], $_SERVER['REQUEST_URI']);
15 15
 
16
-	try {
17
-		$response = $router->route($request);
18
-		echo $response->getAsString();
19
-	} catch(\LunixREST\Exceptions\InvalidAPIKeyException $e){
20
-		header('400 Bad Request', true, 400);
21
-	} catch(\LunixREST\Endpoint\Exceptions\UnknownEndpointException $e){
22
-		header('404 Not Found', true, 404);
23
-	} catch(\LunixREST\Response\Exceptions\UnknownResponseTypeException $e){
24
-		header('404 Not Found', true, 404);
25
-	} catch(\LunixREST\Exceptions\AccessDeniedException $e){
26
-		header('403 Access Denied', true, 403);
27
-	}  catch(\LunixREST\Exceptions\ThrottleLimitExceededException $e){
28
-		header('429 Too Many Requests', true, 429);
29
-	} catch(Exception $e){
30
-		header('500 Internal Server Error', true, 500);
31
-	}
16
+    try {
17
+        $response = $router->route($request);
18
+        echo $response->getAsString();
19
+    } catch(\LunixREST\Exceptions\InvalidAPIKeyException $e){
20
+        header('400 Bad Request', true, 400);
21
+    } catch(\LunixREST\Endpoint\Exceptions\UnknownEndpointException $e){
22
+        header('404 Not Found', true, 404);
23
+    } catch(\LunixREST\Response\Exceptions\UnknownResponseTypeException $e){
24
+        header('404 Not Found', true, 404);
25
+    } catch(\LunixREST\Exceptions\AccessDeniedException $e){
26
+        header('403 Access Denied', true, 403);
27
+    }  catch(\LunixREST\Exceptions\ThrottleLimitExceededException $e){
28
+        header('429 Too Many Requests', true, 429);
29
+    } catch(Exception $e){
30
+        header('500 Internal Server Error', true, 500);
31
+    }
32 32
 } catch(\LunixREST\Exceptions\InvalidRequestFormatException $e){
33
-	header('400 Bad Request', true, 400);
33
+    header('400 Bad Request', true, 400);
34 34
 } catch(Exception $e){
35
-	header('500 Internal Server Error', true, 500);
35
+    header('500 Internal Server Error', true, 500);
36 36
 }
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -11,26 +11,26 @@
 block discarded – undo
11 11
 $router = new \LunixREST\Router\Router($accessControl, $throttle, $responseFactory, $endpointFactory);
12 12
 
13 13
 try {
14
-	$request =  \LunixREST\Request\Request::createFromURL("GET", [], [], '127.0.0.1', "/1.0/public/helloworld.json");// \LunixREST\Request\Request::createFromURL($_SERVER['REQUEST_METHOD'], getallheaders(), $_REQUEST, $_SERVER['REMOTE_ADDR'], $_SERVER['REQUEST_URI']);
14
+	$request = \LunixREST\Request\Request::createFromURL("GET", [], [], '127.0.0.1', "/1.0/public/helloworld.json"); // \LunixREST\Request\Request::createFromURL($_SERVER['REQUEST_METHOD'], getallheaders(), $_REQUEST, $_SERVER['REMOTE_ADDR'], $_SERVER['REQUEST_URI']);
15 15
 
16 16
 	try {
17 17
 		$response = $router->route($request);
18 18
 		echo $response->getAsString();
19
-	} catch(\LunixREST\Exceptions\InvalidAPIKeyException $e){
19
+	} catch (\LunixREST\Exceptions\InvalidAPIKeyException $e) {
20 20
 		header('400 Bad Request', true, 400);
21
-	} catch(\LunixREST\Endpoint\Exceptions\UnknownEndpointException $e){
21
+	} catch (\LunixREST\Endpoint\Exceptions\UnknownEndpointException $e) {
22 22
 		header('404 Not Found', true, 404);
23
-	} catch(\LunixREST\Response\Exceptions\UnknownResponseTypeException $e){
23
+	} catch (\LunixREST\Response\Exceptions\UnknownResponseTypeException $e) {
24 24
 		header('404 Not Found', true, 404);
25
-	} catch(\LunixREST\Exceptions\AccessDeniedException $e){
25
+	} catch (\LunixREST\Exceptions\AccessDeniedException $e) {
26 26
 		header('403 Access Denied', true, 403);
27
-	}  catch(\LunixREST\Exceptions\ThrottleLimitExceededException $e){
27
+	} catch (\LunixREST\Exceptions\ThrottleLimitExceededException $e) {
28 28
 		header('429 Too Many Requests', true, 429);
29
-	} catch(Exception $e){
29
+	} catch (Exception $e) {
30 30
 		header('500 Internal Server Error', true, 500);
31 31
 	}
32
-} catch(\LunixREST\Exceptions\InvalidRequestFormatException $e){
32
+} catch (\LunixREST\Exceptions\InvalidRequestFormatException $e) {
33 33
 	header('400 Bad Request', true, 400);
34
-} catch(Exception $e){
34
+} catch (Exception $e) {
35 35
 	header('500 Internal Server Error', true, 500);
36 36
 }
Please login to merge, or discard this patch.
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 2 patches
Indentation   +48 added lines, -48 removed lines patch added patch discarded remove patch
@@ -9,52 +9,52 @@
 block discarded – undo
9 9
  * @package LunixREST\Configuration
10 10
  */
11 11
 class INIConfiguration implements Configuration {
12
-	/**
13
-	 * @var null
14
-	 */
15
-	protected $nameSpace;
16
-	/**
17
-	 * @var
18
-	 */
19
-	protected $filename;
20
-
21
-	/**
22
-	 * @param string $filename
23
-	 * @param string $nameSpace
24
-	 */
25
-	public function __construct($filename, $nameSpace = null){
26
-		$this->filename = $filename;
27
-		$this->nameSpace = $nameSpace;
28
-	}
29
-
30
-	/**
31
-	 * @param $key
32
-	 * @return mixed
33
-	 * @throws INIKeyNotFoundException
34
-	 * @throws INIParseException
35
-	 */
36
-	public function get($key){
37
-		$config = parse_ini_file($this->filename, (bool)$this->nameSpace);
38
-
39
-		if($config === false){
40
-			throw new INIParseException('Could not parse: ' . $this->filename, true);
41
-		}
42
-
43
-		if($this->nameSpace) {
44
-			if(isset($config[$this->nameSpace])) {
45
-				$config = $config[$this->nameSpace];
46
-			} else {
47
-				throw new INIKeyNotFoundException();
48
-			}
49
-		}
50
-
51
-		return isset($config[$key]) ? $config[$key] : null;
52
-	}
53
-
54
-	/**
55
-	 * @param $key
56
-	 */
57
-	public function set($key){
58
-		//TODO write this
59
-	}
12
+    /**
13
+     * @var null
14
+     */
15
+    protected $nameSpace;
16
+    /**
17
+     * @var
18
+     */
19
+    protected $filename;
20
+
21
+    /**
22
+     * @param string $filename
23
+     * @param string $nameSpace
24
+     */
25
+    public function __construct($filename, $nameSpace = null){
26
+        $this->filename = $filename;
27
+        $this->nameSpace = $nameSpace;
28
+    }
29
+
30
+    /**
31
+     * @param $key
32
+     * @return mixed
33
+     * @throws INIKeyNotFoundException
34
+     * @throws INIParseException
35
+     */
36
+    public function get($key){
37
+        $config = parse_ini_file($this->filename, (bool)$this->nameSpace);
38
+
39
+        if($config === false){
40
+            throw new INIParseException('Could not parse: ' . $this->filename, true);
41
+        }
42
+
43
+        if($this->nameSpace) {
44
+            if(isset($config[$this->nameSpace])) {
45
+                $config = $config[$this->nameSpace];
46
+            } else {
47
+                throw new INIKeyNotFoundException();
48
+            }
49
+        }
50
+
51
+        return isset($config[$key]) ? $config[$key] : null;
52
+    }
53
+
54
+    /**
55
+     * @param $key
56
+     */
57
+    public function set($key){
58
+        //TODO write this
59
+    }
60 60
 }
Please login to merge, or discard this 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/Configuration/Configuration.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -2,6 +2,6 @@
 block discarded – undo
2 2
 namespace LunixREST\Configuration;
3 3
 
4 4
 interface Configuration {
5
-	public function get($key);
6
-	public function set($key);
5
+    public function get($key);
6
+    public function set($key);
7 7
 }
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.