Merge branch '3.4'

nicolas-grekas · nicolas-grekas · commit 1ef1cdd914f9 · 2017-11-07T15:34:02.000+01:00
* 3.4:
  [3.4] Remove useless docblocks
  [3.3] More docblock fixes
  [2.7] More docblock fixes
  [TwigBridge] Fix BC break due required twig environment
  Random fixes
  Docblock fixes
  [DI] Fix cannot bind env var
  Fix some signatures in PHP-DSLs
  [HttpKernel] Enhance deprecation message
  bumped Symfony version to 3.4.0
  updated VERSION for 3.4.0-BETA3
  updated CHANGELOG for 3.4.0-BETA3
  [SecurityBundle] Fix the datacollector to properly support decision.object being null
diff --git a/Encoder/CsvEncoder.php b/Encoder/CsvEncoder.php
@@ -207,8 +207,6 @@ private function getCsvOptions(array $context)
     }
 
     /**
-     * @param array $data
-     *
      * @return string[]
      */
     private function extractHeaders(array $data)
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/Mapping/Loader/LoaderChain.php b/Mapping/Loader/LoaderChain.php
@@ -60,4 +60,12 @@ public function loadClassMetadata(ClassMetadataInterface $metadata)
 
         return $success;
     }
+
+    /**
+     * @return LoaderInterface[]
+     */
+    public function getLoaders()
+    {
+        return $this->loaders;
+    }
 }
diff --git a/Normalizer/DateIntervalNormalizer.php b/Normalizer/DateIntervalNormalizer.php
@@ -24,9 +24,6 @@ class DateIntervalNormalizer implements NormalizerInterface, DenormalizerInterfa
 {
     const FORMAT_KEY = 'dateinterval_format';
 
-    /**
-     * @var string
-     */
     private $format;
 
     /**
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;
 
@@ -122,8 +119,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
`@@ -207,8 +207,6 @@ private function getCsvOptions(array $context)`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`/**`
`210`		`- * @param array $data`
`211`		`- *`
`212`	`210`	`* @return string[]`
`213`	`211`	`*/`
`214`	`212`	`private function extractHeaders(array $data)`
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
`@@ -60,4 +60,12 @@ public function loadClassMetadata(ClassMetadataInterface $metadata)`
`60`	`60`
`61`	`61`	`return $success;`
`62`	`62`	`}`
	`63`	`+`
	`64`	`+ /**`
	`65`	`+ * @return LoaderInterface[]`
	`66`	`+ */`
	`67`	`+ public function getLoaders()`
	`68`	`+ {`
	`69`	`+ return $this->loaders;`
	`70`	`+ }`
`63`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,6 @@ class DateIntervalNormalizer implements NormalizerInterface, DenormalizerInterfa`
`24`	`24`	`{`
`25`	`25`	`const FORMAT_KEY = 'dateinterval_format';`
`26`	`26`
`27`		`- /**`
`28`		`- * @var string`
`29`		`- */`
`30`	`27`	`private $format;`
`31`	`28`
`32`	`29`	`/**`
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)`