Merge branch '2.8' into 3.3

* 2.8:
  [2.7] More docblock fixes

Author: nicolas-grekas

Extension/Core/Type/ChoiceType.php

@@ -364,10 +364,6 @@ public function getBlockPrefix()
 
     /**
      * Adds the sub fields for an expanded choice field.
-     *
-     * @param FormBuilderInterface $builder     The form builder
-     * @param array                $choiceViews The choice view objects
-     * @param array                $options     The build options
      */
     private function addSubForms(FormBuilderInterface $builder, array $choiceViews, array $options)
     {
@@ -388,11 +384,6 @@ private function addSubForms(FormBuilderInterface $builder, array $choiceViews,
     }
 
     /**
-     * @param FormBuilderInterface $builder
-     * @param                      $name
-     * @param                      $choiceView
-     * @param array                $options
-     *
      * @return mixed
      */
     private function addSubForm(FormBuilderInterface $builder, $name, ChoiceView $choiceView, array $options)

FormEvent.php

@@ -21,12 +21,6 @@ class FormEvent extends Event
     private $form;
     protected $data;
 
-    /**
-     * Constructs an event.
-     *
-     * @param FormInterface $form The associated form
-     * @param mixed         $data The data
-     */
     public function __construct(FormInterface $form, $data)
     {
         $this->form = $form;

Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php

@@ -41,8 +41,6 @@ protected function setUp()
     }
 
     /**
-     * @param $path
-     *
      * @return \PHPUnit_Framework_MockObject_MockObject
      */
     private function getPropertyPath($path)