From aa37d100241df6eebaa4b919dd331f3f864d8f4b Mon Sep 17 00:00:00 2001
From: Henrik Hautakoski <henrik.hautakoski@gmail.com>
Date: Mon, 2 Apr 2018 02:28:25 +0200
Subject: [PATCH] Fixing proper namespace for app/library

---
 app/config/loader.php                       |  6 +--
 app/config/services.php                     | 55 +++++++++++----------
 app/forms/UserSettings.php                  |  4 +-
 app/library/{Acl => }/Acl.php               |  2 +-
 app/library/{Auth => }/Auth.php             |  2 +-
 app/library/Debug.php                       |  2 +
 app/library/Menu.php                        |  8 ++-
 app/library/Mvc/Model/Behavior/RandomId.php |  2 +-
 app/library/{Navigation => }/Navigation.php |  4 +-
 app/library/Navigation/Container.php        |  2 +-
 app/library/Navigation/Exception.php        |  2 +-
 app/library/Navigation/Node.php             |  2 +-
 app/library/OAuth.php                       |  5 +-
 app/library/Validation/Validator/Alpha.php  |  2 +-
 app/library/ViewHelper/AbstractHelper.php   |  2 +-
 app/library/ViewHelper/Icon.php             |  2 +-
 app/library/ViewHelper/ServerUrl.php        |  2 +-
 app/library/ViewHelper/Service.php          |  8 +--
 app/library/ViewHelper/UrlStyle.php         |  2 +-
 app/library/ViewHelper/Volt/Extension.php   | 15 +++---
 app/models/Data/Callback.php                |  2 +-
 app/plugins/AclPlugin.php                   |  9 ++--
 22 files changed, 78 insertions(+), 62 deletions(-)
 rename app/library/{Acl => }/Acl.php (98%)
 rename app/library/{Auth => }/Auth.php (99%)
 rename app/library/{Navigation => }/Navigation.php (69%)

diff --git a/app/config/loader.php b/app/config/loader.php
index 488b2f5..548f090 100644
--- a/app/config/loader.php
+++ b/app/config/loader.php
@@ -8,14 +8,14 @@ $loader = new \Phalcon\Loader();
 $loader->registerDirs(
     array(
         $config->application->controllersDir,
-        $config->application->libraryDir,
         $config->application->pluginsDir
     )
 )->register();
 
 $loader->registerNamespaces(array(
-    'Model' => $config->application->modelsDir,
-    'Form'  => $config->application->formsDir,
+    '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 91642d5..94390a0 100644
--- a/app/config/services.php
+++ b/app/config/services.php
@@ -5,22 +5,29 @@
  * @var \Phalcon\Config $config
  */
 
-use Phalcon\Di\FactoryDefault;
-use Phalcon\Mvc\View;
-use Phalcon\Assets\Manager as AssetsManager;
-use Phalcon\Mvc\Url as UrlResolver;
-use Phalcon\Mvc\View\Engine\Volt as VoltEngine;
-use Navigation\Navigation;
-use Phalcon\Flash\Direct as FlashDirect;
-use Phalcon\Mvc\Model\Metadata\Memory as MemoryMetaData;
-use Phalcon\Mvc\Model\MetaData\Apc as ApcMetaData;
-use Phalcon\Cache\Frontend\Data as FrontendDataCache;
-use Phalcon\Cache\Backend\Apc as BackendApcCache;
-use Phalcon\Translate\Adapter\NativeArray as TranslateAdapter;
-use Phalcon\Logger;
-use Phalcon\Logger\Adapter\Firephp as FirephpAdapter;
-use Phalcon\Session\Adapter\Files as SessionAdapter;
-use Phalcon\Mvc\Router;
+
+
+use Phalcon\Di\FactoryDefault,
+    Phalcon\Mvc\View,
+    Phalcon\Assets\Manager as AssetsManager,
+    Phalcon\Mvc\Url as UrlResolver,
+    Phalcon\Mvc\View\Engine\Volt as VoltEngine,
+    Phalcon\Flash\Direct as FlashDirect,
+    Phalcon\Mvc\Model\Metadata\Memory as MemoryMetaData,
+    Phalcon\Mvc\Model\MetaData\Apc as ApcMetaData,
+    Phalcon\Cache\Frontend\Data as FrontendDataCache,
+    Phalcon\Cache\Backend\Apc as BackendApcCache,
+    Phalcon\Translate\Adapter\NativeArray as TranslateAdapter,
+    Phalcon\Logger,
+    Phalcon\Logger\Adapter\File as FileLogAdapter,
+    Phalcon\Session\Adapter\Files as SessionAdapter,
+    Phalcon\Mvc\Router;
+
+use Httpcb\Auth,
+    Httpcb\OAuth,
+    Httpcb\Acl,
+    Httpcb\Navigation,
+    Httpcb\Menu;
 
 /**
  * The FactoryDefault Dependency Injector automatically register the right services providing a full stack framework
@@ -33,7 +40,7 @@ $di = new FactoryDefault();
 $di->setShared('logger', function() {
 
     //return new Phalcon\Logger\Adapter\Firephp("");
-    return new Phalcon\Logger\Adapter\File(APP_PATH . "/app/log.txt");
+    return new FileLogAdapter(APP_PATH . "/app/log.txt");
 });
 
 $di->setShared('dispatcher', function() use ($di, $config) {
@@ -119,7 +126,7 @@ $di->setShared('router', function() {
     return $router;
 });
 
-$di->setShared('viewHelper', '\ViewHelper\Service');
+$di->setShared('viewHelper', 'Httpcb\ViewHelper\Service');
 
 /**
  * Setting up the view component
@@ -145,7 +152,7 @@ $di->setShared('view', function () use ($di, $config) {
 
             // Register view helpers
             $compiler = $volt->getCompiler();
-            $compiler->addExtension(new \ViewHelper\Volt\Extension($di));
+            $compiler->addExtension(new Httpcb\ViewHelper\Volt\Extension($di));
 
             return $volt;
         },
@@ -274,12 +281,10 @@ $di->set('oauth', function() use ($config) {
 });
 
 $di->set('auth', function() use ($config) {
-    return new Auth\Auth($config);
+    return new Auth($config);
 });
 
-$di->set('acl', function() {
-    return new Acl\Acl();
-});
+$di->set('acl', 'Httpcb\Acl');
 
 $di->set('menu', function() use ($di) {
 
@@ -322,9 +327,9 @@ $di->set('menu', function() use ($di) {
     $menu = new Menu($navigation);
     $menu->setMenuClass(null);
     if ($di->get('auth')->hasIdentity()) {
-        $menu->setAclRole(Acl\Acl::ROLE_USER);
+        $menu->setAclRole(Acl::ROLE_USER);
     } else {
-        $menu->setAclRole(Acl\Acl::ROLE_GUEST);
+        $menu->setAclRole(Acl::ROLE_GUEST);
     }
     return $menu;
 });
diff --git a/app/forms/UserSettings.php b/app/forms/UserSettings.php
index ebc7f5c..0e769b0 100644
--- a/app/forms/UserSettings.php
+++ b/app/forms/UserSettings.php
@@ -25,13 +25,13 @@ use Phalcon\Forms\Element\Text,
  */
 use Phalcon\Validation\Validator\Callback as CallbackValidator,
     Phalcon\Validation\Validator\Uniqueness as UniquenessValidator,
-    \Validation\Validator\Alpha as AlphaValidator,
     Phalcon\Validation\Validator\Alnum as AlnumValidator,
     Phalcon\Validation\Validator\PresenceOf as PresenceOfValidator,
     Phalcon\Validation\Validator\Email as EmailValidator,
     Phalcon\Validation\Validator\Confirmation as ConfirmationValidator,
     Phalcon\Validation\Validator\StringLength as StringLengthValidator,
-    Phalcon\Validation\Validator\Identical as IdenticalValidator;
+    Phalcon\Validation\Validator\Identical as IdenticalValidator,
+    Httpcb\Validation\Validator\Alpha as AlphaValidator;
 
 
 class UserSettings extends FormBase
diff --git a/app/library/Acl/Acl.php b/app/library/Acl.php
similarity index 98%
rename from app/library/Acl/Acl.php
rename to app/library/Acl.php
index 6ce634b..6e1458d 100644
--- a/app/library/Acl/Acl.php
+++ b/app/library/Acl.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Acl;
+namespace Httpcb;
 
 use Phalcon\Acl\Role;
 use Phalcon\Acl\Adapter\Memory as AclList;
diff --git a/app/library/Auth/Auth.php b/app/library/Auth.php
similarity index 99%
rename from app/library/Auth/Auth.php
rename to app/library/Auth.php
index 3f76c88..87f2eea 100644
--- a/app/library/Auth/Auth.php
+++ b/app/library/Auth.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Auth;
+namespace Httpcb;
 
 use Phalcon\Mvc\User\Component;
 use Model\Data\User;
diff --git a/app/library/Debug.php b/app/library/Debug.php
index 5ecb5b5..336e7ba 100644
--- a/app/library/Debug.php
+++ b/app/library/Debug.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Httpcb;
+
 class Debug {
 
     public static function dump($var, $label = null, $echo = true)
diff --git a/app/library/Menu.php b/app/library/Menu.php
index 8bf4713..01512fe 100644
--- a/app/library/Menu.php
+++ b/app/library/Menu.php
@@ -1,8 +1,12 @@
 <?php
 
+namespace Httpcb;
+
 use Phalcon\Tag;
-use Navigation\Node;
-use Navigation\Navigation;
+
+use Httpcb\Acl,
+    Httpcb\Navigation,
+    Httpcb\Navigation\Node;
 
 class Menu extends Tag
 {
diff --git a/app/library/Mvc/Model/Behavior/RandomId.php b/app/library/Mvc/Model/Behavior/RandomId.php
index e709284..d84ce2c 100644
--- a/app/library/Mvc/Model/Behavior/RandomId.php
+++ b/app/library/Mvc/Model/Behavior/RandomId.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Mvc\Model\Behavior;
+namespace Httpcb\Mvc\Model\Behavior;
 
 use \Phalcon\Mvc\Model\Behavior;
 use \Phalcon\Mvc\Model\BehaviorInterface;
diff --git a/app/library/Navigation/Navigation.php b/app/library/Navigation.php
similarity index 69%
rename from app/library/Navigation/Navigation.php
rename to app/library/Navigation.php
index 8c1190a..82b78be 100644
--- a/app/library/Navigation/Navigation.php
+++ b/app/library/Navigation.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Navigation;
+namespace Httpcb;
 
-class Navigation extends Container
+class Navigation extends Navigation\Container
 {
     public function __construct($config)
     {
diff --git a/app/library/Navigation/Container.php b/app/library/Navigation/Container.php
index 85bde7a..5d12dbb 100644
--- a/app/library/Navigation/Container.php
+++ b/app/library/Navigation/Container.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Navigation;
+namespace Httpcb\Navigation;
 
 class Container
 {
diff --git a/app/library/Navigation/Exception.php b/app/library/Navigation/Exception.php
index ee5800e..21b16bc 100644
--- a/app/library/Navigation/Exception.php
+++ b/app/library/Navigation/Exception.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Navigation;
+namespace Httpcb\Navigation;
 
 class Exception extends \Exception
 {
diff --git a/app/library/Navigation/Node.php b/app/library/Navigation/Node.php
index 7b7ac5c..e65d61b 100644
--- a/app/library/Navigation/Node.php
+++ b/app/library/Navigation/Node.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Navigation;
+namespace Httpcb\Navigation;
 
 use \Phalcon\Di;
 
diff --git a/app/library/OAuth.php b/app/library/OAuth.php
index 2598d42..c08de76 100644
--- a/app/library/OAuth.php
+++ b/app/library/OAuth.php
@@ -1,8 +1,11 @@
 <?php
 
-//use Opauth;
+namespace Httpcb;
+
 use Phalcon\Mvc\User\Component;
 
+use Opauth;
+
 class OAuth extends Component
 {
     /**
diff --git a/app/library/Validation/Validator/Alpha.php b/app/library/Validation/Validator/Alpha.php
index bcdacb1..73e4970 100644
--- a/app/library/Validation/Validator/Alpha.php
+++ b/app/library/Validation/Validator/Alpha.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Validation\Validator;
+namespace Httpcb\Validation\Validator;
 
 use Phalcon\Validation\Message;
 use Phalcon\Validation\Validator as BaseValidator;
diff --git a/app/library/ViewHelper/AbstractHelper.php b/app/library/ViewHelper/AbstractHelper.php
index 1db0373..916f4a2 100644
--- a/app/library/ViewHelper/AbstractHelper.php
+++ b/app/library/ViewHelper/AbstractHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ViewHelper;
+namespace Httpcb\ViewHelper;
 
 use Phalcon\DiInterface;
 use Phalcon\Di\InjectionAwareInterface;
diff --git a/app/library/ViewHelper/Icon.php b/app/library/ViewHelper/Icon.php
index a39b8d3..5300465 100644
--- a/app/library/ViewHelper/Icon.php
+++ b/app/library/ViewHelper/Icon.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ViewHelper;
+namespace Httpcb\ViewHelper;
 
 /**
  * Class Icon
diff --git a/app/library/ViewHelper/ServerUrl.php b/app/library/ViewHelper/ServerUrl.php
index 09ea462..51ad62e 100644
--- a/app/library/ViewHelper/ServerUrl.php
+++ b/app/library/ViewHelper/ServerUrl.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ViewHelper;
+namespace Httpcb\ViewHelper;
 
 /**
  * Class ServerUrl
diff --git a/app/library/ViewHelper/Service.php b/app/library/ViewHelper/Service.php
index 507b6b4..2a11d2b 100644
--- a/app/library/ViewHelper/Service.php
+++ b/app/library/ViewHelper/Service.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace ViewHelper;
+namespace Httpcb\ViewHelper;
 
-use Phalcon\DiInterface;
-use Phalcon\Di\InjectionAwareInterface;
+use Phalcon\DiInterface,
+    Phalcon\Di\InjectionAwareInterface;
 
 class Service implements InjectionAwareInterface
 {
@@ -66,7 +66,7 @@ class Service implements InjectionAwareInterface
             return $this->_helpers[$name];
         }
 
-        $class = '\ViewHelper\\' . ucfirst($name);
+        $class = 'Httpcb\\ViewHelper\\' . ucfirst($name);
         if (class_exists($class)) {
             $helper = new $class();
             $this->set($name, $helper);
diff --git a/app/library/ViewHelper/UrlStyle.php b/app/library/ViewHelper/UrlStyle.php
index de358d4..d75020e 100644
--- a/app/library/ViewHelper/UrlStyle.php
+++ b/app/library/ViewHelper/UrlStyle.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ViewHelper;
+namespace Httpcb\ViewHelper;
 
 /**
  * Class UrlStyle
diff --git a/app/library/ViewHelper/Volt/Extension.php b/app/library/ViewHelper/Volt/Extension.php
index 4be4340..c9f4550 100644
--- a/app/library/ViewHelper/Volt/Extension.php
+++ b/app/library/ViewHelper/Volt/Extension.php
@@ -1,24 +1,25 @@
 <?php
 
-namespace ViewHelper\Volt;
+namespace Httpcb\ViewHelper\Volt;
 
-use \Phalcon\Di\InjectionAwareInterface;
+use Phalcon\DiInterface,
+    Phalcon\Di\InjectionAwareInterface;
 
 class Extension implements InjectionAwareInterface
 {
-    protected $_serviceKey = 'viewHelper';
+    protected $_serviceKey = 'HttpcbViewHelper';
 
     /**
-     * @var \Phalcon\DiInterface
+     * @var DiInterface
      */
     protected $_di;
 
-    public function __construct(\Phalcon\DiInterface $dependencyInjector)
+    public function __construct(DiInterface $dependencyInjector)
     {
         $this->_di = $dependencyInjector;
 
         if (!$this->_di->has($this->_serviceKey)) {
-            $this->_di->set($this->_serviceKey, '\ViewHelper\Service', true);
+            $this->_di->set($this->_serviceKey, 'Httpcb\ViewHelper\Service', true);
         }
     }
 
@@ -39,7 +40,7 @@ class Extension implements InjectionAwareInterface
      *
      * @param mixed $dependencyInjector
      */
-    public function setDI(\Phalcon\DiInterface $dependencyInjector)
+    public function setDI(DiInterface $dependencyInjector)
     {
         $this->_di = $dependencyInjector;
     }
diff --git a/app/models/Data/Callback.php b/app/models/Data/Callback.php
index 678de0a..9d5e41a 100644
--- a/app/models/Data/Callback.php
+++ b/app/models/Data/Callback.php
@@ -2,7 +2,7 @@
 
 namespace Model\Data;
 
-use Mvc\Model\Behavior\RandomId as RandomIdBehavior;
+use Httpcb\Mvc\Model\Behavior\RandomId as RandomIdBehavior;
 use Phalcon\Mvc\Model;
 
 class Callback extends Model
diff --git a/app/plugins/AclPlugin.php b/app/plugins/AclPlugin.php
index d927f32..73c3363 100644
--- a/app/plugins/AclPlugin.php
+++ b/app/plugins/AclPlugin.php
@@ -1,18 +1,19 @@
 <?php
 
-use Phalcon\Acl;
 use Phalcon\Events\Event;
 use Phalcon\Mvc\Dispatcher;
 
+use Httpcb\Acl;
+
 class AclPlugin extends Phalcon\Mvc\User\Plugin
 {
     public function beforeExecuteRoute(Event $event, Dispatcher $dispatcher)
     {
         // We only have two roles for now, authenticated users and guests.
         if ($this->auth->hasIdentity()) {
-            $role = \Acl\Acl::ROLE_USER;
+            $role = Acl::ROLE_USER;
         } else {
-            $role = \Acl\Acl::ROLE_GUEST;
+            $role = Acl::ROLE_GUEST;
         }
 
         // Support annotations for actions to define custom resources.
@@ -32,7 +33,7 @@ class AclPlugin extends Phalcon\Mvc\User\Plugin
 
         // Now, check and redirect user to login page if
         // this role does not have access to this resource.
-        if ($this->acl->isAllowed($role, $resource, 'Read') == Acl::DENY) {
+        if ($this->acl->isAllowed($role, $resource, 'Read') == \Phalcon\Acl::DENY) {
 
             // Forward to login page.
             $dispatcher->forward(array(