From 755ff9e835614fd66f67615aede950b38f8ab308 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 4 Oct 2016 10:42:45 +0200 Subject: [PATCH 1/2] 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. --- .../EventListener/CreateConfigListener.php | 4 ---- .../CreateConfigListenerTest.php | 20 ------------------- 2 files changed, 24 deletions(-) diff --git a/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php b/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php index 15f4ac3de..8e2f04e9b 100644 --- a/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php +++ b/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php @@ -45,10 +45,6 @@ class CreateConfigListener implements EventSubscriberInterface public function createConfig(UserEvent $event, $eventName = null, EventDispatcherInterface $eventDispatcher = null) { - if (!$event->getUser()->isEnabled()) { - return; - } - $config = new Config($event->getUser()); $config->setTheme($this->theme); $config->setItemsPerPage($this->itemsOnPage); diff --git a/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php b/tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php index 0cebd3e43..a78b77bc3 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 $this->response = Response::create(); } - public function testWithInvalidUser() - { - $user = new User(); - $user->setEnabled(false); - - $event = new FilterUserResponseEvent( - $user, - $this->request, - $this->response - ); - - $this->em->expects($this->never())->method('persist'); - $this->em->expects($this->never())->method('flush'); - - $this->dispatcher->dispatch( - FOSUserEvents::REGISTRATION_COMPLETED, - $event - ); - } - public function testWithValidUser() { $user = new User(); From 9a6ac0b47a75f7cc8c8541b3e3fd3f40a3712f4f Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 4 Oct 2016 11:20:58 +0200 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=91=8B=20HHVM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index b0b26b56e..4170ff043 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,31 +41,11 @@ env: matrix: fast_finish: true include: - # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency - - php: hhvm-3.12 - sudo: required - dist: trusty - group: edge - env: DB=mysql - addons: - apt: - packages: - - mysql-server-5.6 - - mysql-client-core-5.6 - - mysql-client-5.6 - services: - - mysql - - php: hhvm-3.12 - sudo: required - dist: trusty - group: edge - env: DB=sqlite - php: 7.0 env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite - php: 7.0 env: DB=sqlite ASSETS=build allow_failures: - - php: hhvm-3.12 - php: 7.1 - php: nightly