@@ -325,7 +325,7 @@ |
||
325 | 325 | * @param string $openTag |
326 | 326 | * @param string $closeTag |
327 | 327 | * |
328 | - * @return mixed|string |
|
328 | + * @return string |
|
329 | 329 | */ |
330 | 330 | private function removeElement(string $s, string $openTag, string $closeTag) |
331 | 331 | { |
@@ -114,7 +114,7 @@ |
||
114 | 114 | $twigEnvironment->addFunction($function); |
115 | 115 | |
116 | 116 | $template = $twigEnvironment->loadTemplate($this->twigPath); |
117 | - $context = $twigEnvironment->mergeGlobals($data); |
|
117 | + $context = $twigEnvironment->mergeGlobals($data); |
|
118 | 118 | |
119 | 119 | if (!$template->hasBlock('subject', $context) || (!$template->hasBlock('body_html', $context) && !$template->hasBlock('body_text', $context))) { |
120 | 120 | throw MissingBlockException::missingBlock($template->getBlockNames()); |