refactor: address review feedback

Signed-off-by: memleakd <121398829+memleakd@users.noreply.github.com>

Author: memleakd

system/BaseModel.php

@@ -49,8 +49,7 @@
  *      - process various callbacks
  *      - allow intermingling calls to the db connection
  *
- * @phpstan-type row_array array<int|string, float|int|null|object|string|bool>
- * @psalm-type row_array = array<int|string, float|int|null|object|string|bool>
+ * @phpstan-type row_array               array<int|string, float|int|null|object|string|bool>
  * @phpstan-type event_data_beforeinsert array{data: row_array}
  * @phpstan-type event_data_afterinsert  array{id: int|string, data: row_array, result: bool}
  * @phpstan-type event_data_beforefind   array{id?: int|string, method: string, singleton: bool, limit?: int, offset?: int}

system/Model.php

@@ -87,7 +87,6 @@
  * @phpstan-method $this when($condition, callable(BaseBuilder, mixed): mixed $callback, (callable(BaseBuilder): mixed)|null $defaultCallback = null)
  * @phpstan-method $this whenNot($condition, callable(BaseBuilder, mixed): mixed $callback, (callable(BaseBuilder): mixed)|null $defaultCallback = null)
  * @phpstan-import-type row_array from BaseModel
- * @psalm-import-type row_array from BaseModel
  */
 class Model extends BaseModel
 {

system/View/Table.php

@@ -83,7 +83,7 @@ class Table
     /**
      * Callback for custom table layout
      *
-     * @var (callable(mixed): mixed)|string|null
+     * @var (callable(mixed): mixed)|null
      */
     public $function;
 

tests/system/View/TableTest.php

@@ -773,7 +773,7 @@ public function testInvalidCallback(): void
         $this->table->setHeading('Name', 'Color', 'Size');
         $this->table->addRow('Fred', '<strong>Blue</strong>', 'Small');
 
-        $this->table->function = 'ticklemyfancy';
+        $this->table->function = 'ticklemyfancy'; // @phpstan-ignore assign.propertyType (needed for testing)
 
         $generated = $this->table->generate();
 

utils/phpstan-baseline/loader.neon

@@ -1,4 +1,4 @@
-# total 2028 errors
+# total 2015 errors
 
 includes:
     - argument.type.neon