Merge branch '2.8' into 3.3

* 2.8:
  [DI] minor docblock fixes

Author: nicolas-grekas

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)
     {