From 231a3654710593191f5b6c46e6c5339cbb822019 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 5 Oct 2019 18:41:19 +0200 Subject: [PATCH 1/4] Update CHANGELOG --- CHANGELOG | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 4b9d3b4fb..d9b57da6e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,8 +14,12 @@ and "html_to_markdown" filters * added the HtmlExtension extension in the "extra" repositories: "date_uri" filter, and "html_classes" function + * optimized "block('foo') ?? 'bar'" + * fixed the empty test on Traversable instances + * fixed array_key_exists() on objects * fixed cache when opcache is installed but disabled * fixed using macros in arrow functions + * fixed split filter on edge case * 2.11.3 (2019-06-18) From c7a85fd08348ca04b4d8f234f49583d9910906aa Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 5 Oct 2019 18:42:38 +0200 Subject: [PATCH 2/4] Prepare the 2.12.0 release --- CHANGELOG | 2 +- src/Environment.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d9b57da6e..5da07c939 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -* 2.12.0 (2019-XX-XX) +* 2.12.0 (2019-10-05) * added the spaceship operator ("<=>"), useful when using an arrow function in the "sort" filter * added support for an "arrow" function on the "sort" filter diff --git a/src/Environment.php b/src/Environment.php index 2d2bc6fbb..bc3407407 100644 --- a/src/Environment.php +++ b/src/Environment.php @@ -38,12 +38,12 @@ use Twig\TokenParser\TokenParserInterface; */ class Environment { - const VERSION = '2.12.0-DEV'; + const VERSION = '2.12.0'; const VERSION_ID = 21200; const MAJOR_VERSION = 2; const MINOR_VERSION = 12; const RELEASE_VERSION = 0; - const EXTRA_VERSION = 'DEV'; + const EXTRA_VERSION = ''; private $charset; private $loader; From 23419a940881f50525515726eec7507792ace5e0 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 5 Oct 2019 18:44:39 +0200 Subject: [PATCH 3/4] Bump version to 2.12.1-DEV --- CHANGELOG | 4 ++++ src/Environment.php | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 5da07c939..a7a9f760c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +* 2.12.1 (2019-XX-XX) + + * n/a + * 2.12.0 (2019-10-05) * added the spaceship operator ("<=>"), useful when using an arrow function in the "sort" filter diff --git a/src/Environment.php b/src/Environment.php index bc3407407..456413d26 100644 --- a/src/Environment.php +++ b/src/Environment.php @@ -38,12 +38,12 @@ use Twig\TokenParser\TokenParserInterface; */ class Environment { - const VERSION = '2.12.0'; - const VERSION_ID = 21200; + const VERSION = '2.12.1-DEV'; + const VERSION_ID = 21201; const MAJOR_VERSION = 2; const MINOR_VERSION = 12; - const RELEASE_VERSION = 0; - const EXTRA_VERSION = ''; + const RELEASE_VERSION = 1; + const EXTRA_VERSION = 'DEV'; private $charset; private $loader; From ae50257dd0f379203d3243240aa0cae8efaff382 Mon Sep 17 00:00:00 2001 From: Tugdual Saunier Date: Wed, 16 Oct 2019 09:51:34 +0200 Subject: [PATCH 4/4] Update documentation for inky_to_html --- doc/filters/inky_to_html.rst | 8 ++++---- extra/inky-extra/README.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/filters/inky_to_html.rst b/doc/filters/inky_to_html.rst index 0ee1e6784..5462b572d 100644 --- a/doc/filters/inky_to_html.rst +++ b/doc/filters/inky_to_html.rst @@ -24,17 +24,17 @@ You can also use the filter on an included file: .. note:: - The ``inky_to_html`` filter is part of the ``CssInlinerExtension`` which is not + The ``inky_to_html`` filter is part of the ``InkyExtension`` which is not installed by default. Install it first: .. code-block:: bash - $ composer req twig/cssinliner-extra + $ composer req twig/inky-extra Then, use the ``twig/extra-bundle`` on Symfony projects or add the extension explictly on the Twig environment:: - use Twig\Extra\CssInliner\CssInlinerExtension; + use Twig\Extra\Inky\InkyExtension; $twig = new \Twig\Environment(...); - $twig->addExtension(new CssInlinerExtension()); + $twig->addExtension(new InkyExtension()); diff --git a/extra/inky-extra/README.md b/extra/inky-extra/README.md index 72d185028..ec8b18419 100644 --- a/extra/inky-extra/README.md +++ b/extra/inky-extra/README.md @@ -3,6 +3,6 @@ Twig Inky Extension This package is a Twig extension that provides the following: - * [`inky`][1] filter: processes an [inky email template](https://github.com/zurb/inky). + * [`inky_to_html`][1] filter: processes an [inky email template](https://github.com/zurb/inky). [1]: https://twig.symfony.com/inky