Allow tag instantiation to be overridden

csrdelft · Mar 24, 2020 · 4ce7b21 · 4ce7b21
1 parent 9b0a1f1
commit 4ce7b21
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/BbTag.php b/src/BbTag.php
@@ -21,8 +21,11 @@ abstract class BbTag {
      */
     protected $content = null;
 
-    public function __construct(Parser $parser, $env) {
+    public function setParser(Parser $parser) {
         $this->parser = $parser;
+    }
+
+    public function setEnv($env) {
         $this->env = $env;
     }
 

diff --git a/src/Parser.php b/src/Parser.php
@@ -309,7 +309,7 @@ public function parseArray($stoppers = [], $forbidden = []) {
                 $exists = isset($this->registry[$tag]);
 
                 if ($this->bb_mode && $isOpenTag && $exists && $isAllowed) {
-                    $tagInstance = new $this->registry[$tag]($this, $this->env);
+                    $tagInstance = $this->createTagInstance($this->registry[$tag], $this, $this->env);
 
                     $arguments = $this->getArguments($entry);
 
@@ -476,4 +476,13 @@ private function getArguments($fullTag) {
         return $argument_array;
     }
 
+    protected function createTagInstance(string $tag, Parser $parser, $env) {
+        /** @var BbTag $tagInstance */
+        $tagInstance = new $tag($parser, $env);
+        $tagInstance->setParser($parser);
+        $tagInstance->setEnv($env);
+
+        return $tagInstance;
+    }
+
 }