some update for viewRenderer

Author: inhere

src/Helpers/PhpHelper.php

@@ -71,7 +71,7 @@ public static function runtime($startTime, $startMem, array $info = [])
 
         if ($startMem) {
             $startMem = array_sum(explode(' ', $startMem));
-            $endMem = array_sum(explode(' ', memory_get_usage()));
+            $endMem = array_sum(explode(' ', memory_get_usage(true)));
 
             $info['memory'] = number_format(($endMem - $startMem) / 1024, 3) . 'kb';
         }

src/Web/ViewRenderer.php

@@ -23,21 +23,16 @@ class ViewRenderer
      */
     protected $viewsPath;
 
-    /**
-     * 默认布局文件
-     * @var string
-     */
+    /** @var null|string 默认布局文件 */
     protected $layout;
 
-    /**
-     * @var array
-     */
+    /** @var array Attributes for the view */
     protected $attributes;
 
-    /** @var string  */
+    /** @var string Default view suffix. */
     protected $suffix = 'php';
 
-    /** @var array allowed suffix list */
+    /** @var array Allowed suffix list */
     protected $suffixes = ['php','tpl','html'];
 
     /**
@@ -118,6 +113,81 @@ public function renderContent($content, array $data = [], $layout = null)
         return $content;
     }
 
+    /**
+     * @param $view
+     * @param array $data
+     * @param bool $outputIt
+     * @return string|null
+     * @throws \Throwable
+     */
+    public function include($view, array $data = [], $outputIt = true)
+    {
+        if ($outputIt) {
+            echo $this->fetch($view, $data);
+            return null;
+        }
+
+        return $this->fetch($view, $data);
+    }
+
+    /**
+     * Renders a view and returns the result as a string
+     * throws RuntimeException if $viewsPath . $view does not exist
+     * @param string $view
+     * @param array $data
+     * @return mixed
+     * @throws \Throwable
+     */
+    public function fetch($view, array $data = [])
+    {
+        $file = $this->getViewFile($view);
+
+        if (!is_file($file)) {
+            throw new \RuntimeException("cannot render '$view' because the view file does not exist. File: $file");
+        }
+
+        /*
+        foreach ($data as $k=>$val) {
+            if (in_array($k, array_keys($this->attributes))) {
+                throw new \InvalidArgumentException("Duplicate key found in data and renderer attributes. " . $k);
+            }
+        }
+        */
+        $data = array_merge($this->attributes, $data);
+
+        try {
+            ob_start();
+            $this->protectedIncludeScope($file, $data);
+            $output = ob_get_clean();
+        } catch (\Throwable $e) { // PHP 7+
+            ob_end_clean();
+            throw $e;
+        }
+
+        return $output;
+    }
+
+    /**
+     * @param $view
+     * @return string
+     */
+    public function getViewFile($view)
+    {
+        $view = $this->getRealView($view);
+
+        return File::isAbsPath($view) ? $view : $this->viewsPath . $view;
+    }
+
+    /**
+     * @param string $file
+     * @param array $data
+     */
+    protected function protectedIncludeScope($file, array $data)
+    {
+        extract($data, EXTR_OVERWRITE);
+        include $file;
+    }
+
     /**
      * Get the attributes for the renderer
      * @return array
@@ -154,7 +224,7 @@ public function addAttribute($key, $value)
     public function getAttribute($key)
     {
         if (!isset($this->attributes[$key])) {
-            return false;
+            return null;
         }
 
         return $this->attributes[$key];
@@ -198,69 +268,6 @@ public function setLayout($layout)
         $this->layout = rtrim($layout, '/\\');
     }
 
-    /**
-     * Renders a view and returns the result as a string
-     * cannot contain view as a key
-     * throws RuntimeException if $viewsPath . $view does not exist
-     * @param $view
-     * @param array $data
-     * @return mixed
-     * @throws \Throwable
-     */
-    public function fetch($view, array $data = [])
-    {
-        if (isset($data['view'])) {
-            throw new \InvalidArgumentException('Duplicate view key found');
-        }
-
-        $file = $this->getViewFile($view);
-
-        if (!is_file($file)) {
-            throw new \RuntimeException("cannot render '$view' because the view file does not exist. File: $file");
-        }
-
-        /*
-        foreach ($data as $k=>$val) {
-            if (in_array($k, array_keys($this->attributes))) {
-                throw new \InvalidArgumentException("Duplicate key found in data and renderer attributes. " . $k);
-            }
-        }
-        */
-        $data = array_merge($this->attributes, $data);
-
-        try {
-            ob_start();
-            $this->protectedIncludeScope($file, $data);
-            $output = ob_get_clean();
-        } catch (\Throwable $e) { // PHP 7+
-            ob_end_clean();
-            throw $e;
-        }
-
-        return $output;
-    }
-
-    /**
-     * @param $view
-     * @return string
-     */
-    public function getViewFile($view)
-    {
-        $view = $this->getRealView($view);
-
-        return File::isAbsPath($view) ? $view : $this->viewsPath . $view;
-    }
-
-    /**
-     * @param string $file
-     * @param array $data
-     */
-    protected function protectedIncludeScope($file, array $data)
-    {
-        extract($data, EXTR_OVERWRITE);
-        include $file;
-    }
-
     /**
      * @return string
      */