summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Coevoet <stof@notk.org>2015-12-05 18:37:59 +0100
committerChristophe Coevoet <stof@notk.org>2015-12-05 18:37:59 +0100
commit4fa4e5d97c0f2595e917c3197297d8f9dff7d108 (patch)
treef40938648c441971bc7391bea2844f50254263bb
parentec823fe7b451623020e4ac752f190654ae58c8a0 (diff)
parent8ed6a55aa3be7707615e76e7621e70857e3bcaab (diff)
downloadsymfony-security-4fa4e5d97c0f2595e917c3197297d8f9dff7d108.zip
symfony-security-4fa4e5d97c0f2595e917c3197297d8f9dff7d108.tar.gz
symfony-security-4fa4e5d97c0f2595e917c3197297d8f9dff7d108.tar.bz2
Merge branch '2.7' into 2.8
* 2.7: [Process] Fix stopping a process on Windows Added a test case for the Logger class. CS: general fixes
-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
*