Merge pull request #60 from zfhassaan/master

Update for #58 Issue
Flynsarmy · Feb 17, 2023 · 5336b97 · 5336b97
2 parents e2cc151 + 8622265
commit 5336b97
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/Flynsarmy/DbBladeCompiler/DbBladeCompilerEngine.php b/src/Flynsarmy/DbBladeCompiler/DbBladeCompilerEngine.php
@@ -13,4 +13,14 @@ public function __construct(DbBladeCompiler $bladeCompiler)
     {
         parent::__construct($bladeCompiler);
     }
+
+    /**
+     * @param string $compiled_path
+     * @param array $data
+     * @return string
+     */
+    public function getContent(string $compiled_path, array $data)
+    {
+        return $this->evaluatePath($compiled_path, $data);
+    }
 }
diff --git a/src/Flynsarmy/DbBladeCompiler/DbView.php b/src/Flynsarmy/DbBladeCompiler/DbView.php
@@ -109,8 +109,10 @@ protected function getContents()
     {
         $field = $this->config->get('db-blade-compiler.model_property');
         $this->path->{$field} = $this->content_field;
+        $compiler = $this->engine->getCompiler();
+        $compiler->compile($this->path);
 
-        return parent::getContents();
+        return $this->engine->getContent($compiler->getCompiledPath($this->path), $this->data);
     }
 
     /**