Merge branch '2.x' into 3.x

* 2.x:
  Update documentation for inky_to_html
  Bump version to 2.12.1-DEV
  Prepare the 2.12.0 release
  Update CHANGELOG

CHANGELOG

@@ -17,7 +17,11 @@
  * bumped minimum PHP version to 7.2
  * removed PSR-0 classes
 
-* 2.12.0 (2019-XX-XX)
+* 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
  * added support for an "arrow" function on the "sort" filter
@@ -33,8 +37,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)
 

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());

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