Merge branch '2.8' into 3.4

* 2.8:
  Fixed the type of the twig.cache config option
  Documented the enableExceptionOnInvalidIndex() method
  Added the missing attr option in TextType

Author: javiereguiluz

components/property_access.rst

@@ -47,7 +47,23 @@ method. This is done using the index notation that is used in PHP::
     var_dump($propertyAccessor->getValue($person, '[first_name]')); // 'Wouter'
     var_dump($propertyAccessor->getValue($person, '[age]')); // null
 
-As you can see, the method will return ``null`` if the index does not exists.
+As you can see, the method will return ``null`` if the index does not exist.
+But you can change this behavior with the
+:method:`Symfony\\Component\\PropertyAccess\\PropertyAccessorBuilder::enableExceptionOnInvalidIndex`
+method::
+
+    // ...
+    $propertyAccessor = PropertyAccess::createPropertyAccessorBuilder()
+        ->enableExceptionOnInvalidIndex()
+        ->getPropertyAccessor();
+
+    $person = array(
+        'first_name' => 'Wouter',
+    );
+
+    // instead of returning null, the code now throws an exception of type
+    // Symfony\Component\PropertyAccess\Exception\NoSuchIndexException
+    $value = $propertyAccessor->getValue($person, '[age]');
 
 You can also use multi dimensional arrays::
 

reference/configuration/twig.rst

@@ -121,13 +121,13 @@ application harder to maintain.
 cache
 ~~~~~
 
-**type**: ``string`` **default**: ``'%kernel.cache_dir%/twig'``
+**type**: ``string`` | ``false`` | ``Twig\Cache\CacheInterface`` **default**: ``'%kernel.cache_dir%/twig'``
 
 Before using the Twig templates to render some contents, they are compiled into
 regular PHP code. Compilation is a costly process, so the result is cached in
 the directory defined by this configuration option.
 
-Set this option to ``null`` to disable Twig template compilation. However, this
+Set this option to ``false`` to disable Twig template compilation. However, this
 is not recommended; not even in the ``dev`` environment, because the
 ``auto_reload`` option ensures that cached templates which have changed get
 compiled again.

reference/forms/types/text.rst

@@ -9,8 +9,9 @@ The TextType field represents the most basic input text field.
 +-------------+--------------------------------------------------------------------+
 | Rendered as | ``input`` ``text`` field                                           |
 +-------------+--------------------------------------------------------------------+
-| Inherited   | - `data`_                                                          |
-| options     | - `disabled`_                                                      |
+| Inherited   | - `attr`_                                                          |
+| options     | - `data`_                                                          |
+|             | - `disabled`_                                                      |
 |             | - `empty_data`_                                                    |
 |             | - `error_bubbling`_                                                |
 |             | - `error_mapping`_                                                 |
@@ -34,6 +35,8 @@ Inherited Options
 
 These options inherit from the :doc:`FormType </reference/forms/types/form>`:
 
+.. include:: /reference/forms/types/options/attr.rst.inc
+
 .. include:: /reference/forms/types/options/data.rst.inc
 
 .. include:: /reference/forms/types/options/disabled.rst.inc