vince-scarpa / responsibleAPI

src/core/auth/authorise.php

Spacing +7 added lines, -7 removed lines

@@ -63,7 +63,7 @@ 
         /**
          * Check if a custom scope is set
          */
-        if( isset($this->header->getMethod()->data['scope']) && 
+        if (isset($this->header->getMethod()->data['scope']) && 
             ($this->header->getMethod()->data['scope'] == 'anonymous')
         ) {
             $this->grantAccess = true;
@@ -101,14 +101,14 @@ 
                 ->decode()
             ;
 
-            if( isset($decoded['sub']) && !empty($decoded['sub']) ) {
+            if (isset($decoded['sub']) && !empty($decoded['sub'])) {
 
                 $this->user = (object) (new user\user)
                     ->setOptions($this->getOptions())
                     ->load($decoded['sub'], ['refreshToken' => true])
                 ;
 
-                if ( !empty($this->user) ) {
+                if (!empty($this->user)) {
                     $jwt = new auth\jwt;
                     $decoded = $jwt
                         ->setOptions($this->getOptions())
@@ -117,7 +117,7 @@ 
                         ->decode()
                     ;
                 }
-            }else{
+            } else {
 
                 $this->header->unauthorised();
             }
@@ -127,7 +127,7 @@ 
          * [$user Check user account]
          * @var [object]
          */
-        if ( (isset($decoded['sub']) && !empty($decoded['sub'])) && !$this->user ) {
+        if ((isset($decoded['sub']) && !empty($decoded['sub'])) && !$this->user) {
             $this->user = (object) (new user\user)
                 ->setOptions($this->getOptions())
                 ->load($decoded['sub'], ['refreshToken' => true])
@@ -148,7 +148,7 @@ 
      */
     public function user()
     {
-        if( $this->isGrantType() ) {
+        if ($this->isGrantType()) {
             return (object) [
                 'uid' => -1,
                 'account_id' => 0,
@@ -177,7 +177,7 @@ 
             return;
         }
 
-        if( isset($this->header->getMethod()->data['scope']) && 
+        if (isset($this->header->getMethod()->data['scope']) && 
             ($this->header->getMethod()->data['scope'] == 'anonymous')
         ) {
             return;

Braces +1 added lines, -1 removed lines

@@ -117,7 +117,7 @@
                         ->decode()
                     ;
                 }
-            }else{
+            } else{
 
                 $this->header->unauthorised();
             }

src/core/keys/key.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
      */
     public function apiKeyGenerate($length = 32)
     {
-        $randInt = microtime().rand(1000, 9999);
+        $randInt = microtime() . rand(1000, 9999);
         $messageDigest = md5($randInt);
         return implode(
             '-',

src/core/throttle/tokenBucket.php

Spacing +1 added lines, -1 removed lines

@@ -215,7 +215,7 @@
                 if ($nLeakRate < 0) {
                     $nLeakRate = 0;
                 }
-                $this->leakage = (float)$nLeakRate;
+                $this->leakage = (float) $nLeakRate;
             }
         }
 

src/core/throttle/limiterOptions.php

Spacing +1 added lines, -1 removed lines

@@ -138,7 +138,7 @@
 
         if (is_numeric($timeframe)) {
             if ($timeframe < 0) {
-                $timeframe = ($timeframe*-1);
+                $timeframe = ($timeframe * -1);
             }
             self::$timeframe['CUSTOM'] = $timeframe;
             $this->window = intval(self::$timeframe['CUSTOM']);

src/core/auth/jwtValidate.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
      */
     public static function payload(array $payloadObject = [])
     {
-        if( self::isAnonymousScope($payloadObject) ) {
+        if (self::isAnonymousScope($payloadObject)) {
             return true;
         }
 

src/core/user/userLoad.php

Spacing +15 added lines, -15 removed lines

@@ -99,7 +99,7 @@ 
 
         $this->secret = $this->getDefaults()['config']['MASTER_KEY'];
 
-        if( isset($options['secret']) && $options['secret'] == 'append' ) {
+        if (isset($options['secret']) && $options['secret'] == 'append') {
             $this->secretAppend = true;
         }
     }
@@ -138,7 +138,7 @@ 
                 \PDO::FETCH_OBJ
             );
 
-        if( $this->secretAppend ) {
+        if ($this->secretAppend) {
             $this->secret = $account->secret;
         }
 
@@ -153,7 +153,7 @@ 
                 $headers->setOptions($this->getOptions());
                 $sentToken = $headers->hasBearerToken();
 
-                if( $sentToken ) {
+                if ($sentToken) {
                     /**
                      * [$jwt Decode the JWT]
                      * @var auth\jwt
@@ -171,7 +171,7 @@ 
                     ;
                     $absSeconds = ($decoded['exp'] - ($this->timeNow() - $leeway));
 
-                    if( $absSeconds > 0 ) {
+                    if ($absSeconds > 0) {
                         $account->JWT = $sentToken;
                     }
 
@@ -215,21 +215,21 @@ 
     public function refreshTokenGenerate($account)
     {
         $offset = 86400;
-        $time = ($this->timeNow()+$offset);
+        $time = ($this->timeNow() + $offset);
 
-        if( isset($account->refresh_token) && !empty($account->refresh_token) ) {
+        if (isset($account->refresh_token) && !empty($account->refresh_token)) {
             $raToken = explode('.', $account->refresh_token);
-            if( !empty($raToken) ) {
+            if (!empty($raToken)) {
                 $raToken = array_values(array_filter($raToken));
-                $time = ($raToken[0] <= ($this->timeNow()-$offset) ) ? ($this->timeNow()+$offset) : $raToken[0];
+                $time = ($raToken[0] <= ($this->timeNow() - $offset)) ? ($this->timeNow() + $offset) : $raToken[0];
             }
         }
 
         $cipher = new encoder\cipher;
-        $refreshHash = $account->account_id.':'.$account->secret;
+        $refreshHash = $account->account_id . ':' . $account->secret;
         $refreshHash = $cipher->encode($cipher->hash('sha256', $refreshHash, $account->secret));
 
-        $refreshHash = $time.'.'.$refreshHash;
+        $refreshHash = $time . '.' . $refreshHash;
         $account->refreshToken = $refreshHash;
 
         $updateProp = [
@@ -301,7 +301,7 @@ 
         /**
          * Check token expiry
          */
-        if($this->checkVal($userPayload['payload'], 'exp') && !$skipExpiry) {
+        if ($this->checkVal($userPayload['payload'], 'exp') && !$skipExpiry) {
             return $this->refreshJWT($userPayload);
         }
 
@@ -365,26 +365,26 @@ 
                 $payload['iat'] = $iat;
             }
             if (false !== ($nbf = $this->checkVal($jwtOptions, 'notBeFor'))) {
-                if( strtolower($nbf) == 'issuedat' && isset($payload['iat']) ) {
+                if (strtolower($nbf) == 'issuedat' && isset($payload['iat'])) {
                     $nbf = $payload['iat'] + 10;
                 }
                 $payload['nbf'] = $nbf;
             }
         }
 
-        if( $refresh && $exp ) {
+        if ($refresh && $exp) {
             $refreshPayload = $payload;
 
             $offset = $exp - $this->timeNow();
             $leeway = ($this->checkVal($this->options['jwt'], 'leeway')) ?: $this->jwt->getLeeway();
 
-            $refreshPayload['exp'] = $exp+$offset+$leeway;
+            $refreshPayload['exp'] = $exp + $offset + $leeway;
 
             $refreshJWT = $this->refreshJWT([
                 'payload' => $refreshPayload
             ]);
 
-            if( isset($refreshJWT['refresh']) ) {
+            if (isset($refreshJWT['refresh'])) {
                 return $refreshJWT['refresh'];
             }
         }

src/core/throttle/limiter.php

Spacing +5 added lines, -5 removed lines

@@ -211,7 +211,7 @@ 
             $bucket->getTokenData()
         );
 
-        if($this->isMockTest) {
+        if ($this->isMockTest) {
             return;
         }
         
@@ -257,7 +257,7 @@ 
      */
     public function getAccount()
     {
-        if($this->isMockTest) {
+        if ($this->isMockTest) {
             $this->getMockAccount();
         }
 
@@ -281,7 +281,7 @@ 
 
         $mockAccount = [];
 
-        if(!isset($mockAccount['bucket'])) {
+        if (!isset($mockAccount['bucket'])) {
             $mockAccount['bucket'] = $packer->pack(
                 $bucket->getTokenData()
             );
@@ -289,8 +289,8 @@ 
 
         $mockAccount['access'] = time();
 
-        $this->setAccount((object)$mockAccount);
-        $this->mockAccount = (object)$mockAccount;
+        $this->setAccount((object) $mockAccount);
+        $this->mockAccount = (object) $mockAccount;
     }
 
     /**

src/core/server.php

Spacing +9 added lines, -9 removed lines

@@ -153,7 +153,7 @@ 
             $this->header = new headers\header;
             $this->header->setOptions($options);
 
-            if (empty((array)$this->header->getMethod())) {
+            if (empty((array) $this->header->getMethod())) {
                 $this->header->requestMethod();
             }
         }
@@ -206,7 +206,7 @@ 
      * [getOptions Get the stored Responsible API options]
      * @return array|null
      */
-    public function getOptions():?array
+    public function getOptions(): ?array
     {
         return $this->options;
     }
@@ -263,7 +263,7 @@ 
         }
 
         if (is_null($key) || $key == '') {
-            if( !is_null($response) ) {
+            if (!is_null($response)) {
                 $this->RESPONSE['response'] = $response;
             }
             $this->RESPONSE = array_merge($responseHeader, $this->RESPONSE);
@@ -280,7 +280,7 @@ 
      */
     public function getResponse()
     {
-        if(isset($this->RESPONSE['response']['response'])) {
+        if (isset($this->RESPONSE['response']['response'])) {
             $this->RESPONSE['response'] = $this->RESPONSE['response']['response'];
         }
         return $this->RESPONSE;
@@ -310,7 +310,7 @@ 
     public function authenticate()
     {
         $options = $this->getOptions();
-        $route = (isset($options['route']) && !empty($options['route']) ) ? $options['route'] : '';
+        $route = (isset($options['route']) && !empty($options['route'])) ? $options['route'] : '';
 
         $this->endpoints->baseApiRoot(dirname(__DIR__));
         $this->endpoints->register();
@@ -321,7 +321,7 @@ 
         $this->router = $router->route($route);
         $endpoint = $this->endpoints->isEndpoint($router->getApi(), $router->getPath());
 
-        if(isset($endpoint->model['scope'])) {
+        if (isset($endpoint->model['scope'])) {
             $_REQUEST['scope'] = $endpoint->model['scope'];
             $this->header->setData($_REQUEST);
         }
@@ -406,7 +406,7 @@ 
         /**
          * Check if theres a request payload sent
          */
-        if(isset($_REQUEST['payload'])) {
+        if (isset($_REQUEST['payload'])) {
             $router->setRequestBody($_REQUEST['payload']);
         }
         $router->setPostBody($this->header->getBody());
@@ -417,11 +417,11 @@ 
         /**
          * Check the access scope
          */
-        if( !isset($this->router->endpoint->model['scope']) ) {
+        if (!isset($this->router->endpoint->model['scope'])) {
             $this->router->endpoint->model['scope'] = 'private';
         }
 
-        if( isset($this->header->getMethod()->data['scope']) && 
+        if (isset($this->header->getMethod()->data['scope']) && 
             ($this->header->getMethod()->data['scope'] == 'anonymous')
         ) {
             $this->router->endpoint->model['scope'] = 'anonymous';

src/core/auth/jwtDecoder.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
         $payloadObject = $cipher->jsonDecode($cipher->decode($jwtPayload));
 
         // @codeCoverageIgnoreStart
-        if( $this->key == 'payloadOnly' ) {
+        if ($this->key == 'payloadOnly') {
             return $payloadObject;
         }
         // @codeCoverageIgnoreEnd