From f55c8adb20f94847c6f0345245d5d0538ee69317 Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik.hautakoski@gmail.com>
Date: Mon, 2 Apr 2018 12:17:10 +0200
Subject: [PATCH] app/controllers: Fixing namespace.

---
 app/config/loader.php                  |  8 ++++----
 app/config/services.php                |  2 ++
 app/controllers/AuthController.php     |  4 ++++
 app/controllers/CallbackController.php | 24 ++++++++++++++++--------
 app/controllers/ControllerBase.php     |  2 ++
 app/controllers/ErrorController.php    |  4 ++++
 app/controllers/IndexController.php    |  4 ++++
 app/controllers/UserController.php     |  5 ++++-
 8 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/app/config/loader.php b/app/config/loader.php
index 548f090..c52f34e 100644
--- a/app/config/loader.php
+++ b/app/config/loader.php
@@ -7,15 +7,15 @@ $loader = new \Phalcon\Loader();
  */
 $loader->registerDirs(
     array(
-        $config->application->controllersDir,
         $config->application->pluginsDir
     )
 )->register();
 
 $loader->registerNamespaces(array(
-    'Model'     => $config->application->modelsDir,
-    'Form'      => $config->application->formsDir,
-    'Httpcb'    => $config->application->libraryDir,
+    'App\Controller'    => $config->application->controllersDir,
+    'Model'             => $config->application->modelsDir,
+    'Form'              => $config->application->formsDir,
+    'Httpcb'            => $config->application->libraryDir,
 ));
 
 require_once __DIR__ . '/../../vendor/autoload.php';
diff --git a/app/config/services.php b/app/config/services.php
index 94390a0..ce36faa 100644
--- a/app/config/services.php
+++ b/app/config/services.php
@@ -61,6 +61,8 @@ $di->setShared('dispatcher', function() use ($di, $config) {
     $dispatcher = new \Phalcon\Mvc\Dispatcher();
     $dispatcher->setEventsManager($eventsManager);
 
+    $dispatcher->setDefaultNamespace('App\Controller');
+
     return $dispatcher;
 });
 
diff --git a/app/controllers/AuthController.php b/app/controllers/AuthController.php
index b356b31..2956959 100644
--- a/app/controllers/AuthController.php
+++ b/app/controllers/AuthController.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace App\Controller;
+
+use App\Controller\ControllerBase;
+
 class AuthController extends ControllerBase
 {
     public function indexAction()
diff --git a/app/controllers/CallbackController.php b/app/controllers/CallbackController.php
index dd63395..91ce0d4 100644
--- a/app/controllers/CallbackController.php
+++ b/app/controllers/CallbackController.php
@@ -1,5 +1,13 @@
 <?php
 
+namespace App\Controller;
+
+use App\Controller\ControllerBase,
+    Form\CallbackCreate as CreateCallbackForm,
+    Model\Data\Callback as CallbackModel,
+    Model\Data\Request as RequestModel,
+    Model\Data\RequestMeta as RequestMetaModel;
+
 class CallbackController extends ControllerBase
 {
     /**
@@ -17,7 +25,7 @@ class CallbackController extends ControllerBase
      */
     public function listAction($page = 1)
     {
-        $paginator = Model\Data\Callback::getPaginationList($this->_user->getId(), $page, 10);
+        $paginator = CallbackModel::getPaginationList($this->_user->getId(), $page, 10);
 
         if ($paginator->getPaginate()->current > $paginator->getPaginate()->total_pages) {
             $paginator->setCurrentPage(1);
@@ -32,7 +40,7 @@ class CallbackController extends ControllerBase
      */
     public function newAction()
     {
-        $form = new Form\CallbackCreate();
+        $form = new CreateCallbackForm();
 
         if ($this->request->isPost()) {
             $data = $this->request->getPost();
@@ -77,7 +85,7 @@ class CallbackController extends ControllerBase
      */
     public function createdAction($id)
     {
-        $row = Model\Data\Callback::get($id);
+        $row = CallbackModel::get($id);
         if (!$row) {
 
         }
@@ -92,7 +100,7 @@ class CallbackController extends ControllerBase
      */
     public function showAction($id = null, $page = 1)
     {
-        $callback = Model\Data\Callback::findFirst(array(
+        $callback = CallbackModel::findFirst(array(
             'conditions' => 'public_id = ?0 AND userid = ?1',
             'bind' => array($id, $this->_user->getId())
         ));
@@ -125,18 +133,18 @@ class CallbackController extends ControllerBase
         $allowed_methods = array('GET', 'POST');
         if ($this->request->isMethod($allowed_methods)) {
 
-            $callback = Model\Data\Callback::get($id);
+            $callback = CallbackModel::get($id);
 
-            $request = new Model\Data\Request();
+            $request = new RequestModel();
 
             $request->setHeaders($this->request->getHeaders());
             $request->setBody($this->request->getRawBody());
 
-            $dt = new DateTime();
+            $dt = new \DateTime();
 
             $callback->setLastRequest($dt->format('Y-m-d H:i:s'));
 
-            $meta = new Model\Data\RequestMeta();
+            $meta = new RequestMetaModel();
             $meta->Callback = $callback;
             $meta->RequestObject = $request;
 
diff --git a/app/controllers/ControllerBase.php b/app/controllers/ControllerBase.php
index a87fa65..1c2bea8 100644
--- a/app/controllers/ControllerBase.php
+++ b/app/controllers/ControllerBase.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace App\Controller;
+
 use Phalcon\Mvc\Controller;
 
 class ControllerBase extends Controller
diff --git a/app/controllers/ErrorController.php b/app/controllers/ErrorController.php
index cb7d6c0..3149046 100644
--- a/app/controllers/ErrorController.php
+++ b/app/controllers/ErrorController.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace App\Controller;
+
+use App\Controller\ControllerBase;
+
 class ErrorController extends ControllerBase
 {
     public function errorAction()
diff --git a/app/controllers/IndexController.php b/app/controllers/IndexController.php
index 19c7e0a..c44cbb1 100644
--- a/app/controllers/IndexController.php
+++ b/app/controllers/IndexController.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace App\Controller;
+
+use App\Controller\ControllerBase;
+
 class IndexController extends ControllerBase
 {
     public function indexAction()
diff --git a/app/controllers/UserController.php b/app/controllers/UserController.php
index 76d98f3..867a294 100644
--- a/app/controllers/UserController.php
+++ b/app/controllers/UserController.php
@@ -1,6 +1,9 @@
 <?php
 
-use Form\UserSettings as UserSettingsForm;
+namespace App\Controller;
+
+use App\Controller\ControllerBase,
+    Form\UserSettings as UserSettingsForm;
 
 class UserController extends ControllerBase
 {