Merge branch '2.8' into 3.4

* 2.8:
  Use the real image URL for the filesystem tests
  [Finder] Update PHPdoc append()
  [DI] Fix phpdoc
  Fix code examples in PHPDoc
  [HttpKernel] Fix inheritdocs

Author: nicolas-grekas

Core/User/UserInterface.php

@@ -36,12 +36,10 @@ interface UserInterface
     /**
      * Returns the roles granted to the user.
      *
-     * <code>
-     * public function getRoles()
-     * {
-     *     return array('ROLE_USER');
-     * }
-     * </code>
+     *     public function getRoles()
+     *     {
+     *         return array('ROLE_USER');
+     *     }
      *
      * Alternatively, the roles might be stored on a ``roles`` property,
      * and populated in any number of different ways when the user object

Guard/GuardAuthenticatorInterface.php

@@ -42,18 +42,18 @@ interface GuardAuthenticatorInterface extends AuthenticationEntryPointInterface
      *
      * For example, for a form login, you might:
      *
-     *      if ($request->request->has('_username')) {
-     *          return array(
-     *              'username' => $request->request->get('_username'),
-     *              'password' => $request->request->get('_password'),
-     *          );
-     *      } else {
-     *          return;
-     *      }
+     *     if ($request->request->has('_username')) {
+     *         return array(
+     *             'username' => $request->request->get('_username'),
+     *             'password' => $request->request->get('_password'),
+     *         );
+     *     } else {
+     *         return;
+     *     }
      *
      * Or for an API token that's on a header, you might use:
      *
-     *      return array('api_key' => $request->headers->get('X-API-TOKEN'));
+     *     return array('api_key' => $request->headers->get('X-API-TOKEN'));
      *
      * @param Request $request
      *

Http/EntryPoint/AuthenticationEntryPointInterface.php

@@ -31,10 +31,14 @@ interface AuthenticationEntryPointInterface
      * response that "helps" the user start into the authentication process.
      *
      * Examples:
-     *  A) For a form login, you might redirect to the login page
-     *      return new RedirectResponse('/login');
-     *  B) For an API token authentication system, you return a 401 response
-     *      return new Response('Auth header required', 401);
+     *
+     * - For a form login, you might redirect to the login page
+     *
+     *     return new RedirectResponse('/login');
+     *
+     * - For an API token authentication system, you return a 401 response
+     *
+     *     return new Response('Auth header required', 401);
      *
      * @param Request                 $request       The request that resulted in an AuthenticationException
      * @param AuthenticationException $authException The exception that started the authentication process