Merge branch '3.3' into 3.4

nicolas-grekas · nicolas-grekas · commit 6638e54d6548 · 2017-11-07T15:20:24.000+01:00
* 3.3:
  [3.3] More docblock fixes
  [2.7] More docblock fixes
diff --git a/Mapping/ClassMetadata.php b/Mapping/ClassMetadata.php
@@ -19,8 +19,6 @@
 class ClassMetadata implements ClassMetadataInterface
 {
     /**
-     * @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.
diff --git a/Normalizer/DateTimeNormalizer.php b/Normalizer/DateTimeNormalizer.php
@@ -25,9 +25,6 @@ class DateTimeNormalizer implements NormalizerInterface, DenormalizerInterface
     const FORMAT_KEY = 'datetime_format';
     const TIMEZONE_KEY = 'datetime_timezone';
 
-    /**
-     * @var string
-     */
     private $format;
     private $timezone;
 
@@ -127,8 +124,6 @@ public function supportsDenormalization($data, $type, $format = null)
     /**
      * Formats datetime errors.
      *
-     * @param array $errors
-     *
      * @return string[]
      */
     private function formatDateTimeErrors(array $errors)
diff --git a/Normalizer/GetSetMethodNormalizer.php b/Normalizer/GetSetMethodNormalizer.php
@@ -76,8 +76,6 @@ private function supports($class)
     /**
      * Checks if a method's name is get.* or is.*, and can be called without parameters.
      *
-     * @param \ReflectionMethod $method the method to check
-     *
      * @return bool whether the method is a getter or boolean getter
      */
     private function isGetMethod(\ReflectionMethod $method)

Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,6 @@`
`19`	`19`	`class ClassMetadata implements ClassMetadataInterface`
`20`	`20`	`{`
`21`	`21`	`/**`
`22`		`- * @var string`
`23`		`- *`
`24`	`22`	`* @internal This property is public in order to reduce the size of the`
`25`	`23`	`* class' serialized representation. Do not access it. Use`
`26`	`24`	`* {@link getName()} instead.`
Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,6 @@ private function supports($class)`
`76`	`76`	`/**`
`77`	`77`	`* Checks if a method's name is get.* or is.*, and can be called without parameters.`
`78`	`78`	`*`
`79`		`- * @param \ReflectionMethod $method the method to check`
`80`		`- *`
`81`	`79`	`* @return bool whether the method is a getter or boolean getter`
`82`	`80`	`*/`
`83`	`81`	`private function isGetMethod(\ReflectionMethod $method)`