update sandbox

bavix · Dec 22, 2017 · 00ee5d0 · 00ee5d0
1 parent d28be45
commit 00ee5d0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 20 deletions.
diff --git a/src/FlowNative/FlowNative.php b/src/FlowNative/FlowNative.php
@@ -98,7 +98,7 @@ public function path(string $view): string
         {
             return $view;
         }
-        
+
         list($bundle, $path) = explode(':', $view, 2);
 
         return $this->folder($bundle, $path);
@@ -125,8 +125,12 @@ public function sandbox(): Sandbox
      */
     public function render($view, array $arguments = [])
     {
-        return $this->sandbox()
+        \ob_start();
+
+        $this->sandbox()
             ->execute($view, $arguments);
+
+        return \trim(\ob_get_clean());
     }
 
 }
diff --git a/src/FlowNative/Sandbox.php b/src/FlowNative/Sandbox.php
@@ -43,7 +43,7 @@ public function content(): Context
      *
      * @return string
      */
-    public function execute(string $view, array $arguments): string
+    public function execute(string $view, array $arguments)
     {
         /**
          * @var Closure $sandbox
@@ -55,24 +55,13 @@ public function execute(string $view, array $arguments): string
          *
          * @return string
          */
-        $sandbox = function (string $__flow__view) {
-
-            /**
-             * @var Context $this
-             */
-            \extract($this->exports(), EXTR_REFS);
-
-//            \ob_start();
-            require $this->native->path($__flow__view);
+        $sandbox = function (string $__flow__view)
+        {
+            include $this->native->path($__flow__view);
 
-            return //[
-//                \trim(\ob_get_clean()),
-                $this->ext->blocks()->getExtends()//            ];
-                ;
+            return $this->ext->blocks()->getExtends();
         };
 
-        \ob_start();
-
         $content  = clone $this->content;
         $_view    = $view;
         $iterator = 0;
@@ -94,8 +83,6 @@ public function execute(string $view, array $arguments): string
             );
         }
         while ($_view);
-
-        return \trim(\ob_get_clean());
     }
 
 }