allow to find user with username that looks like email

This is especially useful for "switch user" functionality. Without this
patch it is not possible to impersonate a user with username
"bob@example.com" and email "robert@example.com"
Fixes #2500

Author: avant1

Model/UserManager.php

@@ -64,7 +64,10 @@ public function findUserByUsername($username)
     public function findUserByUsernameOrEmail($usernameOrEmail)
     {
         if (preg_match('/^.+\@\S+\.\S+$/', $usernameOrEmail)) {
-            return $this->findUserByEmail($usernameOrEmail);
+            $user = $this->findUserByEmail($usernameOrEmail);
+            if ($user !== null) {
+                return $user;
+            }
         }
 
         return $this->findUserByUsername($usernameOrEmail);

Tests/Model/UserManagerTest.php

@@ -16,11 +16,13 @@
 
 class UserManagerTest extends TestCase
 {
-    /**
-     * @var UserManager
-     */
+    /** @var UserManager|\PHPUnit_Framework_MockObject_MockObject */
     private $manager;
+
+    /** @var \PHPUnit_Framework_MockObject_MockObject */
     private $passwordUpdater;
+
+    /** @var \PHPUnit_Framework_MockObject_MockObject */
     private $fieldsUpdater;
 
     protected function setUp()
@@ -127,7 +129,8 @@ public function testFindUserByUsernameOrEmailWithEmail()
     {
         $this->manager->expects($this->once())
             ->method('findUserBy')
-            ->with($this->equalTo(array('emailCanonical' => 'jack@email.org')));
+            ->with($this->equalTo(array('emailCanonical' => 'jack@email.org')))
+            ->willReturn($this->getUser());
         $this->fieldsUpdater->expects($this->once())
             ->method('canonicalizeEmail')
             ->with('JaCk@EmAiL.oRg')
@@ -136,6 +139,34 @@ public function testFindUserByUsernameOrEmailWithEmail()
         $this->manager->findUserByUsernameOrEmail('JaCk@EmAiL.oRg');
     }
 
+    public function testFindUserByUsernameOrEmailWithUsernameThatLooksLikeEmail()
+    {
+        $usernameThatLooksLikeEmail = 'bob@example.com';
+        $user = $this->getUser();
+
+        $this->manager->expects($this->at(0))
+            ->method('findUserBy')
+            ->with($this->equalTo(array('emailCanonical' => $usernameThatLooksLikeEmail)))
+            ->will($this->returnValue(null));
+        $this->fieldsUpdater->expects($this->once())
+            ->method('canonicalizeEmail')
+            ->with($usernameThatLooksLikeEmail)
+            ->willReturn($usernameThatLooksLikeEmail);
+
+        $this->manager->expects($this->at(1))
+            ->method('findUserBy')
+            ->with($this->equalTo(array('usernameCanonical' => $usernameThatLooksLikeEmail)))
+            ->will($this->returnValue($user));
+        $this->fieldsUpdater->expects($this->once())
+            ->method('canonicalizeUsername')
+            ->with($usernameThatLooksLikeEmail)
+            ->willReturn($usernameThatLooksLikeEmail);
+
+        $actualUser = $this->manager->findUserByUsernameOrEmail($usernameThatLooksLikeEmail);
+
+        $this->assertSame($user, $actualUser);
+    }
+
     /**
      * @return mixed
      */