try phpunit 12 and phpstan 2

Author: hafezdivandari

composer.json

@@ -16,14 +16,14 @@
  "psr/http-server-middleware": "^1.0"
  },
  "require-dev": {
- "phpunit/phpunit": "^10.5|^11.5",
+ "phpunit/phpunit": "^10.5|^11.5|^12.0",
  "laminas/laminas-diactoros": "^3.5",
- "phpstan/phpstan": "^1.12",
- "phpstan/phpstan-phpunit": "^1.3.15",
+ "phpstan/phpstan": "^1.12|^2.0",
+ "phpstan/phpstan-phpunit": "^1.3.15|^2.0",
  "roave/security-advisories": "dev-master",
  "phpstan/extension-installer": "^1.3.1",
- "phpstan/phpstan-deprecation-rules": "^1.1.4",
- "phpstan/phpstan-strict-rules": "^1.5.2",
+ "phpstan/phpstan-deprecation-rules": "^1.1.4|^2.0",
+ "phpstan/phpstan-strict-rules": "^1.5.2|^2.0",
  "slevomat/coding-standard": "^8.14.1",
  "php-parallel-lint/php-parallel-lint": "^1.3.2",
  "squizlabs/php_codesniffer": "^3.8"

src/Grant/AuthCodeGrant.php

@@ -175,7 +175,11 @@ private function validateCodeChallenge(object $authCodePayload, ?string $codeVer
  if (isset($this->codeChallengeVerifiers[$authCodePayload->code_challenge_method])) {
  $codeChallengeVerifier = $this->codeChallengeVerifiers[$authCodePayload->code_challenge_method];
 
- if (!isset($authCodePayload->code_challenge) || $codeChallengeVerifier->verifyCodeChallenge($codeVerifier, $authCodePayload->code_challenge) === false) {
+ if (
+ !property_exists($authCodePayload, 'code_challenge') ||
+ !isset($authCodePayload->code_challenge) ||
+ $codeChallengeVerifier->verifyCodeChallenge($codeVerifier, $authCodePayload->code_challenge) === false
+ ) {
  throw OAuthServerException::invalidGrant('Failed to verify `code_verifier`.');
  }
  } else {

tests/Stubs/ScopeEntity.php

@@ -6,11 +6,13 @@
 
 use League\OAuth2\Server\Entities\ScopeEntityInterface;
 use League\OAuth2\Server\Entities\Traits\EntityTrait;
+use League\OAuth2\Server\Entities\Traits\ScopeTrait;
 use ReturnTypeWillChange;
 
 class ScopeEntity implements ScopeEntityInterface
 {
  use EntityTrait;
+ use ScopeTrait;
 
  #[ReturnTypeWillChange]
  public function jsonSerialize(): string