summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Coevoet <stof@notk.org>2015-12-05 18:45:25 +0100
committerChristophe Coevoet <stof@notk.org>2015-12-05 18:45:25 +0100
commit968a425bd37e6df4b64bc6b7e6950acd7048d907 (patch)
tree5716d2e5f1de8e853b8962d31cf6e51de6bc356e
parent32872c36a7a466673d261bf7f467e8fa918c4a7b (diff)
parent57ca1c2265f570cd2220052ee85ef45faeb6780a (diff)
downloadsymfony-security-968a425bd37e6df4b64bc6b7e6950acd7048d907.zip
symfony-security-968a425bd37e6df4b64bc6b7e6950acd7048d907.tar.gz
symfony-security-968a425bd37e6df4b64bc6b7e6950acd7048d907.tar.bz2
Merge branch '3.0'
* 3.0: [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
*