fix conflicts

CakeDC · Nov 19, 2024 · c7b846b · c7b846b
2 parents 7d73629 + 6abfdc9
commit c7b846b
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 12 deletions.
diff --git a/Docs/Documentation/Authorization.md b/Docs/Documentation/Authorization.md
@@ -54,8 +54,8 @@ At your Application::middleware add the authorization and request authorization
 
 As usual create or update the Application::getAuthorizationService method:
 
-````
-    public function getAuthorizationService(ServerRequestInterface $request, ResponseInterface $response)
+```
+    public function getAuthorizationService(ServerRequestInterface $request): AuthorizationServiceInterface
     {
         $map = new MapResolver();
             $map->map(

diff --git a/src/Authentication/AuthenticationService.php b/src/Authentication/AuthenticationService.php
@@ -124,7 +124,7 @@ protected function getWebauthn2fAuthenticationChecker()
     /**
      * Get the configured u2f authentication checker
      *
-     * @return \CakeDC\Auth\Authentication\Webauthn2FAuthenticationCheckerInterface
+     * @return \CakeDC\Auth\Authentication\U2fAuthenticationCheckerInterface
      */
     protected function getU2fAuthenticationChecker()
     {

diff --git a/src/Authentication/DefaultOneTimePasswordAuthenticationChecker.php b/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)

diff --git a/src/Authentication/DefaultU2fAuthenticationChecker.php b/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)

diff --git a/src/Authentication/DefaultWebauthn2fAuthenticationChecker.php b/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)

diff --git a/src/Authentication/OneTimePasswordAuthenticationCheckerInterface.php b/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);

diff --git a/src/Authentication/U2fAuthenticationCheckerInterface.php b/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);

diff --git a/src/Authentication/Webauthn2fAuthenticationCheckerInterface.php b/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);

diff --git a/src/Rbac/Rbac.php b/src/Rbac/Rbac.php
@@ -228,9 +228,9 @@ 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);
     }
 
     /**

diff --git a/tests/TestCase/Authenticator/CookieAuthenticatorTest.php b/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);