Merge pull request #848 from lookyman/static-analysis

Static analysis with PHPStan
thephpleague · Feb 11, 2018 · 97089ad · 97089ad
2 parents ef06c29 + eca385a
commit 97089ad
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,6 @@ cache:
   - vendor
 
 php:
-  - 5.6
   - 7.0
   - 7.1
   - 7.2
@@ -17,6 +16,7 @@ install:
 
 script:
   - vendor/bin/phpunit
+  - vendor/bin/phpstan analyse -l 6 src
 
 branches:
   only:

diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
     "homepage": "https://oauth2.thephpleague.com/",
     "license": "MIT",
     "require": {
-        "php": ">=5.6.0",
+        "php": ">=7.0.0",
         "ext-openssl": "*",
         "league/event": "^2.1",
         "lcobucci/jwt": "^3.1",
@@ -14,7 +14,8 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8.38 || ^5.7.21",
-        "zendframework/zend-diactoros": "^1.0"
+        "zendframework/zend-diactoros": "^1.0",
+        "phpstan/phpstan": "^0.9.2"
     },
     "repositories": [
         {

diff --git a/src/AuthorizationServer.php b/src/AuthorizationServer.php
@@ -17,6 +17,7 @@
 use League\OAuth2\Server\Repositories\ClientRepositoryInterface;
 use League\OAuth2\Server\Repositories\ScopeRepositoryInterface;
 use League\OAuth2\Server\RequestTypes\AuthorizationRequest;
+use League\OAuth2\Server\ResponseTypes\AbstractResponseType;
 use League\OAuth2\Server\ResponseTypes\BearerTokenResponse;
 use League\OAuth2\Server\ResponseTypes\ResponseTypeInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -190,7 +191,7 @@ public function respondToAccessTokenRequest(ServerRequestInterface $request, Res
             if ($tokenResponse instanceof ResponseTypeInterface) {
                 return $tokenResponse->generateHttpResponse($response);
             }
-            
+
         }
 
         throw OAuthServerException::unsupportedGrantType();
@@ -207,7 +208,9 @@ protected function getResponseType()
             $this->responseType = new BearerTokenResponse();
         }
 
-        $this->responseType->setPrivateKey($this->privateKey);
+        if ($this->responseType instanceof AbstractResponseType === true) {
+            $this->responseType->setPrivateKey($this->privateKey);
+        }
         $this->responseType->setEncryptionKey($this->encryptionKey);
 
         return $this->responseType;

diff --git a/src/Entities/AccessTokenEntityInterface.php b/src/Entities/AccessTokenEntityInterface.php
@@ -9,6 +9,7 @@
 
 namespace League\OAuth2\Server\Entities;
 
+use Lcobucci\JWT\Token;
 use League\OAuth2\Server\CryptKey;
 
 interface AccessTokenEntityInterface extends TokenInterface
@@ -18,7 +19,7 @@ interface AccessTokenEntityInterface extends TokenInterface
      *
      * @param CryptKey $privateKey
      *
-     * @return string
+     * @return Token
      */
     public function convertToJWT(CryptKey $privateKey);
 }
diff --git a/src/Entities/RefreshTokenEntityInterface.php b/src/Entities/RefreshTokenEntityInterface.php
@@ -21,7 +21,7 @@ public function getIdentifier();
     /**
      * Set the token's identifier.
      *
-     * @param $identifier
+     * @param mixed $identifier
      */
     public function setIdentifier($identifier);
 

diff --git a/src/Entities/TokenInterface.php b/src/Entities/TokenInterface.php
@@ -21,7 +21,7 @@ public function getIdentifier();
     /**
      * Set the token's identifier.
      *
-     * @param $identifier
+     * @param mixed $identifier
      */
     public function setIdentifier($identifier);
 
@@ -42,14 +42,14 @@ public function setExpiryDateTime(\DateTime $dateTime);
     /**
      * Set the identifier of the user associated with the token.
      *
-     * @param string|int $identifier The identifier of the user
+     * @param string|int|null $identifier The identifier of the user
      */
     public function setUserIdentifier($identifier);
 
     /**
      * Get the token user's identifier.
      *
-     * @return string|int
+     * @return string|int|null
      */
     public function getUserIdentifier();
 

diff --git a/src/Entities/Traits/AccessTokenTrait.php b/src/Entities/Traits/AccessTokenTrait.php
@@ -12,6 +12,7 @@
 use Lcobucci\JWT\Builder;
 use Lcobucci\JWT\Signer\Key;
 use Lcobucci\JWT\Signer\Rsa\Sha256;
+use Lcobucci\JWT\Token;
 use League\OAuth2\Server\CryptKey;
 use League\OAuth2\Server\Entities\ClientEntityInterface;
 use League\OAuth2\Server\Entities\ScopeEntityInterface;
@@ -23,7 +24,7 @@ trait AccessTokenTrait
      *
      * @param CryptKey $privateKey
      *
-     * @return string
+     * @return Token
      */
     public function convertToJWT(CryptKey $privateKey)
     {

diff --git a/src/Entities/Traits/TokenEntityTrait.php b/src/Entities/Traits/TokenEntityTrait.php
@@ -25,7 +25,7 @@ trait TokenEntityTrait
     protected $expiryDateTime;
 
     /**
-     * @var string|int
+     * @var string|int|null
      */
     protected $userIdentifier;
 
@@ -77,7 +77,7 @@ public function setExpiryDateTime(\DateTime $dateTime)
     /**
      * Set the identifier of the user associated with the token.
      *
-     * @param string|int $identifier The identifier of the user
+     * @param string|int|null $identifier The identifier of the user
      */
     public function setUserIdentifier($identifier)
     {
@@ -87,7 +87,7 @@ public function setUserIdentifier($identifier)
     /**
      * Get the token user's identifier.
      *
-     * @return string|int
+     * @return string|int|null
      */
     public function getUserIdentifier()
     {

diff --git a/src/Exception/OAuthServerException.php b/src/Exception/OAuthServerException.php
@@ -131,7 +131,7 @@ public static function invalidCredentials()
     /**
      * Server error.
      *
-     * @param $hint
+     * @param string $hint
      *
      * @return static
      *

diff --git a/src/Grant/AbstractGrant.php b/src/Grant/AbstractGrant.php
@@ -341,7 +341,7 @@ protected function getServerParameter($parameter, ServerRequestInterface $reques
      *
      * @param \DateInterval          $accessTokenTTL
      * @param ClientEntityInterface  $client
-     * @param string                 $userIdentifier
+     * @param string|null            $userIdentifier
      * @param ScopeEntityInterface[] $scopes
      *
      * @throws OAuthServerException

diff --git a/src/RequestTypes/AuthorizationRequest.php b/src/RequestTypes/AuthorizationRequest.php
@@ -53,7 +53,7 @@ class AuthorizationRequest
     /**
      * The redirect URI used in the request
      *
-     * @var string
+     * @var string|null
      */
     protected $redirectUri;
 
@@ -159,15 +159,15 @@ public function setAuthorizationApproved($authorizationApproved)
     }
 
     /**
-     * @return string
+     * @return string|null
      */
     public function getRedirectUri()
     {
         return $this->redirectUri;
     }
 
     /**
-     * @param string $redirectUri
+     * @param string|null $redirectUri
      */
     public function setRedirectUri($redirectUri)
     {

diff --git a/src/ResourceServer.php b/src/ResourceServer.php
@@ -63,7 +63,9 @@ protected function getAuthorizationValidator()
             $this->authorizationValidator = new BearerTokenValidator($this->accessTokenRepository);
         }
 
-        $this->authorizationValidator->setPublicKey($this->publicKey);
+        if ($this->authorizationValidator instanceof BearerTokenValidator === true) {
+            $this->authorizationValidator->setPublicKey($this->publicKey);
+        }
 
         return $this->authorizationValidator;
     }