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

ChoiceList/Factory/PropertyAccessDecorator.php

@@ -24,18 +24,14 @@
  *
  * Pass the decorated factory to the constructor:
  *
- * ```php
- * $decorator = new PropertyAccessDecorator($factory);
- * ```
+ *     $decorator = new PropertyAccessDecorator($factory);
  *
  * You can now pass property paths for generating choice values, labels, view
  * indices, HTML attributes and for determining the preferred choices and the
  * choice groups:
  *
- * ```php
- * // extract values from the $value property
- * $list = $createListFromChoices($objects, 'value');
- * ```
+ *     // extract values from the $value property
+ *     $list = $createListFromChoices($objects, 'value');
  *
  * @author Bernhard Schussek <[email protected]>
  */

Extension/Validator/ViolationMapper/ViolationPath.php

@@ -198,9 +198,7 @@ public function isIndex($index)
      *
      * Consider the following violation path:
      *
-     * <code>
-     * children[address].children[office].data.street
-     * </code>
+     *     children[address].children[office].data.street
      *
      * In this example, "address" and "office" map to forms, while
      * "street does not.

FormRendererEngineInterface.php

@@ -55,11 +55,9 @@ public function getResourceForBlockName(FormView $view, $blockName);
      * and continues with the child of that root, the child of that child etc.
      * The following is an example for a block hierarchy:
      *
-     * <code>
-     * form_widget
-     * text_widget
-     * url_widget
-     * </code>
+     *     form_widget
+     *     text_widget
+     *     url_widget
      *
      * In this example, "url_widget" is the most specific block, while the other
      * blocks are its ancestors in the hierarchy.
@@ -93,11 +91,9 @@ public function getResourceForBlockNameHierarchy(FormView $view, array $blockNam
      * and continues with the child of that root, the child of that child etc.
      * The following is an example for a block hierarchy:
      *
-     * <code>
-     * form_widget
-     * text_widget
-     * url_widget
-     * </code>
+     *     form_widget
+     *     text_widget
+     *     url_widget
      *
      * The second parameter $hierarchyLevel determines the level of the hierarchy
      * that should be rendered.

FormRendererInterface.php

@@ -71,18 +71,14 @@ public function searchAndRenderBlock(FormView $view, $blockNameSuffix, array $va
      * Use this helper for CSRF protection without the overhead of creating a
      * form.
      *
-     * <code>
-     * <input type="hidden" name="token" value="<?php $renderer->renderCsrfToken('rm_user_'.$user->getId()) ?>">
-     * </code>
+     *     <input type="hidden" name="token" value="<?php $renderer->renderCsrfToken('rm_user_'.$user->getId()) ?>">
      *
      * Check the token in your action using the same 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 ID of the CSRF token
      *

Forms.php

@@ -18,83 +18,71 @@
  *
  * Use this class to conveniently create new form factories:
  *
- * <code>
- * use Symfony\Component\Form\Forms;
+ *     use Symfony\Component\Form\Forms;
  *
- * $formFactory = Forms::createFormFactory();
+ *     $formFactory = Forms::createFormFactory();
  *
- * $form = $formFactory->createBuilder()
- *     ->add('firstName', 'Symfony\Component\Form\Extension\Core\Type\TextType')
- *     ->add('lastName', 'Symfony\Component\Form\Extension\Core\Type\TextType')
- *     ->add('age', 'Symfony\Component\Form\Extension\Core\Type\IntegerType')
- *     ->add('gender', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array(
- *         'choices' => array('Male' => 'm', 'Female' => 'f'),
- *     ))
- *     ->getForm();
- * </code>
+ *     $form = $formFactory->createBuilder()
+ *         ->add('firstName', 'Symfony\Component\Form\Extension\Core\Type\TextType')
+ *         ->add('lastName', 'Symfony\Component\Form\Extension\Core\Type\TextType')
+ *         ->add('age', 'Symfony\Component\Form\Extension\Core\Type\IntegerType')
+ *         ->add('gender', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array(
+ *             'choices' => array('Male' => 'm', 'Female' => 'f'),
+ *         ))
+ *         ->getForm();
  *
  * You can also add custom extensions to the form factory:
  *
- * <code>
- * $formFactory = Forms::createFormFactoryBuilder()
- *     ->addExtension(new AcmeExtension())
- *     ->getFormFactory();
- * </code>
+ *     $formFactory = Forms::createFormFactoryBuilder()
+ *         ->addExtension(new AcmeExtension())
+ *         ->getFormFactory();
  *
  * If you create custom form types or type extensions, it is
  * generally recommended to create your own extensions that lazily
  * load these types and type extensions. In projects where performance
  * does not matter that much, you can also pass them directly to the
  * form factory:
  *
- * <code>
- * $formFactory = Forms::createFormFactoryBuilder()
- *     ->addType(new PersonType())
- *     ->addType(new PhoneNumberType())
- *     ->addTypeExtension(new FormTypeHelpTextExtension())
- *     ->getFormFactory();
- * </code>
+ *     $formFactory = Forms::createFormFactoryBuilder()
+ *         ->addType(new PersonType())
+ *         ->addType(new PhoneNumberType())
+ *         ->addTypeExtension(new FormTypeHelpTextExtension())
+ *         ->getFormFactory();
  *
  * Support for the Validator component is provided by ValidatorExtension.
  * This extension needs a validator object to function properly:
  *
- * <code>
- * use Symfony\Component\Validator\Validation;
- * use Symfony\Component\Form\Extension\Validator\ValidatorExtension;
+ *     use Symfony\Component\Validator\Validation;
+ *     use Symfony\Component\Form\Extension\Validator\ValidatorExtension;
  *
- * $validator = Validation::createValidator();
- * $formFactory = Forms::createFormFactoryBuilder()
- *     ->addExtension(new ValidatorExtension($validator))
- *     ->getFormFactory();
- * </code>
+ *     $validator = Validation::createValidator();
+ *     $formFactory = Forms::createFormFactoryBuilder()
+ *         ->addExtension(new ValidatorExtension($validator))
+ *         ->getFormFactory();
  *
  * Support for the Templating component is provided by TemplatingExtension.
  * This extension needs a PhpEngine object for rendering forms. As second
  * argument you should pass the names of the default themes. Here is an
  * example for using the default layout with "<div>" tags:
  *
- * <code>
- * use Symfony\Component\Form\Extension\Templating\TemplatingExtension;
+ *     use Symfony\Component\Form\Extension\Templating\TemplatingExtension;
  *
- * $formFactory = Forms::createFormFactoryBuilder()
- *     ->addExtension(new TemplatingExtension($engine, null, array(
- *         'FrameworkBundle:Form',
- *     )))
- *     ->getFormFactory();
- * </code>
+ *     $formFactory = Forms::createFormFactoryBuilder()
+ *         ->addExtension(new TemplatingExtension($engine, null, array(
+ *             'FrameworkBundle:Form',
+ *         )))
+ *         ->getFormFactory();
  *
  * The next example shows how to include the "<table>" layout:
  *
- * <code>
- * use Symfony\Component\Form\Extension\Templating\TemplatingExtension;
+ *     use Symfony\Component\Form\Extension\Templating\TemplatingExtension;
  *
- * $formFactory = Forms::createFormFactoryBuilder()
- *     ->addExtension(new TemplatingExtension($engine, null, array(
- *         'FrameworkBundle:Form',
- *         'FrameworkBundle:FormTable',
- *     )))
- *     ->getFormFactory();
- * </code>
+ *     $formFactory = Forms::createFormFactoryBuilder()
+ *         ->addExtension(new TemplatingExtension($engine, null, array(
+ *             'FrameworkBundle:Form',
+ *             'FrameworkBundle:FormTable',
+ *         )))
+ *         ->getFormFactory();
  *
  * @author Bernhard Schussek <[email protected]>
  */