From cdc926c62ac6e5141edcfac5f813ff8e413bea5a Mon Sep 17 00:00:00 2001
From: Dmitry Khomutov <poisoncorpsee@gmail.com>
Date: Sat, 17 Mar 2018 09:23:49 +0700
Subject: [PATCH] Refactored View.

---
 src/View.php           | 87 +++++++++++++++++++++++++++++-------------
 tests/src/ViewTest.php |  7 ----
 2 files changed, 61 insertions(+), 33 deletions(-)

diff --git a/src/View.php b/src/View.php
index 1948b80d..9fecac92 100644
--- a/src/View.php
+++ b/src/View.php
@@ -8,24 +8,40 @@ use PHPCensor\Store\UserStore;
 
 class View
 {
-    protected $vars      = [];
-    protected $isContent = false;
+    /**
+     * @var array
+     */
+    protected $data = [];
 
+    /**
+     * @var string
+     */
+    protected $viewFile;
+
+    /**
+     * @var string
+     */
     protected static $extension = 'phtml';
 
+    /**
+     * @param string      $file
+     * @param string|null $path
+     */
     public function __construct($file, $path = null)
     {
-        if ('{@content}' === $file) {
-            $this->isContent = true;
-        } else {
-            if (!self::exists($file, $path)) {
-                throw new \RuntimeException('View file does not exist: ' . $file);
-            }
-
-            $this->viewFile = self::getViewFile($file, $path);
+        if (!self::exists($file, $path)) {
+            throw new \RuntimeException('View file does not exist: ' . $file);
         }
+
+        $this->viewFile = self::getViewFile($file, $path);
     }
 
+    /**
+     * @param string      $file
+     * @param string|null $path
+     *
+     * @return string
+     */
     protected static function getViewFile($file, $path = null)
     {
         $viewPath = is_null($path) ? (SRC_DIR . 'View/') : $path;
@@ -34,6 +50,12 @@ class View
         return $fullPath;
     }
 
+    /**
+     * @param string      $file
+     * @param string|null $path
+     *
+     * @return boolean
+     */
     public static function exists($file, $path = null)
     {
         if (!file_exists(self::getViewFile($file, $path))) {
@@ -43,37 +65,50 @@ class View
         return true;
     }
 
-    public function __isset($var)
+    /**
+     * @param string $key
+     *
+     * @return boolean
+     */
+    public function __isset($key)
     {
-        return isset($this->vars[$var]);
+        return isset($this->data[$key]);
     }
 
-    public function __get($var)
+    /**
+     * @param string $key
+     *
+     * @return mixed
+     */
+    public function __get($key)
     {
-        return $this->vars[$var];
+        return $this->data[$key];
     }
 
-    public function __set($var, $val)
+    /**
+     * @param string $key
+     * @param mixed  $value
+     */
+    public function __set($key, $value)
     {
-        $this->vars[$var] = $val;
+        $this->data[$key] = $value;
     }
 
+    /**
+     * @return string
+     */
     public function render()
     {
-        if ($this->isContent) {
-            return $this->vars['content'];
-        } else {
-            extract($this->vars);
+        extract($this->data);
 
-            ob_start();
+        ob_start();
 
-            require($this->viewFile);
+        require($this->viewFile);
 
-            $html = ob_get_contents();
-            ob_end_clean();
+        $html = ob_get_contents();
+        ob_end_clean();
 
-            return $html;
-        }
+        return $html;
     }
 
     /**
diff --git a/tests/src/ViewTest.php b/tests/src/ViewTest.php
index 161534e4..d6a62f5e 100755
--- a/tests/src/ViewTest.php
+++ b/tests/src/ViewTest.php
@@ -29,11 +29,4 @@ class ViewTest extends \PHPUnit\Framework\TestCase
         self::assertFalse(isset($view->what));
         self::assertTrue($view->render() == 'Hello World');
     }
-
-    public function testUserViewVars()
-    {
-        $view          = new View('{@content}');
-        $view->content = 'World';
-        self::assertTrue($view->render() == 'World');
-    }
 }