pnx/httpcb
Archived
1
0
Fork 0
Code Releases Activity

app/library/Bootstrap.php: revove "Application" and add "Services" class with the services definitions.

Browse source 
Had some wierd problem with closures an $this when being defined in one class and used in another
(defined in Application, used in Phalcon\Di\FactoryDefault).

So we move all of this to "Services" class that directly extends FactoryDefault DI.
And therefore, we don't need a Application class anymore.
This commit is contained in:
Henrik Hautakoski 2018-06-18 16:46:40 +02:00
parent e591c79133
commit f9050181d0
2 changed files with 8 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

40
app/library/Application.php → app/library/Services.php
View file

@ -2,7 +2,7 @@
namespace Httpcb; namespace Httpcb;
use Phalcon\Di\DiInterface, use Phalcon\DiInterface,
Phalcon\Di\FactoryDefault as DiDefault, Phalcon\Di\FactoryDefault as DiDefault,
Phalcon\Config\Adapter\Yaml as Config, Phalcon\Config\Adapter\Yaml as Config,
Phalcon\Mvc\View, Phalcon\Mvc\View,
@ -32,25 +32,12 @@ use App\Listener\AclListener,
App\Listener\DispatchListener, App\Listener\DispatchListener,
App\Listener\ActivityLog; App\Listener\ActivityLog;
class Services extends DiDefault
class Application extends \Phalcon\Mvc\Application
{ {
public function __construct(\Phalcon\DiInterface $di = null) public function __construct()
{ {
if ($di === null) { parent::__construct();
$di = new DiDefault();
}
parent::__construct($di);
}
/**
* Bootstrap the application (register services)
*
* @return Application
*/
public function bootstrap()
{
$reflection = new \ReflectionObject($this); $reflection = new \ReflectionObject($this);
$methods = $reflection->getMethods(\ReflectionMethod::IS_PROTECTED); $methods = $reflection->getMethods(\ReflectionMethod::IS_PROTECTED);
@ -58,28 +45,13 @@ class Application extends \Phalcon\Mvc\Application
if (substr($method->getName(),0, 11) == '_initShared') { if (substr($method->getName(),0, 11) == '_initShared') {
$service = lcfirst(substr($method->getName(), 11)); $service = lcfirst(substr($method->getName(), 11));
$this->di->setShared($service, $method->getClosure($this)); $this->setShared($service, $method->getClosure($this));
} }
else if (substr($method->getName(),0, 5) == '_init') { else if (substr($method->getName(),0, 5) == '_init') {
$service = lcfirst(substr($method->getName(), 5)); $service = lcfirst(substr($method->getName(), 5));
$this->di->set($service, $method->getClosure($this)); $this->set($service, $method->getClosure($this));
} }
} }
return $this;
}
/**
* @return string
*/
public function run()
{
return $this->handle()->getContent();
}
public function get($service, $parameters = null)
{
return $this->di->get($service, $parameters);
} }
protected function _initSharedConfig() protected function _initSharedConfig()

4
public/index.php
View file

@ -19,5 +19,5 @@ include APP_PATH . "/app/config/loader.php";
/** /**
* Handle the request * Handle the request
*/ */
$app = new Httpcb\Application(); $app = new Phalcon\Mvc\Application(new Httpcb\Services());
echo $app->bootstrap()->run(); echo $app->handle()->getContent();