Fixing proper namespace for app/library
This commit is contained in:
parent
cb1e40ee0a
commit
aa37d10024
22 changed files with 78 additions and 62 deletions
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace ViewHelper;
|
||||
namespace Httpcb\ViewHelper;
|
||||
|
||||
use Phalcon\DiInterface;
|
||||
use Phalcon\Di\InjectionAwareInterface;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace ViewHelper;
|
||||
namespace Httpcb\ViewHelper;
|
||||
|
||||
/**
|
||||
* Class Icon
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace ViewHelper;
|
||||
namespace Httpcb\ViewHelper;
|
||||
|
||||
/**
|
||||
* Class ServerUrl
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace ViewHelper;
|
||||
namespace Httpcb\ViewHelper;
|
||||
|
||||
/**
|
||||
* Class UrlStyle
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
Reference in a new issue