summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Coevoet <stof@notk.org>2015-12-05 18:45:07 +0100
committerChristophe Coevoet <stof@notk.org>2015-12-05 18:45:07 +0100
commit57ca1c2265f570cd2220052ee85ef45faeb6780a (patch)
tree493e43128fae8a2cbc26df3480fceb8e7d53cb22
parent82f83d99b1756d085746aa0c4dae800d9c6ef37d (diff)
parent4fa4e5d97c0f2595e917c3197297d8f9dff7d108 (diff)
downloadsymfony-security-57ca1c2265f570cd2220052ee85ef45faeb6780a.zip
symfony-security-57ca1c2265f570cd2220052ee85ef45faeb6780a.tar.gz
symfony-security-57ca1c2265f570cd2220052ee85ef45faeb6780a.tar.bz2
Merge branch '2.8' into 3.0
* 2.8: [Process] Fix stopping a process on Windows [PhpUnitBridge] Add weak-verbose mode and match against message instead of test name Added a note about the new requirement iconv. Improved error messages for Yaml Deprecations Added a test case for the Logger class. [Form] Fix choices defined as Traversable CS: general fixes Suggested Process dependency
-rw-r--r--Core/User/InMemoryUserProvider.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/User/InMemoryUserProvider.php b/Core/User/InMemoryUserProvider.php
index 9aa39ca..c1981de 100644
--- a/Core/User/InMemoryUserProvider.php
+++ b/Core/User/InMemoryUserProvider.php
@@ -97,7 +97,7 @@ class InMemoryUserProvider implements UserProviderInterface
/**
* Returns the user by given username.
*
- * @param string $username The username.
+ * @param string $username The username.
*
* @return User
*