Merge branch '2.8' into 3.3

* 2.8:
  [2.7] More docblock fixes

Author: nicolas-grekas

Tests/Constraints/FileTest.php

@@ -18,9 +18,6 @@
 class FileTest extends TestCase
 {
     /**
-     * @param mixed $maxSize
-     * @param int   $bytes
-     * @param bool  $binaryFormat
      * @dataProvider provideValidSizes
      */
     public function testMaxSize($maxSize, $bytes, $binaryFormat)
@@ -33,10 +30,6 @@ public function testMaxSize($maxSize, $bytes, $binaryFormat)
 
     /**
      * @dataProvider provideValidSizes
-     *
-     * @param int|string $maxSize
-     * @param int        $bytes
-     * @param string     $binaryFormat
      */
     public function testMaxSizeCanBeSetAfterInitialization($maxSize, $bytes, $binaryFormat)
     {
@@ -50,8 +43,6 @@ public function testMaxSizeCanBeSetAfterInitialization($maxSize, $bytes, $binary
     /**
      * @dataProvider provideInvalidSizes
      * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
-     *
-     * @param int|string $maxSize
      */
     public function testInvalidValueForMaxSizeThrowsExceptionAfterInitialization($maxSize)
     {
@@ -61,8 +52,6 @@ public function testInvalidValueForMaxSizeThrowsExceptionAfterInitialization($ma
 
     /**
      * @dataProvider provideInvalidSizes
-     *
-     * @param int|string $maxSize
      */
     public function testMaxSizeCannotBeSetToInvalidValueAfterInitialization($maxSize)
     {
@@ -77,7 +66,6 @@ public function testMaxSizeCannotBeSetToInvalidValueAfterInitialization($maxSize
     }
 
     /**
-     * @param mixed $maxSize
      * @dataProvider provideInValidSizes
      * @expectedException \Symfony\Component\Validator\Exception\ConstraintDefinitionException
      */
@@ -86,9 +74,6 @@ public function testInvalidMaxSize($maxSize)
         new File(array('maxSize' => $maxSize));
     }
 
-    /**
-     * @return array
-     */
     public function provideValidSizes()
     {
         return array(
@@ -105,9 +90,6 @@ public function provideValidSizes()
         );
     }
 
-    /**
-     * @return array
-     */
     public function provideInvalidSizes()
     {
         return array(
@@ -121,9 +103,6 @@ public function provideInvalidSizes()
     }
 
     /**
-     * @param mixed $maxSize
-     * @param bool  $guessedFormat
-     * @param bool  $binaryFormat
      * @dataProvider provideFormats
      */
     public function testBinaryFormat($maxSize, $guessedFormat, $binaryFormat)
@@ -133,9 +112,6 @@ public function testBinaryFormat($maxSize, $guessedFormat, $binaryFormat)
         $this->assertSame($binaryFormat, $file->binaryFormat);
     }
 
-    /**
-     * @return array
-     */
     public function provideFormats()
     {
         return array(