Refactoring.

Author: meet-aleksey

src/Html.php

@@ -177,7 +177,7 @@ public static function render($path, $model = null) {
      */
     public static function view($path, $model = null) {
         if (($viewPath = PathUtility::getViewFilePath($path)) !== false) {
-            return Make::getView($viewPath, $model);
+            return InternalHelper::getView($viewPath, $model);
         }
         else {
             throw new ViewNotFoundException($path);

src/HttpRequestBase.php

@@ -74,7 +74,14 @@ abstract class HttpRequestBase {
      * 
      * @var array
      */
-    private $headers = null;
+    protected $headers = null;
+
+    /**
+     * Document root path.
+     * 
+     * @var string
+     */
+    protected $documentRoot = null;
 
     /**
      * Initializes a new instance of the HttpRequestBase with the specified parameters.
@@ -184,7 +191,11 @@ public function queryString($key = null) {
      * @return string
      */
     public function documentRoot() {
-        return $this->serverVariables['DOCUMENT_ROOT'];
+        if ($this->documentRoot == null) {
+            $this->documentRoot = isset($this->serverVariables['DOCUMENT_ROOT']) ? $this->serverVariables['DOCUMENT_ROOT'] : substr(PHPMVC_ROOT_PATH, 0, -1);
+        }
+
+        return $this->documentRoot;
     }
 
     /**

src/InternalHelper.php

@@ -105,4 +105,59 @@ public static function invokeMethod($class, $name) {
         return $property->invoke($class);
     }
 
+    /**
+     * Gets the view.
+     * 
+     * @param string $path File name or path to the view file.
+     * 
+     * @return string
+     */
+    public static function getView($path) {
+        if ($path === false) {
+            throw new \Exception('The view file is not specified. Probably the correct path to the file was not found. Make sure that all paths are specified correctly, the files exists and is available.');
+        }
+
+        ob_start();
+
+        require($path);
+
+        $result = ob_get_contents();
+
+        ob_end_clean();
+
+        return $result;
+    }
+
+    /**
+     * Converts array to object,
+     * 
+     * @param array $array The array to convert.
+     * @param \stdClass $parent The parent object.
+     * 
+     * @return \stdClass
+     */
+    public static function arrayToObject($array, $parent = null) {
+        $result = isset($parent) ? $parent : new \stdClass();
+        
+        ksort($array);
+
+        foreach ($array as $key => $value)
+        {
+            if (strpos($key, '_') === false) {
+                $result->$key = $value;
+            } else {
+                $name = explode('_', $key);
+                $newKey = array_shift($name);
+
+                if (!isset($result->$newKey)) {
+                    $result->$newKey = new \stdClass();
+                }
+                
+                self::arrayToObject(array($name[0] => $value), $result->$newKey);
+            }
+        }
+
+        return $result;
+    }
+
 }