[#16577] - refactor: add @template for Model and add to @return in fi…

…nd and findFirst

phalcon/Mvc/Model.zep

@@ -1631,9 +1631,9 @@ abstract class Model extends AbstractInjectionAware implements EntityInterface,
      *     ],
      *     'hydration' => null
      * ]
-     * @return T[]|\Phalcon\Mvc\Model\ResultsetInterface
+     * @return T[]|\Phalcon\Mvc\Model\Resultset<int, T>
      */
-    public static function find(var parameters = null) -> <ResultsetInterface>
+    public static function find(var parameters = null) -> <Resultset>
     {
         var params, query, resultset, hydration;
 

phalcon/Mvc/Model/Resultset.zep

@@ -64,6 +64,9 @@ use Serializable;
  *     $robots->next();
  * }
  * ```
+ * @template TKey
+ * @template TValue
+ * @implements Iterator<TKey, TValue>
  */
 abstract class Resultset
     implements ResultsetInterface, Iterator, SeekableIterator, Countable, ArrayAccess, Serializable, JsonSerializable
@@ -468,6 +471,8 @@ abstract class Resultset
 
     /**
      * Gets pointer number of active row in the resultset
+     *
+     * @return TKey|null
      */
     public function key() -> int | null
     {

phalcon/Mvc/Model/Resultset/Complex.zep

@@ -27,8 +27,11 @@ use stdClass;
  *
  * Complex resultsets may include complete objects and scalar values.
  * This class builds every complex row as it is required
+ *
+ * @template TKey of int
+ * @template TValue of mixed
  */
-class Complex extends Resultset implements ResultsetInterface
+class Complex extends Resultset
 {
     /**
      * @var array

phalcon/Mvc/Model/Resultset/Simple.zep

@@ -24,6 +24,9 @@ use Phalcon\Storage\Serializer\SerializerInterface;
  *
  * Simple resultsets only contains a complete objects
  * This class builds every complete object as it is required
+ *
+ * @template TKey of int
+ * @template TValue of \Phalcon\Mvc\ModelInterface
  */
 class Simple extends Resultset
 {
@@ -71,6 +74,7 @@ class Simple extends Resultset
 
     /**
      * Returns current row in the resultset
+     * @return TValue
      */
     final public function current() -> <ModelInterface> | null
     {

phalcon/Mvc/ModelInterface.zep

@@ -15,13 +15,16 @@ use Phalcon\Di\DiInterface;
 use Phalcon\Messages\MessageInterface;
 use Phalcon\Mvc\Model\CriteriaInterface;
 use Phalcon\Mvc\Model\MetaDataInterface;
+use Phalcon\Mvc\Model\Resultset;
 use Phalcon\Mvc\Model\ResultsetInterface;
 use Phalcon\Mvc\Model\TransactionInterface;
 
 /**
  * Phalcon\Mvc\ModelInterface
  *
  * Interface for Phalcon\Mvc\Model
+ *
+ * @template T
  */
 interface ModelInterface
 {
@@ -102,15 +105,15 @@ interface ModelInterface
      *
      * @param array|string|int|null parameters
      *
-     * @return ResultsetInterface
+     * @return T[]|\Phalcon\Mvc\Model\Resultset<int, T>
      */
-    public static function find(var parameters = null) -> <ResultsetInterface>;
+    public static function find(var parameters = null) -> <Resultset>;
 
     /**
      * Allows to query the first record that match the specified conditions
      *
      * @param array parameters
-     * @return \Phalcon\Mvc\ModelInterface|\Phalcon\Mvc\Model\Row|null
+     * @return T|\Phalcon\Mvc\ModelInterface|\Phalcon\Mvc\Model\Row|null
      *
      * TODO: Current method signature must be reviewed in v5. As it must return only ?ModelInterface (it also returns Row).
      * @see https://github.com/phalcon/cphalcon/issues/15212