Merge pull request #8 from tattersoftware/body-bug

Prevent {body} token inheriting

Author: MGatner

src/Entities/Template.php

@@ -68,7 +68,9 @@ public function getTokens(): array
 
 		if ($parent = $this->getParent())
 		{
-			$matches[1] = array_unique(array_merge($parent->getTokens(), $matches[1]));
+			// Prepend parent tokens (minus {body})
+			$parentTokens = array_diff($parent->getTokens(), ['body']);
+			$matches[1]   = array_unique(array_merge($parentTokens, $matches[1]));
 		}
 
 		return $matches[1];

tests/entities/ParentTemplateTest.php

@@ -47,7 +47,8 @@ public function setUp(): void
 
 	public function testChildIncludesParentTokens()
 	{
-		$expected = ['subject', 'body', 'foobar', 'number'];
+		// Notice that {body} is intentionally excluded
+		$expected = ['subject', 'foobar', 'number'];
 		$result   = $this->template->getTokens();
 
 		$this->assertEquals($expected, array_values($result));