Fix psalm errors in master

Author: markstory

psalm-baseline.xml

@@ -15,28 +15,28 @@
       <code><![CDATA[$event]]></code>
     </ArgumentTypeCoercion>
   </file>
-  <file src="src/Model/Entity/ApiToken.php">
-    <NonInvariantDocblockPropertyType>
-      <code><![CDATA[$_hidden]]></code>
-    </NonInvariantDocblockPropertyType>
-  </file>
-  <file src="src/Model/Entity/User.php">
-    <NonInvariantDocblockPropertyType>
-      <code><![CDATA[$_hidden]]></code>
-      <code><![CDATA[$_virtual]]></code>
-    </NonInvariantDocblockPropertyType>
-  </file>
   <file src="src/Model/Table/ApiTokensTable.php">
     <MethodSignatureMismatch>
       <code><![CDATA[ApiTokensTable]]></code>
       <code><![CDATA[ApiTokensTable]]></code>
     </MethodSignatureMismatch>
+    <MissingTemplateParam>
+      <code><![CDATA[ApiTokensTable]]></code>
+    </MissingTemplateParam>
+  </file>
+  <file src="src/Model/Table/SavedFeedItemsTable.php">
+    <MissingTemplateParam>
+      <code><![CDATA[SavedFeedItemsTable]]></code>
+    </MissingTemplateParam>
   </file>
   <file src="src/Model/Table/UsersTable.php">
     <MethodSignatureMismatch>
       <code><![CDATA[UsersTable]]></code>
       <code><![CDATA[UsersTable]]></code>
     </MethodSignatureMismatch>
+    <MissingTemplateParam>
+      <code><![CDATA[UsersTable]]></code>
+    </MissingTemplateParam>
     <UndefinedMagicPropertyFetch>
       <code><![CDATA[$entity->current_password]]></code>
     </UndefinedMagicPropertyFetch>

src/Model/Table/ApiTokensTable.php

@@ -18,7 +18,7 @@
  * @method \App\Model\Entity\ApiToken newEntity(array $data, array $options = [])
  * @method \App\Model\Entity\ApiToken[] newEntities(array $data, array $options = [])
  * @method \App\Model\Entity\ApiToken get($primaryKey, $options = [])
- * @method \App\Model\Entity\ApiToken findOrCreate($search, ?callable $callback = null, $options = [])
+ * @method \App\Model\Entity\ApiToken findOrCreate($search, array|callable|null $callback = null, $options = [])
  * @method \App\Model\Entity\ApiToken patchEntity(\Cake\Datasource\EntityInterface $entity, array $data, array $options = [])
  * @method \App\Model\Entity\ApiToken[] patchEntities(iterable $entities, array $data, array $options = [])
  * @method \App\Model\Entity\ApiToken|false save(\Cake\Datasource\EntityInterface $entity, $options = [])

src/Model/Table/SavedFeedItemsTable.php

@@ -15,7 +15,7 @@
  * @method \App\Model\Entity\SavedFeedItem newEntity(array $data, array $options = [])
  * @method array<\App\Model\Entity\SavedFeedItem> newEntities(array $data, array $options = [])
  * @method \App\Model\Entity\SavedFeedItem get(mixed $primaryKey, array|string $finder = 'all', \Psr\SimpleCache\CacheInterface|string|null $cache = null, \Closure|string|null $cacheKey = null, mixed ...$args)
- * @method \App\Model\Entity\SavedFeedItem findOrCreate($search, ?callable $callback = null, array $options = [])
+ * @method \App\Model\Entity\SavedFeedItem findOrCreate($search, array|callable|null $callback = null, array $options = [])
  * @method \App\Model\Entity\SavedFeedItem patchEntity(\Cake\Datasource\EntityInterface $entity, array $data, array $options = [])
  * @method array<\App\Model\Entity\SavedFeedItem> patchEntities(iterable $entities, array $data, array $options = [])
  * @method \App\Model\Entity\SavedFeedItem|false save(\Cake\Datasource\EntityInterface $entity, array $options = [])

src/Model/Table/UsersTable.php

@@ -18,7 +18,7 @@
  * @method \App\Model\Entity\User newEntity(array $data, array $options = [])
  * @method \App\Model\Entity\User[] newEntities(array $data, array $options = [])
  * @method \App\Model\Entity\User get($primaryKey, $options = [])
- * @method \App\Model\Entity\User findOrCreate($search, ?callable $callback = null, $options = [])
+ * @method \App\Model\Entity\User findOrCreate($search, array|callable|null $callback = null, $options = [])
  * @method \App\Model\Entity\User patchEntity(\Cake\Datasource\EntityInterface $entity, array $data, array $options = [])
  * @method \App\Model\Entity\User[] patchEntities(iterable $entities, array $data, array $options = [])
  * @method \App\Model\Entity\User|false save(\Cake\Datasource\EntityInterface $entity, $options = [])