[1.x] Remove unused JetBrains Attributes (#64)

* [1.x] Remove unused JetBrains Attributes * [1.x] Fixes static analysis
Laragear · Feb 20, 2024 · 54c3044 · 54c3044
1 parent 48eaa33
commit 54c3044
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 27 deletions.
diff --git a/composer.json b/composer.json
@@ -44,8 +44,7 @@
         "illuminate/encryption": "9.*|10.*"
     },
     "require-dev": {
-        "orchestra/testbench": "^7.22|8.*",
-        "jetbrains/phpstorm-attributes": "*"
+        "orchestra/testbench": "^7.22|8.*"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Attestation/Validator/Pipes/CompileAttestationObject.php b/src/Attestation/Validator/Pipes/CompileAttestationObject.php
@@ -4,7 +4,6 @@
 
 use Closure;
 use Illuminate\Http\Request;
-use JetBrains\PhpStorm\ArrayShape;
 use Laragear\WebAuthn\Attestation\AttestationObject;
 use Laragear\WebAuthn\Attestation\AuthenticatorData;
 use Laragear\WebAuthn\Attestation\Formats\None;
@@ -67,10 +66,9 @@ public function handle(AttestationValidation $validation, Closure $next): mixed
      * Returns an array map from a BASE64 encoded CBOR string.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
+     * @return array{fmt: string, attStmt: array, authData: \Laragear\WebAuthn\ByteBuffer}
      * @throws \Laragear\WebAuthn\Exceptions\AttestationException
      */
-    #[ArrayShape(["fmt" => "string", "attStmt" => "array", "authData" => ByteBuffer::class])]
     protected function decodeCborBase64(Request $request): array
     {
         try {

diff --git a/src/ByteBuffer.php b/src/ByteBuffer.php
@@ -4,7 +4,6 @@
 
 use Illuminate\Contracts\Support\Jsonable;
 use InvalidArgumentException;
-use JetBrains\PhpStorm\ArrayShape;
 use JsonSerializable;
 use OutOfBoundsException;
 use Stringable;
@@ -373,9 +372,8 @@ public function toJson($options = 0): string
     /**
      * Returns an array of data for serialization.
      *
-     * @return array
+     * @return array{binaryData: string}
      */
-    #[ArrayShape(['binaryData' => "string"])]
     public function __serialize(): array
     {
         return ['binaryData' => static::encodeBase64Url($this->binaryData)];

diff --git a/src/Http/Requests/AssertedRequest.php b/src/Http/Requests/AssertedRequest.php
@@ -4,21 +4,15 @@
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Support\Facades\Auth;
-use JetBrains\PhpStorm\ArrayShape;
 use Laragear\WebAuthn\Contracts\WebAuthnAuthenticatable;
 
 class AssertedRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array
+     * @return array<string, string>
      */
-    #[ArrayShape([
-        'id' => "string", 'rawId' => "string", 'response.authenticatorData' => "string",
-        'response.clientDataJSON' => "string", 'response.signature' => "string", 'response.userHandle' => "string",
-        'type' => "string"
-    ])]
     public function rules(): array
     {
         return [

diff --git a/src/Http/Requests/AttestedRequest.php b/src/Http/Requests/AttestedRequest.php
@@ -3,7 +3,6 @@
 namespace Laragear\WebAuthn\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
-use JetBrains\PhpStorm\ArrayShape;
 use Laragear\WebAuthn\Attestation\Validator\AttestationValidation;
 use Laragear\WebAuthn\Attestation\Validator\AttestationValidator;
 use Laragear\WebAuthn\Contracts\WebAuthnAuthenticatable;
@@ -37,12 +36,8 @@ public function authorize(?WebAuthnAuthenticatable $user): bool
     /**
      * Get the validation rules that apply to the request.
      *
-     * @return array
+     * @return array<string, string>
      */
-    #[ArrayShape([
-        'id' => "string", 'rawId' => "string", 'response' => "string", 'response.clientDataJSON' => "string",
-        'response.attestationObject' => "string", 'type' => "string"
-    ])]
     public function rules(): array
     {
         return [

diff --git a/src/WebAuthnAuthentication.php b/src/WebAuthnAuthentication.php
@@ -5,7 +5,6 @@
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Support\Facades\Date;
-use JetBrains\PhpStorm\ArrayShape;
 use Laragear\WebAuthn\Models\WebAuthnCredential;
 
 /**
@@ -21,7 +20,6 @@ trait WebAuthnAuthentication
      *
      * @return array{name: string, displayName: string}
      */
-    #[ArrayShape(['name' => "string", 'displayName' => "string"])]
     public function webAuthnData(): array
     {
         return [

diff --git a/tests/FakeAuthenticator.php b/tests/FakeAuthenticator.php
@@ -2,8 +2,6 @@
 
 namespace Tests;
 
-use JetBrains\PhpStorm\ArrayShape;
-
 class FakeAuthenticator
 {
     public const CREDENTIAL_ID = 'owBYu_waGLhAOCg4EFzi6Lr55x51G2dR5yhJi8q2C3tgZQQL2aEi-nK3I54J6ILj70pJzR_6QxvA5XER17d7NA9EFe2QH3VoJYQGpO8G5yDoFQvsdkxNhioyMyhyQHNrAgTMGyfigIMCfhjk9te7LNYl9K5GbWRc4TGeQl1vROjBtTNm3GdpEOqp9RijWd-ShQZ95eHoc8SA_-8vzCyfmy-wI_K4ZqlQNNl85Fzg2GIBcC2zvcJhLYy1A2kw6JoBTAmz1ZCCgkTKWhzUvAJQpMpu40M67FqE0WkGZfSJ9A';
@@ -23,7 +21,6 @@ class FakeAuthenticator
      *
      * @return array
      */
-    #[ArrayShape(['id' => "string", 'type' => "string", 'rawId' => "string", 'response' => "string[]"])]
     public static function attestationResponse(): array
     {
         return [
@@ -42,7 +39,6 @@ public static function attestationResponse(): array
      *
      * @return array
      */
-    #[ArrayShape(['id' => "string", 'type' => "string", 'rawId' => "string", 'response' => "string[]"])]
     public static function assertionResponse(): array
     {
         return [