merge 2.next into 3.x

.github/workflows/ci.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - 2.x
+      - 2.next
   pull_request:
     branches:
       - '*'

.gitignore

@@ -3,8 +3,9 @@
 /composer.lock
 /phpunit.xml
 /tmp
-/tools
 /vendor
+/tools
+.phpunit.result.cache
 .phpunit.cache
 
 # OS generated files #

psalm.xml

@@ -7,7 +7,6 @@
     findUnusedPsalmSuppress="true"
     findUnusedBaselineEntry="true"
     findUnusedCode="false"
-    errorBaseline="psalm-baseline.xml"
 >
     <projectFiles>
         <directory name="src" />

src/AbstractCollection.php

@@ -20,7 +20,7 @@
 use Cake\Core\ObjectRegistry;
 
 /**
- * @template TObject of object
+ * @template TObject of \Authentication\Identifier\IdentifierInterface|\Authentication\Authenticator\AuthenticatorInterface
  * @extends \Cake\Core\ObjectRegistry<TObject>
  */
 abstract class AbstractCollection extends ObjectRegistry

src/AuthenticationService.php

@@ -152,7 +152,6 @@ public function authenticators(): AuthenticatorCollection
      * @param string $name Name or class name.
      * @param array $config Authenticator configuration.
      * @return \Authentication\Authenticator\AuthenticatorInterface
-     * @psalm-suppress MoreSpecificImplementedParamType
      */
     public function loadAuthenticator(string $name, array $config = []): AuthenticatorInterface
     {
@@ -165,7 +164,6 @@ public function loadAuthenticator(string $name, array $config = []): Authenticat
      * @param string $name Name or class name.
      * @param array $config Identifier configuration.
      * @return \Authentication\Identifier\IdentifierInterface Identifier instance
-     * @psalm-suppress MoreSpecificImplementedParamType
      */
     public function loadIdentifier(string $name, array $config = []): IdentifierInterface
     {
@@ -429,11 +427,9 @@ public function getLoginRedirect(ServerRequestInterface $request): ?string
             return null;
         }
         $parsed += ['path' => '/', 'query' => ''];
-        /** @psalm-suppress PossiblyUndefinedArrayOffset */
         if (strlen($parsed['path']) && $parsed['path'][0] !== '/') {
             $parsed['path'] = "/{$parsed['path']}";
         }
-        /** @psalm-suppress PossiblyUndefinedArrayOffset */
         if ($parsed['query']) {
             $parsed['query'] = "?{$parsed['query']}";
         }

src/Authenticator/AuthenticatorCollection.php

@@ -54,7 +54,6 @@ public function __construct(IdentifierCollection $identifiers, array $config = [
      * @param array $config Config array.
      * @return \Authentication\Authenticator\AuthenticatorInterface
      * @throws \RuntimeException
-     * @psalm-suppress MoreSpecificImplementedParamType
      */
     protected function _create(object|string $class, string $alias, array $config): AuthenticatorInterface
     {

src/Identifier/IdentifierCollection.php

@@ -72,7 +72,6 @@ public function identify(array $credentials): ArrayAccess|array|null
      * @param array $config Config array.
      * @return \Authentication\Identifier\IdentifierInterface
      * @throws \RuntimeException
-     * @psalm-suppress MoreSpecificImplementedParamType
      */
     protected function _create(object|string $class, string $alias, array $config): IdentifierInterface
     {

src/Identifier/Ldap/ExtensionAdapter.php

@@ -165,10 +165,7 @@ public function unbind(): void
         }
 
         $this->_setErrorHandler();
-        /**
-         * @psalm-suppress InvalidArgument
-         * @phpstan-ignore-next-line
-         */
+        /** @phpstan-ignore-next-line */
         ldap_unbind($this->_connection);
         $this->_unsetErrorHandler();
 

src/Identifier/Resolver/OrmResolver.php

@@ -57,7 +57,7 @@ public function find(array $conditions, string $type = self::TYPE_AND): ArrayAcc
     {
         $table = $this->getTableLocator()->get($this->_config['userModel']);
 
-        $query = $table->query();
+        $query = $table->selectQuery();
         $finders = (array)$this->_config['finder'];
         foreach ($finders as $finder => $options) {
             if (is_string($options)) {

src/Identity.php

@@ -127,7 +127,7 @@ public function offsetExists(mixed $offset): bool
      *
      * @link https://php.net/manual/en/arrayaccess.offsetget.php
      * @param mixed $offset Offset
-     * @return mixed
+     * @return \Authentication\IdentityInterface|null
      */
     public function offsetGet(mixed $offset): mixed
     {

src/IdentityInterface.php

@@ -21,7 +21,7 @@
 /**
  * Identity interface
  *
- * @extends \ArrayAccess<string, mixed>
+ * @template-extends \ArrayAccess<int, \Authentication\IdentityInterface>
  */
 interface IdentityInterface extends ArrayAccess
 {