summaryrefslogtreecommitdiffstats
path: root/Core
diff options
context:
space:
mode:
authorChristophe Coevoet <stof@notk.org>2015-12-05 18:37:09 +0100
committerChristophe Coevoet <stof@notk.org>2015-12-05 18:37:09 +0100
commit8ed6a55aa3be7707615e76e7621e70857e3bcaab (patch)
tree5ce97cdba9494f9c87beae8cc5a1377f96d920b2 /Core
parentc5a10052d2345676599b8a892d49ccd480c55be0 (diff)
parenta10207a9431ad9584cacb4c267f748c5ebe629b9 (diff)
downloadsymfony-security-8ed6a55aa3be7707615e76e7621e70857e3bcaab.zip
symfony-security-8ed6a55aa3be7707615e76e7621e70857e3bcaab.tar.gz
symfony-security-8ed6a55aa3be7707615e76e7621e70857e3bcaab.tar.bz2
Merge branch '2.3' into 2.7
* 2.3: [Process] Fix stopping a process on Windows Added a test case for the Logger class. CS: general fixes
Diffstat (limited to 'Core')
-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
*