Merge bc897d0 into 5fd92e1

composer.json

@@ -26,17 +26,18 @@
         "nyholm/psr7": "^1.3"
     },
     "require-dev": {
+        "nunomaduro/larastan": "^0.6.1",
         "orchestra/testbench": "^5.0",
         "phpunit/phpunit": "^8.5||^9.0"
     },
     "autoload": {
         "psr-4": {
-            "DarkGhostHunter\\Larapass\\": "src"
+            "DarkGhostHunter\\Larapass\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "Tests\\": "tests"
+            "Tests\\": "tests/"
         }
     },
     "scripts": {
@@ -53,4 +54,4 @@
             ]
         }
     }
-}
+}

phpstan.neon.dist

@@ -0,0 +1,9 @@
+includes:
+    - vendor/nunomaduro/larastan/extension.neon
+parameters:
+    bootstrapFiles:
+        - tests/phpstan/bootstrap.php
+        - tests/phpstan/User.php
+    level: 5
+    paths:
+        - src/

src/Auth/EloquentWebAuthnProvider.php

@@ -87,7 +87,7 @@ protected function isSignedChallenge(array $credentials)
      * @param  array  $credentials
      * @return bool
      */
-    public function validateCredentials(UserContract $user, array $credentials)
+    public function validateCredentials($user, array $credentials)
     {
         if ($this->isSignedChallenge($credentials)) {
             return (bool)$this->validator->validate($credentials);

src/Contracts/WebAuthnAuthenticatable.php

@@ -64,7 +64,7 @@ public function flushCredentials($except = null) : void;
      * Checks if a given credential exists and is enabled.
      *
      * @param  string  $id
-     * @return mixed
+     * @return bool
      */
     public function hasCredentialEnabled(string $id) : bool;
 

src/Eloquent/WebAuthnCredential.php

@@ -120,7 +120,7 @@ public function isDisabled()
     /**
      * Returns the credential ID encoded in BASE64.
      *
-     * @return false
+     * @return string
      */
     public function getPrettyIdAttribute()
     {

src/WebAuthn/WebAuthnAssertValidator.php

@@ -82,7 +82,7 @@ class WebAuthnAssertValidator
     /**
      * If the login should require explicit User verification.
      *
-     * @var bool
+     * @var string
      */
     protected $verifyLogin;
 

src/WebAuthn/WebAuthnAttestCreator.php

@@ -66,7 +66,7 @@ class WebAuthnAttestCreator
     /**
      * If the devices should be further verified.
      *
-     * @var bool
+     * @var string
      */
     protected $conveyance;
 
@@ -122,7 +122,7 @@ public function __construct(ConfigContract $config,
      * @param  \Illuminate\Contracts\Auth\Authenticatable|\DarkGhostHunter\Larapass\Contracts\WebAuthnAuthenticatable  $user
      * @return \Webauthn\PublicKeyCredentialCreationOptions|null
      */
-    public function retrieveAttestation(WebAuthnAuthenticatable $user)
+    public function retrieveAttestation($user)
     {
         return $this->cache->get($this->cacheKey($user));
     }
@@ -133,7 +133,7 @@ public function retrieveAttestation(WebAuthnAuthenticatable $user)
      * @param  \Illuminate\Contracts\Auth\Authenticatable|\DarkGhostHunter\Larapass\Contracts\WebAuthnAuthenticatable  $user
      * @return mixed|\Webauthn\PublicKeyCredentialCreationOptions
      */
-    public function generateAttestation(WebAuthnAuthenticatable $user)
+    public function generateAttestation($user)
     {
         $attestation = $this->makeAttestationRequest($user);
 

src/WebAuthn/WebAuthnAttestValidator.php

@@ -80,7 +80,7 @@ public function __construct(ConfigContract $config,
      * @param  \Illuminate\Contracts\Auth\Authenticatable|\DarkGhostHunter\Larapass\Contracts\WebAuthnAuthenticatable  $user
      * @return bool|\Webauthn\PublicKeyCredentialSource
      */
-    public function validate(array $data, WebAuthnAuthenticatable $user)
+    public function validate(array $data, $user)
     {
         if (! $attestation = $this->retrieveAttestation($user)) {
             return false;

tests/phpstan/.env

@@ -0,0 +1 @@
+WEBAUTHN_NAME=test

tests/phpstan/User.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App;
+
+use Illuminate\Contracts\Auth\MustVerifyEmail;
+use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Notifications\Notifiable;
+
+class User extends Authenticatable
+{
+    use Notifiable;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'name', 'email', 'password',
+    ];
+
+    /**
+     * The attributes that should be hidden for arrays.
+     *
+     * @var array
+     */
+    protected $hidden = [
+        'password', 'remember_token',
+    ];
+
+    /**
+     * The attributes that should be cast to native types.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'email_verified_at' => 'datetime',
+    ];
+}

tests/phpstan/bootstrap.php

@@ -0,0 +1,4 @@
+<?php
+
+$dotenv = Dotenv\Dotenv::createImmutable(__DIR__);
+$dotenv->load();