Merge branch '2.x' into 3.x

* 2.x:
  fixed markup in docs
  fixed markup in docs
  fixed typo
  fixed CS
  fixed typo

doc/filters/country_name.rst

@@ -28,7 +28,7 @@ By default, the filter uses the current locale. You can pass it explicitly:
 
         $ composer req twig/intl-extra
 
-     Then, add it on the Twig environment::
+    Then, add it on the Twig environment::
 
         use Twig\Extra\Intl\IntlExtension;
 

doc/filters/country_timezones.rst

@@ -21,7 +21,7 @@ with a given timezone:
 
         $ composer req twig/intl-extra
 
-     Then, add it on the Twig environment::
+    Then, add it on the Twig environment::
 
         use Twig\Extra\Intl\IntlExtension;
 

doc/filters/currency_name.rst

@@ -31,7 +31,7 @@ By default, the filter uses the current locale. You can pass it explicitly:
 
         $ composer req twig/intl-extra
 
-     Then, add it on the Twig environment::
+    Then, add it on the Twig environment::
 
         use Twig\Extra\Intl\IntlExtension;
 

doc/filters/currency_symbol.rst

@@ -31,7 +31,7 @@ By default, the filter uses the current locale. You can pass it explicitly:
 
         $ composer req twig/intl-extra
 
-     Then, add it on the Twig environment::
+    Then, add it on the Twig environment::
 
         use Twig\Extra\Intl\IntlExtension;
 

doc/filters/data_uri.rst

@@ -31,7 +31,7 @@ The ``data_uri`` filter generates a URL using the data scheme as defined in RFC
 
         $ composer req twig/html-extra
 
-     Then, add it on the Twig environment::
+    Then, add it on the Twig environment::
 
         use Twig\Extra\Html\HtmlExtension;
 

doc/filters/filter.rst

@@ -1,5 +1,5 @@
 ``filter``
-=========
+==========
 
 The ``filter`` filter filters elements of a sequence or a mapping using an arrow
 function. The arrow function receives the value of the sequence or mapping:

doc/filters/format_currency.rst

@@ -59,7 +59,7 @@ By default, the filter uses the current locale. You can pass it explicitly:
 
         $ composer req twig/intl-extra
 
-     Then, add it on the Twig environment::
+    Then, add it on the Twig environment::
 
         use Twig\Extra\Intl\IntlExtension;
 

doc/filters/format_date.rst

@@ -16,7 +16,7 @@ the ``format_datetime`` filter, but without the time.
 
         $ composer req twig/intl-extra
 
-     Then, add it on the Twig environment::
+    Then, add it on the Twig environment::
 
         use Twig\Extra\Intl\IntlExtension;
 

doc/filters/format_datetime.rst

@@ -51,7 +51,7 @@ By default, the filter uses the current locale. You can pass it explicitly:
 
         $ composer req twig/intl-extra
 
-     Then, add it on the Twig environment::
+    Then, add it on the Twig environment::
 
         use Twig\Extra\Intl\IntlExtension;
 

doc/filters/format_number.rst

@@ -102,7 +102,7 @@ By default, the filter uses the current locale. You can pass it explicitly:
 
         $ composer req twig/intl-extra
 
-     Then, add it on the Twig environment::
+    Then, add it on the Twig environment::
 
         use Twig\Extra\Intl\IntlExtension;
 

doc/filters/format_time.rst

@@ -16,7 +16,7 @@ the ``format_timetime`` filter, but without the date.
 
         $ composer req twig/intl-extra
 
-     Then, add it on the Twig environment::
+    Then, add it on the Twig environment::
 
         use Twig\Extra\Intl\IntlExtension;
 

doc/filters/html_to_markdown.rst

@@ -43,7 +43,7 @@ You can also use the filter on an included file:
 
         $ composer req twig/markdown-extra
 
-     Then, add it on the Twig environment::
+    Then, add it on the Twig environment::
 
         use Twig\Extra\Markdown\MarkdownMarkdownExtension;
 

doc/filters/language_name.rst

@@ -31,7 +31,7 @@ By default, the filter uses the current locale. You can pass it explicitly:
 
         $ composer req twig/intl-extra
 
-     Then, add it on the Twig environment::
+    Then, add it on the Twig environment::
 
         use Twig\Extra\Intl\IntlExtension;
 

doc/filters/locale_name.rst

@@ -31,7 +31,7 @@ By default, the filter uses the current locale. You can pass it explicitly:
 
         $ composer req twig/intl-extra
 
-     Then, add it on the Twig environment::
+    Then, add it on the Twig environment::
 
         use Twig\Extra\Intl\IntlExtension;
 

doc/filters/markdown_to_html.rst

@@ -42,7 +42,7 @@ You can also use the filter on an included file:
 
         $ composer req twig/markdown-extra
 
-     Then, add it on the Twig environment::
+    Then, add it on the Twig environment::
 
         use Twig\Extra\Markdown\MarkdownMarkdownExtension;
 

doc/filters/reduce.rst

@@ -1,5 +1,5 @@
 ``reduce``
-=========
+==========
 
 The ``reduce`` filter iteratively reduces a sequence or a mapping to a single
 value using an arrow function, so as to reduce it to a single value. The arrow

doc/filters/timezone_name.rst

@@ -31,7 +31,7 @@ By default, the filter uses the current locale. You can pass it explicitly:
 
         $ composer req twig/intl-extra
 
-     Then, add it on the Twig environment::
+    Then, add it on the Twig environment::
 
         use Twig\Extra\Intl\IntlExtension;
 

doc/functions/html_classes.rst

@@ -24,7 +24,7 @@ names together:
 
         $ composer req twig/html-extra
 
-     Then, add it on the Twig environment::
+    Then, add it on the Twig environment::
 
         use Twig\Extra\Html\HtmlExtension;
 

extra/twig-extra-bundle/composer.json

@@ -1,7 +1,7 @@
 {
     "name": "twig/extra-bundle",
     "type": "symfony-bundle",
-    "description": "A Symfony bundle for extra Twig extension",
+    "description": "A Symfony bundle for extra Twig extensions",
     "keywords": ["twig", "extra", "bundle"],
     "homepage": "https://twig.symfony.com",
     "license": "MIT",

extra/twig-extra-bundle/src/Resources/config/intl.xml

@@ -7,7 +7,7 @@
     <services>
         <defaults public="false" />
 
-        <service id="twig.extension.intl" class="Twig\Extra\Html\IntlExtension">
+        <service id="twig.extension.intl" class="Twig\Extra\Intl\IntlExtension">
             <tag name="twig.extension" />
         </service>
     </services>

src/Extension/CoreExtension.php

@@ -1542,7 +1542,7 @@ function twig_get_attribute(Environment $env, Source $source, $object, $item, ar
  *
  * @param array|Traversable $array An array
  * @param mixed             $name  The column name
- * @param mixed             $index  The column to use as the index/keys for the returned array
+ * @param mixed             $index The column to use as the index/keys for the returned array
  *
  * @return array The array of values
  */