Revert "[#14213] - Refactored Db/Mvc abstract classes"

This reverts commit a4ff07c.

phalcon/Db/Dialect/AbstractDialect.zep → phalcon/Db/Dialect.zep

@@ -8,16 +8,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Db\Dialect;
-
-use Phalcon\Db\Exception;
-use Phalcon\Db\ColumnInterface;
+namespace Phalcon\Db;
 
 /**
  * This is the base class to each database dialect. This implements
  * common methods to transform intermediate code into its RDBMS related syntax
  */
-abstract class AbstractDialect implements DialectInterface
+abstract class Dialect implements DialectInterface
 {
     protected escapeChar;
 

phalcon/Db/Dialect/Mysql.zep

@@ -10,18 +10,18 @@
 
 namespace Phalcon\Db\Dialect;
 
-use Phalcon\Db\Dialect\AbstractDialect;
+use Phalcon\Db\Dialect;
 use Phalcon\Db\Column;
 use Phalcon\Db\Exception;
 use Phalcon\Db\IndexInterface;
 use Phalcon\Db\ColumnInterface;
 use Phalcon\Db\ReferenceInterface;
-use Phalcon\Db\Dialect\DialectInterface;
+use Phalcon\Db\DialectInterface;
 
 /**
  * Generates database specific SQL for the MySQL RDBMS
  */
-class Mysql extends AbstractDialect
+class Mysql extends Dialect
 {
     /**
      * @var string

phalcon/Db/Dialect/Postgresql.zep

@@ -10,18 +10,18 @@
 
 namespace Phalcon\Db\Dialect;
 
+use Phalcon\Db\Dialect;
 use Phalcon\Db\Column;
-use Phalcon\Db\ColumnInterface;
-use Phalcon\Db\Dialect\AbstractDialect;
-use Phalcon\Db\Dialect\DialectInterface;
 use Phalcon\Db\Exception;
 use Phalcon\Db\IndexInterface;
+use Phalcon\Db\ColumnInterface;
 use Phalcon\Db\ReferenceInterface;
+use Phalcon\Db\DialectInterface;
 
 /**
  * Generates database specific SQL for the PostgreSQL RDBMS
  */
-class Postgresql extends AbstractDialect
+class Postgresql extends Dialect
 {
     /**
      * @var string

phalcon/Db/Dialect/Sqlite.zep

@@ -13,15 +13,15 @@ namespace Phalcon\Db\Dialect;
 use Phalcon\Db\Column;
 use Phalcon\Db\Exception;
 use Phalcon\Db\IndexInterface;
-use Phalcon\Db\Dialect\AbstractDialect;
-use Phalcon\Db\Dialect\DialectInterface;
+use Phalcon\Db\Dialect;
+use Phalcon\Db\DialectInterface;
 use Phalcon\Db\ColumnInterface;
 use Phalcon\Db\ReferenceInterface;
 
 /**
  * Generates database specific SQL for the SQLite RDBMS
  */
-class Sqlite extends AbstractDialect
+class Sqlite extends Dialect
 {
     /**
      * @var string

phalcon/Db/Dialect/DialectInterface.zep → phalcon/Db/DialectInterface.zep

@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Db\Dialect;
+namespace Phalcon\Db;
 
 use Phalcon\Db\ColumnInterface;
 use Phalcon\Db\ReferenceInterface;

phalcon/Mvc/Controller/AbstractController.zep → phalcon/Mvc/Controller.zep

@@ -8,11 +8,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Mvc\Controller;
+namespace Phalcon\Mvc;
 
 use Phalcon\Di\Injectable;
 
 /**
+ * Phalcon\Mvc\Controller
+ *
  * Every application controller should extend this class that encapsulates all
  * the controller functionality
  *
@@ -24,7 +26,7 @@ use Phalcon\Di\Injectable;
  *```php
  * <?php
  *
- * class PeopleController extends \Phalcon\Mvc\Controller\AbstractController
+ * class PeopleController extends \Phalcon\Mvc\Controller
  * {
  *     // This action will be executed by default
  *     public function indexAction()
@@ -50,10 +52,10 @@ use Phalcon\Di\Injectable;
  * }
  *```
  */
-abstract class AbstractController extends Injectable implements ControllerInterface
+abstract class Controller extends Injectable implements ControllerInterface
 {
     /**
-     * Phalcon\Mvc\Controller\AbstractController constructor
+     * Phalcon\Mvc\Controller constructor
      */
     final public function __construct()
     {

phalcon/Mvc/Controller/BindModelInterface.zep

@@ -11,7 +11,9 @@
 namespace Phalcon\Mvc\Controller;
 
 /**
- *Interface for Phalcon\Mvc\Controller\BindModel
+ * Phalcon\Mvc\Controller\BindModelInterface
+ *
+ * Interface for Phalcon\Mvc\Controller
  */
 interface BindModelInterface
 {

phalcon/Mvc/Controller/ControllerInterface.zep → phalcon/Mvc/ControllerInterface.zep

@@ -8,9 +8,11 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Mvc\Controller;
+namespace Phalcon\Mvc;
 
 /**
+ * Phalcon\Mvc\ControllerInterface
+ *
  * Interface for controller handlers
  */
 interface ControllerInterface

phalcon/Mvc/Dispatcher.zep

@@ -14,7 +14,7 @@ use Phalcon\Mvc\DispatcherInterface;
 use Phalcon\Mvc\Dispatcher\Exception;
 use Phalcon\Events\ManagerInterface;
 use Phalcon\Http\ResponseInterface;
-use Phalcon\Mvc\Controller\ControllerInterface;
+use Phalcon\Mvc\ControllerInterface;
 use Phalcon\Dispatcher\AbstractDispatcher as BaseDispatcher;
 
 /**

phalcon/Mvc/DispatcherInterface.zep

@@ -10,7 +10,7 @@
 
 namespace Phalcon\Mvc;
 
-use Phalcon\Mvc\Controller\ControllerInterface;
+use Phalcon\Mvc\ControllerInterface;
 use Phalcon\Dispatcher\DispatcherInterface as DispatcherInterfaceBase;
 
 /**

phalcon/Mvc/Micro.zep

@@ -14,7 +14,7 @@ use ArrayAccess;
 use Closure;
 use Phalcon\DiInterface;
 use Phalcon\Di\Injectable;
-use Phalcon\Mvc\Controller\AbstractController;
+use Phalcon\Mvc\Controller;
 use Phalcon\Di\FactoryDefault;
 use Phalcon\Mvc\Micro\Exception;
 use Phalcon\Di\ServiceInterface;
@@ -474,7 +474,7 @@ class Micro extends Injectable implements ArrayAccess
                 if typeof handler == "array" {
                     let realHandler = handler[0];
 
-                    if realHandler instanceof AbstractController && modelBinder != null {
+                    if realHandler instanceof Controller && modelBinder != null {
                         let methodName = handler[1];
                         let bindCacheKey = "_PHMB_" . get_class(realHandler) . "_" . methodName;
 

phalcon/Mvc/Model.zep

@@ -12,7 +12,7 @@ namespace Phalcon\Mvc;
 use JsonSerializable;
 use Phalcon\Db\Adapter\AdapterInterface;
 use Phalcon\Db\Column;
-use Phalcon\Db\Dialect\DialectInterface;
+use Phalcon\Db\DialectInterface;
 use Phalcon\Db\Enum;
 use Phalcon\Db\RawValue;
 use Phalcon\Di\InjectionAwareInterface;
@@ -22,12 +22,12 @@ use Phalcon\Events\ManagerInterface as EventsManagerInterface;
 use Phalcon\Helper\Arr;
 use Phalcon\Messages\Message;
 use Phalcon\Messages\MessageInterface;
-use Phalcon\Mvc\Model\Behavior\BehaviorInterface;
+use Phalcon\Mvc\Model\BehaviorInterface;
 use Phalcon\Mvc\Model\Criteria;
 use Phalcon\Mvc\Model\CriteriaInterface;
 use Phalcon\Mvc\Model\Exception;
 use Phalcon\Mvc\Model\ManagerInterface;
-use Phalcon\Mvc\Model\MetaData\MetaDataInterface;
+use Phalcon\Mvc\Model\MetaDataInterface;
 use Phalcon\Mvc\Model\Query;
 use Phalcon\Mvc\Model\Query\Builder;
 use Phalcon\Mvc\Model\Query\BuilderInterface;

phalcon/Mvc/Model/Behavior/AbstractBehavior.zep → phalcon/Mvc/Model/Behavior.zep

@@ -8,15 +8,17 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Mvc\Model\Behavior;
+namespace Phalcon\Mvc\Model;
 
 use Phalcon\Mvc\ModelInterface;
-use Phalcon\Mvc\Model\Behavior\BehaviorInterface;
+use Phalcon\Mvc\Model\BehaviorInterface;
 
 /**
+ * Phalcon\Mvc\Model\Behavior
+ *
  * This is an optional base class for ORM behaviors
  */
-abstract class AbstractBehavior implements BehaviorInterface
+abstract class Behavior implements BehaviorInterface
 {
     /**
      * @var array

phalcon/Mvc/Model/Behavior/SoftDelete.zep

@@ -11,7 +11,7 @@
 namespace Phalcon\Mvc\Model\Behavior;
 
 use Phalcon\Mvc\ModelInterface;
-use Phalcon\Mvc\Model\Behavior\AbstractBehavior;
+use Phalcon\Mvc\Model\Behavior;
 use Phalcon\Mvc\Model\Exception;
 
 /**
@@ -20,7 +20,7 @@ use Phalcon\Mvc\Model\Exception;
  * Instead of permanently delete a record it marks the record as deleted
  * changing the value of a flag column
  */
-class SoftDelete extends AbstractBehavior
+class SoftDelete extends Behavior
 {
     /**
      * Listens for notifications from the models manager

phalcon/Mvc/Model/Behavior/Timestampable.zep

@@ -12,7 +12,7 @@ namespace Phalcon\Mvc\Model\Behavior;
 
 use Closure;
 use Phalcon\Mvc\ModelInterface;
-use Phalcon\Mvc\Model\Behavior\AbstractBehavior;
+use Phalcon\Mvc\Model\Behavior;
 use Phalcon\Mvc\Model\Exception;
 
 /**
@@ -21,7 +21,7 @@ use Phalcon\Mvc\Model\Exception;
  * Allows to automatically update a model’s attribute saving the datetime when a
  * record is created or updated
  */
-class Timestampable extends AbstractBehavior
+class Timestampable extends Behavior
 {
     /**
      * Listens for notifications from the models manager

phalcon/Mvc/Model/Behavior/BehaviorInterface.zep → phalcon/Mvc/Model/BehaviorInterface.zep

@@ -8,11 +8,13 @@
  * file that was distributed with this source code.
  */
 
-namespace Phalcon\Mvc\Model\Behavior;
+namespace Phalcon\Mvc\Model;
 
 use Phalcon\Mvc\ModelInterface;
 
 /**
+ * Phalcon\Mvc\Model\BehaviorInterface
+ *
  * Interface for Phalcon\Mvc\Model\Behavior
  */
 interface BehaviorInterface

phalcon/Mvc/Model/Manager.zep

@@ -24,7 +24,7 @@ use Phalcon\Mvc\Model\Query;
 use Phalcon\Mvc\Model\QueryInterface;
 use Phalcon\Mvc\Model\Query\Builder;
 use Phalcon\Mvc\Model\Query\BuilderInterface;
-use Phalcon\Mvc\Model\Behavior\BehaviorInterface;
+use Phalcon\Mvc\Model\BehaviorInterface;
 use Phalcon\Events\ManagerInterface as EventsManagerInterface;
 
 /**

phalcon/Mvc/Model/ManagerInterface.zep

@@ -12,7 +12,7 @@ namespace Phalcon\Mvc\Model;
 
 use Phalcon\Db\Adapter\AdapterInterface;
 use Phalcon\Mvc\ModelInterface;
-use Phalcon\Mvc\Model\Behavior\BehaviorInterface;
+use Phalcon\Mvc\Model\BehaviorInterface;
 use Phalcon\Mvc\Model\RelationInterface;
 use Phalcon\Mvc\Model\Query\BuilderInterface;
 use Phalcon\Mvc\Model\QueryInterface;