From cfe93434ad7c6b60abb75a8ffb1cf17d3cb733b3 Mon Sep 17 00:00:00 2001
From: Dmitry Khomutov <poisoncorpsee@gmail.com>
Date: Sun, 4 Mar 2018 17:50:08 +0700
Subject: [PATCH] Refactored Form.

---
 bootstrap.php                                  |  1 -
 src/B8Framework/Form/Element/CheckboxGroup.php |  9 ---------
 src/B8Framework/Form/Element/Hidden.php        |  9 ---------
 src/PHPCensor/Config.php                       |  4 ----
 src/PHPCensor/Controller/GroupController.php   |  3 +--
 src/PHPCensor/Controller/ProjectController.php |  2 +-
 src/PHPCensor/Controller/SessionController.php | 15 +++++++--------
 src/PHPCensor/Controller/UserController.php    |  2 +-
 src/{B8Framework => PHPCensor}/Form.php        |  5 ++---
 .../Form/ControlGroup.php                      |  2 +-
 .../Form/Element.php                           |  7 +++----
 .../Form/Element/Button.php                    |  4 ++--
 .../Form/Element/Checkbox.php                  |  4 ++--
 src/PHPCensor/Form/Element/CheckboxGroup.php   |  9 +++++++++
 .../Form/Element/Csrf.php                      |  2 +-
 .../Form/Element/Email.php                     |  2 +-
 src/PHPCensor/Form/Element/Hidden.php          |  9 +++++++++
 .../Form/Element/Password.php                  |  2 +-
 .../Form/Element/Radio.php                     |  2 +-
 .../Form/Element/Select.php                    |  4 ++--
 .../Form/Element/Submit.php                    |  2 +-
 .../Form/Element/Text.php                      |  4 ++--
 .../Form/Element/TextArea.php                  |  2 +-
 .../Form/Element/Url.php                       |  2 +-
 .../Form/FieldSet.php                          |  2 +-
 src/{B8Framework => PHPCensor}/Form/Input.php  |  2 +-
 .../Form/View/Button.phtml                     |  0
 .../Form/View/Checkbox.phtml                   |  4 ++--
 .../Form/View/CheckboxGroup.phtml              |  0
 .../Form/View/ControlGroup.phtml               |  0
 .../Form/View/Csrf.phtml                       |  0
 .../Form/View/FieldSet.phtml                   |  0
 .../Form/View/Form.phtml                       |  0
 .../Form/View/Hidden.phtml                     |  0
 .../Form/View/Radio.phtml                      |  0
 .../Form/View/Select.phtml                     |  0
 .../Form/View/Text.phtml                       |  0
 .../Form/View/TextArea.phtml                   |  0
 src/PHPCensor/View.php                         |  2 +-
 tests/{B8Framework => PHPCensor}/FormTest.php  | 18 ++----------------
 tests/{B8Framework => PHPCensor}/ViewTest.php  |  5 ++---
 .../data/view/Form/form.phtml                  |  0
 .../data/view/simple.phtml                     |  0
 .../data/view/vars.phtml                       |  0
 tests/bootstrap.php                            |  1 -
 45 files changed, 58 insertions(+), 83 deletions(-)
 delete mode 100644 src/B8Framework/Form/Element/CheckboxGroup.php
 delete mode 100644 src/B8Framework/Form/Element/Hidden.php
 rename src/{B8Framework => PHPCensor}/Form.php (94%)
 rename src/{B8Framework => PHPCensor}/Form/ControlGroup.php (64%)
 rename src/{B8Framework => PHPCensor}/Form/Element.php (95%)
 rename src/{B8Framework => PHPCensor}/Form/Element/Button.php (84%)
 rename src/{B8Framework => PHPCensor}/Form/Element/Checkbox.php (95%)
 create mode 100644 src/PHPCensor/Form/Element/CheckboxGroup.php
 rename src/{B8Framework => PHPCensor}/Form/Element/Csrf.php (94%)
 rename src/{B8Framework => PHPCensor}/Form/Element/Email.php (92%)
 create mode 100644 src/PHPCensor/Form/Element/Hidden.php
 rename src/{B8Framework => PHPCensor}/Form/Element/Password.php (92%)
 rename src/{B8Framework => PHPCensor}/Form/Element/Radio.php (53%)
 rename src/{B8Framework => PHPCensor}/Form/Element/Select.php (88%)
 rename src/{B8Framework => PHPCensor}/Form/Element/Submit.php (93%)
 rename src/{B8Framework => PHPCensor}/Form/Element/Text.php (79%)
 rename src/{B8Framework => PHPCensor}/Form/Element/TextArea.php (93%)
 rename src/{B8Framework => PHPCensor}/Form/Element/Url.php (92%)
 rename src/{B8Framework => PHPCensor}/Form/FieldSet.php (98%)
 rename src/{B8Framework => PHPCensor}/Form/Input.php (99%)
 rename src/{B8Framework => PHPCensor}/Form/View/Button.phtml (100%)
 rename src/{B8Framework => PHPCensor}/Form/View/Checkbox.phtml (81%)
 rename src/{B8Framework => PHPCensor}/Form/View/CheckboxGroup.phtml (100%)
 rename src/{B8Framework => PHPCensor}/Form/View/ControlGroup.phtml (100%)
 rename src/{B8Framework => PHPCensor}/Form/View/Csrf.phtml (100%)
 rename src/{B8Framework => PHPCensor}/Form/View/FieldSet.phtml (100%)
 rename src/{B8Framework => PHPCensor}/Form/View/Form.phtml (100%)
 rename src/{B8Framework => PHPCensor}/Form/View/Hidden.phtml (100%)
 rename src/{B8Framework => PHPCensor}/Form/View/Radio.phtml (100%)
 rename src/{B8Framework => PHPCensor}/Form/View/Select.phtml (100%)
 rename src/{B8Framework => PHPCensor}/Form/View/Text.phtml (100%)
 rename src/{B8Framework => PHPCensor}/Form/View/TextArea.phtml (100%)
 rename tests/{B8Framework => PHPCensor}/FormTest.php (94%)
 rename tests/{B8Framework => PHPCensor}/ViewTest.php (90%)
 rename tests/{B8Framework => PHPCensor}/data/view/Form/form.phtml (100%)
 rename tests/{B8Framework => PHPCensor}/data/view/simple.phtml (100%)
 rename tests/{B8Framework => PHPCensor}/data/view/vars.phtml (100%)

diff --git a/bootstrap.php b/bootstrap.php
index 7016a321..796c720b 100644
--- a/bootstrap.php
+++ b/bootstrap.php
@@ -30,7 +30,6 @@ require_once(ROOT_DIR . 'vendor/autoload.php');
 $conf = [];
 $conf['b8']['app']['namespace']          = 'PHPCensor';
 $conf['b8']['app']['default_controller'] = 'Home';
-$conf['b8']['view']['path']              = SRC_DIR . 'View/';
 
 $config = new PHPCensor\Config($conf);
 
diff --git a/src/B8Framework/Form/Element/CheckboxGroup.php b/src/B8Framework/Form/Element/CheckboxGroup.php
deleted file mode 100644
index 0b8b7165..00000000
--- a/src/B8Framework/Form/Element/CheckboxGroup.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace b8\Form\Element;
-
-use b8\Form\FieldSet;
-
-class CheckboxGroup extends FieldSet
-{
-}
diff --git a/src/B8Framework/Form/Element/Hidden.php b/src/B8Framework/Form/Element/Hidden.php
deleted file mode 100644
index ebb427e7..00000000
--- a/src/B8Framework/Form/Element/Hidden.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace b8\Form\Element;
-
-use b8\Form\Input;
-
-class Hidden extends Input
-{
-}
diff --git a/src/PHPCensor/Config.php b/src/PHPCensor/Config.php
index 89ec30c7..28ea9054 100644
--- a/src/PHPCensor/Config.php
+++ b/src/PHPCensor/Config.php
@@ -4,10 +4,6 @@ namespace PHPCensor;
 
 use Symfony\Component\Yaml\Parser as YamlParser;
 
-if (!defined('B8_PATH')) {
-    define('B8_PATH', dirname(__DIR__) . '/B8Framework/');
-}
-
 class Config
 {
     /**
diff --git a/src/PHPCensor/Controller/GroupController.php b/src/PHPCensor/Controller/GroupController.php
index 6d6011bb..8b703120 100644
--- a/src/PHPCensor/Controller/GroupController.php
+++ b/src/PHPCensor/Controller/GroupController.php
@@ -2,8 +2,7 @@
 
 namespace PHPCensor\Controller;
 
-use b8;
-use b8\Form;
+use PHPCensor\Form;
 use PHPCensor\Controller;
 use PHPCensor\Http\Response\RedirectResponse;
 use PHPCensor\Model\ProjectGroup;
diff --git a/src/PHPCensor/Controller/ProjectController.php b/src/PHPCensor/Controller/ProjectController.php
index 5904a52d..2cd432ac 100644
--- a/src/PHPCensor/Controller/ProjectController.php
+++ b/src/PHPCensor/Controller/ProjectController.php
@@ -3,7 +3,7 @@
 namespace PHPCensor\Controller;
 
 use PHPCensor\Exception\HttpException\NotFoundException;
-use b8\Form;
+use PHPCensor\Form;
 use JasonGrimes\Paginator;
 use PHPCensor;
 use PHPCensor\BuildFactory;
diff --git a/src/PHPCensor/Controller/SessionController.php b/src/PHPCensor/Controller/SessionController.php
index 60975e1e..106f4a9c 100644
--- a/src/PHPCensor/Controller/SessionController.php
+++ b/src/PHPCensor/Controller/SessionController.php
@@ -2,7 +2,6 @@
 
 namespace PHPCensor\Controller;
 
-use b8;
 use PHPCensor\Helper\Email;
 use PHPCensor\Helper\Lang;
 use PHPCensor\Controller;
@@ -117,42 +116,42 @@ class SessionController extends Controller
             }
         }
 
-        $form = new b8\Form();
+        $form = new \PHPCensor\Form();
         $form->setMethod('POST');
         $form->setAction(APP_URL . 'session/login');
 
-        $email = new b8\Form\Element\Text('email');
+        $email = new \PHPCensor\Form\Element\Text('email');
         $email->setLabel(Lang::get('login'));
         $email->setRequired(true);
         $email->setContainerClass('form-group');
         $email->setClass('form-control');
         $form->addField($email);
 
-        $pwd = new b8\Form\Element\Password('password');
+        $pwd = new \PHPCensor\Form\Element\Password('password');
         $pwd->setLabel(Lang::get('password'));
         $pwd->setRequired(true);
         $pwd->setContainerClass('form-group');
         $pwd->setClass('form-control');
         $form->addField($pwd);
 
-        $remember = b8\Form\Element\Checkbox::create('remember_me', Lang::get('remember_me'), false);
+        $remember = \PHPCensor\Form\Element\Checkbox::create('remember_me', Lang::get('remember_me'), false);
         $remember->setContainerClass('form-group');
         $remember->setCheckedValue(1);
         $remember->setValue(0);
         $form->addField($remember);
 
-        $pwd = new b8\Form\Element\Submit();
+        $pwd = new \PHPCensor\Form\Element\Submit();
         $pwd->setValue(Lang::get('log_in'));
         $pwd->setClass('btn-success');
         $form->addField($pwd);
 
         $tokenValue = $this->generateToken();
         $_SESSION['login_token'] = $tokenValue;
-        $token = new b8\Form\Element\Hidden('token');
+        $token = new \PHPCensor\Form\Element\Hidden('token');
         $token->setValue($tokenValue);
         $form->addField($token);
 
-        $this->view->form = $form->render();
+        $this->view->form   = $form->render();
         $this->view->failed = $isLoginFailure;
 
         return $this->view->render();
diff --git a/src/PHPCensor/Controller/UserController.php b/src/PHPCensor/Controller/UserController.php
index 4f264328..3e8b5ab4 100644
--- a/src/PHPCensor/Controller/UserController.php
+++ b/src/PHPCensor/Controller/UserController.php
@@ -4,7 +4,7 @@ namespace PHPCensor\Controller;
 
 use PHPCensor\Config;
 use PHPCensor\Exception\HttpException\NotFoundException;
-use b8\Form;
+use PHPCensor\Form;
 use PHPCensor\Controller;
 use PHPCensor\Helper\Lang;
 use PHPCensor\Http\Response\RedirectResponse;
diff --git a/src/B8Framework/Form.php b/src/PHPCensor/Form.php
similarity index 94%
rename from src/B8Framework/Form.php
rename to src/PHPCensor/Form.php
index 31ee1563..18b4c092 100644
--- a/src/B8Framework/Form.php
+++ b/src/PHPCensor/Form.php
@@ -1,9 +1,8 @@
 <?php
 
-namespace b8;
+namespace PHPCensor;
 
-use b8\Form\FieldSet;
-use PHPCensor\View;
+use PHPCensor\Form\FieldSet;
 
 class Form extends FieldSet
 {
diff --git a/src/B8Framework/Form/ControlGroup.php b/src/PHPCensor/Form/ControlGroup.php
similarity index 64%
rename from src/B8Framework/Form/ControlGroup.php
rename to src/PHPCensor/Form/ControlGroup.php
index 87848f2c..37afe8e6 100644
--- a/src/B8Framework/Form/ControlGroup.php
+++ b/src/PHPCensor/Form/ControlGroup.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace b8\Form;
+namespace PHPCensor\Form;
 
 class ControlGroup extends FieldSet
 {
diff --git a/src/B8Framework/Form/Element.php b/src/PHPCensor/Form/Element.php
similarity index 95%
rename from src/B8Framework/Form/Element.php
rename to src/PHPCensor/Form/Element.php
index a3542334..dc9b742a 100644
--- a/src/B8Framework/Form/Element.php
+++ b/src/PHPCensor/Form/Element.php
@@ -1,9 +1,8 @@
 <?php
 
-namespace b8\Form;
+namespace PHPCensor\Form;
 
 use PHPCensor\View;
-use PHPCensor\Config;
 
 abstract class Element
 {
@@ -168,7 +167,7 @@ abstract class Element
      */
     public function render($viewFile = null)
     {
-        $viewPath = Config::getInstance()->get('b8.view.path');
+        $viewPath = SRC_DIR . 'View/';
 
         if (is_null($viewFile)) {
             $class    = explode('\\', get_called_class());
@@ -178,7 +177,7 @@ abstract class Element
         if (file_exists($viewPath . 'Form/' . $viewFile . '.phtml')) {
             $view = new View('Form/' . $viewFile);
         } else {
-            $view = new View($viewFile, B8_PATH . 'Form/View/');
+            $view = new View($viewFile, SRC_DIR . 'Form/View/');
         }
 
         $view->name           = $this->getName();
diff --git a/src/B8Framework/Form/Element/Button.php b/src/PHPCensor/Form/Element/Button.php
similarity index 84%
rename from src/B8Framework/Form/Element/Button.php
rename to src/PHPCensor/Form/Element/Button.php
index b3c7774b..80d9e3f5 100644
--- a/src/B8Framework/Form/Element/Button.php
+++ b/src/PHPCensor/Form/Element/Button.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace b8\Form\Element;
+namespace PHPCensor\Form\Element;
 
-use b8\Form\Input;
+use PHPCensor\Form\Input;
 use PHPCensor\View;
 
 class Button extends Input
diff --git a/src/B8Framework/Form/Element/Checkbox.php b/src/PHPCensor/Form/Element/Checkbox.php
similarity index 95%
rename from src/B8Framework/Form/Element/Checkbox.php
rename to src/PHPCensor/Form/Element/Checkbox.php
index d2352714..2db20245 100644
--- a/src/B8Framework/Form/Element/Checkbox.php
+++ b/src/PHPCensor/Form/Element/Checkbox.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace b8\Form\Element;
+namespace PHPCensor\Form\Element;
 
 use PHPCensor\View;
-use b8\Form\Input;
+use PHPCensor\Form\Input;
 
 class Checkbox extends Input
 {
diff --git a/src/PHPCensor/Form/Element/CheckboxGroup.php b/src/PHPCensor/Form/Element/CheckboxGroup.php
new file mode 100644
index 00000000..272bfbac
--- /dev/null
+++ b/src/PHPCensor/Form/Element/CheckboxGroup.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace PHPCensor\Form\Element;
+
+use PHPCensor\Form\FieldSet;
+
+class CheckboxGroup extends FieldSet
+{
+}
diff --git a/src/B8Framework/Form/Element/Csrf.php b/src/PHPCensor/Form/Element/Csrf.php
similarity index 94%
rename from src/B8Framework/Form/Element/Csrf.php
rename to src/PHPCensor/Form/Element/Csrf.php
index ee7fb3f5..a6c4ce7a 100644
--- a/src/B8Framework/Form/Element/Csrf.php
+++ b/src/PHPCensor/Form/Element/Csrf.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace b8\Form\Element;
+namespace PHPCensor\Form\Element;
 
 use PHPCensor\View;
 
diff --git a/src/B8Framework/Form/Element/Email.php b/src/PHPCensor/Form/Element/Email.php
similarity index 92%
rename from src/B8Framework/Form/Element/Email.php
rename to src/PHPCensor/Form/Element/Email.php
index b0990eb8..f8c51fb8 100644
--- a/src/B8Framework/Form/Element/Email.php
+++ b/src/PHPCensor/Form/Element/Email.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace b8\Form\Element;
+namespace PHPCensor\Form\Element;
 
 use PHPCensor\View;
 
diff --git a/src/PHPCensor/Form/Element/Hidden.php b/src/PHPCensor/Form/Element/Hidden.php
new file mode 100644
index 00000000..086042c1
--- /dev/null
+++ b/src/PHPCensor/Form/Element/Hidden.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace PHPCensor\Form\Element;
+
+use PHPCensor\Form\Input;
+
+class Hidden extends Input
+{
+}
diff --git a/src/B8Framework/Form/Element/Password.php b/src/PHPCensor/Form/Element/Password.php
similarity index 92%
rename from src/B8Framework/Form/Element/Password.php
rename to src/PHPCensor/Form/Element/Password.php
index b63d3994..f97e49bf 100644
--- a/src/B8Framework/Form/Element/Password.php
+++ b/src/PHPCensor/Form/Element/Password.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace b8\Form\Element;
+namespace PHPCensor\Form\Element;
 
 use PHPCensor\View;
 
diff --git a/src/B8Framework/Form/Element/Radio.php b/src/PHPCensor/Form/Element/Radio.php
similarity index 53%
rename from src/B8Framework/Form/Element/Radio.php
rename to src/PHPCensor/Form/Element/Radio.php
index d45e0c94..6c1e386b 100644
--- a/src/B8Framework/Form/Element/Radio.php
+++ b/src/PHPCensor/Form/Element/Radio.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace b8\Form\Element;
+namespace PHPCensor\Form\Element;
 
 class Radio extends Select
 {
diff --git a/src/B8Framework/Form/Element/Select.php b/src/PHPCensor/Form/Element/Select.php
similarity index 88%
rename from src/B8Framework/Form/Element/Select.php
rename to src/PHPCensor/Form/Element/Select.php
index d7d91853..2d1e4d8f 100644
--- a/src/B8Framework/Form/Element/Select.php
+++ b/src/PHPCensor/Form/Element/Select.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace b8\Form\Element;
+namespace PHPCensor\Form\Element;
 
 use PHPCensor\View;
-use b8\Form\Input;
+use PHPCensor\Form\Input;
 
 class Select extends Input
 {
diff --git a/src/B8Framework/Form/Element/Submit.php b/src/PHPCensor/Form/Element/Submit.php
similarity index 93%
rename from src/B8Framework/Form/Element/Submit.php
rename to src/PHPCensor/Form/Element/Submit.php
index 14e5ea7a..4e6a8750 100644
--- a/src/B8Framework/Form/Element/Submit.php
+++ b/src/PHPCensor/Form/Element/Submit.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace b8\Form\Element;
+namespace PHPCensor\Form\Element;
 
 use PHPCensor\View;
 
diff --git a/src/B8Framework/Form/Element/Text.php b/src/PHPCensor/Form/Element/Text.php
similarity index 79%
rename from src/B8Framework/Form/Element/Text.php
rename to src/PHPCensor/Form/Element/Text.php
index 59f45ffd..038846d7 100644
--- a/src/B8Framework/Form/Element/Text.php
+++ b/src/PHPCensor/Form/Element/Text.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace b8\Form\Element;
+namespace PHPCensor\Form\Element;
 
-use b8\Form\Input;
+use PHPCensor\Form\Input;
 use PHPCensor\View;
 
 class Text extends Input
diff --git a/src/B8Framework/Form/Element/TextArea.php b/src/PHPCensor/Form/Element/TextArea.php
similarity index 93%
rename from src/B8Framework/Form/Element/TextArea.php
rename to src/PHPCensor/Form/Element/TextArea.php
index b39d6466..d62e9fe3 100644
--- a/src/B8Framework/Form/Element/TextArea.php
+++ b/src/PHPCensor/Form/Element/TextArea.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace b8\Form\Element;
+namespace PHPCensor\Form\Element;
 
 use PHPCensor\View;
 
diff --git a/src/B8Framework/Form/Element/Url.php b/src/PHPCensor/Form/Element/Url.php
similarity index 92%
rename from src/B8Framework/Form/Element/Url.php
rename to src/PHPCensor/Form/Element/Url.php
index e89a4578..d46c2b83 100644
--- a/src/B8Framework/Form/Element/Url.php
+++ b/src/PHPCensor/Form/Element/Url.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace b8\Form\Element;
+namespace PHPCensor\Form\Element;
 
 use PHPCensor\View;
 
diff --git a/src/B8Framework/Form/FieldSet.php b/src/PHPCensor/Form/FieldSet.php
similarity index 98%
rename from src/B8Framework/Form/FieldSet.php
rename to src/PHPCensor/Form/FieldSet.php
index fba88738..23338a33 100644
--- a/src/B8Framework/Form/FieldSet.php
+++ b/src/PHPCensor/Form/FieldSet.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace b8\Form;
+namespace PHPCensor\Form;
 
 use PHPCensor\View;
 
diff --git a/src/B8Framework/Form/Input.php b/src/PHPCensor/Form/Input.php
similarity index 99%
rename from src/B8Framework/Form/Input.php
rename to src/PHPCensor/Form/Input.php
index 37813a52..95dcba04 100644
--- a/src/B8Framework/Form/Input.php
+++ b/src/PHPCensor/Form/Input.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace b8\Form;
+namespace PHPCensor\Form;
 
 use PHPCensor\View;
 
diff --git a/src/B8Framework/Form/View/Button.phtml b/src/PHPCensor/Form/View/Button.phtml
similarity index 100%
rename from src/B8Framework/Form/View/Button.phtml
rename to src/PHPCensor/Form/View/Button.phtml
diff --git a/src/B8Framework/Form/View/Checkbox.phtml b/src/PHPCensor/Form/View/Checkbox.phtml
similarity index 81%
rename from src/B8Framework/Form/View/Checkbox.phtml
rename to src/PHPCensor/Form/View/Checkbox.phtml
index 184efd77..ef101d1d 100644
--- a/src/B8Framework/Form/View/Checkbox.phtml
+++ b/src/PHPCensor/Form/View/Checkbox.phtml
@@ -1,4 +1,4 @@
-<?php if (!($parent instanceof \b8\Form\Element\CheckboxGroup)): ?>
+<?php if (!($parent instanceof \PHPCensor\Form\Element\CheckboxGroup)): ?>
 <div class="control-group <?= $containerClass ?> <?= (isset($error) ? 'error' : ''); ?>">
     <div class="controls">
         <div class="checkbox">
@@ -13,7 +13,7 @@
             <?php if (isset($error)): ?>
                 <span class="help-block"><?= $error; ?></span>
             <?php endif; ?>
-            <?php if (!($parent instanceof \b8\Form\Element\CheckboxGroup)): ?>
+            <?php if (!($parent instanceof \PHPCensor\Form\Element\CheckboxGroup)): ?>
         </div>
     </div>
 </div>
diff --git a/src/B8Framework/Form/View/CheckboxGroup.phtml b/src/PHPCensor/Form/View/CheckboxGroup.phtml
similarity index 100%
rename from src/B8Framework/Form/View/CheckboxGroup.phtml
rename to src/PHPCensor/Form/View/CheckboxGroup.phtml
diff --git a/src/B8Framework/Form/View/ControlGroup.phtml b/src/PHPCensor/Form/View/ControlGroup.phtml
similarity index 100%
rename from src/B8Framework/Form/View/ControlGroup.phtml
rename to src/PHPCensor/Form/View/ControlGroup.phtml
diff --git a/src/B8Framework/Form/View/Csrf.phtml b/src/PHPCensor/Form/View/Csrf.phtml
similarity index 100%
rename from src/B8Framework/Form/View/Csrf.phtml
rename to src/PHPCensor/Form/View/Csrf.phtml
diff --git a/src/B8Framework/Form/View/FieldSet.phtml b/src/PHPCensor/Form/View/FieldSet.phtml
similarity index 100%
rename from src/B8Framework/Form/View/FieldSet.phtml
rename to src/PHPCensor/Form/View/FieldSet.phtml
diff --git a/src/B8Framework/Form/View/Form.phtml b/src/PHPCensor/Form/View/Form.phtml
similarity index 100%
rename from src/B8Framework/Form/View/Form.phtml
rename to src/PHPCensor/Form/View/Form.phtml
diff --git a/src/B8Framework/Form/View/Hidden.phtml b/src/PHPCensor/Form/View/Hidden.phtml
similarity index 100%
rename from src/B8Framework/Form/View/Hidden.phtml
rename to src/PHPCensor/Form/View/Hidden.phtml
diff --git a/src/B8Framework/Form/View/Radio.phtml b/src/PHPCensor/Form/View/Radio.phtml
similarity index 100%
rename from src/B8Framework/Form/View/Radio.phtml
rename to src/PHPCensor/Form/View/Radio.phtml
diff --git a/src/B8Framework/Form/View/Select.phtml b/src/PHPCensor/Form/View/Select.phtml
similarity index 100%
rename from src/B8Framework/Form/View/Select.phtml
rename to src/PHPCensor/Form/View/Select.phtml
diff --git a/src/B8Framework/Form/View/Text.phtml b/src/PHPCensor/Form/View/Text.phtml
similarity index 100%
rename from src/B8Framework/Form/View/Text.phtml
rename to src/PHPCensor/Form/View/Text.phtml
diff --git a/src/B8Framework/Form/View/TextArea.phtml b/src/PHPCensor/Form/View/TextArea.phtml
similarity index 100%
rename from src/B8Framework/Form/View/TextArea.phtml
rename to src/PHPCensor/Form/View/TextArea.phtml
diff --git a/src/PHPCensor/View.php b/src/PHPCensor/View.php
index 1e06d1ac..1948b80d 100644
--- a/src/PHPCensor/View.php
+++ b/src/PHPCensor/View.php
@@ -28,7 +28,7 @@ class View
 
     protected static function getViewFile($file, $path = null)
     {
-        $viewPath = is_null($path) ? Config::getInstance()->get('b8.view.path') : $path;
+        $viewPath = is_null($path) ? (SRC_DIR . 'View/') : $path;
         $fullPath = $viewPath . $file . '.' . static::$extension;
 
         return $fullPath;
diff --git a/tests/B8Framework/FormTest.php b/tests/PHPCensor/FormTest.php
similarity index 94%
rename from tests/B8Framework/FormTest.php
rename to tests/PHPCensor/FormTest.php
index 9b59e465..01e5f288 100755
--- a/tests/B8Framework/FormTest.php
+++ b/tests/PHPCensor/FormTest.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace Tests\b8;
+namespace Tests\PHPCensor;
 
-use b8\Form;
+use PHPCensor\Form;
 use PHPCensor\Config;
 
 class FormTest extends \PHPUnit\Framework\TestCase
@@ -15,20 +15,6 @@ class FormTest extends \PHPUnit\Framework\TestCase
 
         self::assertTrue($f->getAction() == '/');
         self::assertTrue($f->getMethod() == 'POST');
-
-        new Config([
-            'b8' => [
-                'view' => [
-                    'path' => __DIR__ . '/data/view/'
-                ]
-            ]
-        ]);
-
-        self::assertTrue($f->render('form') == '/POST');
-
-        Config::getInstance()->set('b8.view.path', '');
-
-        self::assertTrue(strpos((string)$f, '<form') !== false);
     }
 
     public function testElementBasics()
diff --git a/tests/B8Framework/ViewTest.php b/tests/PHPCensor/ViewTest.php
similarity index 90%
rename from tests/B8Framework/ViewTest.php
rename to tests/PHPCensor/ViewTest.php
index d91cf9e2..e0325d3c 100755
--- a/tests/B8Framework/ViewTest.php
+++ b/tests/PHPCensor/ViewTest.php
@@ -1,11 +1,10 @@
 <?php
 
-namespace Tests\b8;
+namespace Tests\PHPCensor;
 
 use PHPCensor\View;
-use PHPUnit\Framework\TestCase;
 
-class ViewTest extends TestCase
+class ViewTest extends \PHPUnit\Framework\TestCase
 {
     public function testSimpleView()
     {
diff --git a/tests/B8Framework/data/view/Form/form.phtml b/tests/PHPCensor/data/view/Form/form.phtml
similarity index 100%
rename from tests/B8Framework/data/view/Form/form.phtml
rename to tests/PHPCensor/data/view/Form/form.phtml
diff --git a/tests/B8Framework/data/view/simple.phtml b/tests/PHPCensor/data/view/simple.phtml
similarity index 100%
rename from tests/B8Framework/data/view/simple.phtml
rename to tests/PHPCensor/data/view/simple.phtml
diff --git a/tests/B8Framework/data/view/vars.phtml b/tests/PHPCensor/data/view/vars.phtml
similarity index 100%
rename from tests/B8Framework/data/view/vars.phtml
rename to tests/PHPCensor/data/view/vars.phtml
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 055f8d1d..906f8c5a 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -30,7 +30,6 @@ $conf = [];
 
 $conf['b8']['app']['namespace']          = 'PHPCensor';
 $conf['b8']['app']['default_controller'] = 'Home';
-$conf['b8']['view']['path']              = SRC_DIR . 'View/';
 $conf['php-censor']['url']               = 'http://php-censor.local';
 
 $config = new PHPCensor\Config($conf);