Merge branch '3.4' into 4.1

* 3.4:
  Update twig_extension.rst
  Fixed more occurrences of app/console
  Change app to bin .
  Added missing chapters to TOC in file constraints reference

Author: javiereguiluz

console/input.rst

@@ -183,7 +183,7 @@ separation at all (e.g. ``-i 5`` or ``-i5``).
 
     While it is possible to separate an option from its value with a white space,
     using this form leads to an ambiguity should the option appear before the
-    command name. For example, ``php app/console --iterations 5 app:greet Fabien``
+    command name. For example, ``php bin/console --iterations 5 app:greet Fabien``
     is ambiguous; Symfony would interpret ``5`` as the command name. To avoid
     this situation, always place options after the command name, or avoid using
     a space to separate the option name from its value.

reference/constraints/File.rst

@@ -29,6 +29,11 @@ form field.
 |                | - `notReadableMessage`_                                             |
 |                | - `uploadIniSizeErrorMessage`_                                      |
 |                | - `uploadFormSizeErrorMessage`_                                     |
+|                | - `uploadPartialErrorMessage`_                                      |
+|                | - `uploadNoFileErrorMessage`_                                       |
+|                | - `uploadNoTmpDirErrorMessage`_                                     |
+|                | - `uploadCantWriteErrorMessage`_                                    |
+|                | - `uploadExtensionErrorMessage`_                                    |
 |                | - `uploadErrorMessage`_                                             |
 |                | - `payload`_                                                        |
 +----------------+---------------------------------------------------------------------+

templating/twig_extension.rst

@@ -45,11 +45,11 @@ Create a class that extends ``AbstractExtension`` and fill in the logic::
         public function getFilters()
         {
             return array(
-                new TwigFilter('price', array($this, 'priceFilter')),
+                new TwigFilter('price', array($this, 'formatPrice')),
             );
         }
 
-        public function priceFilter($number, $decimals = 0, $decPoint = '.', $thousandsSep = ',')
+        public function formatPrice($number, $decimals = 0, $decPoint = '.', $thousandsSep = ',')
         {
             $price = number_format($number, $decimals, $decPoint, $thousandsSep);
             $price = '$'.$price;
@@ -58,9 +58,33 @@ Create a class that extends ``AbstractExtension`` and fill in the logic::
         }
     }
 
+If you want to create a function instead of a filter, define the ``getFunctions()``
+method:
+
+    // src/Twig/AppExtension.php
+    namespace App\Twig;
+
+    use Twig\Extension\AbstractExtension;
+    use Twig\TwigFunction;
+
+    class AppExtension extends AbstractExtension
+    {
+        public function getFunctions()
+        {
+            return array(
+                new TwigFunction('area', array($this, 'calculateArea')),
+            );
+        }
+
+        public function calculateArea(int $width, int $length)
+        {
+            return $width * $length;
+        }
+    }
+
 .. tip::
 
-    Along with custom filters, you can also add custom `functions`_ and register
+    Along with custom filters and functions, you can also register
     `global variables`_.
 
 Register an Extension as a Service