ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed reliance on global from Dispatcher

Browse source
This commit is contained in:
Marcin Kurczewski 2014-10-04 13:34:08 +02:00
parent 4220a83589
commit a728279bf5
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
public_html/api-dispatch.php
View file

@ -1,9 +1,6 @@
<?php <?php
$start = microtime(true);
require_once(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'Bootstrap.php'); require_once(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'Bootstrap.php');
\Szurubooru\Bootstrap::init();
$httpHelper = \Szurubooru\Injector::get(\Szurubooru\Helpers\HttpHelper::class); $httpHelper = \Szurubooru\Injector::get(\Szurubooru\Helpers\HttpHelper::class);
$dispatcher = \Szurubooru\Injector::get(\Szurubooru\Dispatcher::class); $dispatcher = \Szurubooru\Injector::get(\Szurubooru\Dispatcher::class);
$dispatcher->run($httpHelper->getRequestMethod(), $_GET['q']); $dispatcher->run($httpHelper->getRequestMethod(), $_GET['q']);

14
src/Bootstrap.php
View file

@ -1,14 +1,24 @@
<?php <?php
namespace Szurubooru; namespace Szurubooru;
$startTime = microtime(true);
final class Bootstrap final class Bootstrap
{ {
public static function init() private static $startTime;
public static function init($startTime)
{ {
self::$startTime = $startTime;
self::turnErrorsIntoExceptions(); self::turnErrorsIntoExceptions();
self::initAutoloader(); self::initAutoloader();
} }
public static function getStartTime()
{
return self::$startTime;
}
private static function initAutoloader() private static function initAutoloader()
{ {
require(__DIR__ require(__DIR__
@ -27,4 +37,4 @@ final class Bootstrap
} }
} }
Bootstrap::init(); Bootstrap::init($startTime);

3
src/Dispatcher.php
View file

@ -31,7 +31,6 @@ final class Dispatcher
public function run($requestMethod, $requestUri) public function run($requestMethod, $requestUri)
{ {
global $start;
try try
{ {
$code = 200; $code = 200;
@ -50,7 +49,7 @@ final class Dispatcher
]; ];
} }
$end = microtime(true); $end = microtime(true);
$json['__time'] = $end - $start; $json['__time'] = $end - \Szurubooru\Bootstrap::getStartTime();
$json['__queries'] = $this->databaseConnection->getPDO()->getQueryCount(); $json['__queries'] = $this->databaseConnection->getPDO()->getQueryCount();
$this->httpHelper->setResponseCode($code); $this->httpHelper->setResponseCode($code);