Fixing proper namespace for app/library

app/library/Acl.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Acl;
+namespace Httpcb;
 
 use Phalcon\Acl\Role;
 use Phalcon\Acl\Adapter\Memory as AclList;

app/library/Auth.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Auth;
+namespace Httpcb;
 
 use Phalcon\Mvc\User\Component;
 use Model\Data\User;

app/library/Debug.php

@@ -1,5 +1,7 @@
 <?php
 
+namespace Httpcb;
+
 class Debug {
 
     public static function dump($var, $label = null, $echo = true)

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
 {

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;

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)
     {

app/library/Navigation/Container.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Navigation;
+namespace Httpcb\Navigation;
 
 class Container
 {

app/library/Navigation/Exception.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Navigation;
+namespace Httpcb\Navigation;
 
 class Exception extends \Exception
 {

app/library/Navigation/Node.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Navigation;
+namespace Httpcb\Navigation;
 
 use \Phalcon\Di;
 

app/library/OAuth.php

@@ -1,8 +1,11 @@
 <?php
 
-//use Opauth;
+namespace Httpcb;
+
 use Phalcon\Mvc\User\Component;
 
+use Opauth;
+
 class OAuth extends Component
 {
     /**

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;

app/library/ViewHelper/AbstractHelper.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ViewHelper;
+namespace Httpcb\ViewHelper;
 
 use Phalcon\DiInterface;
 use Phalcon\Di\InjectionAwareInterface;

app/library/ViewHelper/Icon.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ViewHelper;
+namespace Httpcb\ViewHelper;
 
 /**
  * Class Icon

app/library/ViewHelper/ServerUrl.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ViewHelper;
+namespace Httpcb\ViewHelper;
 
 /**
  * Class ServerUrl

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);

app/library/ViewHelper/UrlStyle.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace ViewHelper;
+namespace Httpcb\ViewHelper;
 
 /**
  * Class UrlStyle

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;
     }