From fee4b127b077e55546483e27cc680c18b03653f9 Mon Sep 17 00:00:00 2001
From: Dmitry Khomutov <poisoncorpsee@gmail.com>
Date: Fri, 9 Mar 2018 18:46:09 +0700
Subject: [PATCH] Small bootstrap.php cleanup.

---
 bootstrap.php       |  7 +++++--
 tests/bootstrap.php | 11 ++---------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/bootstrap.php b/bootstrap.php
index d554db01..4d83682a 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -26,7 +26,10 @@ if (!defined('RUNTIME_DIR')) {
 
 require_once(ROOT_DIR . 'vendor/autoload.php');
 
-$config = new PHPCensor\Config();
+use PHPCensor\Config;
+use PHPCensor\Helper\Lang;
+
+$config = new Config();
 
 $configFile = APP_DIR . 'config.yml';
 if (file_exists($configFile)) {
@@ -37,4 +40,4 @@ if (!defined('APP_URL') && !empty($config)) {
     define('APP_URL', $config->get('php-censor.url', '') . '/');
 }
 
-\PHPCensor\Helper\Lang::init($config);
+Lang::init($config);
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 89b44ec2..9e2e3832 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -24,15 +24,8 @@ if (!defined('RUNTIME_DIR')) {
     define('RUNTIME_DIR', ROOT_DIR . 'runtime/');
 }
 
-require_once(ROOT_DIR . 'vendor/autoload.php');
-
-$conf                      = [];
-$conf['php-censor']['url'] = 'http://php-censor.local';
-
-$config = new PHPCensor\Config($conf);
-
 if (!defined('APP_URL')) {
-    define('APP_URL', $config->get('php-censor.url', '') . '/');
+    define('APP_URL', 'http://php-censor.local/');
 }
 
-\PHPCensor\Helper\Lang::init($config);
+require_once(ROOT_DIR . 'vendor/autoload.php');