Revert ./composer.json and remove useless comment and fix code style

Author: huangzhhui

README.md

@@ -12,20 +12,20 @@ composer require swoft/auth
 
 ## Document [wiki](https://github.com/aprchen/swoft-auth/wiki)
 
-now
+Now
 - BasicAuth 
 - BearerToken  (JWT)
 - Acl
 
-feature
-- oauth 2.0 
+Future
+- Oauth 2.0 
 
 
 
 ## Unit testing
 
 ```bash
-phpunit
+composer test
 ```
 
 ## LICENSE

composer.json

@@ -1,46 +1,47 @@
 {
-  "name": "swoft/auth",
-  "type": "library",
-  "keywords": [
-    "php",
-    "swoole",
-    "swoft",
-    "auth",
-    "auth-manager",
-    "jwt",
-    "acl"
-  ],
-  "description": "auth compoment for swoft",
-  "license": "Apache-2.0",
-  "require": {
-    "swoft/http-server": "^1.0",
-    "firebase/php-jwt": "^5.0",
-    "psr/simple-cache": "^1.0",
-    "swoft/framework": "^1.0",
-    "swoft/cache": "^1.0"
-  },
-  "autoload": {
-    "psr-4": {
-      "Swoft\\Auth\\": "src/"
+    "name": "swoft/auth",
+    "type": "library",
+    "keywords": [
+        "php",
+        "swoole",
+        "swoft",
+        "auth",
+        "auth-manager",
+        "jwt",
+        "acl"
+    ],
+    "description": "Auth compoment for swoft",
+    "license": "Apache-2.0",
+    "require": {
+        "swoft/http-server": "^1.0",
+        "firebase/php-jwt": "^5.0",
+        "psr/simple-cache": "^1.0",
+        "swoft/framework": "^1.0",
+        "swoft/cache": "^1.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Swoft\\Auth\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "SwoftTest\\Auth\\": "test/Cases"
+        }
+    },
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://packagist.laravel-china.org"
+        }
+    ],
+    "require-dev": {
+        "eaglewu/swoole-ide-helper": "dev-master",
+        "phpunit/phpunit": "^5.7",
+        "friendsofphp/php-cs-fixer": "^2.11"
+    },
+    "scripts": {
+        "test": "./vendor/bin/phpunit -c phpunit.xml",
+        "cs-fix": "./vendor/bin/php-cs-fixer fix $1"
     }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "SwoftTest\\Auth\\": "test/Cases"
-    }
-  },
-  "repositories": [
-    {
-      "type": "composer",
-      "url": "https://packagist.laravel-china.org"
-    }
-  ],
-  "require-dev": {
-    "eaglewu/swoole-ide-helper": "dev-master",
-    "phpunit/phpunit": "^5.7",
-    "friendsofphp/php-cs-fixer": "^2.11"
-  },
-  "scripts": {
-    "test": "./vendor/bin/phpunit -c phpunit.xml"
-  }
 }

phpunit.xml

@@ -15,7 +15,7 @@
     </testsuites>
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./app</directory>
+            <directory suffix=".php">./src</directory>
         </whitelist>
     </filter>
 </phpunit>

src/AuthManager.php

@@ -25,10 +25,6 @@
 use Swoft\Core\RequestContext;
 use Swoft\Exception\RuntimeException;
 
-/**
- * Class AuthManager
- * @package Swoft\Auth
- */
 class AuthManager implements AuthManagerInterface
 {
     /**
@@ -66,7 +62,7 @@ class AuthManager implements AuthManagerInterface
      */
     private $tokenParser;
 
-    public function getSessionDuration()
+    public function getSessionDuration(): int
     {
         return $this->sessionDuration;
     }
@@ -77,54 +73,41 @@ public function setSessionDuration($time)
     }
 
     /**
-     * @return AuthSession;
+     * @return AuthSession|mixed
      */
     public function getSession()
     {
         return RequestContext::getContextDataByKey(AuthConstants::AUTH_SESSION);
     }
 
-    /**
-     * @param AuthSession $session
-     */
     public function setSession(AuthSession $session)
     {
         RequestContext::setContextData([AuthConstants::AUTH_SESSION => $session]);
     }
 
     /**
-     * @return bool
-     *
      * Check if a user is currently logged in
      */
-    public function isLoggedIn()
+    public function isLoggedIn(): bool
     {
         return $this->getSession() instanceof AuthSession;
     }
 
-    /**
-     * @param $accountTypeName
-     * @param array $data
-     * @return AuthSession
-     */
     public function login(string $accountTypeName, array $data): AuthSession
     {
-        if (!$account = $this->getAccountType($accountTypeName)) {
+        if (! $account = $this->getAccountType($accountTypeName)) {
             throw new AuthException(ErrorCode::AUTH_INVALID_ACCOUNT_TYPE);
         }
         $result = $account->login($data);
-        if (!$result instanceof AuthResult || $result->getIdentity() == '') {
+        if (! $result instanceof AuthResult || $result->getIdentity() === '') {
             throw new AuthException(ErrorCode::AUTH_LOGIN_FAILED);
         }
         $session = $this->generateSession($accountTypeName, $result->getIdentity(), $result->getExtendedData());
         $this->setSession($session);
         if ($this->cacheEnable === true) {
             try {
-                $this->getCacheClient()->set(
-                    $this->getCacheKey($session->getIdentity(), $session->getExtendedData()),
-                    $session->getToken(),
-                    $session->getExpirationTime()
-                );
+                $this->getCacheClient()
+                    ->set($this->getCacheKey($session->getIdentity(), $session->getExtendedData()), $session->getToken(), $session->getExpirationTime());
             } catch (InvalidArgumentException $e) {
                 $err = sprintf('%s Invalid Argument : %s', $session->getIdentity(), $e->getMessage());
                 throw new AuthException(ErrorCode::POST_DATA_NOT_PROVIDED, $err);
@@ -133,7 +116,7 @@ public function login(string $accountTypeName, array $data): AuthSession
         return $session;
     }
 
-    protected function getCacheKey(string $identity, array $extendedData)
+    protected function getCacheKey(string $identity, array $extendedData): string
     {
         if (empty($extendedData)) {
             return $this->prefix . $identity;
@@ -142,19 +125,12 @@ protected function getCacheKey(string $identity, array $extendedData)
         return $this->prefix . $identity . '.' . md5($str);
     }
 
-    /**
-     * @param string $accountTypeName
-     * @param string $identity
-     * @param array $data
-     * @return AuthSession
-     */
-    public function generateSession(string $accountTypeName, string $identity, array $data = [])
+    public function generateSession(string $accountTypeName, string $identity, array $data = []): AuthSession
     {
         $startTime = time();
         $exp = $startTime + (int)$this->sessionDuration;
         $session = new AuthSession();
-        $session
-            ->setExtendedData($data)
+        $session->setExtendedData($data)
             ->setExpirationTime($exp)
             ->setCreateTime($startTime)
             ->setIdentity($identity)
@@ -171,45 +147,42 @@ public function generateSession(string $accountTypeName, string $identity, array
      */
     public function getAccountType($name)
     {
-        if (!App::hasBean($name)) {
+        if (! App::hasBean($name)) {
             return null;
         }
         $account = App::getBean($name);
-        if (!$account instanceof AccountTypeInterface) {
+        if (! $account instanceof AccountTypeInterface) {
             return null;
         }
         return $account;
     }
 
     /**
-     * @return TokenParserInterface
+     * @throws RuntimeException When TokenParser missing or error.
      */
     public function getTokenParser(): TokenParserInterface
     {
-        if (!$this->tokenParser instanceof TokenParserInterface) {
-            if (!App::hasBean($this->tokenParserClass)) {
+        if (! $this->tokenParser instanceof TokenParserInterface) {
+            if (! App::hasBean($this->tokenParserClass)) {
                 throw new RuntimeException('Can`t find tokenParserClass');
             }
             $tokenParser = App::getBean($this->tokenParserClass);
-            if (!$tokenParser instanceof TokenParserInterface) {
+            if (! $tokenParser instanceof TokenParserInterface) {
                 throw new RuntimeException("TokenParser need implements Swoft\Auth\Mapping\TokenParserInterface ");
             }
             $this->tokenParser = $tokenParser;
         }
         return $this->tokenParser;
     }
 
-    /**
-     * @return CacheInterface
-     */
-    public function getCacheClient()
+    public function getCacheClient(): CacheInterface
     {
-        if (!$this->cache instanceof CacheInterface) {
-            if (!App::hasBean($this->cacheClass)) {
+        if (! $this->cache instanceof CacheInterface) {
+            if (! App::hasBean($this->cacheClass)) {
                 throw new RuntimeException('Can`t find cacheClass');
             }
             $cache = App::getBean($this->cacheClass);
-            if (!$cache instanceof CacheInterface) {
+            if (! $cache instanceof CacheInterface) {
                 throw new RuntimeException('CacheClient need implements Psr\SimpleCache\CacheInterface');
             }
             $this->cache = $cache;
@@ -218,8 +191,6 @@ public function getCacheClient()
     }
 
     /**
-     * @param $token
-     * @return bool
      * @throws AuthException
      */
     public function authenticateToken(string $token): bool
@@ -231,26 +202,27 @@ public function authenticateToken(string $token): bool
             throw new AuthException(ErrorCode::AUTH_TOKEN_INVALID);
         }
 
-        if (!$session) {
+        if (! $session) {
             return false;
         }
 
         if ($session->getExpirationTime() < time()) {
             throw new AuthException(ErrorCode::AUTH_SESSION_EXPIRED);
         }
 
-        if (!$account = $this->getAccountType($session->getAccountTypeName())) {
+        if (! $account = $this->getAccountType($session->getAccountTypeName())) {
             throw new AuthException(ErrorCode::AUTH_SESSION_INVALID);
         }
 
-        if (!$account->authenticate($session->getIdentity())) {
+        if (! $account->authenticate($session->getIdentity())) {
             throw new AuthException(ErrorCode::AUTH_TOKEN_INVALID);
         }
 
         if ($this->cacheEnable === true) {
             try {
-                $cache = $this->getCacheClient()->get($this->getCacheKey($session->getIdentity(), $session->getExtendedData()));
-                if (!$cache || $cache !== $token) {
+                $cache = $this->getCacheClient()
+                    ->get($this->getCacheKey($session->getIdentity(), $session->getExtendedData()));
+                if (! $cache || $cache !== $token) {
                     throw new AuthException(ErrorCode::AUTH_TOKEN_INVALID);
                 }
             } catch (InvalidArgumentException $e) {