Merge branch '5.2' into 5.x

xabbuh · xabbuh · commit 694c0f7bbe2d · 2021-05-01T16:00:17.000+02:00
* 5.2:
  run tests against doctrine/persistence 2.2 again
  [Security] Do not try to rehash null-passwords
  Small phpdoc imporvement
diff --git a/Request.php b/Request.php
@@ -698,7 +698,7 @@ public static function getHttpMethodParameterOverride()
      * flexibility in controllers, it is better to explicitly get request parameters from the appropriate
      * public property instead (attributes, query, request).
      *
-     * Order of precedence: PATH (routing placeholders or custom attributes), GET, BODY
+     * Order of precedence: PATH (routing placeholders or custom attributes), GET, POST
      *
      * @param mixed $default The default value if the parameter key does not exist
      *

Original file line number	Diff line number	Diff line change
`@@ -698,7 +698,7 @@ public static function getHttpMethodParameterOverride()`
`698`	`698`	`* flexibility in controllers, it is better to explicitly get request parameters from the appropriate`
`699`	`699`	`* public property instead (attributes, query, request).`
`700`	`700`	`*`
`701`		`- * Order of precedence: PATH (routing placeholders or custom attributes), GET, BODY`
	`701`	`+ * Order of precedence: PATH (routing placeholders or custom attributes), GET, POST`
`702`	`702`	`*`
`703`	`703`	`* @param mixed $default The default value if the parameter key does not exist`
`704`	`704`	`*`