Merge branch '3.4'

* 3.4:
  fixing a bit more on a bad merge
  fixing bad merge
  Implement proposed changes
  Remove whitespace
  Use preferred way of retrieving authenticated user
  Break long lines
  Clarify comment about "Retrieving the User Object"
  Minor reword about assets:install
  Reorder DoctrineBundle configuration sections

Author: weaverryan

reference/configuration/doctrine.rst

@@ -270,102 +270,6 @@ Full Default Configuration
             </doctrine:config>
         </container>
 
-Configuration Overview
-----------------------
-
-This following configuration example shows all the configuration defaults
-that the ORM resolves to:
-
-.. code-block:: yaml
-
-    doctrine:
-        orm:
-            auto_mapping: true
-            # the standard distribution overrides this to be true in debug, false otherwise
-            auto_generate_proxy_classes: false
-            proxy_namespace: Proxies
-            proxy_dir: '%kernel.cache_dir%/doctrine/orm/Proxies'
-            default_entity_manager: default
-            metadata_cache_driver: array
-            query_cache_driver: array
-            result_cache_driver: array
-
-There are lots of other configuration options that you can use to overwrite
-certain classes, but those are for very advanced use-cases only.
-
-Caching Drivers
-~~~~~~~~~~~~~~~
-
-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:
-
-.. code-block:: yaml
-
-    doctrine:
-        orm:
-            auto_mapping: true
-            # each caching driver type defines its own config options
-            metadata_cache_driver: apc
-            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
-~~~~~~~~~~~~~~~~~~~~~
-
-Explicit definition of all the mapped entities is the only necessary
-configuration for the ORM and there are several configuration options that
-you can control. The following configuration options exist for a mapping:
-
-type
-....
-
-One of ``annotation``, ``xml``, ``yml``, ``php`` or ``staticphp``. This
-specifies which type of metadata type your mapping uses.
-
-dir
-...
-
-Path to the mapping or entity files (depending on the driver). If this path
-is relative it is assumed to be relative to the bundle root. This only works
-if the name of your mapping is a bundle name. If you want to use this option
-to specify absolute paths you should prefix the path with the kernel parameters
-that exist in the DIC (for example ``%kernel.project_dir%``).
-
-prefix
-......
-
-A common namespace prefix that all entities of this mapping share. This
-prefix should never conflict with prefixes of other defined mappings otherwise
-some of your entities cannot be found by Doctrine. This option defaults
-to the bundle namespace + ``Entity``, for example for an application bundle
-called AcmeHelloBundle prefix would be ``Acme\HelloBundle\Entity``.
-
-alias
-.....
-
-Doctrine offers a way to alias entity namespaces to simpler, shorter names
-to be used in DQL queries or for Repository access. When using a bundle
-the alias defaults to the bundle name.
-
-is_bundle
-.........
-
-This option is a derived value from ``dir`` and by default is set to ``true``
-if dir is relative proved by a ``file_exists()`` check that returns ``false``.
-It is ``false`` if the existence check returns ``true``. In this case an
-absolute path was specified and the metadata files are most likely in a
-directory outside of a bundle.
 
 .. index::
     single: Configuration; Doctrine DBAL
@@ -492,8 +396,31 @@ service where ``[name]`` is the name of the connection.
 
 .. _DBAL documentation: http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html
 
+Doctrine ORM Configuration
+--------------------------
+
+This following configuration example shows all the configuration defaults
+that the ORM resolves to:
+
+.. code-block:: yaml
+
+    doctrine:
+        orm:
+            auto_mapping: true
+            # the standard distribution overrides this to be true in debug, false otherwise
+            auto_generate_proxy_classes: false
+            proxy_namespace: Proxies
+            proxy_dir: '%kernel.cache_dir%/doctrine/orm/Proxies'
+            default_entity_manager: default
+            metadata_cache_driver: array
+            query_cache_driver: array
+            result_cache_driver: array
+
+There are lots of other configuration options that you can use to overwrite
+certain classes, but those are for very advanced use-cases only.
+
 Shortened Configuration Syntax
-------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 When you are only using one entity manager, all config options available
 can be placed directly under ``doctrine.orm`` config level.
@@ -525,8 +452,82 @@ can be placed directly under ``doctrine.orm`` config level.
 This shortened version is commonly used in other documentation sections.
 Keep in mind that you can't use both syntaxes at the same time.
 
+Caching Drivers
+~~~~~~~~~~~~~~~
+
+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:
+
+.. code-block:: yaml
+
+    doctrine:
+        orm:
+            auto_mapping: true
+            # each caching driver type defines its own config options
+            metadata_cache_driver: apc
+            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
+~~~~~~~~~~~~~~~~~~~~~
+
+Explicit definition of all the mapped entities is the only necessary
+configuration for the ORM and there are several configuration options that
+you can control. The following configuration options exist for a mapping:
+
+type
+....
+
+One of ``annotation``, ``xml``, ``yml``, ``php`` or ``staticphp``. This
+specifies which type of metadata type your mapping uses.
+
+dir
+...
+
+Path to the mapping or entity files (depending on the driver). If this path
+is relative it is assumed to be relative to the bundle root. This only works
+if the name of your mapping is a bundle name. If you want to use this option
+to specify absolute paths you should prefix the path with the kernel parameters
+that exist in the DIC (for example ``%kernel.project_dir%``).
+
+prefix
+......
+
+A common namespace prefix that all entities of this mapping share. This
+prefix should never conflict with prefixes of other defined mappings otherwise
+some of your entities cannot be found by Doctrine. This option defaults
+to the bundle namespace + ``Entity``, for example for an application bundle
+called AcmeHelloBundle prefix would be ``Acme\HelloBundle\Entity``.
+
+alias
+.....
+
+Doctrine offers a way to alias entity namespaces to simpler, shorter names
+to be used in DQL queries or for Repository access. When using a bundle
+the alias defaults to the bundle name.
+
+is_bundle
+.........
+
+This option is a derived value from ``dir`` and by default is set to ``true``
+if dir is relative proved by a ``file_exists()`` check that returns ``false``.
+It is ``false`` if the existence check returns ``true``. In this case an
+absolute path was specified and the metadata files are most likely in a
+directory outside of a bundle.
+
 Custom Mapping Entities in a Bundle
------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Doctrine's ``auto_mapping`` feature loads annotation configuration from
 the ``Entity/`` directory of each bundle *and* looks for other formats (e.g.
@@ -587,7 +588,7 @@ directory instead:
         ));
 
 Mapping Entities Outside of a Bundle
-------------------------------------
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You can also create new mappings, for example outside of the Symfony folder.
 
@@ -652,7 +653,7 @@ namespace in the ``src/Entity`` directory and gives them an ``App`` alias
         ));
 
 Detecting a Mapping Configuration Format
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+........................................
 
 If the ``type`` on the bundle configuration isn't set, the DoctrineBundle
 will try to detect the correct mapping configuration format for the bundle.
@@ -671,7 +672,7 @@ root directory. If the folder exist, Doctrine will fall back to using an
 annotation driver.
 
 Default Value of Dir
-~~~~~~~~~~~~~~~~~~~~
+....................
 
 If ``dir`` is not specified, then its default value depends on which configuration
 driver is being used. For drivers that rely on the PHP files (annotation,

security.rst

@@ -1002,14 +1002,12 @@ look like::
 
     use Symfony\Component\Security\Core\User\UserInterface;
 
-    public function indexAction(UserInterface $user)
+    public function indexAction()
     {
-        if (!$this->get('security.authorization_checker')->isGranted('IS_AUTHENTICATED_FULLY')) {
-            throw $this->createAccessDeniedException();
-        }
+        $this->denyAccessUnlessGranted('IS_AUTHENTICATED_FULLY');
 
-        // the above is a shortcut for this
-        $user = $this->get('security.token_storage')->getToken()->getUser();
+        $user = $this->getUser();
+        // or you can also type-hint a method argument with UserInterface: e.g. "UserInterface $user"
     }
 
 .. tip::
@@ -1018,10 +1016,8 @@ look like::
     your :ref:`user provider <security-user-providers>`.
 
 .. versionadded:: 3.2
-    The functionality to get the user via the method signature was introduced in
-    Symfony 3.2. You can still retrieve it by calling ``$this->getUser()`` if you
-    extend the :class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller`
-    class.
+    The ability to get the user by type-hinting an argument with UserInterface
+    was introduced in Symfony 3.2.
 
 Now you can call whatever methods are on *your* User object. For example,
 if your User object has a ``getFirstName()`` method, you could use that::

templating.rst

@@ -881,7 +881,7 @@ block of the base template.
 You can also include assets located in your bundles' ``Resources/public`` folder.
 You will need to run the ``php bin/console assets:install target [--symlink]``
 command, which copies (or symlinks) files into the correct location. (target
-is by default "web").
+is by default the "web/" directory of your application).
 
 .. code-block:: html+twig