aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.travis.yml20
-rw-r--r--docs/de/user/installation.rst1
-rw-r--r--docs/en/user/installation.rst1
-rw-r--r--docs/fr/user/installation.rst1
-rw-r--r--src/Wallabag/UserBundle/EventListener/CreateConfigListener.php4
-rw-r--r--tests/Wallabag/UserBundle/EventListener/CreateConfigListenerTest.php20
6 files changed, 3 insertions, 44 deletions
diff --git a/.travis.yml b/.travis.yml
index b9672936..f1334f52 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,29 +41,9 @@ env:
41matrix: 41matrix:
42 fast_finish: true 42 fast_finish: true
43 include: 43 include:
44 # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency
45 - php: hhvm-3.12
46 sudo: required
47 dist: trusty
48 group: edge
49 env: DB=mysql
50 addons:
51 apt:
52 packages:
53 - mysql-server-5.6
54 - mysql-client-core-5.6
55 - mysql-client-5.6
56 services:
57 - mysql
58 - php: hhvm-3.12
59 sudo: required
60 dist: trusty
61 group: edge
62 env: DB=sqlite
63 - php: 7.0 44 - php: 7.0
64 env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite 45 env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite
65 allow_failures: 46 allow_failures:
66 - php: hhvm-3.12
67 - php: 7.1 47 - php: 7.1
68 - php: nightly 48 - php: nightly
69 49
diff --git a/docs/de/user/installation.rst b/docs/de/user/installation.rst
index f9f34c3c..c438761f 100644
--- a/docs/de/user/installation.rst
+++ b/docs/de/user/installation.rst
@@ -23,6 +23,7 @@ nicht alle folgenden Pakete installieren.
23- php-curl 23- php-curl
24- php-gettext 24- php-gettext
25- php-tokenizer 25- php-tokenizer
26- php-bcmath
26 27
27wallabag nutzt PDO, um sich mit der Datenbank zu verbinden, darum benötigst du eines der folgenden Komponenten: 28wallabag nutzt PDO, um sich mit der Datenbank zu verbinden, darum benötigst du eines der folgenden Komponenten:
28 29
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index 756eb74c..833a36a6 100644
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -22,6 +22,7 @@ You'll need the following extensions for wallabag to work. Some of these may alr
22- php-curl 22- php-curl
23- php-gettext 23- php-gettext
24- php-tokenizer 24- php-tokenizer
25- php-bcmath
25 26
26wallabag uses PDO to connect to the database, so you'll need one of the following: 27wallabag uses PDO to connect to the database, so you'll need one of the following:
27 28
diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst
index e8d18434..cba8444a 100644
--- a/docs/fr/user/installation.rst
+++ b/docs/fr/user/installation.rst
@@ -22,6 +22,7 @@ Vous aurez besoin des extensions suivantes pour que wallabag fonctionne. Il est
22- php-curl 22- php-curl
23- php-gettext 23- php-gettext
24- php-tokenizer 24- php-tokenizer
25- php-bcmath
25 26
26wallabag utilise PDO afin de se connecter à une base de données, donc vous aurez besoin d'une extension et d'un système de bases de données parmi : 27wallabag utilise PDO afin de se connecter à une base de données, donc vous aurez besoin d'une extension et d'un système de bases de données parmi :
27 28
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();