Merge pull request #59 from aternosorg/fix-query-result-generics

Fix PHPDoc generics for query results and model collections

Author: matthi4s

src/GenericModel.php

@@ -456,7 +456,7 @@ public static function get(string $id, bool $update = false, bool $saveToRegistr
      * Query the model
      *
      * @param Query $query
-     * @return QueryResult<static>|static[]
+     * @return QueryResult<static>
      * @noinspection PhpDocSignatureInspection
      */
     public static function query(Query $query): QueryResult
@@ -545,7 +545,7 @@ public static function query(Query $query): QueryResult
      * @param array|int|Limit|null $limit
      * @param array|GroupField[]|string[]|null $group
      * @param bool $saveResultsToRegistry Whether results of this query should be saved in the model registry.
-     * @return QueryResult<static>|static[]
+     * @return QueryResult<static>
      * @throws ModelException
      * @noinspection PhpDocSignatureInspection
      */
@@ -580,7 +580,7 @@ public static function count(null|WhereCondition|array|WhereGroup $where = null)
      * @param array|null|WhereCondition|WhereGroup $where
      * @param array|null $order
      * @param array|int|Limit|null $limit
-     * @return QueryResult<static>|static[]
+     * @return QueryResult<static>
      * @noinspection PhpDocSignatureInspection
      */
     public static function update(null|array                           $fields = null,
@@ -682,7 +682,7 @@ public function delete(): bool
      * dataset
      *
      * @param array $data
-     * @return QueryResult<static>|static[]
+     * @return QueryResult<static>
      * @noinspection PhpDocSignatureInspection
      */
     public function set(array $data): QueryResult

src/ModelCollection.php

@@ -10,6 +10,8 @@
  * Class ModelCollection
  *
  * @template TModel of ModelInterface
+ * @implements Iterator<int, TModel>
+ * @implements ArrayAccess<int, TModel>
  * @package Aternos\Model
  */
 class ModelCollection implements Iterator, Countable, ArrayAccess