Merge branch '2.7' into 2.8

* 2.7:
  [Intl] Make intl-data tests pass and save language aliases again
  Remove useless docblocks

Author: nicolas-grekas

Encoder/DecoderInterface.php

@@ -25,7 +25,7 @@ interface DecoderInterface
      *
      * @param string $data    Data to decode
      * @param string $format  Format name
-     * @param array  $context options that decoders have access to
+     * @param array  $context Options that decoders have access to
      *
      * The format parameter specifies which format the data is in; valid values
      * depend on the specific implementation. Authors implementing this interface
@@ -41,7 +41,7 @@ public function decode($data, $format, array $context = array());
     /**
      * Checks whether the deserializer can decode from given format.
      *
-     * @param string $format format name
+     * @param string $format Format name
      *
      * @return bool
      */

Encoder/EncoderInterface.php

@@ -25,7 +25,7 @@ interface EncoderInterface
      *
      * @param mixed  $data    Data to encode
      * @param string $format  Format name
-     * @param array  $context options that normalizers/encoders have access to
+     * @param array  $context Options that normalizers/encoders have access to
      *
      * @return scalar
      *
@@ -36,7 +36,7 @@ public function encode($data, $format, array $context = array());
     /**
      * Checks whether the serializer can encode to given format.
      *
-     * @param string $format format name
+     * @param string $format Format name
      *
      * @return bool
      */

Encoder/JsonDecode.php

@@ -20,24 +20,12 @@
  */
 class JsonDecode implements DecoderInterface
 {
-    /**
-     * Specifies if the returned result should be an associative array or a nested stdClass object hierarchy.
-     *
-     * @var bool
-     */
-    private $associative;
+    protected $serializer;
 
-    /**
-     * Specifies the recursion depth.
-     *
-     * @var int
-     */
+    private $associative;
     private $recursionDepth;
-
     private $lastError = JSON_ERROR_NONE;
 
-    protected $serializer;
-
     /**
      * Constructs a new JsonDecode instance.
      *

Encoder/JsonEncoder.php

@@ -20,14 +20,7 @@ class JsonEncoder implements EncoderInterface, DecoderInterface
 {
     const FORMAT = 'json';
 
-    /**
-     * @var JsonEncode
-     */
     protected $encodingImpl;
-
-    /**
-     * @var JsonDecode
-     */
     protected $decodingImpl;
 
     public function __construct(JsonEncode $encodingImpl = null, JsonDecode $decodingImpl = null)

Encoder/XmlEncoder.php

@@ -154,7 +154,7 @@ public function supportsDecoding($format)
     /**
      * Sets the root node name.
      *
-     * @param string $name root node name
+     * @param string $name Root node name
      */
     public function setRootNodeName($name)
     {
@@ -252,8 +252,6 @@ final protected function isElementNameValid($name)
     /**
      * Parse the input DOMNode into an array or a string.
      *
-     * @param \DOMNode $node xml to parse
-     *
      * @return array|string
      */
     private function parseXml(\DOMNode $node)
@@ -288,8 +286,6 @@ private function parseXml(\DOMNode $node)
     /**
      * Parse the input DOMNode attributes into an array.
      *
-     * @param \DOMNode $node xml to parse
-     *
      * @return array
      */
     private function parseXmlAttributes(\DOMNode $node)
@@ -322,8 +318,6 @@ private function parseXmlAttributes(\DOMNode $node)
     /**
      * Parse the input DOMNode value (content and children) into an array or a string.
      *
-     * @param \DOMNode $node xml to parse
-     *
      * @return array|string
      */
     private function parseXmlValue(\DOMNode $node)
@@ -523,7 +517,7 @@ private function resolveXmlRootName(array $context = array())
     /**
      * Create a DOM document, taking serializer options into account.
      *
-     * @param array $context options that the encoder has access to
+     * @param array $context Options that the encoder has access to
      *
      * @return \DOMDocument
      */

Mapping/Loader/FileLoader.php

@@ -20,9 +20,6 @@
  */
 abstract class FileLoader implements LoaderInterface
 {
-    /**
-     * @var string
-     */
     protected $file;
 
     /**

Mapping/Loader/LoaderChain.php

@@ -27,9 +27,6 @@
  */
 class LoaderChain implements LoaderInterface
 {
-    /**
-     * @var LoaderInterface[]
-     */
     private $loaders;
 
     /**

NameConverter/CamelCaseToSnakeCaseNameConverter.php

@@ -18,14 +18,7 @@
  */
 class CamelCaseToSnakeCaseNameConverter implements NameConverterInterface
 {
-    /**
-     * @var array|null
-     */
     private $attributes;
-
-    /**
-     * @var bool
-     */
     private $lowerCamelCase;
 
     /**

Normalizer/AbstractNormalizer.php

@@ -78,7 +78,7 @@ public function __construct(ClassMetadataFactoryInterface $classMetadataFactory
     /**
      * Set circular reference limit.
      *
-     * @param int $circularReferenceLimit limit of iterations for the same object
+     * @param int $circularReferenceLimit Limit of iterations for the same object
      *
      * @return self
      */
@@ -112,7 +112,7 @@ public function setCircularReferenceHandler($circularReferenceHandler)
     /**
      * Set normalization callbacks.
      *
-     * @param callable[] $callbacks help normalize the result
+     * @param callable[] $callbacks Help normalize the result
      *
      * @return self
      *

Normalizer/DenormalizableInterface.php

@@ -32,7 +32,7 @@ interface DenormalizableInterface
      * @param array|scalar          $data         The data from which to re-create the object
      * @param string|null           $format       The format is optionally given to be able to denormalize differently
      *                                            based on different input formats
-     * @param array                 $context      options for denormalizing
+     * @param array                 $context      Options for denormalizing
      *
      * @return object
      */