Merge branch '2.7' into 2.8

xabbuh · xabbuh · commit 3a41ea82eec5 · 2017-08-29T09:36:16.000+02:00
* 2.7: Update resources.rst Improved a help note about authentication providers [#8280] add missing trailing comma Improved the explanation about the doctrine caching services [Routing] Add URI scheme enforcement annotation example
diff --git a/components/validator/resources.rst b/components/validator/resources.rst
@@ -179,14 +179,14 @@ Using a Custom MetadataFactory
 ------------------------------
 
 All the loaders and the cache are passed to an instance of
-:class:`Symfony\\Component\\Validator\\Mapping\\ClassMetadataFactory`. This
-class is responsible for creating a ``ClassMetadata`` instance from all the
+:class:`Symfony\\Component\\Validator\\Mapping\\Factory\\LazyLoadingMetadataFactory`. 
+This class is responsible for creating a ``ClassMetadata`` instance from all the
 configured resources.
 
 You can also use a custom metadata factory implementation by creating a class
 which implements
-:class:`Symfony\\Component\\Validator\\MetadataFactoryInterface`. You can set
-this custom implementation using
+:class:`Symfony\\Component\\Validator\\Mapping\\Factory\\MetadataFactoryInterface`. 
+You can set this custom implementation using
 :method:`Symfony\\Component\\Validator\\ValidatorBuilder::setMetadataFactory`::
 
     use Acme\Validation\CustomMetadataFactory;
diff --git a/reference/configuration/doctrine.rst b/reference/configuration/doctrine.rst
@@ -299,9 +299,10 @@ certain classes, but those are for very advanced use-cases only.
 Caching Drivers
 ~~~~~~~~~~~~~~~
 
-For the caching drivers you can specify the values ``array``, ``apc``, ``apcu``,
-``memcache``, ``memcached``, ``redis``, ``wincache``, ``zenddata``, ``xcache``
-or ``service``.
+The built-in types of caching drivers are: ``array``, ``apc``, ``apcu``,
+``memcache``, ``memcached``, ``redis``, ``wincache``, ``zenddata`` and ``xcache``.
+There is a special type called ``service`` which lets you define the ID of your
+own caching service.
 
 The following example shows an overview of the caching configurations:
 
@@ -310,15 +311,17 @@ The following example shows an overview of the caching configurations:
     doctrine:
         orm:
             auto_mapping: true
+            # each caching driver type defines its own config options
             metadata_cache_driver: apc
-            query_cache_driver:
-                type: service
-                id: my_doctrine_common_cache_service
             result_cache_driver:
                 type: memcache
                 host: localhost
                 port: 11211
                 instance_class: Memcache
+            # the 'service' type requires to define the 'id' option too
+            query_cache_driver:
+                type: service
+                id: my_doctrine_common_cache_service
 
 Mapping Configuration
 ~~~~~~~~~~~~~~~~~~~~~
diff --git a/routing/scheme.rst b/routing/scheme.rst
@@ -10,6 +10,25 @@ the URI scheme via schemes:
 
 .. configuration-block::
 
+    .. code-block:: php-annotations
+
+        // src/AppBundle/Controller/MainController.php
+        namespace AppBundle\Controller;
+
+        use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+        use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+
+        class MainController extends Controller
+        {
+            /**
+             * @Route("/secure", name="secure", schemes={"https"})
+             */
+            public function secureAction()
+            {
+                // ...
+            }
+        }
+
     .. code-block:: yaml
 
         # app/config/routing.yml
diff --git a/security/api_key_authentication.rst b/security/api_key_authentication.rst
@@ -130,8 +130,11 @@ method, if any.
 
 .. caution::
 
-    In case you return ``null`` from your ``createToken()`` method, be sure to enable
-    ``anonymous`` in you firewall. This way you'll be able to get an ``AnonymousToken``.
+    In case you return ``null`` from your ``createToken()`` method, Symfony
+    passes this request to the next authentication provider. If you haven't
+    configured any other provider, enable the ``anonymous`` option in your
+    firewall. This way Symfony executes the anonymous authentication provider
+    and you'll get an ``AnonymousToken``.
 
 2. supportsToken
 ~~~~~~~~~~~~~~~~
