johnvandeweghe / LunixREST

src/Server/Router.php

Spacing +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
     /**
      * @param EndpointFactory $endpointFactory
      */
-    public function __construct(EndpointFactory $endpointFactory){
+    public function __construct(EndpointFactory $endpointFactory) {
         $this->endpointFactory = $endpointFactory;
     }
 
@@ -43,8 +43,8 @@ 
      * @throws MethodNotFoundException
      */
     protected function executeEndpoint(Endpoint $endpoint, Request $request): ResponseData {
-        if(!method_exists($endpoint, $request->getMethod())){
-            throw new MethodNotFoundException("The endpoint method " . $request->getMethod() . " was not found");
+        if (!method_exists($endpoint, $request->getMethod())) {
+            throw new MethodNotFoundException("The endpoint method ".$request->getMethod()." was not found");
         }
         return call_user_func([$endpoint, $request->getMethod()], $request);
     }

Braces +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
     /**
      * @param EndpointFactory $endpointFactory
      */
-    public function __construct(EndpointFactory $endpointFactory){
+    public function __construct(EndpointFactory $endpointFactory) {
         $this->endpointFactory = $endpointFactory;
     }
 
@@ -43,7 +43,7 @@ 
      * @throws MethodNotFoundException
      */
     protected function executeEndpoint(Endpoint $endpoint, Request $request): ResponseData {
-        if(!method_exists($endpoint, $request->getMethod())){
+        if(!method_exists($endpoint, $request->getMethod())) {
             throw new MethodNotFoundException("The endpoint method " . $request->getMethod() . " was not found");
         }
         return call_user_func([$endpoint, $request->getMethod()], $request);

src/Response/DefaultResponseFactory.php

Spacing +2 added lines, -2 removed lines

@@ -11,11 +11,11 @@
      * @throws NotAcceptableResponseTypeException
      */
     public function getResponse(ResponseData $data, array $acceptedMIMETypes): Response {
-        if(empty($acceptedMIMETypes)){
+        if (empty($acceptedMIMETypes)) {
             $acceptedMIMETypes = $this->getSupportedMIMETypes();
         }
 
-        foreach($acceptedMIMETypes as $acceptedMIMEType) {
+        foreach ($acceptedMIMETypes as $acceptedMIMEType) {
             switch (strtolower($acceptedMIMEType)) {
                 case "application/json":
                     return new JSONResponse($data);

Braces +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
      * @throws NotAcceptableResponseTypeException
      */
     public function getResponse(ResponseData $data, array $acceptedMIMETypes): Response {
-        if(empty($acceptedMIMETypes)){
+        if(empty($acceptedMIMETypes)) {
             $acceptedMIMETypes = $this->getSupportedMIMETypes();
         }
 

src/Server/Server.php

Spacing +6 added lines, -6 removed lines

@@ -39,7 +39,7 @@ 
      * @param ResponseFactory $responseFactory
      * @param EndpointFactory $endpointFactory
      */
-    public function __construct(AccessControl $accessControl, Throttle $throttle, ResponseFactory $responseFactory, EndpointFactory $endpointFactory){
+    public function __construct(AccessControl $accessControl, Throttle $throttle, ResponseFactory $responseFactory, EndpointFactory $endpointFactory) {
         $this->accessControl = $accessControl;
         $this->throttle = $throttle;
         $this->responseFactory = $responseFactory;
@@ -60,11 +60,11 @@ 
 
         $this->validateExtension($request);
 
-        if($this->throttle->shouldThrottle($request)) {
+        if ($this->throttle->shouldThrottle($request)) {
             throw new ThrottleLimitExceededException('Request limit exceeded');
         }
 
-        if(!$this->accessControl->validateAccess($request)) {
+        if (!$this->accessControl->validateAccess($request)) {
             throw new AccessDeniedException("API key does not have the required permissions to access requested resource");
         }
 
@@ -79,8 +79,8 @@ 
      * @param Request $request
      * @throws InvalidAPIKeyException
      */
-    protected function validateKey(Request $request){
-        if(!$this->accessControl->validateKey($request->getApiKey())){
+    protected function validateKey(Request $request) {
+        if (!$this->accessControl->validateKey($request->getApiKey())) {
             throw new InvalidAPIKeyException('Invalid API key');
         }
     }
@@ -91,7 +91,7 @@ 
      */
     protected function validateExtension(Request $request) {
         $formats = $this->responseFactory->getSupportedMIMETypes();
-        if(empty($formats) || (
+        if (empty($formats) || (
             !empty($request->getAcceptableMIMETypes()) && empty(array_intersect($request->getAcceptableMIMETypes(), $formats))
             )) {
             throw new NotAcceptableResponseTypeException('None of the requests acceptable response types are valid');

Braces +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
      * @param ResponseFactory $responseFactory
      * @param EndpointFactory $endpointFactory
      */
-    public function __construct(AccessControl $accessControl, Throttle $throttle, ResponseFactory $responseFactory, EndpointFactory $endpointFactory){
+    public function __construct(AccessControl $accessControl, Throttle $throttle, ResponseFactory $responseFactory, EndpointFactory $endpointFactory) {
         $this->accessControl = $accessControl;
         $this->throttle = $throttle;
         $this->responseFactory = $responseFactory;
@@ -80,8 +80,8 @@ 
      * @param Request $request
      * @throws InvalidAPIKeyException
      */
-    protected function validateKey(Request $request){
-        if(!$this->accessControl->validateKey($request->getApiKey())){
+    protected function validateKey(Request $request) {
+        if(!$this->accessControl->validateKey($request->getApiKey())) {
             throw new InvalidAPIKeyException('Invalid API key');
         }
     }

src/Request/RequestData/JSONRequestData.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     public function __construct($body) {
         $this->jsonString = $body;
         $this->parsedData = json_decode($body, true);
-        if($this->parsedData === null) {
+        if ($this->parsedData === null) {
             throw new InvalidRequestDataException('Content not valid JSON');
         }
     }

src/Request/Request.php

Spacing +2 added lines, -2 removed lines

@@ -64,7 +64,7 @@ 
      * @internal param string $extension
      */
 
-    public function __construct($method, array $headers, RequestData $body, RequestData $urlData, $ip, $version, $apiKey, $endpoint, array $acceptableMIMETypes = [], $instance = null){
+    public function __construct($method, array $headers, RequestData $body, RequestData $urlData, $ip, $version, $apiKey, $endpoint, array $acceptableMIMETypes = [], $instance = null) {
         $this->method = strtolower($method);
         $this->headers = $headers;
         $this->body = $body;
@@ -88,7 +88,7 @@ 
      * @return string
      */
     public function getMethod() {
-        return $this->method . ($this->instance ? '' : 'All');
+        return $this->method.($this->instance ? '' : 'All');
     }
 
     /**

Braces +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
      * @internal param string $extension
      */
 
-    public function __construct($method, array $headers, RequestData $body, RequestData $urlData, $ip, $version, $apiKey, $endpoint, array $acceptableMIMETypes = [], $instance = null){
+    public function __construct($method, array $headers, RequestData $body, RequestData $urlData, $ip, $version, $apiKey, $endpoint, array $acceptableMIMETypes = [], $instance = null) {
         $this->method = strtolower($method);
         $this->headers = $headers;
         $this->body = $body;

src/Request/RequestFactory/GenericRequestFactory.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
         $parsedData = $bodyParser->parse($data);
 
         $apiKey = $parsedURL->getAPIKey();
-        if($apiKey === null) {
+        if ($apiKey === null) {
             $apiKey = $parsedHeaders->getAPIKey();
         }
 

src/Server/HTTPServer.php

Spacing +10 added lines, -10 removed lines

@@ -40,28 +40,28 @@
 
             try {
                 $response = $this->server->handleRequest($request);
-                header("Content-Type: " . $response->getMIMEType());
+                header("Content-Type: ".$response->getMIMEType());
                 echo $response->getAsString();
-            } catch(InvalidAPIKeyException $e){
+            } catch (InvalidAPIKeyException $e) {
                 header('400 Bad Request', true, 400);
-            } catch(UnknownEndpointException $e){
+            } catch (UnknownEndpointException $e) {
                 header('404 Not Found', true, 404);
-            } catch(NotAcceptableResponseTypeException $e){
+            } catch (NotAcceptableResponseTypeException $e) {
                 header('406 Not Acceptable', true, 406);
-            } catch(AccessDeniedException $e){
+            } catch (AccessDeniedException $e) {
                 header('403 Access Denied', true, 403);
-            } catch(ThrottleLimitExceededException $e){
+            } catch (ThrottleLimitExceededException $e) {
                 header('429 Too Many Requests', true, 429);
             } catch (\Exception $e) {
                 header('500 Internal Server Error', true, 500);
             }
-        } catch(InvalidRequestURLException $e){
+        } catch (InvalidRequestURLException $e) {
             header('400 Bad Request', true, 400);
-        } catch(UnknownContentTypeException $e){
+        } catch (UnknownContentTypeException $e) {
             header('400 Bad Request', true, 400);
-        } catch(InvalidRequestDataException $e){
+        } catch (InvalidRequestDataException $e) {
             header('400 Bad Request', true, 400);
-        } catch(\Exception $e){
+        } catch (\Exception $e) {
             header('500 Internal Server Error', true, 500);
         }
     }

Braces +9 added lines, -9 removed lines

@@ -42,26 +42,26 @@
                 $response = $this->server->handleRequest($request);
                 header("Content-Type: " . $response->getMIMEType());
                 echo $response->getAsString();
-            } catch(InvalidAPIKeyException $e){
+            } catch(InvalidAPIKeyException $e) {
                 header('400 Bad Request', true, 400);
-            } catch(UnknownEndpointException $e){
+            } catch(UnknownEndpointException $e) {
                 header('404 Not Found', true, 404);
-            } catch(NotAcceptableResponseTypeException $e){
+            } catch(NotAcceptableResponseTypeException $e) {
                 header('406 Not Acceptable', true, 406);
-            } catch(AccessDeniedException $e){
+            } catch(AccessDeniedException $e) {
                 header('403 Access Denied', true, 403);
-            } catch(ThrottleLimitExceededException $e){
+            } catch(ThrottleLimitExceededException $e) {
                 header('429 Too Many Requests', true, 429);
             } catch (\Exception $e) {
                 header('500 Internal Server Error', true, 500);
             }
-        } catch(InvalidRequestURLException $e){
+        } catch(InvalidRequestURLException $e) {
             header('400 Bad Request', true, 400);
-        } catch(UnknownContentTypeException $e){
+        } catch(UnknownContentTypeException $e) {
             header('400 Bad Request', true, 400);
-        } catch(InvalidRequestDataException $e){
+        } catch(InvalidRequestDataException $e) {
             header('400 Bad Request', true, 400);
-        } catch(\Exception $e){
+        } catch(\Exception $e) {
             header('500 Internal Server Error', true, 500);
         }
     }

src/AccessControl/AllAccessListAccessControl.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
     /**
      * @param array $keys
      */
-    public function __construct(Array $keys){
+    public function __construct(array $keys){
         $this->keys = $keys;
     }
 

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
     /**
      * @param array $keys
      */
-    public function __construct(Array $keys){
+    public function __construct(Array $keys) {
         $this->keys = $keys;
     }
 
@@ -25,7 +25,7 @@ 
      * @param \LunixREST\Request\Request $request
      * @return bool true if key is valid
      */
-    public function validateAccess(Request $request){
+    public function validateAccess(Request $request) {
         return $this->validateKey($request->getApiKey());
     }
 
@@ -33,7 +33,7 @@ 
      * @param $apiKey
      * @return bool true if key is in the array passed to this object in it's construction
      */
-    public function validateKey($apiKey){
+    public function validateKey($apiKey) {
         return in_array($apiKey, $this->keys);
     }
 }

Braces +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
     /**
      * @param array $keys
      */
-    public function __construct(Array $keys){
+    public function __construct(Array $keys) {
         $this->keys = $keys;
     }
 
@@ -25,7 +25,7 @@ 
      * @param \LunixREST\Request\Request $request
      * @return bool true if key is valid
      */
-    public function validateAccess(Request $request){
+    public function validateAccess(Request $request) {
         return $this->validateKey($request->getApiKey());
     }
 
@@ -33,7 +33,7 @@ 
      * @param $apiKey
      * @return bool true if key is in the array passed to this object in it's construction
      */
-    public function validateKey($apiKey){
+    public function validateKey($apiKey) {
         return in_array($apiKey, $this->keys);
     }
 }

src/Configuration/INIConfiguration.php

Braces +4 added lines, -4 removed lines

@@ -22,7 +22,7 @@ 
 	 * @param string $filename
 	 * @param string $nameSpace
 	 */
-	public function __construct($filename, $nameSpace = null){
+	public function __construct($filename, $nameSpace = null) {
 		$this->filename = $filename;
 		$this->nameSpace = $nameSpace;
 	}
@@ -33,10 +33,10 @@ 
 	 * @throws INIKeyNotFoundException
 	 * @throws INIParseException
 	 */
-	public function get($key){
+	public function get($key) {
 		$config = parse_ini_file($this->filename, (bool)$this->nameSpace);
 
-		if($config === false){
+		if($config === false) {
 			throw new INIParseException('Could not parse: ' . $this->filename, true);
 		}
 
@@ -54,7 +54,7 @@ 
 	/**
 	 * @param $key
 	 */
-	public function set($key){
+	public function set($key) {
 		//TODO write this
 	}
 }

Indentation +49 added lines, -49 removed lines

@@ -10,54 +10,54 @@
  * @package LunixREST\Configuration
  */
 class INIConfiguration implements Configuration {
-	/**
-	 * @var null
-	 */
-	protected $nameSpace;
-	/**
-	 * @var
-	 */
-	protected $filename;
-
-	/**
-	 * @param string $filename
-	 * @param string $nameSpace
-	 */
-	public function __construct($filename, $nameSpace = null){
-		$this->filename = $filename;
-		$this->nameSpace = $nameSpace;
-	}
-
-	/**
+    /**
+     * @var null
+     */
+    protected $nameSpace;
+    /**
+     * @var
+     */
+    protected $filename;
+
+    /**
+     * @param string $filename
+     * @param string $nameSpace
+     */
+    public function __construct($filename, $nameSpace = null){
+        $this->filename = $filename;
+        $this->nameSpace = $nameSpace;
+    }
+
+    /**
      * //TODO: Move throws/loading to constructor to keep with get contract
-	 * @param $key
-	 * @return mixed
-	 * @throws INIKeyNotFoundException
-	 * @throws INIParseException
-	 */
-	public function get($key){
-	    //TODO: Cache the file contents
-		$config = parse_ini_file($this->filename, (bool)$this->nameSpace);
-
-		if($config === false){
-			throw new INIParseException('Could not parse: ' . $this->filename, true);
-		}
-
-		if($this->nameSpace) {
-			if(isset($config[$this->nameSpace])) {
-				$config = $config[$this->nameSpace];
-			} else {
-				throw new INIKeyNotFoundException();
-			}
-		}
-
-		return isset($config[$key]) ? $config[$key] : null;
-	}
-
-	/**
-	 * @param $key
-	 */
-	public function set($key){
-		//TODO write this
-	}
+     * @param $key
+     * @return mixed
+     * @throws INIKeyNotFoundException
+     * @throws INIParseException
+     */
+    public function get($key){
+        //TODO: Cache the file contents
+        $config = parse_ini_file($this->filename, (bool)$this->nameSpace);
+
+        if($config === false){
+            throw new INIParseException('Could not parse: ' . $this->filename, true);
+        }
+
+        if($this->nameSpace) {
+            if(isset($config[$this->nameSpace])) {
+                $config = $config[$this->nameSpace];
+            } else {
+                throw new INIKeyNotFoundException();
+            }
+        }
+
+        return isset($config[$key]) ? $config[$key] : null;
+    }
+
+    /**
+     * @param $key
+     */
+    public function set($key){
+        //TODO write this
+    }
 }

Spacing +8 added lines, -8 removed lines

@@ -23,7 +23,7 @@ 
 	 * @param string $filename
 	 * @param string $nameSpace
 	 */
-	public function __construct($filename, $nameSpace = null){
+	public function __construct($filename, $nameSpace = null) {
 		$this->filename = $filename;
 		$this->nameSpace = $nameSpace;
 	}
@@ -35,16 +35,16 @@ 
 	 * @throws INIKeyNotFoundException
 	 * @throws INIParseException
 	 */
-	public function get($key){
+	public function get($key) {
 	    //TODO: Cache the file contents
-		$config = parse_ini_file($this->filename, (bool)$this->nameSpace);
+		$config = parse_ini_file($this->filename, (bool) $this->nameSpace);
 
-		if($config === false){
-			throw new INIParseException('Could not parse: ' . $this->filename, true);
+		if ($config === false) {
+			throw new INIParseException('Could not parse: '.$this->filename, true);
 		}
 
-		if($this->nameSpace) {
-			if(isset($config[$this->nameSpace])) {
+		if ($this->nameSpace) {
+			if (isset($config[$this->nameSpace])) {
 				$config = $config[$this->nameSpace];
 			} else {
 				throw new INIKeyNotFoundException();
@@ -57,7 +57,7 @@ 
 	/**
 	 * @param $key
 	 */
-	public function set($key){
+	public function set($key) {
 		//TODO write this
 	}
 }