Fix static analysis

lonnieezell · Apr 27, 2022 · 7b1f045 · 7b1f045
1 parent 78b9cb1
commit 7b1f045
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 27 deletions.
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -13,6 +13,7 @@ parameters:
 		- '#.+Mockery.+#'
 		- '#Call to an undefined method .+::shouldReceive\(\)#'
 		- '#Call to an undefined method CodeIgniter\\Database\\BaseBuilder::[A-Za-z]+\(\)#'
+		- '#Call to an undefined method CodeIgniter\\Model::[A-Za-z]+\(\)#'
 		- '#Call to an undefined static method Config\\Services::[A-Za-z]+\(\)#'
 		- '#Cannot access property [\$a-z_]+ on (array|object)#'
 		- '#Parameter \$user of method Myth\\Auth\\Authentication\\Passwords\\ValidatorInterface::check\(\) has typehint with deprecated class CodeIgniter\\Entity#'

diff --git a/src/Commands/SetPassword.php b/src/Commands/SetPassword.php
@@ -19,6 +19,10 @@ class SetPassword extends BaseCommand
 
     public function run(array $params = [])
     {
+        /**
+         * @var array<int, string> $params
+         */
+
         // Consume or prompt for password
         $identity = $params[0] ?? null;
         $password = $params[1] ?? null;

diff --git a/src/Config/Services.php b/src/Config/Services.php
@@ -37,6 +37,7 @@ public static function authentication(string $lib = 'local', ?Model $userModel =
             ->setLoginModel($loginModel);
     }
 
+    // Note that these input models *must be* of types GroupModel, PermissionModel, and UserModel respectively
     public static function authorization(?Model $groupModel = null, ?Model $permissionModel = null, ?Model $userModel = null, bool $getShared = true)
     {
         if ($getShared) {
@@ -47,9 +48,9 @@ public static function authorization(?Model $groupModel = null, ?Model $permissi
         $permissionModel ??= model(PermissionModel::class);
         $userModel ??= model(UserModel::class);
 
-        $instance = new FlatAuthorization($groupModel, $permissionModel);
+        $instance = new FlatAuthorization($groupModel, $permissionModel); // @phpstan-ignore-line
 
-        return $instance->setUserModel($userModel);
+        return $instance->setUserModel($userModel); // @phpstan-ignore-line
     }
 
     /**

diff --git a/tests/_support/AuthTestCase.php b/tests/_support/AuthTestCase.php
@@ -78,9 +78,9 @@ protected function setUp(): void
 
         $this->resetAuthServices();
 
-        $this->users       = model(UserModel::class, false);
-        $this->groups      = model(GroupModel::class, false);
-        $this->permissions = model(PermissionModel::class, false);
+        $this->users       = model(UserModel::class, false); // @phpstan-ignore-line
+        $this->groups      = model(GroupModel::class, false); // @phpstan-ignore-line
+        $this->permissions = model(PermissionModel::class, false); // @phpstan-ignore-line
 
         $this->faker = Factory::create();
     }

diff --git a/tests/controllers/LoginTest.php b/tests/controllers/LoginTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use CodeIgniter\Test\ControllerTester;
+use CodeIgniter\Test\ControllerTestTrait;
 use Myth\Auth\Controllers\AuthController;
 use Tests\Support\AuthTestCase;
 
@@ -9,7 +9,7 @@
  */
 final class LoginTest extends AuthTestCase
 {
-    use ControllerTester;
+    use ControllerTestTrait;
 
     protected $refresh = true;
 
@@ -23,7 +23,7 @@ protected function setUp(): void
         $vConfig             = new \Config\Validation();
         $vConfig->ruleSets[] = \Myth\Auth\Authentication\Passwords\ValidationRules::class;
         $vConfig->ruleSets   = array_reverse($vConfig->ruleSets);
-        \CodeIgniter\Config\Config::injectMock('Validation', $vConfig);
+        \CodeIgniter\Config\Factories::injectMock('Config', 'Validation', $vConfig);
 
         // Make sure our routes are mapped
         $routes = service('routes');
@@ -82,7 +82,7 @@ public function testAttemptLoginSuccess()
         // Just make sure since it's a default
         $config                   = config('Auth');
         $config->allowRemembering = false;
-        \CodeIgniter\Config\Config::injectMock('Auth', $config);
+        \CodeIgniter\Config\Factories::injectMock('Config', 'Auth', $config);
 
         $result = $this->withUri(site_url('login'))
             ->withRequest($request)
@@ -122,7 +122,7 @@ public function testAttemptLoginSuccessWithRememberMe()
         // Just make sure since it's a default
         $config                   = config('Auth');
         $config->allowRemembering = true;
-        \CodeIgniter\Config\Config::injectMock('Auth', $config);
+        \CodeIgniter\Config\Factories::injectMock('Config', 'Auth', $config);
 
         $result = $this->withUri(site_url('login'))
             ->withRequest($request)

diff --git a/tests/controllers/RegisterTest.php b/tests/controllers/RegisterTest.php
@@ -24,7 +24,7 @@ protected function setUp(): void
         $vConfig             = new \Config\Validation();
         $vConfig->ruleSets[] = \Myth\Auth\Authentication\Passwords\ValidationRules::class;
         $vConfig->ruleSets   = array_reverse($vConfig->ruleSets);
-        \CodeIgniter\Config\Config::injectMock('Validation', $vConfig);
+        \CodeIgniter\Config\Factories::injectMock('Config', 'Validation', $vConfig);
 
         // Make sure our routes are mapped
         $routes = service('routes');
@@ -49,7 +49,7 @@ public function testAttemptRegisterDisabled()
     {
         $config                    = new \Myth\Auth\Config\Auth();
         $config->allowRegistration = false;
-        \CodeIgniter\Config\Config::injectMock('Auth', $config);
+        \CodeIgniter\Config\Factories::injectMock('Config', 'Auth', $config);
 
         $result = $this->withUri(site_url('register'))
             ->controller(AuthController::class)
@@ -63,7 +63,7 @@ public function testAttemptRegisterValidationErrors()
     {
         $config                    = new \Myth\Auth\Config\Auth();
         $config->allowRegistration = true;
-        \CodeIgniter\Config\Config::injectMock('Auth', $config);
+        \CodeIgniter\Config\Factories::injectMock('Config', 'Auth', $config);
 
         $result = $this->withUri(site_url('register'))
             ->controller(AuthController::class)
@@ -93,7 +93,7 @@ public function testAttemptRegisterCreatesUser()
         // don't require activation for this...
         $config                    = config('Auth');
         $config->requireActivation = null;
-        \CodeIgniter\Config\Config::injectMock('Auth', $config);
+        \CodeIgniter\Config\Factories::injectMock('Config', 'Auth', $config);
 
         $result = $this->withUri(site_url('register'))
             ->withRequest($request)
@@ -132,7 +132,7 @@ public function testAttemptRegisterCreatesUserWithDefaultGroup()
         $config                    = config('Auth');
         $config->requireActivation = null;
         $config->defaultUserGroup  = $group->name;
-        \CodeIgniter\Config\Config::injectMock('Auth', $config);
+        \CodeIgniter\Config\Factories::injectMock('Config', 'Auth', $config);
 
         $result = $this->withUri(site_url('register'))
             ->withRequest($request)

diff --git a/tests/unit/NothingPersonalValidatorTest.php b/tests/unit/NothingPersonalValidatorTest.php
@@ -114,17 +114,11 @@ public function testIsNotPersonalFalsePositivesCaughtByIsNotSimilar($password)
         $config->maxSimilarity = 50;
         $this->validator->setConfig($config);
 
-        $isNotPersonal = $this->getPrivateMethodInvoker(
-            $this->validator,
-            'isNotPersonal',
-            [$password, $user]
-        );
+        $method        = $this->getPrivateMethodInvoker($this->validator, 'isNotPersonal');
+        $isNotPersonal = $method($password, $user);
 
-        $isNotSimilar = $this->getPrivateMethodInvoker(
-            $this->validator,
-            'isNotSimilar',
-            [$password, $user]
-        );
+        $method       = $this->getPrivateMethodInvoker($this->validator, 'isNotSimilar');
+        $isNotSimilar = $method($password, $user);
 
         $this->assertNotSame($isNotPersonal, $isNotSimilar);
     }
@@ -194,8 +188,7 @@ public function firstLastNameProvider()
     public function testMaxSimilarityZeroTurnsOffSimilarityCalculation(
         $maxSimilarity,
         $expected
-    )
-    {
+    ) {
         $config                = new \Myth\Auth\Config\Auth();
         $config->maxSimilarity = $maxSimilarity;
         $this->validator->setConfig($config);