From 82abff2b5170194dc5be1659a41e6b5c8f2ccb14 Mon Sep 17 00:00:00 2001
From: Nikolaos Dimopoulos <nikos@niden.net>
Date: Mon, 1 Jul 2019 10:04:27 -0400
Subject: [PATCH] [#14213] - Refactor Dispatcher with AbstractDispatcher

---
 phalcon/Cli/Dispatcher.zep                 | 2 +-
 phalcon/Cli/DispatcherInterface.zep        | 2 +-
 phalcon/Dispatcher/Dispatcher.zep          | 2 +-
 phalcon/Dispatcher/DispatcherInterface.zep | 2 +-
 phalcon/Mvc/Dispatcher.zep                 | 2 +-
 phalcon/Mvc/DispatcherInterface.zep        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/phalcon/Cli/Dispatcher.zep b/phalcon/Cli/Dispatcher.zep
index abaa3714b28..822473a0d60 100644
--- a/phalcon/Cli/Dispatcher.zep
+++ b/phalcon/Cli/Dispatcher.zep
@@ -11,7 +11,7 @@
 namespace Phalcon\Cli;
 
 use Phalcon\Cli\Dispatcher\Exception;
-use Phalcon\Dispatcher as CliDispatcher;
+use Phalcon\Dispatcher\AbstractDispatcher as CliDispatcher;
 use Phalcon\Events\ManagerInterface;
 use Phalcon\Filter\FilterInterface;
 
diff --git a/phalcon/Cli/DispatcherInterface.zep b/phalcon/Cli/DispatcherInterface.zep
index 6f2dadff317..d3e062431f3 100644
--- a/phalcon/Cli/DispatcherInterface.zep
+++ b/phalcon/Cli/DispatcherInterface.zep
@@ -10,7 +10,7 @@
 
 namespace Phalcon\Cli;
 
-use Phalcon\DispatcherInterface as DispatcherInterfaceBase;
+use Phalcon\Dispatcher\DispatcherInterface as DispatcherInterfaceBase;
 
 /**
  * Interface for Phalcon\Cli\Dispatcher
diff --git a/phalcon/Dispatcher/Dispatcher.zep b/phalcon/Dispatcher/Dispatcher.zep
index ae9f9192763..9d03ac3244c 100644
--- a/phalcon/Dispatcher/Dispatcher.zep
+++ b/phalcon/Dispatcher/Dispatcher.zep
@@ -13,7 +13,7 @@ namespace Phalcon\Dispatcher;
 use Exception;
 use Phalcon\DiInterface;
 use Phalcon\Di\InjectionAwareInterface;
-use Phalcon\DispatcherInterface;
+use Phalcon\Dispatcher\DispatcherInterface;
 use Phalcon\Events\EventsAwareInterface;
 use Phalcon\Events\ManagerInterface;
 use Phalcon\Exception as PhalconException;
diff --git a/phalcon/Dispatcher/DispatcherInterface.zep b/phalcon/Dispatcher/DispatcherInterface.zep
index 585dcc6a13d..d82dd1758d9 100644
--- a/phalcon/Dispatcher/DispatcherInterface.zep
+++ b/phalcon/Dispatcher/DispatcherInterface.zep
@@ -11,7 +11,7 @@
 namespace Phalcon\Dispatcher;
 
 /**
- * Interface for Phalcon\Dispatcher
+ * Interface for Phalcon\Dispatcher\AbstractDispatcher
  */
 interface DispatcherInterface
 {
diff --git a/phalcon/Mvc/Dispatcher.zep b/phalcon/Mvc/Dispatcher.zep
index c0c2276456a..75d7710b5c0 100644
--- a/phalcon/Mvc/Dispatcher.zep
+++ b/phalcon/Mvc/Dispatcher.zep
@@ -15,7 +15,7 @@ use Phalcon\Mvc\Dispatcher\Exception;
 use Phalcon\Events\ManagerInterface;
 use Phalcon\Http\ResponseInterface;
 use Phalcon\Mvc\ControllerInterface;
-use Phalcon\Dispatcher as BaseDispatcher;
+use Phalcon\Dispatcher\AbstractDispatcher as BaseDispatcher;
 
 /**
  * Dispatching is the process of taking the request object, extracting the
diff --git a/phalcon/Mvc/DispatcherInterface.zep b/phalcon/Mvc/DispatcherInterface.zep
index b3c0edf43f0..2a187f5fe94 100644
--- a/phalcon/Mvc/DispatcherInterface.zep
+++ b/phalcon/Mvc/DispatcherInterface.zep
@@ -11,7 +11,7 @@
 namespace Phalcon\Mvc;
 
 use Phalcon\Mvc\ControllerInterface;
-use Phalcon\DispatcherInterface as DispatcherInterfaceBase;
+use Phalcon\Dispatcher\DispatcherInterface as DispatcherInterfaceBase;
 
 /**
  * Phalcon\Mvc\DispatcherInterface