Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit 7d3a57cd3d53 · 2017-03-20T09:46:40.000+01:00
* 2.7:
  #20411 fix Yaml parsing for very long quoted strings
  [Doctrine Bridge] fix priority for doctrine event listeners
  Use PHP functions as array_map callbacks when possible
  [Validator] revert wrong Phpdoc change
  Use proper line endings
diff --git a/Mapping/ClassMetadata.php b/Mapping/ClassMetadata.php
@@ -299,9 +299,8 @@ public function addPropertyConstraints($property, array $constraints)
      * The name of the getter is assumed to be the name of the property with an
      * uppercased first letter and either the prefix "get" or "is".
      *
-     * @param string      $property   The name of the property
-     * @param Constraint  $constraint The constraint
-     * @param string|null $method     The method that is called to retrieve the value being validated (null for auto-detection)
+     * @param string     $property   The name of the property
+     * @param Constraint $constraint The constraint
      *
      * @return $this
      */

Original file line number	Diff line number	Diff line change
`@@ -299,9 +299,8 @@ public function addPropertyConstraints($property, array $constraints)`
`299`	`299`	`* The name of the getter is assumed to be the name of the property with an`
`300`	`300`	`* uppercased first letter and either the prefix "get" or "is".`
`301`	`301`	`*`
`302`		`- * @param string $property The name of the property`
`303`		`- * @param Constraint $constraint The constraint`
`304`		`- * @param string\|null $method The method that is called to retrieve the value being validated (null for auto-detection)`
	`302`	`+ * @param string $property The name of the property`
	`303`	`+ * @param Constraint $constraint The constraint`
`305`	`304`	`*`
`306`	`305`	`* @return $this`
`307`	`306`	`*/`