Fix tests

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.2', '7.3', '7.4', '8.0']
+        php-version: ['7.2', '7.3', '7.4', '8.0', '8.1']
         db-type: [sqlite, mysql, pgsql]
         prefer-lowest: ['']
 

src/Authentication/AuthenticationService.php

@@ -123,7 +123,7 @@ protected function getWebauthn2fAuthenticationChecker()
     /**
      * Get the configured u2f authentication checker
      *
-     * @return \CakeDC\Auth\Authentication\Webauthn2FAuthenticationCheckerInterface
+     * @return \CakeDC\Auth\Authentication\U2fAuthenticationCheckerInterface
      */
     protected function getU2fAuthenticationChecker()
     {

src/Authentication/DefaultOneTimePasswordAuthenticationChecker.php

@@ -51,7 +51,7 @@ public function isEnabled()
     /**
      * Check if two factor authentication is required for a user
      *
-     * @param array $user user data
+     * @param array<mixed>|null $user user data
      * @return bool
      */
     public function isRequired(?array $user = null)

src/Authentication/DefaultU2fAuthenticationChecker.php

@@ -34,7 +34,7 @@ public function isEnabled()
     /**
      * Check if two factor authentication is required for a user
      *
-     * @param array $user user data
+     * @param array<mixed>|null $user user data
      * @return bool
      */
     public function isRequired(?array $user = null)

src/Authentication/DefaultWebauthn2fAuthenticationChecker.php

@@ -34,7 +34,7 @@ public function isEnabled()
     /**
      * Check if two factor authentication is required for a user
      *
-     * @param array $user user data
+     * @param array<mixed>|null $user user data
      * @return bool
      */
     public function isRequired(?array $user = null)

src/Authentication/OneTimePasswordAuthenticationCheckerInterface.php

@@ -24,7 +24,7 @@ public function isEnabled();
     /**
      * Check if two factor authentication is required for a user
      *
-     * @param array $user user data
+     * @param array<mixed>|null $user user data
      * @return bool
      */
     public function isRequired(?array $user = null);

src/Authentication/U2fAuthenticationCheckerInterface.php

@@ -24,7 +24,7 @@ public function isEnabled();
     /**
      * Check if two factor authentication is required for a user
      *
-     * @param array $user user data
+     * @param array<mixed>|null $user user data
      * @return bool
      */
     public function isRequired(?array $user = null);

src/Authentication/Webauthn2fAuthenticationCheckerInterface.php

@@ -24,7 +24,7 @@ public function isEnabled();
     /**
      * Check if two factor authentication is required for a user
      *
-     * @param array $user user data
+     * @param array<mixed>|null $user user data
      * @return bool
      */
     public function isRequired(?array $user = null);

src/Rbac/Rbac.php

@@ -226,10 +226,11 @@ protected function _matchPermission(array $permission, $user, $role, ServerReque
     protected function _matchOrAsterisk($possibleValues, $value, $allowEmpty = false)
     {
         $possibleArray = (array)$possibleValues;
+
         return $possibleValues === '*' ||
-        $value === $possibleValues ||
-        in_array($value, $possibleArray) ||
-        in_array(Inflector::camelize((string)$value, '-'), $possibleArray);
+            $value === $possibleValues ||
+            in_array($value, $possibleArray) ||
+            in_array(Inflector::camelize((string)$value, '-'), $possibleArray);
     }
 
     /**

tests/TestCase/Authenticator/CookieAuthenticatorTest.php

@@ -16,6 +16,7 @@
 use Authentication\Identifier\IdentifierCollection;
 use Cake\Http\Response;
 use Cake\TestSuite\TestCase;
+use Cake\Utility\Security;
 use CakeDC\Auth\Authenticator\CookieAuthenticator;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -71,6 +72,7 @@ public function testPersistIdentity($setCookie, $field, array $post, array $sess
             'username' => 'johndoe',
             'password' => '$2a$10$u05j8FjsvLBNdfhBhc21LOuVMpzpabVXQ9OpC2wO3pSO0q6t7HHMO',
         ]);
+        Security::setSalt('22f40226f5b51926aeb29995ebf0108eae3435e2');
         $result = $authenticator->persistIdentity($request, $response, $identity);
         $this->assertIsArray($result);
         $this->assertArrayHasKey('request', $result);