Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit 9b558753e3a0 · 2019-08-20T16:44:19.000+02:00
* 4.3:
  cs fix
  Fix inconsistent return points.
  [Config] Add handling for ignored keys in ArrayNode::mergeValues.
  Fix inconsistent return points.
  [Security/Core] UserInterface::getPassword() can return null
  [Router] Fix TraceableUrlMatcher behaviour with trailing slash
  Revert "bug #33092 [DependencyInjection] Improve an exception message (fabpot)"
diff --git a/User/UserInterface.php b/User/UserInterface.php
@@ -54,7 +54,7 @@ public function getRoles();
      * This should be the encoded password. On authentication, a plain-text
      * password will be salted, encoded, and then compared to this value.
      *
-     * @return string The password
+     * @return string|null The encoded password if any
      */
     public function getPassword();
 

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function getRoles();`
`54`	`54`	`* This should be the encoded password. On authentication, a plain-text`
`55`	`55`	`* password will be salted, encoded, and then compared to this value.`
`56`	`56`	`*`
`57`		`- * @return string The password`
	`57`	`+ * @return string\|null The encoded password if any`
`58`	`58`	`*/`
`59`	`59`	`public function getPassword();`
`60`	`60`