Skip to content

Commit

Permalink
Merge branch 'b-7.0.x-issue-with-dot-in-template-names-OXDEV-6895' in…
Browse files Browse the repository at this point in the history
…to b-7.1.x-issue-with-dot-in-template-names-OXDEV-6895
  • Loading branch information
Jelle72 committed Nov 21, 2023
2 parents 5dc0c77 + 63b3f12 commit 79932aa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 14 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Change Log for OXID Twig engine component

## v2.2.0 - unreleased
## v2.2.0 - 2023-11-16

### Deprecated
- `SmartyCycleExtension` will be removed
Expand Down
14 changes: 1 addition & 13 deletions src/TwigEngine.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,28 +86,16 @@ public function renderFragment(string $fragment, string $fragmentId, array $cont
->render($context);
}

/**
* @param string $name
* @param mixed $value
*/
public function addGlobal(string $name, $value)
public function addGlobal(string $name, mixed $value)
{
$this->engine->addGlobal($name, $value);
}

/**
* Returns assigned globals.
*
* @return array
*/
public function getGlobals(): array
{
return $this->engine->getGlobals();
}

/**
* @param EscaperInterface $escaper
*/
public function addEscaper(EscaperInterface $escaper)
{
/** @var EscaperExtension $escaperExtension */
Expand Down

0 comments on commit 79932aa

Please sign in to comment.