johnvandeweghe / LunixREST

src/Configuration/INIConfiguration.php

Spacing +8 added lines, -8 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){
-			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();
@@ -54,7 +54,7 @@ 
 	/**
 	 * @param $key
 	 */
-	public function set($key){
+	public function set($key) {
 		//TODO write this
 	}
 }

src/Throttle/SQLiteThrottle.php

Spacing +9 added lines, -9 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,20 +42,20 @@ 
      * @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){
-                    $this->db->query('UPDATE throttle SET count = ' . ($result['count'] + 1) . ' WHERE key = ' . \SQLite3::escapeString($key));
+        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;
                 }
             } else {
-                $this->db->query('UPDATE throttle SET lastMinute = ' . $minute . ', count = 1 WHERE key = ' . \SQLite3::escapeString($key));
+                $this->db->query('UPDATE throttle SET lastMinute = '.$minute.', count = 1 WHERE key = '.\SQLite3::escapeString($key));
             }
         } else {
-            $this->db->query('INSERT INTO throttle (key, count, lastMinute) VALUES (' . \SQLite3::escapeString($key) . ', 1, ' . $minute . ')');
+            $this->db->query('INSERT INTO throttle (key, count, lastMinute) VALUES ('.\SQLite3::escapeString($key).', 1, '.$minute.')');
         }
         return false;
     }

src/Request/Request.php

Spacing +5 added lines, -5 removed lines

@@ -57,7 +57,7 @@ 
      * @param string $extension
      * @param string $instance
      */
-    public function __construct($method, array $headers, array $data, $ip, $version, $apiKey, $endpoint, $extension, $instance = null){
+    public function __construct($method, array $headers, array $data, $ip, $version, $apiKey, $endpoint, $extension, $instance = null) {
         $this->method = strtolower($method);
         $this->headers = $headers;
         $this->data = $data;
@@ -82,7 +82,7 @@ 
      */
     public function getMethod()
     {
-        return $this->method . ($this->instance ? '' : 'All');
+        return $this->method.($this->instance ? '' : 'All');
     }
 
     /**
@@ -150,9 +150,9 @@ 
      * @return Request
      * @throws InvalidRequestFormatException
      */
-    public static function createFromURL($method, array $headers, array $data, $ip, $url){
+    public static function createFromURL($method, array $headers, array $data, $ip, $url) {
         $splitURL = explode('/', trim($url, '/'));
-        if(count($splitURL) < 3){
+        if (count($splitURL) < 3) {
             throw new InvalidRequestFormatException();
         }
         //Find endpoint
@@ -165,7 +165,7 @@ 
 
         $instance = null;
 
-        if(count($splitURL) == 4){
+        if (count($splitURL) == 4) {
             $instance = implode('.', $splitExtension);
         } else {
             $endpoint = implode('.', $splitExtension);

src/Router/Router.php

Spacing +20 added lines, -20 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);
@@ -89,24 +89,24 @@ 
      * @param Request $request
      * @return string
      */
-    protected function endpointClass(Request $request){
-        return '\\' . $this->endpointNamespace . '\Endpoints\v' . str_replace('.', '_', $request->getVersion()) . '\\' . $request->getEndpoint();
+    protected function endpointClass(Request $request) {
+        return '\\'.$this->endpointNamespace.'\Endpoints\v'.str_replace('.', '_', $request->getVersion()).'\\'.$request->getEndpoint();
     }
 
     /**
      * @param Request $request
      * @return string
      */
-    protected function responseClass(Request $request){
-        return '\\LunixREST\\Response\\' . strtoupper($request->getExtension()) . "Response";
+    protected function responseClass(Request $request) {
+        return '\\LunixREST\\Response\\'.strtoupper($request->getExtension())."Response";
     }
 
     /**
      * @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');
         }
     }
@@ -119,8 +119,8 @@ 
     protected 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());
         }
     }
 
@@ -128,10 +128,10 @@ 
      * @param $fullEndpoint
      * @throws UnknownEndpointException
      */
-    protected function validateEndpoint($fullEndpoint){
+    protected function validateEndpoint($fullEndpoint) {
         $endpointReflection = new \ReflectionClass($fullEndpoint);
-        if(!class_exists($fullEndpoint) || !$endpointReflection->isSubclassOf('\LunixREST\Endpoints\Endpoint')){
-            throw new UnknownEndpointException("unknown endpoint: " . $fullEndpoint);
+        if (!class_exists($fullEndpoint) || !$endpointReflection->isSubclassOf('\LunixREST\Endpoints\Endpoint')) {
+            throw new UnknownEndpointException("unknown endpoint: ".$fullEndpoint);
         }
     }
 
@@ -139,8 +139,8 @@ 
      * @param Request $request
      * @throws ThrottleLimitExceededException
      */
-    protected function throttle(Request $request){
-        if($this->throttle->throttle($request)){
+    protected function throttle(Request $request) {
+        if ($this->throttle->throttle($request)) {
             throw new ThrottleLimitExceededException('Request limit exceeded');
         }
     }
@@ -149,8 +149,8 @@ 
      * @param Request $request
      * @throws AccessDeniedException
      */
-    protected function validateAccess(Request $request){
-        if(!$this->accessControl->validateAccess($request)){
+    protected function validateAccess(Request $request) {
+        if (!$this->accessControl->validateAccess($request)) {
             throw new AccessDeniedException("API key does not have the required permissions to access requested resource");
         }
     }
@@ -159,13 +159,13 @@ 
      * @param $responseData
      * @throws InvalidResponseFormatException
      */
-    protected function validateResponse($responseData){
-        if(!is_array($responseData)){
+    protected function validateResponse($responseData) {
+        if (!is_array($responseData)) {
             throw new InvalidResponseFormatException('Method output MUST be an array');
         }
     }
 
-    protected function executeEndpoint($fullEndpoint, Request $request){
+    protected function executeEndpoint($fullEndpoint, Request $request) {
         $endPoint = new $fullEndpoint($request);
         return call_user_func([$endPoint, $request->getMethod()]);
     }