Merge pull request #5970 from kenjis/fix-Model-static-analysis

fix: Model::_call() static analysis

Author: kenjis

phpstan-baseline.neon.dist

@@ -665,11 +665,6 @@ parameters:
 			count: 1
 			path: system/Log/Logger.php
 
-		-
-			message: "#^Call to an undefined method CodeIgniter\\\\Database\\\\BaseBuilder\\:\\:asArray\\(\\)\\.$#"
-			count: 1
-			path: system/Model.php
-
 		-
 			message: "#^Property CodeIgniter\\\\RESTful\\\\ResourceController\\:\\:\\$formatter \\(CodeIgniter\\\\Format\\\\FormatterInterface\\) in isset\\(\\) is not nullable\\.$#"
 			count: 1

system/Model.php

@@ -38,9 +38,37 @@
  *      - allow intermingling calls to the builder
  *      - removes the need to use Result object directly in most cases
  *
- * @mixin BaseBuilder
- *
  * @property BaseConnection $db
+ *
+ * @method $this havingIn(?string $key = null, $values = null, ?bool $escape = null)
+ * @method $this havingLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
+ * @method $this havingNotIn(?string $key = null, $values = null, ?bool $escape = null)
+ * @method $this join(string $table, string $cond, string $type = '', ?bool $escape = null)
+ * @method $this like($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
+ * @method $this limit(?int $value = null, ?int $offset = 0)
+ * @method $this notHavingLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
+ * @method $this notLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
+ * @method $this offset(int $offset)
+ * @method $this orderBy(string $orderBy, string $direction = '', ?bool $escape = null)
+ * @method $this orHaving($key, $value = null, ?bool $escape = null)
+ * @method $this orHavingIn(?string $key = null, $values = null, ?bool $escape = null)
+ * @method $this orHavingLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
+ * @method $this orHavingNotIn(?string $key = null, $values = null, ?bool $escape = null)
+ * @method $this orLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
+ * @method $this orNotHavingLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
+ * @method $this orNotLike($field, string $match = '', string $side = 'both', ?bool $escape = null, bool $insensitiveSearch = false)
+ * @method $this orWhere($key, $value = null, ?bool $escape = null)
+ * @method $this orWhereIn(?string $key = null, $values = null, ?bool $escape = null)
+ * @method $this orWhereNotIn(?string $key = null, $values = null, ?bool $escape = null)
+ * @method $this select($select = '*', ?bool $escape = null)
+ * @method $this selectAvg(string $select = '', string $alias = '')
+ * @method $this selectCount(string $select = '', string $alias = '')
+ * @method $this selectMax(string $select = '', string $alias = '')
+ * @method $this selectMin(string $select = '', string $alias = '')
+ * @method $this selectSum(string $select = '', string $alias = '')
+ * @method $this where($key, $value = null, ?bool $escape = null)
+ * @method $this whereIn(?string $key = null, $values = null, ?bool $escape = null)
+ * @method $this whereNotIn(?string $key = null, $values = null, ?bool $escape = null)
  */
 class Model extends BaseModel
 {

tests/system/Models/FindModelTest.php

@@ -338,7 +338,7 @@ public function testSoftDeleteWithTableJoinsFirst(): void
     {
         $this->seeInDatabase('user', ['name' => 'Derek Jones', 'deleted_at' => null]);
 
-        $results = $this->createModel(UserModel::class)->join('job', 'job.id = user.id')->first(1);
+        $results = $this->createModel(UserModel::class)->join('job', 'job.id = user.id')->first();
         $this->assertSame(1, (int) $results->id);
     }
 }