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/INIConfiguration.php

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
 	}
 }

Response/JSONResponse.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
     /**
      * @return string
      */
-    public function output(){
+    public function output() {
         return json_encode($this->data);
     }
 }

Response/Response.php

Spacing +1 added lines, -1 removed lines

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

Throttle/SQLiteThrottle.php

Spacing +6 added lines, -6 removed lines

@@ -22,11 +22,11 @@ 
      * @param $file
      * @param $limitPerMinute
      */
-    public function __construct($file, $limitPerMinute){
+    public function __construct($file, $limitPerMinute) {
         $this->db = new \SQLite3($file);
 
         $result = $this->db->query('SELECT name FROM sqlite_master');
-        if(!($row = $result->fetchArray()) || $row['name'] != 'throttle'){
+        if (!($row = $result->fetchArray()) || $row['name'] != 'throttle') {
             $this->db->exec('CREATE TABLE throttle (key STRING, count NUMBER, lastMinute NUMBER)');
         }
         $this->limit = $limitPerMinute;
@@ -42,11 +42,11 @@ 
      * @param $key
      * @return bool
      */
-    protected function genericThrottle($key){
+    protected function genericThrottle($key) {
         $minute = ceil(time() / 60);
-        if($result = $this->db->querySingle('SELECT key, count, lastMinute FROM throttle WHERE key = ' . \SQLite3::escapeString($key), true)) {
-            if($result['lastMinute'] == $minute){
-                if($result['count'] + 1 <= $this->limit){
+        if ($result = $this->db->querySingle('SELECT key, count, lastMinute FROM throttle WHERE key = ' . \SQLite3::escapeString($key), true)) {
+            if ($result['lastMinute'] == $minute) {
+                if ($result['count'] + 1 <= $this->limit) {
                     $this->db->query('UPDATE throttle SET count = ' . ($result['count'] + 1) . ' WHERE key = ' . \SQLite3::escapeString($key));
                 } else {
                     return true;