johnvandeweghe / LunixREST

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

Router/Router.php

Spacing +16 added lines, -16 removed lines

@@ -45,7 +45,7 @@ 
      * @param Configuration $formatsConfig
      * @param string $endpointNamespace
      */
-    public function __construct(AccessControl $accessControl, Throttle $throttle, Configuration $formatsConfig, $endpointNamespace = ''){
+    public function __construct(AccessControl $accessControl, Throttle $throttle, Configuration $formatsConfig, $endpointNamespace = '') {
         $this->accessControl = $accessControl;
         $this->throttle = $throttle;
         $this->formatsConfig = $formatsConfig;
@@ -62,7 +62,7 @@ 
      * @throws UnknownEndpointException
      * @throws UnknownResponseFormatException
      */
-    public function handle(Request $request){
+    public function handle(Request $request) {
         $this->validateKey($request);
 
         $this->validateExtension($request);
@@ -90,7 +90,7 @@ 
      * @param Request $request
      * @return string
      */
-    private function endpointClass(Request $request){
+    private function endpointClass(Request $request) {
         return '\\' . $this->endpointNamespace . '\Endpoints\v' . str_replace('.', '_', $request->getVersion()) . '\\' . $request->getEndpoint();
     }
 
@@ -98,7 +98,7 @@ 
      * @param Request $request
      * @return string
      */
-    private function responseClass(Request $request){
+    private function responseClass(Request $request) {
         return '\\LunixREST\\Response\\' . strtoupper($request->getExtension()) . "Response";
     }
 
@@ -106,8 +106,8 @@ 
      * @param Request $request
      * @throws InvalidAPIKeyException
      */
-    private function validateKey(Request $request){
-        if(!$this->accessControl->validateKey($request->getApiKey())){
+    private function validateKey(Request $request) {
+        if (!$this->accessControl->validateKey($request->getApiKey())) {
             throw new InvalidAPIKeyException('Invalid API key');
         }
     }
@@ -120,8 +120,8 @@ 
     private function validateExtension(Request $request)
     {
         $formats = $this->formatsConfig->get('formats');
-        if(!($formats && in_array($request->getExtension(), $formats))){
-            throw new UnknownResponseFormatException('Unknown response format: ' .$request->getExtension());
+        if (!($formats && in_array($request->getExtension(), $formats))) {
+            throw new UnknownResponseFormatException('Unknown response format: ' . $request->getExtension());
         }
     }
 
@@ -129,9 +129,9 @@ 
      * @param $fullEndpoint
      * @throws UnknownEndpointException
      */
-    private function validateEndpoint($fullEndpoint){
+    private function validateEndpoint($fullEndpoint) {
         $endpointReflection = new \ReflectionClass($fullEndpoint);
-        if(!class_exists($fullEndpoint) || !$endpointReflection->isSubclassOf('\LunixREST\Endpoints\Endpoint')){
+        if (!class_exists($fullEndpoint) || !$endpointReflection->isSubclassOf('\LunixREST\Endpoints\Endpoint')) {
             throw new UnknownEndpointException("unknown endpoint: " . $fullEndpoint);
         }
     }
@@ -140,8 +140,8 @@ 
      * @param Request $request
      * @throws ThrottleLimitExceededException
      */
-    private function throttle(Request $request){
-        if($this->throttle->throttle($request)){
+    private function throttle(Request $request) {
+        if ($this->throttle->throttle($request)) {
             throw new ThrottleLimitExceededException('Request limit exceeded');
         }
     }
@@ -150,8 +150,8 @@ 
      * @param Request $request
      * @throws AccessDeniedException
      */
-    private function validateAccess(Request $request){
-        if(!$this->accessControl->validateAccess($request)){
+    private function validateAccess(Request $request) {
+        if (!$this->accessControl->validateAccess($request)) {
             throw new AccessDeniedException("API key does not have the required permissions to access requested resource");
         }
     }
@@ -160,8 +160,8 @@ 
      * @param $responseData
      * @throws InvalidResponseFormatException
      */
-    private function validateResponse($responseData){
-        if(!is_array($responseData)){
+    private function validateResponse($responseData) {
+        if (!is_array($responseData)) {
             throw new InvalidResponseFormatException('Method output MUST be an array');
         }
     }

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;

examples/geophone/Endpoints/v1/phonenumbers.php

Indentation +3 added lines, -3 removed lines

@@ -7,7 +7,7 @@
 class phonenumbers extends Endpoint {
 
     public function get(){
-		$geoPhone = new GeoPhone('data.csv');
-		return $geoPhone->lookupNumber($this->request->getInstance());
-	}
+        $geoPhone = new GeoPhone('data.csv');
+        return $geoPhone->lookupNumber($this->request->getInstance());
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 
 class phonenumbers extends Endpoint {
 
-    public function get(){
+    public function get() {
 		$geoPhone = new GeoPhone('data.csv');
 		return $geoPhone->lookupNumber($this->request->getInstance());
 	}

examples/geophone/Models/GeoPhone.php

Spacing +3 added lines, -3 removed lines

@@ -14,7 +14,7 @@ 
     /**
      * @param string $filename
      */
-    public function __construct($filename = 'data.csv'){
+    public function __construct($filename = 'data.csv') {
         $this->fileHandle = fopen($filename, 'r');
     }
 
@@ -23,13 +23,13 @@ 
      * @return array an array with one value keyed with "location". The value is an array with two keys "city" and "state".
      * City and state are empty when not found.
      */
-    public function lookupNumber($phoneNumber){
+    public function lookupNumber($phoneNumber) {
         $phoneNumber = preg_replace('/[^0-9]/s', '', $phoneNumber);
         $areaCode = substr($phoneNumber, 0, 3);
         $nextThree = substr($phoneNumber, 3, 3);
 
         while (($data = fgetcsv($this->fileHandle)) !== FALSE) {
-            if($areaCode == $data[0] && $nextThree == $data[1]){
+            if ($areaCode == $data[0] && $nextThree == $data[1]) {
                 return ["location" =>
                     [
                         'city' => $data[2],

examples/geophone/index.php

Indentation +22 added lines, -22 removed lines

@@ -10,29 +10,29 @@
 $router = new \LunixREST\Router\Router($accessControl, $throttle, $formatsConfig, "GeoPhone");
 
 try {
-	$request = new \LunixREST\Request\Request("GET", [], [], '127.0.0.1',  "/1/123456/phonenumbers/6517855237.json");//new \LunixREST\Request\Request($_SERVER['REQUEST_METHOD'], getallheaders(), $_REQUEST, $_SERVER['REMOTE_ADDR'], $_SERVER['REQUEST_URI']);
+    $request = new \LunixREST\Request\Request("GET", [], [], '127.0.0.1',  "/1/123456/phonenumbers/6517855237.json");//new \LunixREST\Request\Request($_SERVER['REQUEST_METHOD'], getallheaders(), $_REQUEST, $_SERVER['REMOTE_ADDR'], $_SERVER['REQUEST_URI']);
 
-	try {
-		echo $router->handle($request);
-	} catch(\LunixREST\Exceptions\InvalidRequestFormatException $e){
-		header('400 Bad Request', 400);
-	} catch(\LunixREST\Exceptions\UnknownEndpointException $e){
-		header('404 Not Found', 404);
-	} catch(\LunixREST\Exceptions\UnknownResponseFormatException $e){
-		header('404 Not Found', 404);
-	} catch(\LunixREST\Exceptions\InstanceNotFoundException $e){
-		header('404 Not Found', 404);
-	} catch(\LunixREST\Exceptions\AccessDeniedException $e){
-		header('403 Access Denied', 403);
-	} catch(\LunixREST\Exceptions\ThrottleLimitExceededException $e){
-		header('429 Too Many Requests', 429);
-	} catch(\LunixREST\Exceptions\InvalidResponseFormatException $e){
-		header('500 Internal Server Error', 500);
-	} catch(Exception $e){
-		header('500 Internal Server Error', 500);
-	}
+    try {
+        echo $router->handle($request);
+    } catch(\LunixREST\Exceptions\InvalidRequestFormatException $e){
+        header('400 Bad Request', 400);
+    } catch(\LunixREST\Exceptions\UnknownEndpointException $e){
+        header('404 Not Found', 404);
+    } catch(\LunixREST\Exceptions\UnknownResponseFormatException $e){
+        header('404 Not Found', 404);
+    } catch(\LunixREST\Exceptions\InstanceNotFoundException $e){
+        header('404 Not Found', 404);
+    } catch(\LunixREST\Exceptions\AccessDeniedException $e){
+        header('403 Access Denied', 403);
+    } catch(\LunixREST\Exceptions\ThrottleLimitExceededException $e){
+        header('429 Too Many Requests', 429);
+    } catch(\LunixREST\Exceptions\InvalidResponseFormatException $e){
+        header('500 Internal Server Error', 500);
+    } catch(Exception $e){
+        header('500 Internal Server Error', 500);
+    }
 } catch(\LunixREST\Exceptions\InvalidRequestFormatException $e){
-	header('400 Bad Request', 400);
+    header('400 Bad Request', 400);
 } catch(Exception $e){
-	header('500 Internal Server Error', 500);
+    header('500 Internal Server Error', 500);
 }

Spacing +11 added lines, -11 removed lines

@@ -10,29 +10,29 @@
 $router = new \LunixREST\Router\Router($accessControl, $throttle, $formatsConfig, "GeoPhone");
 
 try {
-	$request = new \LunixREST\Request\Request("GET", [], [], '127.0.0.1',  "/1/123456/phonenumbers/6517855237.json");//new \LunixREST\Request\Request($_SERVER['REQUEST_METHOD'], getallheaders(), $_REQUEST, $_SERVER['REMOTE_ADDR'], $_SERVER['REQUEST_URI']);
+	$request = new \LunixREST\Request\Request("GET", [], [], '127.0.0.1', "/1/123456/phonenumbers/6517855237.json"); //new \LunixREST\Request\Request($_SERVER['REQUEST_METHOD'], getallheaders(), $_REQUEST, $_SERVER['REMOTE_ADDR'], $_SERVER['REQUEST_URI']);
 
 	try {
 		echo $router->handle($request);
-	} catch(\LunixREST\Exceptions\InvalidRequestFormatException $e){
+	} catch (\LunixREST\Exceptions\InvalidRequestFormatException $e) {
 		header('400 Bad Request', 400);
-	} catch(\LunixREST\Exceptions\UnknownEndpointException $e){
+	} catch (\LunixREST\Exceptions\UnknownEndpointException $e) {
 		header('404 Not Found', 404);
-	} catch(\LunixREST\Exceptions\UnknownResponseFormatException $e){
+	} catch (\LunixREST\Exceptions\UnknownResponseFormatException $e) {
 		header('404 Not Found', 404);
-	} catch(\LunixREST\Exceptions\InstanceNotFoundException $e){
+	} catch (\LunixREST\Exceptions\InstanceNotFoundException $e) {
 		header('404 Not Found', 404);
-	} catch(\LunixREST\Exceptions\AccessDeniedException $e){
+	} catch (\LunixREST\Exceptions\AccessDeniedException $e) {
 		header('403 Access Denied', 403);
-	} catch(\LunixREST\Exceptions\ThrottleLimitExceededException $e){
+	} catch (\LunixREST\Exceptions\ThrottleLimitExceededException $e) {
 		header('429 Too Many Requests', 429);
-	} catch(\LunixREST\Exceptions\InvalidResponseFormatException $e){
+	} catch (\LunixREST\Exceptions\InvalidResponseFormatException $e) {
 		header('500 Internal Server Error', 500);
-	} catch(Exception $e){
+	} catch (Exception $e) {
 		header('500 Internal Server Error', 500);
 	}
-} catch(\LunixREST\Exceptions\InvalidRequestFormatException $e){
+} catch (\LunixREST\Exceptions\InvalidRequestFormatException $e) {
 	header('400 Bad Request', 400);
-} catch(Exception $e){
+} catch (Exception $e) {
 	header('500 Internal Server Error', 500);
 }

examples/helloworld/Endpoints/v1_0/helloworld.php

Indentation +2 added lines, -2 removed lines

@@ -5,6 +5,6 @@
 
 class helloworld extends Endpoint {
     public function getAll(){
-		return ["helloworld" => "hello world"];
-	}
+        return ["helloworld" => "hello world"];
+    }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 use LunixREST\Endpoints\Endpoint;
 
 class helloworld extends Endpoint {
-    public function getAll(){
+    public function getAll() {
 		return ["helloworld" => "hello world"];
 	}
 }
\ No newline at end of file

examples/helloworld/index.php

Indentation +20 added lines, -20 removed lines

@@ -9,27 +9,27 @@
 $router = new \LunixREST\Router\Router($accessControl, $throttle, $formatsConfig, "HelloWorld");
 
 try {
-	$request = new \LunixREST\Request\Request("GET", [], [], '127.0.0.1', "/1.0/public/helloworld.json");//new \LunixREST\Request\Request($_SERVER['REQUEST_METHOD'], getallheaders(), $_REQUEST, $_SERVER['REMOTE_ADDR'], $_SERVER['REQUEST_URI']);
+    $request = new \LunixREST\Request\Request("GET", [], [], '127.0.0.1', "/1.0/public/helloworld.json");//new \LunixREST\Request\Request($_SERVER['REQUEST_METHOD'], getallheaders(), $_REQUEST, $_SERVER['REMOTE_ADDR'], $_SERVER['REQUEST_URI']);
 
-	try {
-		echo $router->handle($request);
-	} catch(\LunixREST\Exceptions\InvalidRequestFormatException $e){
-		header('400 Bad Request', 400);
-	} catch(\LunixREST\Exceptions\UnknownEndpointException $e){
-		header('404 Not Found', 404);
-	} catch(\LunixREST\Exceptions\UnknownResponseFormatException $e){
-		header('404 Not Found', 404);
-	} catch(\LunixREST\Exceptions\AccessDeniedException $e){
-		header('403 Access Denied', 403);
-	}  catch(\LunixREST\Exceptions\ThrottleLimitExceededException $e){
-		header('429 Too Many Requests', 429);
-	} catch(\LunixREST\Exceptions\InvalidResponseFormatException $e){
-		header('500 Internal Server Error', 500);
-	} catch(Exception $e){
-		header('500 Internal Server Error', 500);
-	}
+    try {
+        echo $router->handle($request);
+    } catch(\LunixREST\Exceptions\InvalidRequestFormatException $e){
+        header('400 Bad Request', 400);
+    } catch(\LunixREST\Exceptions\UnknownEndpointException $e){
+        header('404 Not Found', 404);
+    } catch(\LunixREST\Exceptions\UnknownResponseFormatException $e){
+        header('404 Not Found', 404);
+    } catch(\LunixREST\Exceptions\AccessDeniedException $e){
+        header('403 Access Denied', 403);
+    }  catch(\LunixREST\Exceptions\ThrottleLimitExceededException $e){
+        header('429 Too Many Requests', 429);
+    } catch(\LunixREST\Exceptions\InvalidResponseFormatException $e){
+        header('500 Internal Server Error', 500);
+    } catch(Exception $e){
+        header('500 Internal Server Error', 500);
+    }
 } catch(\LunixREST\Exceptions\InvalidRequestFormatException $e){
-	header('400 Bad Request', 400);
+    header('400 Bad Request', 400);
 } catch(Exception $e){
-	header('500 Internal Server Error', 500);
+    header('500 Internal Server Error', 500);
 }

Spacing +10 added lines, -10 removed lines

@@ -9,27 +9,27 @@
 $router = new \LunixREST\Router\Router($accessControl, $throttle, $formatsConfig, "HelloWorld");
 
 try {
-	$request = new \LunixREST\Request\Request("GET", [], [], '127.0.0.1', "/1.0/public/helloworld.json");//new \LunixREST\Request\Request($_SERVER['REQUEST_METHOD'], getallheaders(), $_REQUEST, $_SERVER['REMOTE_ADDR'], $_SERVER['REQUEST_URI']);
+	$request = new \LunixREST\Request\Request("GET", [], [], '127.0.0.1', "/1.0/public/helloworld.json"); //new \LunixREST\Request\Request($_SERVER['REQUEST_METHOD'], getallheaders(), $_REQUEST, $_SERVER['REMOTE_ADDR'], $_SERVER['REQUEST_URI']);
 
 	try {
 		echo $router->handle($request);
-	} catch(\LunixREST\Exceptions\InvalidRequestFormatException $e){
+	} catch (\LunixREST\Exceptions\InvalidRequestFormatException $e) {
 		header('400 Bad Request', 400);
-	} catch(\LunixREST\Exceptions\UnknownEndpointException $e){
+	} catch (\LunixREST\Exceptions\UnknownEndpointException $e) {
 		header('404 Not Found', 404);
-	} catch(\LunixREST\Exceptions\UnknownResponseFormatException $e){
+	} catch (\LunixREST\Exceptions\UnknownResponseFormatException $e) {
 		header('404 Not Found', 404);
-	} catch(\LunixREST\Exceptions\AccessDeniedException $e){
+	} catch (\LunixREST\Exceptions\AccessDeniedException $e) {
 		header('403 Access Denied', 403);
-	}  catch(\LunixREST\Exceptions\ThrottleLimitExceededException $e){
+	} catch (\LunixREST\Exceptions\ThrottleLimitExceededException $e) {
 		header('429 Too Many Requests', 429);
-	} catch(\LunixREST\Exceptions\InvalidResponseFormatException $e){
+	} catch (\LunixREST\Exceptions\InvalidResponseFormatException $e) {
 		header('500 Internal Server Error', 500);
-	} catch(Exception $e){
+	} catch (Exception $e) {
 		header('500 Internal Server Error', 500);
 	}
-} catch(\LunixREST\Exceptions\InvalidRequestFormatException $e){
+} catch (\LunixREST\Exceptions\InvalidRequestFormatException $e) {
 	header('400 Bad Request', 400);
-} catch(Exception $e){
+} catch (Exception $e) {
 	header('500 Internal Server Error', 500);
 }

Braces +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 		header('404 Not Found', 404);
 	} catch(\LunixREST\Exceptions\AccessDeniedException $e){
 		header('403 Access Denied', 403);
-	}  catch(\LunixREST\Exceptions\ThrottleLimitExceededException $e){
+	} catch(\LunixREST\Exceptions\ThrottleLimitExceededException $e){
 		header('429 Too Many Requests', 429);
 	} catch(\LunixREST\Exceptions\InvalidResponseFormatException $e){
 		header('500 Internal Server Error', 500);