phpstan and phpcs fixes

Author: skie

composer.json

@@ -35,9 +35,12 @@
         "firebase/php-jwt": "^6.2"
     },
     "require-dev": {
-        "cakephp/cakephp-codesniffer": "~4.4.0",
+        "cakephp/cakephp-codesniffer": "^4.5",
         "league/flysystem-vfs": "^1.0",
+        "phpstan/phpstan": "^1.8",
         "phpunit/phpunit": "^9.5",
+        "robthree/twofactorauth": "^1.6",
+        "web-auth/webauthn-lib": "^3.3.11",
         "vlucas/phpdotenv": "^3.3"
     },
     "autoload": {

phpstan.neon

@@ -2,8 +2,8 @@ includes:
     - phpstan-baseline.neon
 
 parameters:
-    level: 4
-    autoload_files:
+    level: 2
+    bootstrapFiles:
         - tests/bootstrap.php
     ignoreErrors:
 

src/Command/ServiceRoutesCommand.php

@@ -68,6 +68,7 @@ public function execute(Arguments $args, ConsoleIo $io): ?int
         $service = ServiceRegistry::getServiceLocator()->get($serviceName);
         if ($service === null) {
             $io->error(__('Service "{0}" not found', $serviceName));
+
             return Command::CODE_ERROR;
         }
 

src/Model/Entity/AuthStore.php

@@ -9,7 +9,7 @@
  * AuthStore Entity
  *
  * @property string $id
- * @property string|null $store
+ * @property array|null $store
  * @property \Cake\I18n\FrozenTime $created
  * @property \Cake\I18n\FrozenTime $modified
  */

src/Model/Entity/JwtRefreshToken.php

@@ -35,7 +35,7 @@ class JwtRefreshToken extends Entity
      * be mass assigned. For security purposes, it is advised to set '*' to false
      * (or remove it), and explicitly make individual fields accessible as needed.
      *
-     * @var array
+     * @var array<string, bool>
      */
     protected $_accessible = [
         '*' => true,
@@ -45,7 +45,7 @@ class JwtRefreshToken extends Entity
     /**
      * Fields that are excluded from JSON versions of the entity.
      *
-     * @var array
+     * @var array<string>
      */
     protected $_hidden = [
         'token',

src/Model/Table/AuthStoreTable.php

@@ -4,8 +4,6 @@
 namespace CakeDC\Api\Model\Table;
 
 use Cake\Database\Schema\TableSchemaInterface;
-use Cake\ORM\Query;
-use Cake\ORM\RulesChecker;
 use Cake\ORM\Table;
 use Cake\Validation\Validator;
 
@@ -25,7 +23,6 @@
  * @method \CakeDC\Api\Model\Entity\AuthStore[]|\Cake\Datasource\ResultSetInterface saveManyOrFail(iterable $entities, $options = [])
  * @method \CakeDC\Api\Model\Entity\AuthStore[]|\Cake\Datasource\ResultSetInterface|false deleteMany(iterable $entities, $options = [])
  * @method \CakeDC\Api\Model\Entity\AuthStore[]|\Cake\Datasource\ResultSetInterface deleteManyOrFail(iterable $entities, $options = [])
- *
  * @mixin \Cake\ORM\Behavior\TimestampBehavior
  */
 class AuthStoreTable extends Table
@@ -62,8 +59,6 @@ public function validationDefault(Validator $validator): Validator
         return $validator;
     }
 
-
-
     /**
      * Initialize schema
      *

src/Rbac/Rules/TwoFactorPassedScope.php

@@ -13,18 +13,15 @@
 namespace CakeDC\Api\Rbac\Rules;
 
 use Authentication\Authenticator\JwtAuthenticator;
-use CakeDC\Auth\Rbac\Rules\AbstractRule;
-use Cake\Utility\Hash;
 use Cake\Routing\Router;
-use OutOfBoundsException;
+use CakeDC\Auth\Rbac\Rules\AbstractRule;
 use Psr\Http\Message\ServerRequestInterface;
 
 /**
  * Owner rule class, used to match ownership permissions
  */
 class TwoFactorPassedScope extends AbstractRule
 {
-
     protected $_defaultConfig = [
     ];
 

src/Rbac/Rules/TwoFactorScope.php

@@ -13,18 +13,15 @@
 namespace CakeDC\Api\Rbac\Rules;
 
 use Authentication\Authenticator\JwtAuthenticator;
-use CakeDC\Auth\Rbac\Rules\AbstractRule;
-use Cake\Utility\Hash;
 use Cake\Routing\Router;
-use OutOfBoundsException;
+use CakeDC\Auth\Rbac\Rules\AbstractRule;
 use Psr\Http\Message\ServerRequestInterface;
 
 /**
  * Owner rule class, used to match ownership permissions
  */
 class TwoFactorScope extends AbstractRule
 {
-
     protected $_defaultConfig = [
     ];
 

src/Routing/ApiRouter.php

@@ -95,14 +95,14 @@ class ApiRouter extends Router
     /**
      * A hash of request context data.
      *
-     * @var array
+     * @var array<string, mixed>
      */
     protected static $_requestContext = [];
 
     /**
      * Named expressions
      *
-     * @var array
+     * @var array<string, string>
      */
     protected static $_namedExpressions = [
         'Action' => Router::ACTION,
@@ -132,14 +132,14 @@ class ApiRouter extends Router
      * The stack of URL filters to apply against routing URLs before passing the
      * parameters to the route collection.
      *
-     * @var array
+     * @var array<callable(): mixed>
      */
     protected static $_urlFilters = [];
 
     /**
      * Default extensions defined with Router::extensions()
      *
-     * @var array
+     * @var array<string>
      */
     protected static $_defaultExtensions = [];
 }

src/Service/Action/Auth/JwtSocialLoginAction.php

@@ -28,7 +28,7 @@ class JwtSocialLoginAction extends Action
      * Execute action.
      *
      * @return mixed
-     * @throws \CakeDC\Api\Service\Action\Exception
+     * @throws \Exception
      */
     public function execute()
     {
@@ -38,6 +38,6 @@ public function execute()
             return false;
         }
 
-        return $this->generateTokenResponse($user);
+        return $this->generateTokenResponse($user, 'login');
     }
 }