Merge branch '2.3'

fabpot · fabpot · commit 8edfe5546f01 · 2013-10-26T09:53:03.000+02:00
* 2.3:
  Fixed English usage for existing users.
  Clean up of WebProfiler Controller classes:
  [Process] Fix #9343 : revert file handle usage on Windows platform
diff --git a/User/InMemoryUserProvider.php b/User/InMemoryUserProvider.php
@@ -56,7 +56,7 @@ public function __construct(array $users = array())
     public function createUser(UserInterface $user)
     {
         if (isset($this->users[strtolower($user->getUsername())])) {
-            throw new \LogicException('Another user with the same username already exist.');
+            throw new \LogicException('Another user with the same username already exists.');
         }
 
         $this->users[strtolower($user->getUsername())] = $user;

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function __construct(array $users = array())`
`56`	`56`	`public function createUser(UserInterface $user)`
`57`	`57`	`{`
`58`	`58`	`if (isset($this->users[strtolower($user->getUsername())])) {`
`59`		`- throw new \LogicException('Another user with the same username already exist.');`
	`59`	`+ throw new \LogicException('Another user with the same username already exists.');`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`$this->users[strtolower($user->getUsername())] = $user;`