aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-10-04 10:42:45 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-10-04 10:42:46 +0200
commit755ff9e835614fd66f67615aede950b38f8ab308 (patch)
treeb1c31a46b1e13cd974e0c172c4c8d460af155400
parentf0b2d57154832fdd6255a1bef0df34a7144806c5 (diff)
downloadwallabag-755ff9e835614fd66f67615aede950b38f8ab308.tar.gz
wallabag-755ff9e835614fd66f67615aede950b38f8ab308.tar.zst
wallabag-755ff9e835614fd66f67615aede950b38f8ab308.zip
Create config even if user is disabled
When a user register itself AND the wallabag instance is configured to send a confirmation email, the user is disabled when the listener (which create the config) receive the event. There were a check (don't know why) if the user is enabled we create the config. But the user is disabled when confirmation email is actived.
-rw-r--r--src/Wallabag/UserBundle/EventListener/CreateConfigListener.php4
-rw-r--r--tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php20
2 files changed, 0 insertions, 24 deletions
diff --git a/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php b/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php
index 15f4ac3d..8e2f04e9 100644
--- a/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php
+++ b/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php
@@ -45,10 +45,6 @@ class CreateConfigListener implements EventSubscriberInterface
45 45
46 public function createConfig(UserEvent $event, $eventName = null, EventDispatcherInterface $eventDispatcher = null) 46 public function createConfig(UserEvent $event, $eventName = null, EventDispatcherInterface $eventDispatcher = null)
47 { 47 {
48 if (!$event->getUser()->isEnabled()) {
49 return;
50 }
51
52 $config = new Config($event->getUser()); 48 $config = new Config($event->getUser());
53 $config->setTheme($this->theme); 49 $config->setTheme($this->theme);
54 $config->setItemsPerPage($this->itemsOnPage); 50 $config->setItemsPerPage($this->itemsOnPage);
diff --git a/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php b/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php
index 0cebd3e4..a78b77bc 100644
--- a/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php
+++ b/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php
@@ -41,26 +41,6 @@ class CreateConfigListenerTest extends \PHPUnit_Framework_TestCase
41 $this->response = Response::create(); 41 $this->response = Response::create();
42 } 42 }
43 43
44 public function testWithInvalidUser()
45 {
46 $user = new User();
47 $user->setEnabled(false);
48
49 $event = new FilterUserResponseEvent(
50 $user,
51 $this->request,
52 $this->response
53 );
54
55 $this->em->expects($this->never())->method('persist');
56 $this->em->expects($this->never())->method('flush');
57
58 $this->dispatcher->dispatch(
59 FOSUserEvents::REGISTRATION_COMPLETED,
60 $event
61 );
62 }
63
64 public function testWithValidUser() 44 public function testWithValidUser()
65 { 45 {
66 $user = new User(); 46 $user = new User();