Added null checks before calling set functions

src/Entities/AuthCodeEntityInterface.php

@@ -17,7 +17,7 @@ interface AuthCodeEntityInterface extends TokenInterface
     public function getRedirectUri();
 
     /**
-     * @param string|null $uri
+     * @param string $uri
      */
     public function setRedirectUri($uri);
 }

src/Grant/AbstractGrant.php

@@ -407,7 +407,10 @@ abstract class AbstractGrant implements GrantTypeInterface
         $authCode->setExpiryDateTime((new \DateTime())->add($authCodeTTL));
         $authCode->setClient($client);
         $authCode->setUserIdentifier($userIdentifier);
+
+        if ($redirectUri !== null) {
             $authCode->setRedirectUri($redirectUri);
+        }
 
         foreach ($scopes as $scope) {
             $authCode->addScope($scope);

src/Grant/AuthCodeGrant.php

@@ -270,7 +270,11 @@ class AuthCodeGrant extends AbstractAuthorizeGrant
         $authorizationRequest->setGrantTypeId($this->getIdentifier());
         $authorizationRequest->setClient($client);
         $authorizationRequest->setRedirectUri($redirectUri);
+
+        if ($stateParameter !== null) {
             $authorizationRequest->setState($stateParameter);
+        }
+
         $authorizationRequest->setScopes($scopes);
 
         if ($this->enableCodeExchangeProof === true) {

src/Grant/ImplicitGrant.php

@@ -177,7 +177,11 @@ class ImplicitGrant extends AbstractAuthorizeGrant
         $authorizationRequest->setGrantTypeId($this->getIdentifier());
         $authorizationRequest->setClient($client);
         $authorizationRequest->setRedirectUri($redirectUri);
+
+        if ($stateParameter !== null) {
             $authorizationRequest->setState($stateParameter);          
+        }
+
         $authorizationRequest->setScopes($finalizedScopes);
 
         return $authorizationRequest;

src/RequestTypes/AuthorizationRequest.php

@@ -183,7 +183,7 @@ class AuthorizationRequest
     }
 
     /**
-     * @param string|null $state
+     * @param string $state
      */
     public function setState($state)
     {