Revert change as getUsername is abstract and thus required

[userbundle] / Controller / DefaultController.php

diff --git a/Controller/DefaultController.php b/Controller/DefaultController.php
index 32ab7369403018047fb9caab9f3a72ae16f86c4b..6fed8f54395ad9ba940683d6a44c32d6b1c36933 100644 (file)
--- a/Controller/DefaultController.php
+++ b/Controller/DefaultController.php
@@ -148,7 +148,7 @@ class DefaultController extends AbstractController {
                                        $data = $reset->getData();
 
                                        //Set password
                                        $data = $reset->getData();
 
                                        //Set password

-                                       $data->setPassword($this->hasher->encodePassword($data, $data->getPassword()));
+                                       $data->setPassword($this->hasher->hashPassword($data, $data->getPassword()));

 
                                        //Queue snippet save
                                        $this->manager->persist($data);
 
                                        //Queue snippet save
                                        $this->manager->persist($data);


@@ -472,14 +472,14 @@ class DefaultController extends AbstractController {
                                //Set data
                                $data = $form->getData();
 
                                //Set data
                                $data = $form->getData();
 

-                               //Set encoded password
-                               $encoded = $this->hasher->encodePassword($user, $user->getPassword());
+                               //Set hashed password
+                               $hashed = $this->hasher->hashPassword($user, $user->getPassword());

 
                                //Update pass
 
                                //Update pass

-                               $pass = $this->slugger->hash($encoded);
+                               $pass = $this->slugger->hash($hashed);

 
                                //Set user password
 
                                //Set user password

-                               $user->setPassword($encoded);
+                               $user->setPassword($hashed);

 
                                //Persist user
                                $this->manager->persist($user);
 
                                //Persist user
                                $this->manager->persist($user);


@@ -741,7 +741,7 @@ class DefaultController extends AbstractController {
                                $registerMail =& $this->config['register']['mail'];
 
                                //Set password
                                $registerMail =& $this->config['register']['mail'];
 
                                //Set password

-                               $user->setPassword($this->hasher->encodePassword($user, $user->getPassword()));
+                               $user->setPassword($this->hasher->hashPassword($user, $user->getPassword()));

 
                                //Persist user
                                $this->manager->persist($user);
 
                                //Persist user
                                $this->manager->persist($user);