Merge branch '2.x' into 3.x

* 2.x:
  Allow Symfony 5
  Fix small typo
  Bump version to 2.12.2-DEV
  Prepare the 2.12.1 release

CHANGELOG

@@ -17,7 +17,11 @@
  * bumped minimum PHP version to 7.2
  * removed PSR-0 classes
 
-* 2.12.1 (2019-XX-XX)
+* 2.12.2 (2019-XX-XX)
+
+ * n/a
+
+* 2.12.1 (2019-10-17)
 
  * added the String extension in the "extra" repositories: "u" filter
 

doc/filters/u.rst

@@ -70,7 +70,7 @@ For large strings manipulation, use the ``apply`` tag:
         $ composer req twig/string-extra
 
     Then, use the ``twig/extra-bundle`` on Symfony projects or add the extension
-    explictly on the Twig environment::
+    explicitly on the Twig environment::
 
         use Twig\Extra\String\StringExtension;
 

extra/intl-extra/composer.json

@@ -16,7 +16,7 @@
     "require": {
         "php": "^7.1.3",
         "twig/twig": "^2.4|^3.0",
-        "symfony/intl": "^4.3"
+        "symfony/intl": "^4.3|^5.0"
     },
     "require-dev": {
         "symfony/phpunit-bridge": "^4.4@dev"