Merge pull request #2353 from wallabag/assets-fix

Basically, fix everything

diff --git a/.travis.yml b/.travis.yml
index b967293668155efe98ea923813cbd854bf9c802d..f1334f5265ccdd27f8b2f5e4b4b7669b1459bcef 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,29 +41,9 @@ 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 ASSETS=build DB=sqlite
     allow_failures:
-        - php: hhvm-3.12
         - php: 7.1
         - php: nightly
 

diff --git a/docs/de/user/installation.rst b/docs/de/user/installation.rst
index f9f34c3cdde71e826208b0832146abc45389e0d6..c438761f947cb34d5fee1a36e3eee76514449186 100644 (file)
--- a/docs/de/user/installation.rst
+++ b/docs/de/user/installation.rst
@@ -23,6 +23,7 @@ nicht alle folgenden Pakete installieren.
 - php-curl
 - php-gettext
 - php-tokenizer
+- php-bcmath
 
 wallabag nutzt PDO, um sich mit der Datenbank zu verbinden, darum benötigst du eines der folgenden Komponenten:
 

diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index 756eb74cdc7ef8902c65d727c02b277617d4a7a3..833a36a691e9c009124f193669682aaf4290ffc1 100644 (file)
--- 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
 - php-curl
 - php-gettext
 - php-tokenizer
+- php-bcmath
 
 wallabag uses PDO to connect to the database, so you'll need one of the following:
 

diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst
index e8d18434beb963dc8d330eb93d5e454d88564d34..cba8444a778e96c643029e167dbc18b0d5b6be6a 100644 (file)
--- 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
 - php-curl
 - php-gettext
 - php-tokenizer
+- php-bcmath
 
 wallabag 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 :
 

diff --git a/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php b/src/Wallabag/UserBundle/EventListener/CreateConfigListener.php
index 15f4ac3dee41faad596d6b56484d3cc1858b6e41..8e2f04e9beca05428dc5c0c4d698e0ddb85252c2 100644 (file)
--- 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 0cebd3e43731a23dba09040ab0b984a9574e75f1..a78b77bc37c332c628e7b405732a3339413899db 100644 (file)
--- 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();