Merge branch '2.8' into 3.3

* 2.8:
  [DI] minor docblock fixes

AbstractRendererEngine.php

@@ -23,24 +23,10 @@ abstract class AbstractRendererEngine implements FormRendererEngineInterface
      */
     const CACHE_KEY_VAR = 'cache_key';
 
-    /**
-     * @var array
-     */
     protected $defaultThemes;
-
-    /**
-     * @var array
-     */
     protected $themes = array();
-
-    /**
-     * @var array
-     */
     protected $resources = array();
 
-    /**
-     * @var array
-     */
     private $resourceHierarchyLevels = array();
 
     /**

Button.php

@@ -273,8 +273,6 @@ public function getPropertyPath()
     /**
      * Unsupported method.
      *
-     * @param FormError $error
-     *
      * @throws BadMethodCallException
      */
     public function addError(FormError $error)

ButtonBuilder.php

@@ -184,8 +184,6 @@ public function addEventListener($eventName, $listener, $priority = 0)
      *
      * This method should not be invoked.
      *
-     * @param EventSubscriberInterface $subscriber
-     *
      * @throws BadMethodCallException
      */
     public function addEventSubscriber(EventSubscriberInterface $subscriber)
@@ -272,8 +270,6 @@ public function setAttributes(array $attributes)
      *
      * This method should not be invoked.
      *
-     * @param DataMapperInterface $dataMapper
-     *
      * @throws BadMethodCallException
      */
     public function setDataMapper(DataMapperInterface $dataMapper = null)
@@ -396,8 +392,6 @@ public function setCompound($compound)
     /**
      * Sets the type of the button.
      *
-     * @param ResolvedFormTypeInterface $type The type of the button
-     *
      * @return $this
      */
     public function setType(ResolvedFormTypeInterface $type)
@@ -440,8 +434,6 @@ public function setDataLocked($locked)
      *
      * This method should not be invoked.
      *
-     * @param FormFactoryInterface $formFactory
-     *
      * @throws BadMethodCallException
      */
     public function setFormFactory(FormFactoryInterface $formFactory)
@@ -476,8 +468,6 @@ public function setMethod($method)
     /**
      * Unsupported method.
      *
-     * @param RequestHandlerInterface $requestHandler
-     *
      * @throws BadMethodCallException
      */
     public function setRequestHandler(RequestHandlerInterface $requestHandler)

ChoiceList/Factory/CachingFactoryDecorator.php

@@ -22,9 +22,6 @@
  */
 class CachingFactoryDecorator implements ChoiceListFactoryInterface
 {
-    /**
-     * @var ChoiceListFactoryInterface
-     */
     private $decoratedFactory;
 
     /**
@@ -89,11 +86,6 @@ private static function flatten(array $array, &$output)
         }
     }
 
-    /**
-     * Decorates the given factory.
-     *
-     * @param ChoiceListFactoryInterface $decoratedFactory The decorated factory
-     */
     public function __construct(ChoiceListFactoryInterface $decoratedFactory)
     {
         $this->decoratedFactory = $decoratedFactory;

ChoiceList/Factory/PropertyAccessDecorator.php

@@ -41,22 +41,9 @@
  */
 class PropertyAccessDecorator implements ChoiceListFactoryInterface
 {
-    /**
-     * @var ChoiceListFactoryInterface
-     */
     private $decoratedFactory;
-
-    /**
-     * @var PropertyAccessorInterface
-     */
     private $propertyAccessor;
 
-    /**
-     * Decorates the given factory.
-     *
-     * @param ChoiceListFactoryInterface     $decoratedFactory The decorated factory
-     * @param null|PropertyAccessorInterface $propertyAccessor The used property accessor
-     */
     public function __construct(ChoiceListFactoryInterface $decoratedFactory, PropertyAccessorInterface $propertyAccessor = null)
     {
         $this->decoratedFactory = $decoratedFactory;

ChoiceList/View/ChoiceView.php

@@ -41,8 +41,6 @@ class ChoiceView
 
     /**
      * Additional attributes for the HTML tag.
-     *
-     * @var array
      */
     public $attr;
 

Extension/Core/DataMapper/PropertyPathMapper.php

@@ -23,16 +23,8 @@
  */
 class PropertyPathMapper implements DataMapperInterface
 {
-    /**
-     * @var PropertyAccessorInterface
-     */
     private $propertyAccessor;
 
-    /**
-     * Creates a new property path mapper.
-     *
-     * @param PropertyAccessorInterface $propertyAccessor The property accessor
-     */
     public function __construct(PropertyAccessorInterface $propertyAccessor = null)
     {
         $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();

Extension/Core/DataTransformer/ChoiceToValueTransformer.php

@@ -22,9 +22,6 @@ class ChoiceToValueTransformer implements DataTransformerInterface
 {
     private $choiceList;
 
-    /**
-     * @param ChoiceListInterface $choiceList
-     */
     public function __construct(ChoiceListInterface $choiceList)
     {
         $this->choiceList = $choiceList;

Extension/Core/DataTransformer/ChoicesToValuesTransformer.php

@@ -22,17 +22,12 @@ class ChoicesToValuesTransformer implements DataTransformerInterface
 {
     private $choiceList;
 
-    /**
-     * @param ChoiceListInterface $choiceList
-     */
     public function __construct(ChoiceListInterface $choiceList)
     {
         $this->choiceList = $choiceList;
     }
 
     /**
-     * @param array $array
-     *
      * @return array
      *
      * @throws TransformationFailedException if the given value is not an array
@@ -51,8 +46,6 @@ public function transform($array)
     }
 
     /**
-     * @param array $array
-     *
      * @return array
      *
      * @throws TransformationFailedException if the given value is not an array

Extension/Core/DataTransformer/DataTransformerChain.php

@@ -21,17 +21,12 @@
  */
 class DataTransformerChain implements DataTransformerInterface
 {
-    /**
-     * The value transformers.
-     *
-     * @var DataTransformerInterface[]
-     */
     protected $transformers;
 
     /**
      * Uses the given value transformers to transform values.
      *
-     * @param array $transformers
+     * @param DataTransformerInterface[] $transformers
      */
     public function __construct(array $transformers)
     {

Extension/Core/DataTransformer/ValueToDuplicatesTransformer.php

@@ -47,8 +47,6 @@ public function transform($value)
     /**
      * Extracts the duplicated value from an array.
      *
-     * @param array $array
-     *
      * @return mixed The value
      *
      * @throws TransformationFailedException if the given value is not an array or

Extension/Core/EventListener/ResizeFormListener.php

@@ -24,35 +24,20 @@
  */
 class ResizeFormListener implements EventSubscriberInterface
 {
-    /**
-     * @var string
-     */
     protected $type;
-
-    /**
-     * @var array
-     */
     protected $options;
-
-    /**
-     * Whether children could be added to the group.
-     *
-     * @var bool
-     */
     protected $allowAdd;
-
-    /**
-     * Whether children could be removed from the group.
-     *
-     * @var bool
-     */
     protected $allowDelete;
 
-    /**
-     * @var bool
-     */
     private $deleteEmpty;
 
+    /**
+     * @param string $type
+     * @param array  $options
+     * @param bool   $allowAdd    whether children could be added to the group
+     * @param bool   $allowDelete whether children could be removed from the group
+     * @param bool   $deleteEmpty
+     */
     public function __construct($type, array $options = array(), $allowAdd = false, $allowDelete = false, $deleteEmpty = false)
     {
         $this->type = $type;

Extension/DataCollector/EventListener/DataCollectorListener.php

@@ -49,8 +49,6 @@ public static function getSubscribedEvents()
 
     /**
      * Listener for the {@link FormEvents::POST_SET_DATA} event.
-     *
-     * @param FormEvent $event The event object
      */
     public function postSetData(FormEvent $event)
     {
@@ -65,8 +63,6 @@ public function postSetData(FormEvent $event)
 
     /**
      * Listener for the {@link FormEvents::POST_SUBMIT} event.
-     *
-     * @param FormEvent $event The event object
      */
     public function postSubmit(FormEvent $event)
     {

Extension/DataCollector/FormDataCollector.php

@@ -29,9 +29,6 @@
  */
 class FormDataCollector extends DataCollector implements FormDataCollectorInterface
 {
-    /**
-     * @var FormDataExtractor
-     */
     private $dataExtractor;
 
     /**

Extension/DataCollector/FormDataCollectorInterface.php

@@ -24,37 +24,26 @@ interface FormDataCollectorInterface extends DataCollectorInterface
 {
     /**
      * Stores configuration data of the given form and its children.
-     *
-     * @param FormInterface $form A root form
      */
     public function collectConfiguration(FormInterface $form);
 
     /**
      * Stores the default data of the given form and its children.
-     *
-     * @param FormInterface $form A root form
      */
     public function collectDefaultData(FormInterface $form);
 
     /**
      * Stores the submitted data of the given form and its children.
-     *
-     * @param FormInterface $form A root form
      */
     public function collectSubmittedData(FormInterface $form);
 
     /**
      * Stores the view variables of the given form view and its children.
-     *
-     * @param FormView $view A root form view
      */
     public function collectViewVariables(FormView $view);
 
     /**
      * Specifies that the given objects represent the same conceptual form.
-     *
-     * @param FormInterface $form A form object
-     * @param FormView      $view A view object
      */
     public function associateFormWithView(FormInterface $form, FormView $view);
 
@@ -63,8 +52,6 @@ public function associateFormWithView(FormInterface $form, FormView $view);
      * a tree-like data structure.
      *
      * The result can be queried using {@link getData()}.
-     *
-     * @param FormInterface $form A root form
      */
     public function buildPreliminaryFormTree(FormInterface $form);
 
@@ -85,9 +72,6 @@ public function buildPreliminaryFormTree(FormInterface $form);
      * tree, only the view data will be included in the result. If a
      * corresponding {@link FormInterface} exists otherwise, call
      * {@link associateFormWithView()} before calling this method.
-     *
-     * @param FormInterface $form A root form
-     * @param FormView      $view A root view
      */
     public function buildFinalFormTree(FormInterface $form, FormView $view);
 

Extension/DataCollector/FormDataExtractor.php

@@ -166,8 +166,6 @@ public function extractViewVariables(FormView $view)
     /**
      * Recursively builds an HTML ID for a form.
      *
-     * @param FormInterface $form The form
-     *
      * @return string The HTML ID
      */
     private function buildId(FormInterface $form)

Extension/DataCollector/FormDataExtractorInterface.php

@@ -24,35 +24,27 @@ interface FormDataExtractorInterface
     /**
      * Extracts the configuration data of a form.
      *
-     * @param FormInterface $form The form
-     *
      * @return array Information about the form's configuration
      */
     public function extractConfiguration(FormInterface $form);
 
     /**
      * Extracts the default data of a form.
      *
-     * @param FormInterface $form The form
-     *
      * @return array Information about the form's default data
      */
     public function extractDefaultData(FormInterface $form);
 
     /**
      * Extracts the submitted data of a form.
      *
-     * @param FormInterface $form The form
-     *
      * @return array Information about the form's submitted data
      */
     public function extractSubmittedData(FormInterface $form);
 
     /**
      * Extracts the view variables of a form.
      *
-     * @param FormView $view The form view
-     *
      * @return array Information about the view's variables
      */
     public function extractViewVariables(FormView $view);