From 86c526f801fce3bb41e6bf7175f94077173026e9 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Mon, 1 Jul 2019 21:12:22 -0400
Subject: [PATCH] Revert "[#14213] - Correct model references"

This reverts commit 1351b4a417e4ca9985bbcba9f1dc2d80ed1df299.
---
 phalcon/Mvc/Model/Resultset/Complex.zep | 10 +++++-----
 phalcon/Mvc/Model/Resultset/Simple.zep  | 11 +++++------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/phalcon/Mvc/Model/Resultset/Complex.zep b/phalcon/Mvc/Model/Resultset/Complex.zep
index bd0090ba6a6..800933ba486 100644
--- a/phalcon/Mvc/Model/Resultset/Complex.zep
+++ b/phalcon/Mvc/Model/Resultset/Complex.zep
@@ -10,11 +10,11 @@
 
 namespace Phalcon\Mvc\Model\Resultset;
 
-use Phalcon\Db\ResultInterface;
-use Phalcon\Mvc\Model\AbstractModel;
-use Phalcon\Mvc\Model\Exception;
+use Phalcon\Mvc\Model;
 use Phalcon\Mvc\Model\Row;
+use Phalcon\Db\ResultInterface;
 use Phalcon\Mvc\Model\Resultset;
+use Phalcon\Mvc\Model\Exception;
 use Phalcon\Mvc\Model\ResultsetInterface;
 use Phalcon\DiInterface;
 use Phalcon\Di;
@@ -187,7 +187,7 @@ class Complex extends Resultset implements ResultsetInterface
                              * Get the base instance. Assign the values to the
                              * attributes using a column map
                              */
-                            let value = AbstractModel::cloneResultMap(
+                            let value = Model::cloneResultMap(
                                 column["instance"],
                                 rowModel,
                                 columnMap,
@@ -200,7 +200,7 @@ class Complex extends Resultset implements ResultsetInterface
 
                     default:
                         // Other kinds of hydration
-                        let value = AbstractModel::cloneResultMapHydrate(
+                        let value = Model::cloneResultMapHydrate(
                             rowModel,
                             columnMap,
                             hydrateMode
diff --git a/phalcon/Mvc/Model/Resultset/Simple.zep b/phalcon/Mvc/Model/Resultset/Simple.zep
index 139e90dd1fc..35d9dc3a559 100644
--- a/phalcon/Mvc/Model/Resultset/Simple.zep
+++ b/phalcon/Mvc/Model/Resultset/Simple.zep
@@ -12,8 +12,7 @@ namespace Phalcon\Mvc\Model\Resultset;
 
 use Phalcon\Di;
 use Phalcon\DiInterface;
-use Phalcon\Mvc\Model\AbstractModel;
-use Phalcon\Mvc\Model\Enum;
+use Phalcon\Mvc\Model;
 use Phalcon\Mvc\Model\Exception;
 use Phalcon\Mvc\Model\Resultset;
 use Phalcon\Cache\Adapter\AdapterInterface;
@@ -114,15 +113,15 @@ class Simple extends Resultset
                         this->model,
                         row,
                         columnMap,
-                        Enum::DIRTY_STATE_PERSISTENT,
+                        Model::DIRTY_STATE_PERSISTENT,
                         this->keepSnapshots
                     );
                 } else {
-                    let activeRow = AbstractModel::cloneResultMap(
+                    let activeRow = Model::cloneResultMap(
                         this->model,
                         row,
                         columnMap,
-                        Enum::DIRTY_STATE_PERSISTENT,
+                        Model::DIRTY_STATE_PERSISTENT,
                         this->keepSnapshots
                     );
                 }
@@ -133,7 +132,7 @@ class Simple extends Resultset
                 /**
                  * Other kinds of hydrations
                  */
-                let activeRow = AbstractModel::cloneResultMapHydrate(
+                let activeRow = Model::cloneResultMapHydrate(
                     row,
                     columnMap,
                     hydrateMode