Merge branch '3.4' into 4.1

* 3.4:
  Use the real image URL for the filesystem tests
  [Finder] Update PHPdoc append()
  [DI] Fix phpdoc
  Fix code examples in PHPDoc
  [HttpKernel] Fix inheritdocs
  bumped Symfony version to 3.4.16
  updated VERSION for 3.4.15
  updated CHANGELOG for 3.4.15

Author: sroze

Kernel/MicroKernelTrait.php

@@ -39,17 +39,17 @@ abstract protected function configureRoutes(RouteCollectionBuilder $routes);
      *
      * You can register extensions:
      *
-     * $c->loadFromExtension('framework', array(
-     *     'secret' => '%secret%'
-     * ));
+     *     $c->loadFromExtension('framework', array(
+     *         'secret' => '%secret%'
+     *     ));
      *
      * Or services:
      *
-     * $c->register('halloween', 'FooBundle\HalloweenProvider');
+     *     $c->register('halloween', 'FooBundle\HalloweenProvider');
      *
      * Or parameters:
      *
-     * $c->setParameter('halloween', 'lot of fun');
+     *     $c->setParameter('halloween', 'lot of fun');
      *
      * @param ContainerBuilder $c
      * @param LoaderInterface  $loader

Templating/Helper/FormHelper.php

@@ -224,18 +224,14 @@ public function block(FormView $view, $blockName, array $variables = array())
      * Use this helper for CSRF protection without the overhead of creating a
      * form.
      *
-     * <code>
-     * echo $view['form']->csrfToken('rm_user_'.$user->getId());
-     * </code>
+     *     echo $view['form']->csrfToken('rm_user_'.$user->getId());
      *
      * Check the token in your action using the same CSRF token id.
      *
-     * <code>
-     * // $csrfProvider being an instance of Symfony\Component\Security\Csrf\TokenGenerator\TokenGeneratorInterface
-     * if (!$csrfProvider->isCsrfTokenValid('rm_user_'.$user->getId(), $token)) {
-     *     throw new \RuntimeException('CSRF attack detected.');
-     * }
-     * </code>
+     *     // $csrfProvider being an instance of Symfony\Component\Security\Csrf\TokenGenerator\TokenGeneratorInterface
+     *     if (!$csrfProvider->isCsrfTokenValid('rm_user_'.$user->getId(), $token)) {
+     *         throw new \RuntimeException('CSRF attack detected.');
+     *     }
      *
      * @param string $tokenId The CSRF token id of the protected action
      *