add email to user and allow to connect through email or username

Entity/User.php

@@ -22,6 +22,24 @@ class User implements AdvancedUserInterface {
      */
     private $username;
     
+    /**
+     *
+     * @var string
+     */
+    private $usernameCanonical;
+    
+    /**
+     *
+     * @var string
+     */
+    private $email;
+    
+    /**
+     *
+     * @var string
+     */
+    private $emailCanonical;
+    
     /**
      *
      * @var string 
@@ -115,9 +133,47 @@ class User implements AdvancedUserInterface {
         return $this->username;
     }
     
+    public function getUsernameCanonical()
+    {
+        return $this->usernameCanonical;
+    }
+
+    public function getEmail()
+    {
+        return $this->email;
+    }
+
+    public function getEmailCanonical()
+    {
+        return $this->emailCanonical;
+    }
+
+    public function setUsernameCanonical($usernameCanonical)
+    {
+        $this->usernameCanonical = $usernameCanonical;
+        
+        return $this;
+    }
+
+    public function setEmail($email)
+    {
+        $this->email = $email;
+        
+        return $this;
+    }
+
+    public function setEmailCanonical($emailCanonical)
+    {
+        $this->emailCanonical = $emailCanonical;
+        
+        return $this;
+    }
+
+        
     function setPassword($password)
     {
         $this->password =  $password;
+        
         return $this;
     }