johnvandeweghe / LunixREST

AccessControl/AllAccessConfigurationListAccessControl.php

Spacing +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
      * @param Configuration $config a config that has a list of valid keys in the stored $configKey
      * @param string $configKey key to use when accessing the list of valid keys from the $config
      */
-    public function __construct(Configuration $config, $configKey = 'keys'){
+    public function __construct(Configuration $config, $configKey = 'keys') {
         $this->config = $config;
         $this->configKey = $configKey;
     }
@@ -31,7 +31,7 @@ 
      * @param \LunixREST\Request\Request $request
      * @return bool true if this key is valid
      */
-    public function validateAccess(Request $request){
+    public function validateAccess(Request $request) {
         return $this->validateKey($request->getApiKey());
     }
 
@@ -39,7 +39,7 @@ 
      * @param $apiKey
      * @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
      */
-    public function validateKey($apiKey){
+    public function validateKey($apiKey) {
         return in_array($apiKey, $this->config->get($this->configKey));
     }
 }
\ No newline at end of file

AccessControl/AllAccessListAccessControl.php

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
     /**
      * @param array $keys
      */
-    public function __construct(Array $keys){
+    public function __construct(Array $keys) {
         $this->keys = $keys;
     }
 
@@ -23,7 +23,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());
     }
 
@@ -31,7 +31,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);
     }
 }
\ No newline at end of file

AccessControl/MultiAccessControl.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
     /**
      * @param AccessControl[] $accessControls array of access controls to use based on implmentation
      */
-    public function __construct(array $accessControls){
+    public function __construct(array $accessControls) {
         $this->accessControls = $accessControls;
     }
 }
\ No newline at end of file

AccessControl/MultiAndAccessControl.php

Spacing +6 added lines, -6 removed lines

@@ -11,9 +11,9 @@ 
      * @param \LunixREST\Request\Request $request
      * @return bool true if all of the $accessControls' validate access methods returned true for the given request
      */
-    public function validateAccess(Request $request){
-        foreach($this->accessControls as $accessControl){
-            if(!$accessControl->validateAccess($request)){
+    public function validateAccess(Request $request) {
+        foreach ($this->accessControls as $accessControl) {
+            if (!$accessControl->validateAccess($request)) {
                 return false;
             }
         }
@@ -24,9 +24,9 @@ 
      * @param $apiKey
      * @return bool true if all of the $accessControls' validate key methods returned true for the given request
      */
-    public function validateKey($apiKey){
-        foreach($this->accessControls as $accessControl){
-            if(!$accessControl->validateKey($apiKey)){
+    public function validateKey($apiKey) {
+        foreach ($this->accessControls as $accessControl) {
+            if (!$accessControl->validateKey($apiKey)) {
                 return false;
             }
         }

AccessControl/PublicAccessControl.php

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
     /**
      * @param string $publicKey
      */
-    public function __construct($publicKey = 'public'){
+    public function __construct($publicKey = 'public') {
         $this->publicKey = $publicKey;
     }
 
@@ -23,7 +23,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());
     }
 
@@ -31,7 +31,7 @@ 
      * @param $apiKey
      * @return bool true if key is the key specified in the constructor
      */
-    public function validateKey($apiKey){
+    public function validateKey($apiKey) {
         return $apiKey === $this->publicKey;
     }
 }
\ No newline at end of file

Configuration/Configuration.php

Indentation +2 added lines, -2 removed lines

@@ -2,6 +2,6 @@
 namespace LunixREST\Configuration;
 
 interface Configuration {
-	public function get($key);
-	public function set($key);
+    public function get($key);
+    public function set($key);
 }

Configuration/INIConfiguration.php

Indentation +48 added lines, -48 removed lines

@@ -9,52 +9,52 @@
  * @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;
-	}
-
-	/**
-	 * @param $key
-	 * @return mixed
-	 * @throws INIKeyNotFoundException
-	 * @throws INIParseException
-	 */
-	public function get($key){
-		$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
-	}
+    /**
+     * @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;
+    }
+
+    /**
+     * @param $key
+     * @return mixed
+     * @throws INIKeyNotFoundException
+     * @throws INIParseException
+     */
+    public function get($key){
+        $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 +7 added lines, -7 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,15 +33,15 @@ 
 	 * @throws INIKeyNotFoundException
 	 * @throws INIParseException
 	 */
-	public function get($key){
-		$config = parse_ini_file($this->filename, (bool)$this->nameSpace);
+	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);
 		}
 
-		if($this->nameSpace) {
-			if(isset($config[$this->nameSpace])) {
+		if ($this->nameSpace) {
+			if (isset($config[$this->nameSpace])) {
 				$config = $config[$this->nameSpace];
 			} else {
 				throw new INIKeyNotFoundException();
@@ -54,7 +54,7 @@ 
 	/**
 	 * @param $key
 	 */
-	public function set($key){
+	public function set($key) {
 		//TODO write this
 	}
 }

Endpoints/EndPoint.php

Spacing +12 added lines, -12 removed lines

@@ -17,56 +17,56 @@ 
     /**
      * @param Request $request
      */
-    public function __construct(Request $request){
+    public function __construct(Request $request) {
         $this->request = $request;
     }
 
     /**
      * @return array
      */
-    public function get(){
+    public function get() {
         $this->unsupportedMethod();
     }
 
     /**
      * @return array
      */
-    public function getAll(){
+    public function getAll() {
         $this->unsupportedMethod();
     }
 
     /**
      * @return array
      */
-    public function post(){
+    public function post() {
         $this->unsupportedMethod();
     }
 
     /**
      * @return array
      */
-    public function postAll(){
+    public function postAll() {
         $this->unsupportedMethod();
     }
 
     /**
      * @return array
      */
-    public function put(){
+    public function put() {
         $this->unsupportedMethod();
     }
 
     /**
      * @return array
      */
-    public function putAll(){
+    public function putAll() {
         $this->unsupportedMethod();
     }
 
     /**
      * @return array
      */
-    public function options(){
+    public function options() {
         $this->unsupportedMethod();
     }
 
@@ -74,25 +74,25 @@ 
     /**
      * @return array
      */
-    public function optionsAll(){
+    public function optionsAll() {
         $this->unsupportedMethod();
     }
 
     /**
      * @return array
      */
-    public function delete(){
+    public function delete() {
         $this->unsupportedMethod();
     }
 
     /**
      * @return array
      */
-    public function deleteAll(){
+    public function deleteAll() {
         $this->unsupportedMethod();
     }
 
-    private function unsupportedMethod(){
+    private function unsupportedMethod() {
         throw new UnknownEndpointException('Method not supported');
     }
 }

Request/Request.php

Spacing +6 added lines, -6 removed lines

@@ -59,19 +59,19 @@ 
      * @param string $instance
      * @throws InvalidRequestFormatException
      */
-    public function __construct($method, array $headers, array $data, $ip, $url, $version = '', $apiKey = '', $endpoint = '', $extension = '', $instance = ''){
+    public function __construct($method, array $headers, array $data, $ip, $url, $version = '', $apiKey = '', $endpoint = '', $extension = '', $instance = '') {
         $this->method = strtolower($method);
         $this->headers = $headers;
         $this->data = $data;
         $this->ip = $ip;
 
-        if($version && $apiKey && $endpoint && $extension){
+        if ($version && $apiKey && $endpoint && $extension) {
             $this->version = $version;
             $this->apiKey = $apiKey;
             $this->endpoint = $endpoint;
             $this->extension = $extension;
             $this->instance = $instance;
-        } elseif($url !== false) {
+        } elseif ($url !== false) {
             $this->parseURL($url);
         } else {
             throw new InvalidRequestFormatException('Either URL or the rest of the parameters MUST be set');
@@ -154,9 +154,9 @@ 
      * @param string $url
      * @throws InvalidRequestFormatException
      */
-    private function parseURL($url){
+    private function parseURL($url) {
         $splitURL = explode('/', trim($url, '/'));
-        if(count($splitURL) < 3){
+        if (count($splitURL) < 3) {
             throw new InvalidRequestFormatException();
         }
         //Find endpoint
@@ -167,7 +167,7 @@ 
         $splitExtension = explode('.', $splitURL[count($splitURL) - 1]);
         $this->extension = array_pop($splitExtension);
 
-        if(count($splitURL) == 4){
+        if (count($splitURL) == 4) {
             $this->instance = implode('.', $splitExtension);
         } else {
             $this->endpoint = implode('.', $splitExtension);