From a728279bf503b02098f50663c59531123447febd Mon Sep 17 00:00:00 2001
From: Marcin Kurczewski <mkurczew@gmail.com>
Date: Sat, 4 Oct 2014 13:34:08 +0200
Subject: [PATCH] Removed reliance on global from Dispatcher

---
 public_html/api-dispatch.php |  3 ---
 src/Bootstrap.php            | 14 ++++++++++++--
 src/Dispatcher.php           |  3 +--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/public_html/api-dispatch.php b/public_html/api-dispatch.php
index 4bc5a20b..85c5fe93 100644
--- a/public_html/api-dispatch.php
+++ b/public_html/api-dispatch.php
@@ -1,9 +1,6 @@
 <?php
-$start = microtime(true);
-
 require_once(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . 'Bootstrap.php');
 
-\Szurubooru\Bootstrap::init();
 $httpHelper = \Szurubooru\Injector::get(\Szurubooru\Helpers\HttpHelper::class);
 $dispatcher = \Szurubooru\Injector::get(\Szurubooru\Dispatcher::class);
 $dispatcher->run($httpHelper->getRequestMethod(), $_GET['q']);
diff --git a/src/Bootstrap.php b/src/Bootstrap.php
index 9e83ffc3..71daaa4d 100644
--- a/src/Bootstrap.php
+++ b/src/Bootstrap.php
@@ -1,14 +1,24 @@
 <?php
 namespace Szurubooru;
 
+$startTime = microtime(true);
+
 final class Bootstrap
 {
-	public static function init()
+	private static $startTime;
+
+	public static function init($startTime)
 	{
+		self::$startTime = $startTime;
 		self::turnErrorsIntoExceptions();
 		self::initAutoloader();
 	}
 
+	public static function getStartTime()
+	{
+		return self::$startTime;
+	}
+
 	private static function initAutoloader()
 	{
 		require(__DIR__
@@ -27,4 +37,4 @@ final class Bootstrap
 	}
 }
 
-Bootstrap::init();
+Bootstrap::init($startTime);
diff --git a/src/Dispatcher.php b/src/Dispatcher.php
index 2696ac20..0073c161 100644
--- a/src/Dispatcher.php
+++ b/src/Dispatcher.php
@@ -31,7 +31,6 @@ final class Dispatcher
 
 	public function run($requestMethod, $requestUri)
 	{
-		global $start;
 		try
 		{
 			$code = 200;
@@ -50,7 +49,7 @@ final class Dispatcher
 			];
 		}
 		$end = microtime(true);
-		$json['__time'] = $end - $start;
+		$json['__time'] = $end - \Szurubooru\Bootstrap::getStartTime();
 		$json['__queries'] = $this->databaseConnection->getPDO()->getQueryCount();
 
 		$this->httpHelper->setResponseCode($code);