diff --git a/.appveyor.yml b/.appveyor.yml index aa41f4b561..84be8fbae3 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -29,6 +29,7 @@ install: - echo max_execution_time=1200 >> php.ini-min - echo date.timezone="America/Los_Angeles" >> php.ini-min - echo extension_dir=ext >> php.ini-min + - echo extension=php_xsl.dll >> php.ini-min - copy /Y php.ini-min php.ini-max - echo zend_extension=php_opcache.dll >> php.ini-max - echo opcache.enable_cli=1 >> php.ini-max diff --git a/composer.json b/composer.json index da182ca589..bb539b5105 100644 --- a/composer.json +++ b/composer.json @@ -119,7 +119,10 @@ "egulias/email-validator": "~1.2,>=1.2.8|~2.0", "symfony/phpunit-bridge": "^3.4.31|^4.3.4|~5.0", "symfony/security-acl": "~2.8|~3.0", - "phpdocumentor/reflection-docblock": "^3.0|^4.0" + "phpdocumentor/reflection-docblock": "^3.0|^4.0", + "twig/cssinliner-extra": "^2.12", + "twig/inky-extra": "^2.12", + "twig/markdown-extra": "^2.12" }, "conflict": { "masterminds/html5": "<2.6", diff --git a/src/Symfony/Bridge/Twig/Mime/BodyRenderer.php b/src/Symfony/Bridge/Twig/Mime/BodyRenderer.php index 1af04720d1..e1031b3d56 100644 --- a/src/Symfony/Bridge/Twig/Mime/BodyRenderer.php +++ b/src/Symfony/Bridge/Twig/Mime/BodyRenderer.php @@ -47,7 +47,7 @@ final class BodyRenderer implements BodyRendererInterface $messageContext = $message->getContext(); if (isset($messageContext['email'])) { - throw new InvalidArgumentException(sprintf('A "%s" context cannot have an "email" entry as this is a reserved variable.', TemplatedEmail::class)); + throw new InvalidArgumentException(sprintf('A "%s" context cannot have an "email" entry as this is a reserved variable.', \get_class($message))); } $vars = array_merge($this->context, $messageContext, [ diff --git a/src/Symfony/Bridge/Twig/Mime/NotificationEmail.php b/src/Symfony/Bridge/Twig/Mime/NotificationEmail.php new file mode 100644 index 0000000000..17a9c629f7 --- /dev/null +++ b/src/Symfony/Bridge/Twig/Mime/NotificationEmail.php @@ -0,0 +1,216 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Bridge\Twig\Mime; + +use Symfony\Component\ErrorRenderer\Exception\FlattenException; +use Symfony\Component\Mime\Header\Headers; +use Symfony\Component\Mime\Part\AbstractPart; +use Twig\Extra\CssInliner\CssInlinerExtension; +use Twig\Extra\Inky\InkyExtension; +use Twig\Extra\Markdown\MarkdownExtension; + +/** + * @author Fabien Potencier + */ +class NotificationEmail extends TemplatedEmail +{ + public const IMPORTANCE_URGENT = 'urgent'; + public const IMPORTANCE_HIGH = 'high'; + public const IMPORTANCE_MEDIUM = 'medium'; + public const IMPORTANCE_LOW = 'low'; + + private $theme = 'default'; + private $context = [ + 'importance' => self::IMPORTANCE_LOW, + 'content' => '', + 'exception' => false, + 'action_text' => null, + 'action_url' => null, + 'markdown' => false, + 'raw' => false, + ]; + + public function __construct(Headers $headers = null, AbstractPart $body = null) + { + if (!class_exists(CssInlinerExtension::class)) { + throw new \LogicException(sprintf('You cannot use "%s" if the CSS Inliner Twig extension is not available; try running "composer require twig/cssinliner-extra".', static::class)); + } + + if (!class_exists(InkyExtension::class)) { + throw new \LogicException(sprintf('You cannot use "%s" if the Inky Twig extension is not available; try running "composer require twig/inky-extra".', static::class)); + } + + parent::__construct($headers, $body); + } + + /** + * @return $this + */ + public function markdown(string $content) + { + if (!class_exists(MarkdownExtension::class)) { + throw new \LogicException(sprintf('You cannot use "%s" if the Markdown Twig extension is not available; try running "composer require twig/markdown-extra".', __METHOD__)); + } + + $this->context['markdown'] = true; + + return $this->content($content); + } + + /** + * @return $this + */ + public function content(string $content, bool $raw = false) + { + $this->context['content'] = $content; + $this->context['raw'] = $raw; + + return $this; + } + + /** + * @return $this + */ + public function action(string $text, string $url) + { + $this->context['action_text'] = $text; + $this->context['action_url'] = $url; + + return $this; + } + + /** + * @return self + */ + public function importance(string $importance) + { + $this->context['importance'] = $importance; + + return $this; + } + + /** + * @param \Throwable|FlattenException + * + * @return $this + */ + public function exception($exception) + { + $exceptionAsString = $this->getExceptionAsString($exception); + + $this->context['exception'] = true; + $this->attach($exceptionAsString, 'exception.txt', 'text/plain'); + $this->importance(self::IMPORTANCE_URGENT); + + if (!$this->getSubject()) { + $this->subject($exception->getMessage()); + } + + return $this; + } + + /** + * @return $this + */ + public function theme(string $theme) + { + $this->theme = $theme; + + return $this; + } + + public function getTextTemplate(): ?string + { + if ($template = parent::getTextTemplate()) { + return $template; + } + + return '@email/'.$this->theme.'/notification/body.txt.twig'; + } + + public function getHtmlTemplate(): ?string + { + if ($template = parent::getHtmlTemplate()) { + return $template; + } + + return '@email/'.$this->theme.'/notification/body.html.twig'; + } + + public function getContext(): array + { + return array_merge($this->context, parent::getContext()); + } + + public function getPreparedHeaders(): Headers + { + $headers = parent::getPreparedHeaders(); + + $importance = $this->context['importance'] ?? IMPORTANCE_LOW; + $this->priority($this->determinePriority($importance)); + $headers->setHeaderBody('Text', 'Subject', sprintf('[%s] %s', strtoupper($importance), $this->getSubject())); + + return $headers; + } + + private function determinePriority(string $importance): int + { + switch ($importance) { + case self::IMPORTANCE_URGENT: + return self::PRIORITY_HIGHEST; + case self::IMPORTANCE_HIGH: + return self::PRIORITY_HIGH; + case self::IMPORTANCE_MEDIUM: + return self::PRIORITY_NORMAL; + case self::IMPORTANCE_LOW: + default: + return self::PRIORITY_LOW; + } + } + + private function getExceptionAsString($exception): string + { + if (class_exists(FlattenException::class)) { + $exception = $exception instanceof FlattenException ? $exception : FlattenException::createFromThrowable($exception); + + return $exception->getAsString(); + } + + $message = \get_class($exception); + if ('' != $exception->getMessage()) { + $message .= ': '.$exception->getMessage(); + } + + $message .= ' in '.$exception->getFile().':'.$exception->getLine()."\n"; + $message .= "Stack trace:\n".$exception->getTraceAsString()."\n\n"; + + return rtrim($message); + } + + /** + * @internal + */ + public function __serialize(): array + { + return [$this->context, parent::__serialize()]; + } + + /** + * @internal + */ + public function __unserialize(array $data): void + { + [$this->context, $parentData] = $data; + + parent::__unserialize($parentData); + } +} diff --git a/src/Symfony/Bridge/Twig/Resources/views/Email/default/notification/body.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Email/default/notification/body.html.twig new file mode 100644 index 0000000000..9027546861 --- /dev/null +++ b/src/Symfony/Bridge/Twig/Resources/views/Email/default/notification/body.html.twig @@ -0,0 +1 @@ +{% extends "@email/zurb_2/notification/body.html.twig" %} diff --git a/src/Symfony/Bridge/Twig/Resources/views/Email/default/notification/body.txt.twig b/src/Symfony/Bridge/Twig/Resources/views/Email/default/notification/body.txt.twig new file mode 100644 index 0000000000..37671b1f28 --- /dev/null +++ b/src/Symfony/Bridge/Twig/Resources/views/Email/default/notification/body.txt.twig @@ -0,0 +1 @@ +{% extends "@email/zurb_2/notification/body.txt.twig" %} diff --git a/src/Symfony/Bridge/Twig/Resources/views/Email/zurb_2/main.css b/src/Symfony/Bridge/Twig/Resources/views/Email/zurb_2/main.css new file mode 100644 index 0000000000..b826813ec5 --- /dev/null +++ b/src/Symfony/Bridge/Twig/Resources/views/Email/zurb_2/main.css @@ -0,0 +1,1667 @@ +/* + * Copyright (c) 2017 ZURB, inc. -- MIT License + * + * https://raw.githubusercontent.com/foundation/foundation-emails/v2.2.1/dist/foundation-emails.css + */ + +.wrapper { + width: 100%; +} + +#outlook a { + padding: 0; +} + +body { + width: 100% !important; + min-width: 100%; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; + margin: 0; + Margin: 0; + padding: 0; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; +} + +.ExternalClass { + width: 100%; +} + +.ExternalClass, +.ExternalClass p, +.ExternalClass span, +.ExternalClass font, +.ExternalClass td, +.ExternalClass div { + line-height: 100%; +} + +#backgroundTable { + margin: 0; + Margin: 0; + padding: 0; + width: 100% !important; + line-height: 100% !important; +} + +img { + outline: none; + text-decoration: none; + -ms-interpolation-mode: bicubic; + width: auto; + max-width: 100%; + clear: both; + display: block; +} + +center { + width: 100%; + min-width: 580px; +} + +a img { + border: none; +} + +p { + margin: 0 0 0 10px; + Margin: 0 0 0 10px; +} + +table { + border-spacing: 0; + border-collapse: collapse; +} + +td { + word-wrap: break-word; + -webkit-hyphens: auto; + -moz-hyphens: auto; + hyphens: auto; + border-collapse: collapse !important; +} + +table, +tr, +td { + padding: 0; + vertical-align: top; + text-align: left; +} + +@media only screen { + html { + min-height: 100%; + background: #f3f3f3; + } +} + +table.body { + background: #f3f3f3; + height: 100%; + width: 100%; +} + +table.container { + background: #fefefe; + width: 580px; + margin: 0 auto; + Margin: 0 auto; + text-align: inherit; +} + +table.row { + padding: 0; + width: 100%; + position: relative; +} + +table.spacer { + width: 100%; +} + +table.spacer td { + mso-line-height-rule: exactly; +} + +table.container table.row { + display: table; +} + +td.columns, +td.column, +th.columns, +th.column { + margin: 0 auto; + Margin: 0 auto; + padding-left: 16px; + padding-bottom: 16px; +} + +td.columns .column, +td.columns .columns, +td.column .column, +td.column .columns, +th.columns .column, +th.columns .columns, +th.column .column, +th.column .columns { + padding-left: 0 !important; + padding-right: 0 !important; +} + +td.columns .column center, +td.columns .columns center, +td.column .column center, +td.column .columns center, +th.columns .column center, +th.columns .columns center, +th.column .column center, +th.column .columns center { + min-width: none !important; +} + +td.columns.last, +td.column.last, +th.columns.last, +th.column.last { + padding-right: 16px; +} + +td.columns table:not(.button), +td.column table:not(.button), +th.columns table:not(.button), +th.column table:not(.button) { + width: 100%; +} + +td.large-1, +th.large-1 { + width: 32.33333px; + padding-left: 8px; + padding-right: 8px; +} + +td.large-1.first, +th.large-1.first { + padding-left: 16px; +} + +td.large-1.last, +th.large-1.last { + padding-right: 16px; +} + +.collapse>tbody>tr>td.large-1, +.collapse>tbody>tr>th.large-1 { + padding-right: 0; + padding-left: 0; + width: 48.33333px; +} + +.collapse td.large-1.first, +.collapse th.large-1.first, +.collapse td.large-1.last, +.collapse th.large-1.last { + width: 56.33333px; +} + +td.large-1 center, +th.large-1 center { + min-width: 0.33333px; +} + +.body .columns td.large-1, +.body .column td.large-1, +.body .columns th.large-1, +.body .column th.large-1 { + width: 8.33333%; +} + +td.large-2, +th.large-2 { + width: 80.66667px; + padding-left: 8px; + padding-right: 8px; +} + +td.large-2.first, +th.large-2.first { + padding-left: 16px; +} + +td.large-2.last, +th.large-2.last { + padding-right: 16px; +} + +.collapse>tbody>tr>td.large-2, +.collapse>tbody>tr>th.large-2 { + padding-right: 0; + padding-left: 0; + width: 96.66667px; +} + +.collapse td.large-2.first, +.collapse th.large-2.first, +.collapse td.large-2.last, +.collapse th.large-2.last { + width: 104.66667px; +} + +td.large-2 center, +th.large-2 center { + min-width: 48.66667px; +} + +.body .columns td.large-2, +.body .column td.large-2, +.body .columns th.large-2, +.body .column th.large-2 { + width: 16.66667%; +} + +td.large-3, +th.large-3 { + width: 129px; + padding-left: 8px; + padding-right: 8px; +} + +td.large-3.first, +th.large-3.first { + padding-left: 16px; +} + +td.large-3.last, +th.large-3.last { + padding-right: 16px; +} + +.collapse>tbody>tr>td.large-3, +.collapse>tbody>tr>th.large-3 { + padding-right: 0; + padding-left: 0; + width: 145px; +} + +.collapse td.large-3.first, +.collapse th.large-3.first, +.collapse td.large-3.last, +.collapse th.large-3.last { + width: 153px; +} + +td.large-3 center, +th.large-3 center { + min-width: 97px; +} + +.body .columns td.large-3, +.body .column td.large-3, +.body .columns th.large-3, +.body .column th.large-3 { + width: 25%; +} + +td.large-4, +th.large-4 { + width: 177.33333px; + padding-left: 8px; + padding-right: 8px; +} + +td.large-4.first, +th.large-4.first { + padding-left: 16px; +} + +td.large-4.last, +th.large-4.last { + padding-right: 16px; +} + +.collapse>tbody>tr>td.large-4, +.collapse>tbody>tr>th.large-4 { + padding-right: 0; + padding-left: 0; + width: 193.33333px; +} + +.collapse td.large-4.first, +.collapse th.large-4.first, +.collapse td.large-4.last, +.collapse th.large-4.last { + width: 201.33333px; +} + +td.large-4 center, +th.large-4 center { + min-width: 145.33333px; +} + +.body .columns td.large-4, +.body .column td.large-4, +.body .columns th.large-4, +.body .column th.large-4 { + width: 33.33333%; +} + +td.large-5, +th.large-5 { + width: 225.66667px; + padding-left: 8px; + padding-right: 8px; +} + +td.large-5.first, +th.large-5.first { + padding-left: 16px; +} + +td.large-5.last, +th.large-5.last { + padding-right: 16px; +} + +.collapse>tbody>tr>td.large-5, +.collapse>tbody>tr>th.large-5 { + padding-right: 0; + padding-left: 0; + width: 241.66667px; +} + +.collapse td.large-5.first, +.collapse th.large-5.first, +.collapse td.large-5.last, +.collapse th.large-5.last { + width: 249.66667px; +} + +td.large-5 center, +th.large-5 center { + min-width: 193.66667px; +} + +.body .columns td.large-5, +.body .column td.large-5, +.body .columns th.large-5, +.body .column th.large-5 { + width: 41.66667%; +} + +td.large-6, +th.large-6 { + width: 274px; + padding-left: 8px; + padding-right: 8px; +} + +td.large-6.first, +th.large-6.first { + padding-left: 16px; +} + +td.large-6.last, +th.large-6.last { + padding-right: 16px; +} + +.collapse>tbody>tr>td.large-6, +.collapse>tbody>tr>th.large-6 { + padding-right: 0; + padding-left: 0; + width: 290px; +} + +.collapse td.large-6.first, +.collapse th.large-6.first, +.collapse td.large-6.last, +.collapse th.large-6.last { + width: 298px; +} + +td.large-6 center, +th.large-6 center { + min-width: 242px; +} + +.body .columns td.large-6, +.body .column td.large-6, +.body .columns th.large-6, +.body .column th.large-6 { + width: 50%; +} + +td.large-7, +th.large-7 { + width: 322.33333px; + padding-left: 8px; + padding-right: 8px; +} + +td.large-7.first, +th.large-7.first { + padding-left: 16px; +} + +td.large-7.last, +th.large-7.last { + padding-right: 16px; +} + +.collapse>tbody>tr>td.large-7, +.collapse>tbody>tr>th.large-7 { + padding-right: 0; + padding-left: 0; + width: 338.33333px; +} + +.collapse td.large-7.first, +.collapse th.large-7.first, +.collapse td.large-7.last, +.collapse th.large-7.last { + width: 346.33333px; +} + +td.large-7 center, +th.large-7 center { + min-width: 290.33333px; +} + +.body .columns td.large-7, +.body .column td.large-7, +.body .columns th.large-7, +.body .column th.large-7 { + width: 58.33333%; +} + +td.large-8, +th.large-8 { + width: 370.66667px; + padding-left: 8px; + padding-right: 8px; +} + +td.large-8.first, +th.large-8.first { + padding-left: 16px; +} + +td.large-8.last, +th.large-8.last { + padding-right: 16px; +} + +.collapse>tbody>tr>td.large-8, +.collapse>tbody>tr>th.large-8 { + padding-right: 0; + padding-left: 0; + width: 386.66667px; +} + +.collapse td.large-8.first, +.collapse th.large-8.first, +.collapse td.large-8.last, +.collapse th.large-8.last { + width: 394.66667px; +} + +td.large-8 center, +th.large-8 center { + min-width: 338.66667px; +} + +.body .columns td.large-8, +.body .column td.large-8, +.body .columns th.large-8, +.body .column th.large-8 { + width: 66.66667%; +} + +td.large-9, +th.large-9 { + width: 419px; + padding-left: 8px; + padding-right: 8px; +} + +td.large-9.first, +th.large-9.first { + padding-left: 16px; +} + +td.large-9.last, +th.large-9.last { + padding-right: 16px; +} + +.collapse>tbody>tr>td.large-9, +.collapse>tbody>tr>th.large-9 { + padding-right: 0; + padding-left: 0; + width: 435px; +} + +.collapse td.large-9.first, +.collapse th.large-9.first, +.collapse td.large-9.last, +.collapse th.large-9.last { + width: 443px; +} + +td.large-9 center, +th.large-9 center { + min-width: 387px; +} + +.body .columns td.large-9, +.body .column td.large-9, +.body .columns th.large-9, +.body .column th.large-9 { + width: 75%; +} + +td.large-10, +th.large-10 { + width: 467.33333px; + padding-left: 8px; + padding-right: 8px; +} + +td.large-10.first, +th.large-10.first { + padding-left: 16px; +} + +td.large-10.last, +th.large-10.last { + padding-right: 16px; +} + +.collapse>tbody>tr>td.large-10, +.collapse>tbody>tr>th.large-10 { + padding-right: 0; + padding-left: 0; + width: 483.33333px; +} + +.collapse td.large-10.first, +.collapse th.large-10.first, +.collapse td.large-10.last, +.collapse th.large-10.last { + width: 491.33333px; +} + +td.large-10 center, +th.large-10 center { + min-width: 435.33333px; +} + +.body .columns td.large-10, +.body .column td.large-10, +.body .columns th.large-10, +.body .column th.large-10 { + width: 83.33333%; +} + +td.large-11, +th.large-11 { + width: 515.66667px; + padding-left: 8px; + padding-right: 8px; +} + +td.large-11.first, +th.large-11.first { + padding-left: 16px; +} + +td.large-11.last, +th.large-11.last { + padding-right: 16px; +} + +.collapse>tbody>tr>td.large-11, +.collapse>tbody>tr>th.large-11 { + padding-right: 0; + padding-left: 0; + width: 531.66667px; +} + +.collapse td.large-11.first, +.collapse th.large-11.first, +.collapse td.large-11.last, +.collapse th.large-11.last { + width: 539.66667px; +} + +td.large-11 center, +th.large-11 center { + min-width: 483.66667px; +} + +.body .columns td.large-11, +.body .column td.large-11, +.body .columns th.large-11, +.body .column th.large-11 { + width: 91.66667%; +} + +td.large-12, +th.large-12 { + width: 564px; + padding-left: 8px; + padding-right: 8px; +} + +td.large-12.first, +th.large-12.first { + padding-left: 16px; +} + +td.large-12.last, +th.large-12.last { + padding-right: 16px; +} + +.collapse>tbody>tr>td.large-12, +.collapse>tbody>tr>th.large-12 { + padding-right: 0; + padding-left: 0; + width: 580px; +} + +.collapse td.large-12.first, +.collapse th.large-12.first, +.collapse td.large-12.last, +.collapse th.large-12.last { + width: 588px; +} + +td.large-12 center, +th.large-12 center { + min-width: 532px; +} + +.body .columns td.large-12, +.body .column td.large-12, +.body .columns th.large-12, +.body .column th.large-12 { + width: 100%; +} + +td.large-offset-1, +td.large-offset-1.first, +td.large-offset-1.last, +th.large-offset-1, +th.large-offset-1.first, +th.large-offset-1.last { + padding-left: 64.33333px; +} + +td.large-offset-2, +td.large-offset-2.first, +td.large-offset-2.last, +th.large-offset-2, +th.large-offset-2.first, +th.large-offset-2.last { + padding-left: 112.66667px; +} + +td.large-offset-3, +td.large-offset-3.first, +td.large-offset-3.last, +th.large-offset-3, +th.large-offset-3.first, +th.large-offset-3.last { + padding-left: 161px; +} + +td.large-offset-4, +td.large-offset-4.first, +td.large-offset-4.last, +th.large-offset-4, +th.large-offset-4.first, +th.large-offset-4.last { + padding-left: 209.33333px; +} + +td.large-offset-5, +td.large-offset-5.first, +td.large-offset-5.last, +th.large-offset-5, +th.large-offset-5.first, +th.large-offset-5.last { + padding-left: 257.66667px; +} + +td.large-offset-6, +td.large-offset-6.first, +td.large-offset-6.last, +th.large-offset-6, +th.large-offset-6.first, +th.large-offset-6.last { + padding-left: 306px; +} + +td.large-offset-7, +td.large-offset-7.first, +td.large-offset-7.last, +th.large-offset-7, +th.large-offset-7.first, +th.large-offset-7.last { + padding-left: 354.33333px; +} + +td.large-offset-8, +td.large-offset-8.first, +td.large-offset-8.last, +th.large-offset-8, +th.large-offset-8.first, +th.large-offset-8.last { + padding-left: 402.66667px; +} + +td.large-offset-9, +td.large-offset-9.first, +td.large-offset-9.last, +th.large-offset-9, +th.large-offset-9.first, +th.large-offset-9.last { + padding-left: 451px; +} + +td.large-offset-10, +td.large-offset-10.first, +td.large-offset-10.last, +th.large-offset-10, +th.large-offset-10.first, +th.large-offset-10.last { + padding-left: 499.33333px; +} + +td.large-offset-11, +td.large-offset-11.first, +td.large-offset-11.last, +th.large-offset-11, +th.large-offset-11.first, +th.large-offset-11.last { + padding-left: 547.66667px; +} + +td.expander, +th.expander { + visibility: hidden; + width: 0; + padding: 0 !important; +} + +table.container.radius { + border-radius: 0; + border-collapse: separate; +} + +.block-grid { + width: 100%; + max-width: 580px; +} + +.block-grid td { + display: inline-block; + padding: 8px; +} + +.up-2 td { + width: 274px !important; +} + +.up-3 td { + width: 177px !important; +} + +.up-4 td { + width: 129px !important; +} + +.up-5 td { + width: 100px !important; +} + +.up-6 td { + width: 80px !important; +} + +.up-7 td { + width: 66px !important; +} + +.up-8 td { + width: 56px !important; +} + +table.text-center, +th.text-center, +td.text-center, +h1.text-center, +h2.text-center, +h3.text-center, +h4.text-center, +h5.text-center, +h6.text-center, +p.text-center, +span.text-center { + text-align: center; +} + +table.text-left, +th.text-left, +td.text-left, +h1.text-left, +h2.text-left, +h3.text-left, +h4.text-left, +h5.text-left, +h6.text-left, +p.text-left, +span.text-left { + text-align: left; +} + +table.text-right, +th.text-right, +td.text-right, +h1.text-right, +h2.text-right, +h3.text-right, +h4.text-right, +h5.text-right, +h6.text-right, +p.text-right, +span.text-right { + text-align: right; +} + +span.text-center { + display: block; + width: 100%; + text-align: center; +} + +@media only screen and (max-width: 596px) { + .small-float-center { + margin: 0 auto !important; + float: none !important; + text-align: center !important; + } + .small-text-center { + text-align: center !important; + } + .small-text-left { + text-align: left !important; + } + .small-text-right { + text-align: right !important; + } +} + +img.float-left { + float: left; + text-align: left; +} + +img.float-right { + float: right; + text-align: right; +} + +img.float-center, +img.text-center { + margin: 0 auto; + Margin: 0 auto; + float: none; + text-align: center; +} + +table.float-center, +td.float-center, +th.float-center { + margin: 0 auto; + Margin: 0 auto; + float: none; + text-align: center; +} + +.hide-for-large { + display: none !important; + mso-hide: all; + overflow: hidden; + max-height: 0; + font-size: 0; + width: 0; + line-height: 0; +} + +@media only screen and (max-width: 596px) { + .hide-for-large { + display: block !important; + width: auto !important; + overflow: visible !important; + max-height: none !important; + font-size: inherit !important; + line-height: inherit !important; + } +} + +table.body table.container .hide-for-large * { + mso-hide: all; +} + +@media only screen and (max-width: 596px) { + table.body table.container .hide-for-large, + table.body table.container .row.hide-for-large { + display: table !important; + width: 100% !important; + } +} + +@media only screen and (max-width: 596px) { + table.body table.container .callout-inner.hide-for-large { + display: table-cell !important; + width: 100% !important; + } +} + +@media only screen and (max-width: 596px) { + table.body table.container .show-for-large { + display: none !important; + width: 0; + mso-hide: all; + overflow: hidden; + } +} + +body, +table.body, +h1, +h2, +h3, +h4, +h5, +h6, +p, +td, +th, +a { + color: #0a0a0a; + font-family: Helvetica, Arial, sans-serif; + font-weight: normal; + padding: 0; + margin: 0; + Margin: 0; + text-align: left; + line-height: 1.3; +} + +h1, +h2, +h3, +h4, +h5, +h6 { + color: inherit; + word-wrap: normal; + font-family: Helvetica, Arial, sans-serif; + font-weight: normal; + margin-bottom: 10px; + Margin-bottom: 10px; +} + +h1 { + font-size: 34px; +} + +h2 { + font-size: 30px; +} + +h3 { + font-size: 28px; +} + +h4 { + font-size: 24px; +} + +h5 { + font-size: 20px; +} + +h6 { + font-size: 18px; +} + +body, +table.body, +p, +td, +th { + font-size: 16px; + line-height: 1.3; +} + +p { + margin-bottom: 10px; + Margin-bottom: 10px; +} + +p.lead { + font-size: 20px; + line-height: 1.6; +} + +p.subheader { + margin-top: 4px; + margin-bottom: 8px; + Margin-top: 4px; + Margin-bottom: 8px; + font-weight: normal; + line-height: 1.4; + color: #8a8a8a; +} + +small { + font-size: 80%; + color: #cacaca; +} + +a { + color: #2199e8; + text-decoration: none; +} + +a:hover { + color: #147dc2; +} + +a:active { + color: #147dc2; +} + +a:visited { + color: #2199e8; +} + +h1 a, +h1 a:visited, +h2 a, +h2 a:visited, +h3 a, +h3 a:visited, +h4 a, +h4 a:visited, +h5 a, +h5 a:visited, +h6 a, +h6 a:visited { + color: #2199e8; +} + +pre { + background: #f3f3f3; + margin: 30px 0; + Margin: 30px 0; +} + +pre code { + color: #cacaca; +} + +pre code span.callout { + color: #8a8a8a; + font-weight: bold; +} + +pre code span.callout-strong { + color: #ff6908; + font-weight: bold; +} + +table.hr { + width: 100%; +} + +table.hr th { + height: 0; + max-width: 580px; + border-top: 0; + border-right: 0; + border-bottom: 1px solid #0a0a0a; + border-left: 0; + margin: 20px auto; + Margin: 20px auto; + clear: both; +} + +.stat { + font-size: 40px; + line-height: 1; +} + +p+.stat { + margin-top: -16px; + Margin-top: -16px; +} + +span.preheader { + display: none !important; + visibility: hidden; + mso-hide: all !important; + font-size: 1px; + color: #f3f3f3; + line-height: 1px; + max-height: 0px; + max-width: 0px; + opacity: 0; + overflow: hidden; +} + +table.button { + width: auto; + margin: 0 0 16px 0; + Margin: 0 0 16px 0; +} + +table.button table td { + text-align: left; + color: #fefefe; + background: #2199e8; + border: 2px solid #2199e8; +} + +table.button table td a { + font-family: Helvetica, Arial, sans-serif; + font-size: 16px; + font-weight: bold; + color: #fefefe; + text-decoration: none; + display: inline-block; + padding: 8px 16px 8px 16px; + border: 0 solid #2199e8; + border-radius: 3px; +} + +table.button.radius table td { + border-radius: 3px; + border: none; +} + +table.button.rounded table td { + border-radius: 500px; + border: none; +} + +table.button:hover table tr td a, +table.button:active table tr td a, +table.button table tr td a:visited, +table.button.tiny:hover table tr td a, +table.button.tiny:active table tr td a, +table.button.tiny table tr td a:visited, +table.button.small:hover table tr td a, +table.button.small:active table tr td a, +table.button.small table tr td a:visited, +table.button.large:hover table tr td a, +table.button.large:active table tr td a, +table.button.large table tr td a:visited { + color: #fefefe; +} + +table.button.tiny table td, +table.button.tiny table a { + padding: 4px 8px 4px 8px; +} + +table.button.tiny table a { + font-size: 10px; + font-weight: normal; +} + +table.button.small table td, +table.button.small table a { + padding: 5px 10px 5px 10px; + font-size: 12px; +} + +table.button.large table a { + padding: 10px 20px 10px 20px; + font-size: 20px; +} + +table.button.expand, +table.button.expanded { + width: 100% !important; +} + +table.button.expand table, +table.button.expanded table { + width: 100%; +} + +table.button.expand table a, +table.button.expanded table a { + text-align: center; + width: 100%; + padding-left: 0; + padding-right: 0; +} + +table.button.expand center, +table.button.expanded center { + min-width: 0; +} + +table.button:hover table td, +table.button:visited table td, +table.button:active table td { + background: #147dc2; + color: #fefefe; +} + +table.button:hover table a, +table.button:visited table a, +table.button:active table a { + border: 0 solid #147dc2; +} + +table.button.secondary table td { + background: #777777; + color: #fefefe; + border: 0px solid #777777; +} + +table.button.secondary table a { + color: #fefefe; + border: 0 solid #777777; +} + +table.button.secondary:hover table td { + background: #919191; + color: #fefefe; +} + +table.button.secondary:hover table a { + border: 0 solid #919191; +} + +table.button.secondary:hover table td a { + color: #fefefe; +} + +table.button.secondary:active table td a { + color: #fefefe; +} + +table.button.secondary table td a:visited { + color: #fefefe; +} + +table.button.success table td { + background: #3adb76; + border: 0px solid #3adb76; +} + +table.button.success table a { + border: 0 solid #3adb76; +} + +table.button.success:hover table td { + background: #23bf5d; +} + +table.button.success:hover table a { + border: 0 solid #23bf5d; +} + +table.button.alert table td { + background: #ec5840; + border: 0px solid #ec5840; +} + +table.button.alert table a { + border: 0 solid #ec5840; +} + +table.button.alert:hover table td { + background: #e23317; +} + +table.button.alert:hover table a { + border: 0 solid #e23317; +} + +table.button.warning table td { + background: #ffae00; + border: 0px solid #ffae00; +} + +table.button.warning table a { + border: 0px solid #ffae00; +} + +table.button.warning:hover table td { + background: #cc8b00; +} + +table.button.warning:hover table a { + border: 0px solid #cc8b00; +} + +table.callout { + margin-bottom: 16px; + Margin-bottom: 16px; +} + +th.callout-inner { + width: 100%; + border: 1px solid #cbcbcb; + padding: 10px; + background: #fefefe; +} + +th.callout-inner.primary { + background: #def0fc; + border: 1px solid #444444; + color: #0a0a0a; +} + +th.callout-inner.secondary { + background: #ebebeb; + border: 1px solid #444444; + color: #0a0a0a; +} + +th.callout-inner.success { + background: #e1faea; + border: 1px solid #1b9448; + color: #fefefe; +} + +th.callout-inner.warning { + background: #fff3d9; + border: 1px solid #996800; + color: #fefefe; +} + +th.callout-inner.alert { + background: #fce6e2; + border: 1px solid #b42912; + color: #fefefe; +} + +.thumbnail { + border: solid 4px #fefefe; + box-shadow: 0 0 0 1px rgba(10, 10, 10, 0.2); + display: inline-block; + line-height: 0; + max-width: 100%; + transition: box-shadow 200ms ease-out; + border-radius: 3px; + margin-bottom: 16px; +} + +.thumbnail:hover, +.thumbnail:focus { + box-shadow: 0 0 6px 1px rgba(33, 153, 232, 0.5); +} + +table.menu { + width: 580px; +} + +table.menu td.menu-item, +table.menu th.menu-item { + padding: 10px; + padding-right: 10px; +} + +table.menu td.menu-item a, +table.menu th.menu-item a { + color: #2199e8; +} + +table.menu.vertical td.menu-item, +table.menu.vertical th.menu-item { + padding: 10px; + padding-right: 0; + display: block; +} + +table.menu.vertical td.menu-item a, +table.menu.vertical th.menu-item a { + width: 100%; +} + +table.menu.vertical td.menu-item table.menu.vertical td.menu-item, +table.menu.vertical td.menu-item table.menu.vertical th.menu-item, +table.menu.vertical th.menu-item table.menu.vertical td.menu-item, +table.menu.vertical th.menu-item table.menu.vertical th.menu-item { + padding-left: 10px; +} + +table.menu.text-center a { + text-align: center; +} + +.menu[align="center"] { + width: auto !important; +} + +body.outlook p { + display: inline !important; +} + +@media only screen and (max-width: 596px) { + table.body img { + width: auto; + height: auto; + } + table.body center { + min-width: 0 !important; + } + table.body .container { + width: 95% !important; + } + table.body .columns, + table.body .column { + height: auto !important; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; + padding-left: 16px !important; + padding-right: 16px !important; + } + table.body .columns .column, + table.body .columns .columns, + table.body .column .column, + table.body .column .columns { + padding-left: 0 !important; + padding-right: 0 !important; + } + table.body .collapse .columns, + table.body .collapse .column { + padding-left: 0 !important; + padding-right: 0 !important; + } + td.small-1, + th.small-1 { + display: inline-block !important; + width: 8.33333% !important; + } + td.small-2, + th.small-2 { + display: inline-block !important; + width: 16.66667% !important; + } + td.small-3, + th.small-3 { + display: inline-block !important; + width: 25% !important; + } + td.small-4, + th.small-4 { + display: inline-block !important; + width: 33.33333% !important; + } + td.small-5, + th.small-5 { + display: inline-block !important; + width: 41.66667% !important; + } + td.small-6, + th.small-6 { + display: inline-block !important; + width: 50% !important; + } + td.small-7, + th.small-7 { + display: inline-block !important; + width: 58.33333% !important; + } + td.small-8, + th.small-8 { + display: inline-block !important; + width: 66.66667% !important; + } + td.small-9, + th.small-9 { + display: inline-block !important; + width: 75% !important; + } + td.small-10, + th.small-10 { + display: inline-block !important; + width: 83.33333% !important; + } + td.small-11, + th.small-11 { + display: inline-block !important; + width: 91.66667% !important; + } + td.small-12, + th.small-12 { + display: inline-block !important; + width: 100% !important; + } + .columns td.small-12, + .column td.small-12, + .columns th.small-12, + .column th.small-12 { + display: block !important; + width: 100% !important; + } + table.body td.small-offset-1, + table.body th.small-offset-1 { + margin-left: 8.33333% !important; + Margin-left: 8.33333% !important; + } + table.body td.small-offset-2, + table.body th.small-offset-2 { + margin-left: 16.66667% !important; + Margin-left: 16.66667% !important; + } + table.body td.small-offset-3, + table.body th.small-offset-3 { + margin-left: 25% !important; + Margin-left: 25% !important; + } + table.body td.small-offset-4, + table.body th.small-offset-4 { + margin-left: 33.33333% !important; + Margin-left: 33.33333% !important; + } + table.body td.small-offset-5, + table.body th.small-offset-5 { + margin-left: 41.66667% !important; + Margin-left: 41.66667% !important; + } + table.body td.small-offset-6, + table.body th.small-offset-6 { + margin-left: 50% !important; + Margin-left: 50% !important; + } + table.body td.small-offset-7, + table.body th.small-offset-7 { + margin-left: 58.33333% !important; + Margin-left: 58.33333% !important; + } + table.body td.small-offset-8, + table.body th.small-offset-8 { + margin-left: 66.66667% !important; + Margin-left: 66.66667% !important; + } + table.body td.small-offset-9, + table.body th.small-offset-9 { + margin-left: 75% !important; + Margin-left: 75% !important; + } + table.body td.small-offset-10, + table.body th.small-offset-10 { + margin-left: 83.33333% !important; + Margin-left: 83.33333% !important; + } + table.body td.small-offset-11, + table.body th.small-offset-11 { + margin-left: 91.66667% !important; + Margin-left: 91.66667% !important; + } + table.body table.columns td.expander, + table.body table.columns th.expander { + display: none !important; + } + table.body .right-text-pad, + table.body .text-pad-right { + padding-left: 10px !important; + } + table.body .left-text-pad, + table.body .text-pad-left { + padding-right: 10px !important; + } + table.menu { + width: 100% !important; + } + table.menu td, + table.menu th { + width: auto !important; + display: inline-block !important; + } + table.menu.vertical td, + table.menu.vertical th, + table.menu.small-vertical td, + table.menu.small-vertical th { + display: block !important; + } + table.menu[align="center"] { + width: auto !important; + } + table.button.small-expand, + table.button.small-expanded { + width: 100% !important; + } + table.button.small-expand table, + table.button.small-expanded table { + width: 100%; + } + table.button.small-expand table a, + table.button.small-expanded table a { + text-align: center !important; + width: 100% !important; + padding-left: 0 !important; + padding-right: 0 !important; + } + table.button.small-expand center, + table.button.small-expanded center { + min-width: 0; + } +} diff --git a/src/Symfony/Bridge/Twig/Resources/views/Email/zurb_2/notification/body.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Email/zurb_2/notification/body.html.twig new file mode 100644 index 0000000000..1f278c25e2 --- /dev/null +++ b/src/Symfony/Bridge/Twig/Resources/views/Email/zurb_2/notification/body.html.twig @@ -0,0 +1,63 @@ +{% filter inky_to_html|inline_css %} + + + + + + + + + + + {% block lead %} + {{ importance|upper }} +

+ {{ email.subject }} +

+ {% endblock %} + + {% block content %} + {% if markdown %} + {{ include('@email/zurb_2/notification/content_markdown.html.twig') }} + {% else %} + {{ (raw ? content|raw : content)|nl2br }} + {% endif %} + {% endblock %} + + {% block action %} + {% if action_url %} + + + {% endif %} + {% endblock %} + + {% block exception %} + {% if exception %} + +

Exception stack trace attached.

+ {% endif %} + {% endblock %} +
+
+ + + + {% block footer %} + + + {% block footer_content %} +

Notification e-mail sent by Symfony

+ {% endblock %} +
+
+ {% endblock %} +
+
+ + +{% endfilter %} diff --git a/src/Symfony/Bridge/Twig/Resources/views/Email/zurb_2/notification/body.txt.twig b/src/Symfony/Bridge/Twig/Resources/views/Email/zurb_2/notification/body.txt.twig new file mode 100644 index 0000000000..db85582970 --- /dev/null +++ b/src/Symfony/Bridge/Twig/Resources/views/Email/zurb_2/notification/body.txt.twig @@ -0,0 +1,20 @@ +{% block lead %} +{{ email.subject }} +{% endblock %} + +{% block content %} +{{ content }} +{% endblock %} + +{% block action %} +{% if action_url %} +{{ action_url }}: {{ action_text }} +{% endif %} +{% endblock %} + +{% block exception %} +{% if exception %} +Exception stack trace attached. +{{ exception }} +{% endif %} +{% endblock %} diff --git a/src/Symfony/Bridge/Twig/Resources/views/Email/zurb_2/notification/content_markdown.html.twig b/src/Symfony/Bridge/Twig/Resources/views/Email/zurb_2/notification/content_markdown.html.twig new file mode 100644 index 0000000000..120b2caad9 --- /dev/null +++ b/src/Symfony/Bridge/Twig/Resources/views/Email/zurb_2/notification/content_markdown.html.twig @@ -0,0 +1 @@ +{{ content|markdown_to_html }} diff --git a/src/Symfony/Bridge/Twig/Resources/views/Email/zurb_2/notification/local.css b/src/Symfony/Bridge/Twig/Resources/views/Email/zurb_2/notification/local.css new file mode 100644 index 0000000000..2e68dcd3ef --- /dev/null +++ b/src/Symfony/Bridge/Twig/Resources/views/Email/zurb_2/notification/local.css @@ -0,0 +1,19 @@ +body { + background: #f3f3f3; +} + +.wrapper.secondary { + background: #f3f3f3; +} + +.container.body_alert { + border-top: 8px solid #ec5840; +} + +.container.body_warning { + border-top: 8px solid #ffae00; +} + +.container.body_default { + border-top: 8px solid #aaaaaa; +} diff --git a/src/Symfony/Bridge/Twig/Tests/Mime/NotificationEmailTest.php b/src/Symfony/Bridge/Twig/Tests/Mime/NotificationEmailTest.php new file mode 100644 index 0000000000..1cd8aa0462 --- /dev/null +++ b/src/Symfony/Bridge/Twig/Tests/Mime/NotificationEmailTest.php @@ -0,0 +1,66 @@ +markdown('Foo') + ->exception(new \Exception()) + ->importance(NotificationEmail::IMPORTANCE_HIGH) + ->action('Bar', 'http://example.com/') + ->context(['a' => 'b']) + ; + + $this->assertEquals([ + 'importance' => NotificationEmail::IMPORTANCE_HIGH, + 'content' => 'Foo', + 'exception' => true, + 'action_text' => 'Bar', + 'action_url' => 'http://example.com/', + 'markdown' => true, + 'raw' => false, + 'a' => 'b', + ], $email->getContext()); + } + + public function testSerialize() + { + $email = unserialize(serialize((new NotificationEmail()) + ->content('Foo', true) + ->exception(new \Exception()) + ->importance(NotificationEmail::IMPORTANCE_HIGH) + ->action('Bar', 'http://example.com/') + ->context(['a' => 'b']) + )); + $this->assertEquals([ + 'importance' => NotificationEmail::IMPORTANCE_HIGH, + 'content' => 'Foo', + 'exception' => true, + 'action_text' => 'Bar', + 'action_url' => 'http://example.com/', + 'markdown' => false, + 'raw' => true, + 'a' => 'b', + ], $email->getContext()); + } + + public function testTheme() + { + $email = (new NotificationEmail())->theme('mine'); + $this->assertSame('@email/mine/notification/body.html.twig', $email->getHtmlTemplate()); + $this->assertSame('@email/mine/notification/body.txt.twig', $email->getTextTemplate()); + } + + public function testSubject() + { + $email = (new NotificationEmail())->from('me@example.com')->subject('Foo'); + $headers = $email->getPreparedHeaders(); + $this->assertSame('[LOW] Foo', $headers->get('Subject')->getValue()); + } +} diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index 61023d480b..e299420c09 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -43,7 +43,10 @@ "symfony/var-dumper": "^3.4|^4.0|^5.0", "symfony/expression-language": "^3.4|^4.0|^5.0", "symfony/web-link": "^4.4|^5.0", - "symfony/workflow": "^4.3|^5.0" + "symfony/workflow": "^4.3|^5.0", + "twig/cssinliner-extra": "^2.12", + "twig/inky-extra": "^2.12", + "twig/markdown-extra": "^2.12" }, "conflict": { "symfony/console": "<3.4", diff --git a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php index d10e3c6b7e..c6b0aaa584 100644 --- a/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php +++ b/src/Symfony/Bundle/TwigBundle/DependencyInjection/Compiler/ExtensionPass.php @@ -40,24 +40,42 @@ class ExtensionPass implements CompilerPassInterface $container->removeDefinition('twig.extension.yaml'); } + $viewDir = \dirname((new \ReflectionClass('Symfony\Bridge\Twig\Extension\FormExtension'))->getFileName(), 2).'/Resources/views'; + $templateIterator = $container->getDefinition('twig.template_iterator'); + $templatePaths = $templateIterator->getArgument(2); + $cacheWarmer = null; + if ($container->hasDefinition('twig.cache_warmer')) { + $cacheWarmer = $container->getDefinition('twig.cache_warmer'); + $cacheWarmerPaths = $cacheWarmer->getArgument(2); + } + $loader = $container->getDefinition('twig.loader.native_filesystem'); + + if ($container->has('mailer')) { + $emailPath = $viewDir.'/Email'; + $loader->addMethodCall('addPath', [$emailPath, 'email']); + $loader->addMethodCall('addPath', [$emailPath, '!email']); + $templatePaths[$emailPath] = 'email'; + if ($cacheWarmer) { + $cacheWarmerPaths[$emailPath] = 'email'; + } + } + if ($container->has('form.extension')) { $container->getDefinition('twig.extension.form')->addTag('twig.extension'); - $reflClass = new \ReflectionClass('Symfony\Bridge\Twig\Extension\FormExtension'); - $coreThemePath = \dirname($reflClass->getFileName(), 2).'/Resources/views/Form'; - $container->getDefinition('twig.loader.native_filesystem')->addMethodCall('addPath', [$coreThemePath]); - - $paths = $container->getDefinition('twig.template_iterator')->getArgument(2); - $paths[$coreThemePath] = null; - $container->getDefinition('twig.template_iterator')->replaceArgument(2, $paths); - - if ($container->hasDefinition('twig.cache_warmer')) { - $paths = $container->getDefinition('twig.cache_warmer')->getArgument(2); - $paths[$coreThemePath] = null; - $container->getDefinition('twig.cache_warmer')->replaceArgument(2, $paths); + $coreThemePath = $viewDir.'/Form'; + $loader->addMethodCall('addPath', [$coreThemePath]); + $templatePaths[$coreThemePath] = null; + if ($cacheWarmer) { + $cacheWarmerPaths[$coreThemePath] = null; } } + $templateIterator->replaceArgument(2, $templatePaths); + if ($cacheWarmer) { + $container->getDefinition('twig.cache_warmer')->replaceArgument(2, $cacheWarmerPaths); + } + if ($container->has('router')) { $container->getDefinition('twig.extension.routing')->addTag('twig.extension'); } diff --git a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Compiler/ExtensionPassTest.php b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Compiler/ExtensionPassTest.php index 539a952a60..add657d051 100644 --- a/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Compiler/ExtensionPassTest.php +++ b/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Compiler/ExtensionPassTest.php @@ -13,6 +13,7 @@ namespace Symfony\Bundle\TwigBundle\Tests\DependencyInjection\Compiler; use PHPUnit\Framework\TestCase; use Symfony\Bundle\TwigBundle\DependencyInjection\Compiler\ExtensionPass; +use Symfony\Bundle\TwigBundle\TemplateIterator; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Definition; @@ -38,6 +39,9 @@ class ExtensionPassTest extends TestCase $filesystemLoader->addMethodCall('addPath', []); $container->setDefinition('twig.loader.filesystem', $filesystemLoader); + $templateIterator = new Definition(TemplateIterator::class, [null, null, null]); + $container->setDefinition('twig.template_iterator', $templateIterator); + $extensionPass = new ExtensionPass(); $extensionPass->process($container);