Merge branch '2.7' into 2.8

* 2.7:
  [DI] minor docblock fixes

Author: nicolas-grekas

Annotation/Groups.php

@@ -29,8 +29,6 @@ class Groups
     private $groups;
 
     /**
-     * @param array $data
-     *
      * @throws InvalidArgumentException
      */
     public function __construct(array $data)

Encoder/JsonDecode.php

@@ -125,8 +125,6 @@ public function supportsDecoding($format)
     /**
      * Merges the default options of the Json Decoder with the passed context.
      *
-     * @param array $context
-     *
      * @return array
      */
     private function resolveContext(array $context)

Encoder/JsonEncode.php

@@ -73,8 +73,6 @@ public function supportsEncoding($format)
     /**
      * Merge default json encode options with context.
      *
-     * @param array $context
-     *
      * @return array
      */
     private function resolveContext(array $context = array())

Encoder/XmlEncoder.php

@@ -511,8 +511,6 @@ private function selectNodeType(\DOMNode $node, $val)
     /**
      * Get real XML root node name, taking serializer options into account.
      *
-     * @param array $context
-     *
      * @return string
      */
     private function resolveXmlRootName(array $context = array())

Mapping/AttributeMetadata.php

@@ -19,17 +19,13 @@
 class AttributeMetadata implements AttributeMetadataInterface
 {
     /**
-     * @var string
-     *
      * @internal This property is public in order to reduce the size of the
      *           class' serialized representation. Do not access it. Use
      *           {@link getName()} instead.
      */
     public $name;
 
     /**
-     * @var array
-     *
      * @internal This property is public in order to reduce the size of the
      *           class' serialized representation. Do not access it. Use
      *           {@link getGroups()} instead.

Mapping/AttributeMetadataInterface.php

@@ -45,8 +45,6 @@ public function getGroups();
 
     /**
      * Merges an {@see AttributeMetadataInterface} with in the current one.
-     *
-     * @param AttributeMetadataInterface $attributeMetadata
      */
     public function merge(AttributeMetadataInterface $attributeMetadata);
 }

Mapping/ClassMetadataInterface.php

@@ -33,8 +33,6 @@ public function getName();
 
     /**
      * Adds an {@link AttributeMetadataInterface}.
-     *
-     * @param AttributeMetadataInterface $attributeMetadata
      */
     public function addAttributeMetadata(AttributeMetadataInterface $attributeMetadata);
 
@@ -47,8 +45,6 @@ public function getAttributesMetadata();
 
     /**
      * Merges a {@link ClassMetadataInterface} in the current one.
-     *
-     * @param ClassMetadataInterface $classMetadata
      */
     public function merge(ClassMetadataInterface $classMetadata);
 

Mapping/Factory/ClassMetadataFactory.php

@@ -23,25 +23,10 @@
  */
 class ClassMetadataFactory implements ClassMetadataFactoryInterface
 {
-    /**
-     * @var LoaderInterface
-     */
     private $loader;
-
-    /**
-     * @var Cache
-     */
     private $cache;
-
-    /**
-     * @var array
-     */
     private $loadedClasses;
 
-    /**
-     * @param LoaderInterface $loader
-     * @param Cache|null      $cache
-     */
     public function __construct(LoaderInterface $loader, Cache $cache = null)
     {
         $this->loader = $loader;

Mapping/Loader/AnnotationLoader.php

@@ -24,14 +24,8 @@
  */
 class AnnotationLoader implements LoaderInterface
 {
-    /**
-     * @var Reader
-     */
     private $reader;
 
-    /**
-     * @param Reader $reader
-     */
     public function __construct(Reader $reader)
     {
         $this->reader = $reader;

Mapping/Loader/LoaderInterface.php

@@ -21,10 +21,6 @@
 interface LoaderInterface
 {
     /**
-     * Load class metadata.
-     *
-     * @param ClassMetadataInterface $classMetadata A metadata
-     *
      * @return bool
      */
     public function loadClassMetadata(ClassMetadataInterface $classMetadata);

Normalizer/AbstractNormalizer.php

@@ -68,9 +68,6 @@ abstract class AbstractNormalizer extends SerializerAwareNormalizer implements N
 
     /**
      * Sets the {@link ClassMetadataFactoryInterface} to use.
-     *
-     * @param ClassMetadataFactoryInterface|null $classMetadataFactory
-     * @param NameConverterInterface|null        $nameConverter
      */
     public function __construct(ClassMetadataFactoryInterface $classMetadataFactory = null, NameConverterInterface $nameConverter = null)
     {
@@ -139,8 +136,6 @@ public function setCallbacks(array $callbacks)
     /**
      * Set ignored attributes for normalization and denormalization.
      *
-     * @param array $ignoredAttributes
-     *
      * @return self
      */
     public function setIgnoredAttributes(array $ignoredAttributes)

SerializerAwareInterface.php

@@ -20,8 +20,6 @@ interface SerializerAwareInterface
 {
     /**
      * Sets the owning Serializer object.
-     *
-     * @param SerializerInterface $serializer
      */
     public function setSerializer(SerializerInterface $serializer);
 }