From 3b700f8d3c5d6c4ab881b16cbcf03718db133c66 Mon Sep 17 00:00:00 2001
From: Dmitry Khomutov <poisoncorpsee@gmail.com>
Date: Sun, 4 Mar 2018 21:33:35 +0700
Subject: [PATCH] Refactored project structure (Improvements).

---
 bootstrap.php                               | 7 +------
 src/Application.php                         | 2 +-
 tests/bootstrap.php                         | 7 ++-----
 tests/src/Plugin/EmailTest.php              | 8 +-------
 tests/src/Plugin/Util/PhpUnitResultTest.php | 4 ----
 5 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/bootstrap.php b/bootstrap.php
index 2bb67d62..d554db01 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -26,12 +26,7 @@ if (!defined('RUNTIME_DIR')) {
 
 require_once(ROOT_DIR . 'vendor/autoload.php');
 
-// Load configuration if present:
-$conf = [];
-$conf['b8']['app']['namespace']          = 'PHPCensor';
-$conf['b8']['app']['default_controller'] = 'Home';
-
-$config = new PHPCensor\Config($conf);
+$config = new PHPCensor\Config();
 
 $configFile = APP_DIR . 'config.yml';
 if (file_exists($configFile)) {
diff --git a/src/Application.php b/src/Application.php
index 857cc17b..8a56716e 100644
--- a/src/Application.php
+++ b/src/Application.php
@@ -281,7 +281,7 @@ class Application
         $namespace  = $this->toPhpName($route['namespace']);
         $controller = $this->toPhpName($route['controller']);
 
-        return $this->config->get('b8.app.namespace') . '\\' . $namespace . '\\' . $controller . 'Controller';
+        return 'PHPCensor\\' . $namespace . '\\' . $controller . 'Controller';
     }
 
     /**
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 0783ef40..89b44ec2 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -26,11 +26,8 @@ if (!defined('RUNTIME_DIR')) {
 
 require_once(ROOT_DIR . 'vendor/autoload.php');
 
-$conf = [];
-
-$conf['b8']['app']['namespace']          = 'PHPCensor';
-$conf['b8']['app']['default_controller'] = 'Home';
-$conf['php-censor']['url']               = 'http://php-censor.local';
+$conf                      = [];
+$conf['php-censor']['url'] = 'http://php-censor.local';
 
 $config = new PHPCensor\Config($conf);
 
diff --git a/tests/src/Plugin/EmailTest.php b/tests/src/Plugin/EmailTest.php
index 315424c1..6d2ff213 100644
--- a/tests/src/Plugin/EmailTest.php
+++ b/tests/src/Plugin/EmailTest.php
@@ -56,13 +56,7 @@ class EmailTest extends \PHPUnit\Framework\TestCase
         $this->mailDelivered = true;
         $self                = $this;
 
-        $config = new Config([
-            'b8' => [
-                'view' => [
-                    'path' => SRC_DIR . 'View/'
-                ]
-            ]
-        ]);
+        new Config();
 
         $this->mockProject = $this
             ->getMockBuilder('\PHPCensor\Model\Project')
diff --git a/tests/src/Plugin/Util/PhpUnitResultTest.php b/tests/src/Plugin/Util/PhpUnitResultTest.php
index d16bde0c..0587effd 100644
--- a/tests/src/Plugin/Util/PhpUnitResultTest.php
+++ b/tests/src/Plugin/Util/PhpUnitResultTest.php
@@ -48,8 +48,6 @@ class PhpUnitResultTest extends \PHPUnit\Framework\TestCase
             self::assertContains('Incomplete Test:', $output[5]['message']);
         } catch (\PHPUnit_Framework_ExpectationFailedException $e) {
             self::$skipped[] = ['cls' => $resultClass, 'ex' => $e];
-        } catch (\PHPUnit\Framework\ExpectationFailedException $e) {
-            self::$skipped[] = ['cls' => $resultClass, 'ex' => $e];
         }
 
         self::assertEquals(PhpUnitResult::SEVERITY_SKIPPED, $output[11]['severity']);
@@ -57,8 +55,6 @@ class PhpUnitResultTest extends \PHPUnit\Framework\TestCase
             self::assertContains('Skipped Test:', $output[11]['message']);
         } catch (\PHPUnit_Framework_ExpectationFailedException $e) {
             self::$skipped[] = ['cls' => $resultClass, 'ex' => $e];
-        } catch (\PHPUnit\Framework\ExpectationFailedException $e) {
-            self::$skipped[] = ['cls' => $resultClass, 'ex' => $e];
         }
     }