Merge branch '3.4' into 4.0

* 3.4:
  Improved the configuration references
  Fixed inconsistency differently
  Update entity_provider.rst
  Update scheme.rst

Author: javiereguiluz

reference/configuration/debug.rst

@@ -25,10 +25,12 @@ key in your application configuration.
 Configuration
 -------------
 
+.. class:: list-config-options
+
+* `dump_destination`_
 * `max_items`_
 * `min_depth`_
 * `max_string_length`_
-* `dump_destination`_
 
 max_items
 ~~~~~~~~~

reference/configuration/framework.rst

@@ -27,111 +27,156 @@ configured under the ``framework`` key in your application configuration.
 Configuration
 -------------
 
-* `secret`_
-* `http_method_override`_
-* `ide`_
-* `test`_
-* `default_locale`_
-* `trusted_hosts`_
-* :ref:`form <reference-framework-form>`
-    * :ref:`enabled <reference-form-enabled>`
+.. class:: list-config-options list-config-options--complex
+
+* `annotations`_
+
+  * :ref:`cache <reference-annotations-cache>`
+  * `debug`_
+  * `file_cache_dir`_
+
+* `assets`_
+
+  * `base_path`_
+  * `base_urls`_
+  * `json_manifest_path`_
+  * `packages`_
+  * `version_format`_
+  * `version_strategy`_
+  * `version`_
+
+* :ref:`cache <reference-cache>`
+
+  * :ref:`app <reference-cache-app>`
+  * `default_doctrine_provider`_
+  * `default_memcached_provider`_
+  * `default_psr6_provider`_
+  * `default_redis_provider`_
+  * `directory`_
+  * `pools`_
+
+    * :ref:`name <reference-cache-pools-name>`
+
+      * `adapter`_
+      * `clearer`_
+      * `default_lifetime`_
+      * `provider`_
+      * `public`_
+
+  * `prefix_seed`_
+  * `system`_
+
 * `csrf_protection`_
-    * :ref:`enabled <reference-csrf_protection-enabled>`
+
+  * :ref:`enabled <reference-csrf_protection-enabled>`
+
+* `default_locale`_
 * `esi`_
-    * :ref:`enabled <reference-esi-enabled>`
+
+  * :ref:`enabled <reference-esi-enabled>`
+
+* :ref:`form <reference-framework-form>`
+
+  * :ref:`enabled <reference-form-enabled>`
+
 * `fragments`_
-    * :ref:`enabled <reference-fragments-enabled>`
-    * :ref:`path <reference-fragments-path>`
+
+  * :ref:`enabled <reference-fragments-enabled>`
+  * :ref:`path <reference-fragments-path>`
+
+* `http_method_override`_
+* `ide`_
+* :ref:`lock <reference-lock>`
+* `php_errors`_
+
+  * `log`_
+  * `throw`_
+
 * `profiler`_
-    * :ref:`enabled <reference-profiler-enabled>`
+
     * `collect`_
+    * `dsn`_
+    * :ref:`enabled <reference-profiler-enabled>`
     * `only_exceptions`_
     * `only_master_requests`_
-    * `dsn`_
+
+* `property_access`_
+
+  * `magic_call`_
+  * `throw_exception_on_invalid_index`_
+
 * `request`_:
-    * `formats`_
+
+  * `formats`_
+
 * `router`_
-    * `resource`_
-    * `type`_
-    * `http_port`_
-    * `https_port`_
-    * `strict_requirements`_
+
+  * `http_port`_
+  * `https_port`_
+  * `resource`_
+  * `strict_requirements`_
+  * `type`_
+
+* `secret`_
+* `serializer`_
+
+  * :ref:`circular_reference_handler <reference-serializer-circular_reference_handler>`
+  * :ref:`enable_annotations <reference-serializer-enable_annotations>`
+  * :ref:`enabled <reference-serializer-enabled>`
+  * :ref:`mapping <reference-serializer-mapping>`
+
+    * :ref:`paths <reference-serializer-mapping-paths>`
+
+  * :ref:`name_converter <reference-serializer-name_converter>`
+
 * `session`_
-    * `storage_id`_
-    * `handler_id`_
-    * `name`_
-    * `cookie_lifetime`_
-    * `cookie_path`_
-    * `cookie_domain`_
-    * `cookie_secure`_
-    * `cookie_httponly`_
-    * `gc_divisor`_
-    * `gc_probability`_
-    * `gc_maxlifetime`_
-    * `save_path`_
-    * `metadata_update_threshold`_
-* `assets`_
-    * `base_path`_
-    * `base_urls`_
-    * `packages`_
-    * `version_strategy`_
-    * `version`_
-    * `version_format`_
-    * `json_manifest_path`_
+
+  * `cookie_domain`_
+  * `cookie_httponly`_
+  * `cookie_lifetime`_
+  * `cookie_path`_
+  * `cookie_secure`_
+  * `gc_divisor`_
+  * `gc_maxlifetime`_
+  * `gc_probability`_
+  * `handler_id`_
+  * `metadata_update_threshold`_
+  * `name`_
+  * `save_path`_
+  * `storage_id`_
+
 * `templating`_
-    * `hinclude_default_template`_
-    * :ref:`form <reference-templating-form>`
-        * `resources`_
-    * :ref:`cache <reference-templating-cache>`
-    * `engines`_
-    * `loaders`_
+
+  * :ref:`cache <reference-templating-cache>`
+  * `engines`_
+  * :ref:`form <reference-templating-form>`
+
+    * `resources`_
+
+  * `hinclude_default_template`_
+  * `loaders`_
+
+* `test`_
 * `translator`_
-    * :ref:`enabled <reference-translator-enabled>`
-    * `fallbacks`_
-    * `logging`_
-    * :ref:`paths <reference-translator-paths>`
-* `property_access`_
-    * `magic_call`_
-    * `throw_exception_on_invalid_index`_
+
+  * :ref:`enabled <reference-translator-enabled>`
+  * `fallbacks`_
+  * `logging`_
+  * :ref:`paths <reference-translator-paths>`
+
+* `trusted_hosts`_
+* `trusted_proxies`_
 * `validation`_
-    * :ref:`enabled <reference-validation-enabled>`
-    * :ref:`cache <reference-validation-cache>`
-    * :ref:`enable_annotations <reference-validation-enable_annotations>`
-    * `translation_domain`_
-    * `strict_email`_
-    * :ref:`mapping <reference-validation-mapping>`
-        * :ref:`paths <reference-validation-mapping-paths>`
-* `annotations`_
-    * :ref:`cache <reference-annotations-cache>`
-    * `file_cache_dir`_
-    * `debug`_
-* `serializer`_
-    * :ref:`enabled <reference-serializer-enabled>`
-    * :ref:`enable_annotations <reference-serializer-enable_annotations>`
-    * :ref:`name_converter <reference-serializer-name_converter>`
-    * :ref:`circular_reference_handler <reference-serializer-circular_reference_handler>`
-    * :ref:`mapping <reference-serializer-mapping>`
-        * :ref:`paths <reference-serializer-mapping-paths>`
-* `php_errors`_
-    * `log`_
-    * `throw`_
-* :ref:`cache <reference-cache>`
-    * :ref:`app <reference-cache-app>`
-    * `system`_
-    * `directory`_
-    * `default_doctrine_provider`_
-    * `default_psr6_provider`_
-    * `default_redis_provider`_
-    * `default_memcached_provider`_
-    * `pools`_
-        * :ref:`name <reference-cache-pools-name>`
-            * `adapter`_
-            * `public`_
-            * `default_lifetime`_
-            * `provider`_
-            * `clearer`_
-    * `prefix_seed`_
-* :ref:`lock <reference-lock>`
+
+  * :ref:`cache <reference-validation-cache>`
+  * :ref:`enable_annotations <reference-validation-enable_annotations>`
+  * :ref:`enabled <reference-validation-enabled>`
+  * :ref:`mapping <reference-validation-mapping>`
+
+    * :ref:`paths <reference-validation-mapping-paths>`
+
+  * `strict_email`_
+  * `translation_domain`_
 
 secret
 ~~~~~~

reference/configuration/swiftmailer.rst

@@ -25,29 +25,35 @@ to :doc:`send emails </email>`. All these options are configured under the
 Configuration
 -------------
 
-* `url`_
-* `transport`_
-* `username`_
-* `password`_
-* `command`_
-* `host`_
-* `port`_
-* `timeout`_
-* `source_ip`_
-* `local_domain`_
-* `encryption`_
-* `auth_mode`_
-* `spool`_
-    * `type`_
-    * `path`_
-* `sender_address`_
+.. class:: list-config-options list-config-options--complex
+
 * `antiflood`_
-    * `threshold`_
-    * `sleep`_
+
+  * `threshold`_
+  * `sleep`_
+
+* `auth_mode`_
+* `command`_
 * `delivery_addresses`_
 * `delivery_whitelist`_
 * `disable_delivery`_
+* `encryption`_
+* `host`_
+* `local_domain`_
 * `logging`_
+* `password`_
+* `port`_
+* `sender_address`_
+* `source_ip`_
+* `spool`_
+
+  * `type`_
+  * `path`_
+
+* `timeout`_
+* `transport`_
+* `url`_
+* `username`_
 
 url
 ~~~

reference/configuration/twig.rst

@@ -25,6 +25,33 @@ the ``twig`` key in your application configuration.
 Configuration
 -------------
 
+.. class:: list-config-options list-config-options--complex
+
+* `auto_reload`_
+* `autoescape`_
+* `autoescape_service`_
+* `autoescape_service_method`_
+* `base_template_class`_
+* `cache`_
+* `charset`_
+* `date`_
+
+  * `format`_
+  * `interval_format`_
+  * `timezone`_
+
+* `debug`_
+* `exception_controller`_
+* `number_format`_
+
+  * `decimals`_
+  * `decimal_point`_
+  * `thousands_separator`_
+
+* `optimizations`_
+* `paths`_
+* `strict_variables`_
+
 auto_reload
 ~~~~~~~~~~~
 

reference/configuration/web_profiler.rst

@@ -30,9 +30,11 @@ execution and displays it in both the web debug toolbar and the
 Configuration
 -------------
 
-* `toolbar`_
-* `intercept_redirects`_
+.. class:: list-config-options
+
 * `excluded_ajax_paths`_
+* `intercept_redirects`_
+* `toolbar`_
 
 toolbar
 ~~~~~~~

routing/scheme.rst

@@ -16,7 +16,7 @@ the URI scheme via schemes:
         namespace App\Controller;
 
         use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-        use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+        use Symfony\Component\Routing\Annotation\Route;
 
         class MainController extends Controller
         {

security/entity_provider.rst

@@ -130,7 +130,7 @@ with the following fields: ``id``, ``username``, ``password``,
                 $this->password,
                 // see section on salt below
                 // $this->salt
-            ) = unserialize($serialized, ['allowed_classes' => false]);
+            ) = unserialize($serialized, array('allowed_classes' => false));
         }
     }