vince-scarpa / responsibleAPI

src/core/headers/header.php

Spacing +4 added lines, -4 removed lines

@@ -189,7 +189,7 @@ 
         foreach ($headers_list as $index => $headValue) {
             @list($key, $value) = explode(": ", $headValue);
             
-            if (!is_null($key) && !is_null($value) ) {
+            if (!is_null($key) && !is_null($value)) {
                 $headers_list[$key] = $value;
                 unset($headers_list[$index]);
             }
@@ -201,7 +201,7 @@ 
             $apacheRequestHeaders = apache_request_headers();
         }
 
-        if( is_null($apacheRequestHeaders) || empty($apacheRequestHeaders) ) {
+        if (is_null($apacheRequestHeaders) || empty($apacheRequestHeaders)) {
             return [];
         }
 
@@ -259,7 +259,7 @@ 
             '*',
         ));
 
-        if( !array_key_exists('Access-Control-Allow-Methods', $this->getHeaders()) ) {
+        if (!array_key_exists('Access-Control-Allow-Methods', $this->getHeaders())) {
             $this->setHeader('Access-Control-Allow-Methods', array(
                 'GET,POST,OPTIONS',
             ));
@@ -458,7 +458,7 @@ 
                     )
                 );
 
-            if( empty($account) ) {
+            if (empty($account)) {
                 $this->unauthorised();
             }
 

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;
         }
 
@@ -151,7 +151,7 @@ 
                 $account->refresh_token = $this->refreshTokenGenerate($account);
                 $sentToken = (new headers\header)->hasBearerToken();
 
-                if( $sentToken ) {
+                if ($sentToken) {
                     /**
                      * [$jwt Decode the JWT]
                      * @var auth\jwt
@@ -169,7 +169,7 @@ 
                     ;
                     $absSeconds = ($decoded['exp'] - ($this->timeNow() - $leeway));
 
-                    if( $absSeconds > 0 ) {
+                    if ($absSeconds > 0) {
                         $account->JWT = $sentToken;
                     }
 
@@ -207,21 +207,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 = [
@@ -293,7 +293,7 @@ 
         /**
          * Check token expiry
          */
-        if($this->checkVal($userPayload['payload'], 'exp') && !$skipExpiry) {
+        if ($this->checkVal($userPayload['payload'], 'exp') && !$skipExpiry) {
             return $this->refreshJWT($userPayload);
         }
 
@@ -357,26 +357,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'];
             }
         }

tests/AuthTest.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
             ->decode()
         ;
 
-        $this->assertEquals(true, (is_array($decoded)&&!empty($decoded)) );
+        $this->assertEquals(true, (is_array($decoded) && !empty($decoded)));
     }
 
     /**

src/core/exception/errorException.php

Spacing +2 added lines, -2 removed lines

@@ -170,7 +170,7 @@ 
                 'MESSAGE' => $message,
             ), JSON_PRETTY_PRINT);
 
-            if( isset($options['errors']) && $options['errors'] == 'catchAll' ) {
+            if (isset($options['errors']) && $options['errors'] == 'catchAll') {
                 throw new self($eMessage, 1);
             }
 
@@ -185,7 +185,7 @@ 
                 'MESSAGE' => $message,
             ), JSON_PRETTY_PRINT);
 
-            if( isset($options['errors']) && $options['errors'] == 'catchAll' ) {
+            if (isset($options['errors']) && $options['errors'] == 'catchAll') {
                 throw new self($eMessage, 1);
             }