pgaultier / yii2-oauth2

src/commands/JwtController.php

Spacing +16 added lines, -16 removed lines

@@ -76,14 +76,14 @@ 
             $jwt->publicKey = $publicKey;
         }
         if ($jwt->save() === true) {
-            $this->stdout('Jwt created :' . "\n");
-            $this->stdout(' - id: ' . $jwt->id . "\n");
-            $this->stdout(' - clientId: ' . $jwt->clientId . "\n");
-            $this->stdout(' - subject: ' . $jwt->subject . "\n");
-            $this->stdout(' - publicKey: ' . $jwt->publicKey . "\n");
+            $this->stdout('Jwt created :'."\n");
+            $this->stdout(' - id: '.$jwt->id."\n");
+            $this->stdout(' - clientId: '.$jwt->clientId."\n");
+            $this->stdout(' - subject: '.$jwt->subject."\n");
+            $this->stdout(' - publicKey: '.$jwt->publicKey."\n");
             return ExitCode::OK;
         } else {
-            $this->stdout('Jwt cannot be created.' . "\n");
+            $this->stdout('Jwt cannot be created.'."\n");
             return ExitCode::UNSPECIFIED_ERROR;
         }
     }
@@ -106,18 +106,18 @@ 
             $jwt->subject = $this->subject;
             $jwt->publicKey = $this->publicKey;
             if ($jwt->save() === true) {
-                $this->stdout('Jwt updated :' . "\n");
-                $this->stdout(' - id: ' . $jwt->id . "\n");
-                $this->stdout(' - clientId: ' . $jwt->clientId . "\n");
-                $this->stdout(' - subject: ' . $jwt->subject . "\n");
-                $this->stdout(' - publicKey: ' . $jwt->publicKey . "\n");
+                $this->stdout('Jwt updated :'."\n");
+                $this->stdout(' - id: '.$jwt->id."\n");
+                $this->stdout(' - clientId: '.$jwt->clientId."\n");
+                $this->stdout(' - subject: '.$jwt->subject."\n");
+                $this->stdout(' - publicKey: '.$jwt->publicKey."\n");
                 return ExitCode::OK;
             } else {
-                $this->stdout('Jwt ' . $id . ' cannot be updated' . "\n");
+                $this->stdout('Jwt '.$id.' cannot be updated'."\n");
                 return ExitCode::UNSPECIFIED_ERROR;
             }
         } else {
-            $this->stdout('Jwt ' . $id . ' does not exist' . "\n");
+            $this->stdout('Jwt '.$id.' does not exist'."\n");
             return ExitCode::UNSPECIFIED_ERROR;
         }
     }
@@ -137,14 +137,14 @@ 
         $jwt = $jwtClass::findOne($id);
         if ($jwt !== null) {
             if ($jwt->delete() === true) {
-                $this->stdout('Jwt ' . $id . ' deleted' . "\n");
+                $this->stdout('Jwt '.$id.' deleted'."\n");
                 return ExitCode::OK;
             } else {
-                $this->stdout('Jwt ' . $id . ' cannot be deleted' . "\n");
+                $this->stdout('Jwt '.$id.' cannot be deleted'."\n");
                 return ExitCode::UNSPECIFIED_ERROR;
             }
         } else {
-            $this->stdout('Jwt ' . $id . ' does not exist' . "\n");
+            $this->stdout('Jwt '.$id.' does not exist'."\n");
             return ExitCode::UNSPECIFIED_ERROR;
         }
     }

src/commands/MigrateRedisController.php

Spacing +10 added lines, -10 removed lines

@@ -30,7 +30,7 @@ 
             /// AccessToken
             ///
             ///////////////
-            $this->stdout('Start migrating AccessTokens ...' . "\n");
+            $this->stdout('Start migrating AccessTokens ...'."\n");
             /** @var AccessTokenService $accessTokenService */
             $accessTokenService = Yii::createObject('sweelix\oauth2\server\interfaces\AccessTokenServiceInterface');
             $accessTokenList = $accessTokenService->getAccessTokenListKey();
@@ -80,14 +80,14 @@ 
                     }
                 }
             }
-            $this->stdout('Done migrating AccessTokens !' . "\n");
+            $this->stdout('Done migrating AccessTokens !'."\n");
 
             ///////////////
             ///
             /// Clients
             ///
             ///////////////
-            $this->stdout('Start migrating Clients ...' . "\n");
+            $this->stdout('Start migrating Clients ...'."\n");
             /** @var ClientService $clientService */
             $clientService = Yii::createObject('sweelix\oauth2\server\interfaces\ClientServiceInterface');
             $clientList = $clientService->getClientListKey();
@@ -111,14 +111,14 @@ 
                     $db->executeCommand('SADD', [$clientService->getClientListKey(), $clientData[1]]);
                 }
             }
-            $this->stdout('Done migrating Clients !' . "\n");
+            $this->stdout('Done migrating Clients !'."\n");
 
             ///////////////
             ///
             /// Jti
             ///
             ///////////////
-            $this->stdout('Start migrating Jtis ...' . "\n");
+            $this->stdout('Start migrating Jtis ...'."\n");
             /** @var JtiService $jtiService */
             $jtiService = Yii::createObject('sweelix\oauth2\server\interfaces\JtiServiceInterface');
             $jtiList = $jtiService->getJtiListKey();
@@ -157,14 +157,14 @@ 
                     }
                 }
             }
-            $this->stdout('Done migrating Jtis !' . "\n");
+            $this->stdout('Done migrating Jtis !'."\n");
 
             ///////////////
             ///
             /// RefreshToken
             ///
             ///////////////
-            $this->stdout('Start migrating RefreshTokens ...' . "\n");
+            $this->stdout('Start migrating RefreshTokens ...'."\n");
             /** @var RefreshTokenService $refreshTokenService */
             $refreshTokenService = Yii::createObject('sweelix\oauth2\server\interfaces\RefreshTokenServiceInterface');
             $refreshTokenList = $refreshTokenService->getRefreshTokenListKey();
@@ -203,12 +203,12 @@ 
                     }
                 }
             }
-            $this->stdout('Done migrating RefreshTokens !' . "\n");
+            $this->stdout('Done migrating RefreshTokens !'."\n");
 
-            $this->stdout('Migration done !' . "\n");
+            $this->stdout('Migration done !'."\n");
             $exitCode = ExitCode::OK;
         } catch (\Exception $e) {
-            $this->stderr($e->getMessage() . "\n");
+            $this->stderr($e->getMessage()."\n");
             $exitCode = ExitCode::getReason($e->getCode());
         }
         return $exitCode;

src/services/redis/AccessTokenService.php

Spacing +7 added lines, -7 removed lines

@@ -55,7 +55,7 @@ 
      */
     public function getAccessTokenKey($aid)
     {
-        return $this->namespace . ':' . $aid;
+        return $this->namespace.':'.$aid;
     }
 
     /**
@@ -65,7 +65,7 @@ 
      */
     public function getUserAccessTokensKey($uid)
     {
-        return $this->userNamespace . ':' . $uid . ':accessTokens';
+        return $this->userNamespace.':'.$uid.':accessTokens';
     }
 
     /**
@@ -75,7 +75,7 @@ 
      */
     public function getClientAccessTokensKey($cid)
     {
-        return $this->clientNamespace . ':' . $cid . ':accessTokens';
+        return $this->clientNamespace.':'.$cid.':accessTokens';
     }
 
     /**
@@ -83,7 +83,7 @@ 
      */
     public function getAccessTokenListKey()
     {
-        return $this->namespace . ':keys';
+        return $this->namespace.':keys';
     }
 
     /**
@@ -91,7 +91,7 @@ 
      */
     public function getUserListKey()
     {
-        return $this->userNamespace . ':keys';
+        return $this->userNamespace.':keys';
     }
 
     /**
@@ -137,7 +137,7 @@ 
         //check if record exists
         $entityStatus = (int)$this->db->executeCommand('EXISTS', [$accessTokenKey]);
         if ($entityStatus === 1) {
-            throw new DuplicateKeyException('Duplicate key "' . $accessTokenKey . '"');
+            throw new DuplicateKeyException('Duplicate key "'.$accessTokenKey.'"');
         }
 
         $values = $accessToken->getDirtyAttributes($attributes);
@@ -217,7 +217,7 @@ 
             $newAccessTokenKey = $this->getAccessTokenKey($values[$modelKey]);
             $entityStatus = (int)$this->db->executeCommand('EXISTS', [$newAccessTokenKey]);
             if ($entityStatus === 1) {
-                throw new DuplicateKeyException('Duplicate key "' . $newAccessTokenKey . '"');
+                throw new DuplicateKeyException('Duplicate key "'.$newAccessTokenKey.'"');
             }
         }
 

src/services/redis/JtiService.php

Spacing +7 added lines, -7 removed lines

@@ -53,7 +53,7 @@ 
      */
     public function getJtiKey($jid)
     {
-        return $this->namespace . ':' . $jid;
+        return $this->namespace.':'.$jid;
     }
 
     /**
@@ -62,7 +62,7 @@ 
      */
     public function getSubjectJtisKey($sid)
     {
-        return $this->subjectNamespace . ':' . $sid . ':jtis';
+        return $this->subjectNamespace.':'.$sid.':jtis';
     }
 
     /**
@@ -71,7 +71,7 @@ 
      */
     public function getClientJtisKey($cid)
     {
-        return $this->clientNamespace . ':' . $cid . ':jtis';
+        return $this->clientNamespace.':'.$cid.':jtis';
     }
 
     /**
@@ -79,7 +79,7 @@ 
      */
     public function getJtiListKey()
     {
-        return $this->namespace . ':keys';
+        return $this->namespace.':keys';
     }
 
     /**
@@ -87,7 +87,7 @@ 
      */
     public function getSubjectListKey()
     {
-        return $this->subjectNamespace . ':keys';
+        return $this->subjectNamespace.':keys';
     }
 
     /**
@@ -133,7 +133,7 @@ 
         //check if record exists
         $entityStatus = (int)$this->db->executeCommand('EXISTS', [$jtiKey]);
         if ($entityStatus === 1) {
-            throw new DuplicateKeyException('Duplicate key "' . $jtiKey . '"');
+            throw new DuplicateKeyException('Duplicate key "'.$jtiKey.'"');
         }
 
         $values = $jti->getDirtyAttributes($attributes);
@@ -213,7 +213,7 @@ 
             $newJtiKey = $this->getJtiKey($values[$modelKey]);
             $entityStatus = (int)$this->db->executeCommand('EXISTS', [$newJtiKey]);
             if ($entityStatus === 1) {
-                throw new DuplicateKeyException('Duplicate key "' . $newJtiKey . '"');
+                throw new DuplicateKeyException('Duplicate key "'.$newJtiKey.'"');
             }
         }
 

src/services/redis/ClientService.php

Spacing +6 added lines, -6 removed lines

@@ -50,7 +50,7 @@ 
      */
     public function getClientKey($cid)
     {
-        return $this->namespace . ':' . $cid;
+        return $this->namespace.':'.$cid;
     }
 
     /**
@@ -60,7 +60,7 @@ 
      */
     public function getClientUsersListKey($cid)
     {
-        return $this->namespace . ':' . $cid . ':users';
+        return $this->namespace.':'.$cid.':users';
     }
 
     /**
@@ -70,7 +70,7 @@ 
      */
     public function getUserClientsListKey($uid)
     {
-        return $this->userNamespace . ':' . $uid . ':clients';
+        return $this->userNamespace.':'.$uid.':clients';
     }
 
     /**
@@ -78,7 +78,7 @@ 
      */
     public function getClientListKey()
     {
-        return $this->namespace . ':keys';
+        return $this->namespace.':keys';
     }
 
     /**
@@ -115,7 +115,7 @@ 
         //check if record exists
         $entityStatus = (int)$this->db->executeCommand('EXISTS', [$clientKey]);
         if ($entityStatus === 1) {
-            throw new DuplicateKeyException('Duplicate key "' . $clientKey . '"');
+            throw new DuplicateKeyException('Duplicate key "'.$clientKey.'"');
         }
 
         $values = $client->getDirtyAttributes($attributes);
@@ -175,7 +175,7 @@ 
             $newClientKey = $this->getClientKey($values[$modelKey]);
             $entityStatus = (int)$this->db->executeCommand('EXISTS', [$newClientKey]);
             if ($entityStatus === 1) {
-                throw new DuplicateKeyException('Duplicate key "' . $newClientKey . '"');
+                throw new DuplicateKeyException('Duplicate key "'.$newClientKey.'"');
             }
         }
 

src/services/redis/RefreshTokenService.php

Spacing +7 added lines, -7 removed lines

@@ -55,7 +55,7 @@ 
      */
     public function getRefreshTokenKey($rid)
     {
-        return $this->namespace . ':' . $rid;
+        return $this->namespace.':'.$rid;
     }
 
     /**
@@ -65,7 +65,7 @@ 
      */
     public function getUserRefreshTokensKey($uid)
     {
-        return $this->userNamespace . ':' . $uid . ':refreshTokens';
+        return $this->userNamespace.':'.$uid.':refreshTokens';
     }
 
     /**
@@ -75,7 +75,7 @@ 
      */
     public function getClientRefreshTokensKey($cid)
     {
-        return $this->clientNamespace . ':' . $cid . ':refreshTokens';
+        return $this->clientNamespace.':'.$cid.':refreshTokens';
     }
 
     /**
@@ -83,7 +83,7 @@ 
      */
     public function getRefreshTokenListKey()
     {
-        return $this->namespace . ':keys';
+        return $this->namespace.':keys';
     }
 
     /**
@@ -91,7 +91,7 @@ 
      */
     public function getUserListKey()
     {
-        return $this->userNamespace . ':keys';
+        return $this->userNamespace.':keys';
     }
 
     /**
@@ -341,7 +341,7 @@ 
         $userRefreshTokens = $this->db->executeCommand('ZRANGE', [$userRefreshTokensKey, 0, -1]);
         $refreshTokens = [];
         if ((is_array($userRefreshTokens) === true) && (count($userRefreshTokens) > 0)) {
-            foreach($userRefreshTokens as $userRefreshTokenId) {
+            foreach ($userRefreshTokens as $userRefreshTokenId) {
                 $refreshTokens[] = $this->findOne($userRefreshTokenId);
             }
         }
@@ -373,7 +373,7 @@ 
         $clientRefreshTokens = $this->db->executeCommand('ZRANGE', [$clientRefreshTokensKey, 0, -1]);
         $refreshTokens = [];
         if ((is_array($clientRefreshTokens) === true) && (count($clientRefreshTokens) > 0)) {
-            foreach($clientRefreshTokens as $clientRefreshTokenId) {
+            foreach ($clientRefreshTokens as $clientRefreshTokenId) {
                 $refreshTokens[] = $this->findOne($clientRefreshTokenId);
             }
         }