Merge pull request #45 from minvws/fix-remove-override-props

fix: remove overloaded properties of OpenIDConnectClient

Author: ricklambrechts

composer.json

@@ -31,7 +31,7 @@
     },
     "require": {
         "php": ">=8.1",
-        "jumbojett/openid-connect-php": "^1.0.0",
+        "jumbojett/openid-connect-php": "^1.0.2",
         "guzzlehttp/guzzle": "^7.5",
         "illuminate/contracts": "^10.0||^11.0",
         "web-token/jwt-library": "^3.4"

phpstan.neon

@@ -2,7 +2,5 @@ parameters:
     paths:
         - src
     level: 8
-    excludePaths:
-        - src/BaseOpenIDConnectClient.php
 includes:
     - phar://phpstan.phar/conf/bleedingEdge.neon

src/OpenIDConnectClient.php

@@ -20,15 +20,11 @@ class OpenIDConnectClient extends \Jumbojett\OpenIDConnectClient
 {
     protected ?JweDecryptInterface $jweDecrypter;
     protected ?OpenIDConfiguration $openIDConfiguration;
-    /**
-     * @var int|null Response code from the server
-     */
-    protected ?int $responseCode;
 
     /**
      * @var string|null Content type from the server
      */
-    private ?string $responseContentType;
+    private ?string $internalResponseContentType = null;
 
     public function __construct(
         ?string $providerUrl = null,
@@ -199,7 +195,7 @@ protected function fetchURL(string $url, string $post_body = null, array $header
         }
 
         $this->responseCode = $request->status();
-        $this->responseContentType = $request->header('Content-Type');
+        $this->internalResponseContentType = $request->header('Content-Type');
 
         if ($request->failed()) {
             throw new OpenIDConnectClientException(
@@ -227,7 +223,7 @@ public function getResponseCode(): int
      */
     public function getResponseContentType(): ?string
     {
-        return $this->responseContentType;
+        return $this->internalResponseContentType;
     }
 
     public function setTlsVerify(bool|string $tlsVerify): void

src/Services/ExceptionHandler.php

@@ -103,11 +103,8 @@ protected function default400Response(OpenIDConnectClientException $exception):
 
     protected function getRequest(): ?Request
     {
+        /** @psalm-var Request $request */
         $request = request();
-        if (!($request instanceof Request)) {
-            return null;
-        }
-
         return $request;
     }
 }