Update finder methods and find() calls.

Author: ADmad

src/Identifier/Resolver/OrmResolver.php

@@ -63,7 +63,7 @@ public function find(array $conditions, $type = self::TYPE_AND): ArrayAccess|arr
             if (is_string($options)) {
                 $query->find($options);
             } else {
-                $query->find($finder, $options);
+                $query->find($finder, ...$options);
             }
         }
 

tests/TestCase/Identifier/Resolver/OrmResolverTest.php

@@ -40,7 +40,7 @@ public function testFindConfig()
             'userModel' => 'AuthUsers',
             'finder' => [
                 'all',
-                'auth' => ['return_created' => true],
+                'auth' => ['returnCreated' => true],
             ],
         ]);
 

tests/test_app/TestApp/Model/Table/AuthUsersTable.php

@@ -26,13 +26,13 @@ class AuthUsersTable extends Table
      * Custom finder
      *
      * @param \Cake\ORM\Query\SelectQuery $query The query to find with
-     * @param array $options The options to find with
-     * @return \Cake\ORM\Query The query builder
+     * @param bool $returnCreated Whether to return 'created' field.
+     * @return \Cake\ORM\Query\SelectQuery The query builder
      */
-    public function findAuth(SelectQuery $query, array $options)
+    public function findAuth(SelectQuery $query, bool $returnCreated = false): SelectQuery
     {
         $query->select(['id', 'username', 'password']);
-        if (!empty($options['return_created'])) {
+        if ($returnCreated) {
             $query->select(['created']);
         }
 
@@ -43,19 +43,13 @@ public function findAuth(SelectQuery $query, array $options)
      * Custom finder
      *
      * @param \Cake\ORM\Query\SelectQuery $query The query to find with
-     * @param array $options The options to find with
-     * @return \Cake\ORM\Query The query builder
+     * @param string $username String username
+     * @return \Cake\ORM\Query\SelectQuery The query builder
      */
-    public function findUsername(SelectQuery $query, array $options)
+    public function findUsername(SelectQuery $query, string $username): SelectQuery
     {
-        if (empty($options['username'])) {
-            throw new Exception('Username not defined');
-        }
-
-        $query = $this->find()
-            ->where(['username' => $options['username']])
+        return $this->find()
+            ->where(['username' => $username])
             ->select(['id', 'username', 'password']);
-
-        return $query;
     }
 }