Logging in by email or username with FOSUserBundle_FIXED

config.yml

fos_user:
    # ...
    service:
        user_manager: my_user_manager

services.yml

services:
    my_user_manager:
        class: Acme\UserBundle\Model\UserManager
        parent: fos_user.user_manager.default
        public: false

UserManager.php

<?php

namespace Acme\UserBundle\Model;

use FOS\UserBundle\Entity\UserManager as BaseUserManager;
use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;

class UserManager extends BaseUserManager
{
    public function loadUserByUsername($username)
    {
        $user = $this->findUserByUsernameOrEmail($username);

        if (!$user) {
            throw new UsernameNotFoundException(sprintf('No user with name "%s" was found.', $username));
        }

        return $user;
    }
}