Release wallabag 2.3.1

2017-12-26 16:04:28 +01:00
211 changed files with 3954 additions and 6511 deletions
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -8,15 +8,9 @@
 | Documentation | yes/no
 | Translation   | yes/no
 | CHANGELOG.md  | yes/no
+| Fixed tickets | #...
 | License       | MIT

-<!--
-Please list the issues your PR fixes using special keywords, see
-https://help.github.com/articles/closing-issues-using-keywords/
-
-Fixes #…
-->
-
 <!--
 - Please fill in this template according to the PR you're about to submit.
 - Replace this comment by a description of what your PR is solving.
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@ -26,18 +26,3 @@ tools:
 checks:
    php:
        code_rating: true
-
-# use the new PHP analysis engine
-# https://scrutinizer-ci.com/docs/tools/php/php-analyzer/guides/migrate_to_new_php_analysis
-build:
-    nodes:
-        analysis:
-            tests:
-                override:
-                    - php-scrutinizer-run
-
-    dependencies:
-        override:
-            - npm install -g 'yarn'
-            - yarn install --force
-            - COMPOSER_MEMORY_LIMIT=-1 composer install -o --no-interaction --no-progress --prefer-dist
--- a/.travis.yml
+++ b/.travis.yml
@ -1,14 +1,17 @@
 language: php

 services:
-    - rabbitmq
-    - redis
+  - rabbitmq
+  - redis
+
+# faster builds on docker-container setup
+sudo: false

 # used for HHVM
 addons:
-    apt:
-        packages:
-            - tidy
+  apt:
+    packages:
+      - tidy

 # cache vendor dirs
 cache:
@ -41,6 +44,7 @@ matrix:
        - php: 7.0
          env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite
    allow_failures:
+        - php: 7.2
        - php: nightly

 # exclude v1 branches
@ -48,14 +52,6 @@ branches:
    except:
        - legacy

-before_install:
-    - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
-
-install:
-    - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.10; fi;
-    - if [[ $ASSETS = build ]]; then npm install -g yarn@latest; fi;
-    - if [[ $ASSETS = build ]]; then yarn install; fi;
-
 before_script:
    - PHP=$TRAVIS_PHP_VERSION
    - if [[ ! $PHP = hhvm* ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
@ -63,17 +59,17 @@ before_script:
    - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
    - composer self-update --no-progress
    - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi;
-    # increase swap to avoid "proc_open(): fork failed - Cannot allocate memory"
-    # this should be removed when no more PHP 5 build will be defined
-    - sudo swapon -s
-    - sudo fallocate -l 4G /swapfile
-    - sudo chmod 600 /swapfile
-    - sudo mkswap /swapfile
-    - sudo swapon /swapfile
-    - sudo swapon -s
+
+install:
+    - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.10; fi;
+    - if [[ $ASSETS = build ]]; then npm install -g yarn@latest; fi;
+    - if [[ $ASSETS = build ]]; then yarn install; fi;
+
+before_install:
+    - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;

 script:
-    - travis_wait bash composer update -o --no-interaction --no-progress --prefer-dist
+    - travis_wait composer update --no-interaction --no-progress
    - echo "travis_fold:start:prepare"
    - make prepare DB=$DB
    - echo "travis_fold:end:prepare"
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,140 +1,5 @@
 # Changelog

-## [2.3.8](https://github.com/wallabag/wallabag/tree/2.3.8)
-   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.7...2.3.8)
-
-### Fixes
-
- Jump to 2.3.8-dev [#3897](https://github.com/wallabag/wallabag/pull/3897)
- material: fix left padding on non-entry pages [#3901](https://github.com/wallabag/wallabag/pull/3901)
- Make dev/install/update script posix compatible [#3860](https://github.com/wallabag/wallabag/pull/3860)
- epub: fix exception when articles have the same title [#3908](https://github.com/wallabag/wallabag/pull/3908)
- Fix PHP warning [#3909](https://github.com/wallabag/wallabag/pull/3909)
- Add ability to match many domains for credentials [#3937](https://github.com/wallabag/wallabag/pull/3937)
- material: add metadata to list view [#3942](https://github.com/wallabag/wallabag/pull/3942)
- Enable no-referrer on img tags, enable strict-origin-when-cross-origin by default [#3943](https://github.com/wallabag/wallabag/pull/3943)
- Remove preview picture from share view page#3922
- Fix Intl Locale issue [#3964](https://github.com/wallabag/wallabag/pull/3964)
-
-## [2.3.7](https://github.com/wallabag/wallabag/tree/2.3.7)
-   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.6...2.3.7)
-
-### Fixes
-
- Jump to 2.3.7-dev [#3837](https://github.com/wallabag/wallabag/pull/3837)
- Fix bad order parameter in the API [#3841](https://github.com/wallabag/wallabag/pull/3841)
- Update composer.json to add php-tidy (ext-tidy) [#3853](https://github.com/wallabag/wallabag/pull/3853)
- Add dedicated email for site config issue [#3861](https://github.com/wallabag/wallabag/pull/3861)
- Fix read & starred status in Pocket import [#3819](https://github.com/wallabag/wallabag/pull/3819)
- Fix broken 2 factor auth logo image [#3869](https://github.com/wallabag/wallabag/pull/3869)
- Fix CORS for API [#3882](https://github.com/wallabag/wallabag/pull/3882)
- Add support of expect parameter to change return object when deleting entry [#3887](https://github.com/wallabag/wallabag/pull/3887)
- epub export: fix missing cover image, only for exports of one article [#3886](https://github.com/wallabag/wallabag/pull/3886)
- Allow optional --ignore-root-warning [#3885](https://github.com/wallabag/wallabag/pull/3885)
- material: fix left padding of content on medium screens [#3893](https://github.com/wallabag/wallabag/pull/3893)
- material: hide creation date from card actions on specific sizes [#3894](https://github.com/wallabag/wallabag/pull/3894)
-
-## [2.3.6](https://github.com/wallabag/wallabag/tree/2.3.6)
-   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.5...2.3.6)
-
-### Fixes
-
- Jump to 2.3.6-dev and update release process [#3814](https://github.com/wallabag/wallabag/pull/3814)
- Fix tag API leak [#3823](https://github.com/wallabag/wallabag/pull/3823)
- Validate imported entry to avoid error on import [#3816](https://github.com/wallabag/wallabag/pull/3816)
- Fix incorrect reading time calculation for entries with CJK characters [#3820](https://github.com/wallabag/wallabag/pull/3820)
- EntriesExport/epub: replace epub identifier with unique urn [#3827](https://github.com/wallabag/wallabag/pull/3827)
- Fix settings field inverted [#3833](https://github.com/wallabag/wallabag/pull/3833)
- Cast client id to avoid PG error [#3831](https://github.com/wallabag/wallabag/pull/3831)
- Rework of EPUB/PDF exports [#3826](https://github.com/wallabag/wallabag/pull/3826)
-
-## [2.3.5](https://github.com/wallabag/wallabag/tree/2.3.5)
-   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.4...2.3.5)
-
-### Fixes
-
- Jump to 2.3.5-dev and update release process [#3778](https://github.com/wallabag/wallabag/pull/3778)
- Remove preview picture from single entry view page [#3765](https://github.com/wallabag/wallabag/pull/3765)
- Fix Android app login issue [#3784](https://github.com/wallabag/wallabag/pull/3784)
- material: fix missing thumbnail on list view [#3782](https://github.com/wallabag/wallabag/pull/3782)
- material: decrease size of tags on list view [#3783](https://github.com/wallabag/wallabag/pull/3783)
- build: upgrade yarn dependencies, update prod assets [#3781](https://github.com/wallabag/wallabag/pull/3781)
- No more dev for guzzle-site-authenticator [#3810](https://github.com/wallabag/wallabag/pull/3810)
-
-## [2.3.4](https://github.com/wallabag/wallabag/tree/2.3.4)
-   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.3...2.3.4)
-
-### Fixes
-
- Fix image downloading on null image path [#3684](https://github.com/wallabag/wallabag/pull/3684)
- Remove remaining deprecation notices [#3686](https://github.com/wallabag/wallabag/pull/3686)
- Fix mobile viewport on big iframe and video elements [#3683](https://github.com/wallabag/wallabag/pull/3683)
- Autofocus the username field on the login page [#3691](https://github.com/wallabag/wallabag/pull/3691)
- Feature/svg logo [#3692](https://github.com/wallabag/wallabag/pull/3692)
- Fixes a typo [#3702](https://github.com/wallabag/wallabag/pull/3702)
- Update release script [#3705](https://github.com/wallabag/wallabag/pull/3705)
- Removing failing test from Travis [#3707](https://github.com/wallabag/wallabag/pull/3707)
- Replace SO url by lemonde.fr to avoid random failing test [#3685](https://github.com/wallabag/wallabag/pull/3685)
- php-cs-fixer: native_function_invocation [#3716](https://github.com/wallabag/wallabag/pull/3716)
- PHP 7.2 shouldn't fail [#3717](https://github.com/wallabag/wallabag/pull/3717)
- Liberation goes https [#3726](https://github.com/wallabag/wallabag/pull/3726)
- Bugfix: Sanitize the title of a saved webpage from invalid UTF-8 characters. [#3725](https://github.com/wallabag/wallabag/pull/3725)
- Fix dockerfile php72 [#3734](https://github.com/wallabag/wallabag/pull/3734)
- Fix sort parameters [#3719](https://github.com/wallabag/wallabag/pull/3719)
- Add note on GitHub PR template to auto-close issues [#3763](https://github.com/wallabag/wallabag/pull/3763)
- Fix link to wallabag requirements in documentation [#3766](https://github.com/wallabag/wallabag/pull/3766)
- Update translation when marking as read [#3772](https://github.com/wallabag/wallabag/pull/3772)
- Makefile fixes for non GNU systems [#3706](https://github.com/wallabag/wallabag/pull/3706)
- Card no preview replaced by wallabag logo [#3774](https://github.com/wallabag/wallabag/pull/3774)
-
-### Changes
-
- Propose YunoHost badge for installing [#3678](https://github.com/wallabag/wallabag/pull/3678)
- More robust srcset image attribute handling [#3690](https://github.com/wallabag/wallabag/pull/3690)
- Rename getBuilderByUser and refactor query for untagged entries [#3712](https://github.com/wallabag/wallabag/pull/3712)
- Show tags on non-image gallery preview card [#3743](https://github.com/wallabag/wallabag/pull/3743)
- add manifest.json for android pwa [#3606](https://github.com/wallabag/wallabag/pull/3606)
- Add placeholder image to card-based gallery entries page [#3745](https://github.com/wallabag/wallabag/pull/3745)
- Abort running install and update script if root [#3733](https://github.com/wallabag/wallabag/pull/3733)
- Swap entry url with origin url if graby provides an updated one [#3553](https://github.com/wallabag/wallabag/pull/3553)
-
-## [2.3.3](https://github.com/wallabag/wallabag/tree/2.3.3)
-   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.2...2.3.3)
-
-### Fixes
-
- Fix error when withRemove variable is not defined. [#3573](https://github.com/wallabag/wallabag/pull/3573)
- Fix title card HTML parsing [#3592](https://github.com/wallabag/wallabag/pull/3592)
- Fix tests [#3597](https://github.com/wallabag/wallabag/pull/3597)
- Fix tests [#3619](https://github.com/wallabag/wallabag/pull/3619)
- Better encoding of the URI for the bookmarklet [#3616](https://github.com/wallabag/wallabag/pull/3616)
- Fix overflow wrap issue [#3652](https://github.com/wallabag/wallabag/pull/3652)
- Fix/firefox mobile unneeded resize [#3653](https://github.com/wallabag/wallabag/pull/3653)
- Fix srcset attribute on images downloaded [#3661](https://github.com/wallabag/wallabag/pull/3661)
- Fix authors and preview alt encoding display [#3664](https://github.com/wallabag/wallabag/pull/3664)
- Spelling: GitHub, Log out, of the dev [#3614](https://github.com/wallabag/wallabag/pull/3614)
- Fix tests [#3668](https://github.com/wallabag/wallabag/pull/3668)
- Fixed migrations with dash into db names [#3538](https://github.com/wallabag/wallabag/pull/3538)
-
-### Changes
-
- Allow login by email [#3615](https://github.com/wallabag/wallabag/pull/3615)
- Occitan update [#3646](https://github.com/wallabag/wallabag/pull/3646)
- Highlight code in articles using highlight.js [#3636](https://github.com/wallabag/wallabag/pull/3636)
-
-## [2.3.2](https://github.com/wallabag/wallabag/tree/2.3.2)
-   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.1...2.3.2)
-
-### Fixes
-
- Add `set -eu` to update.sh [#3546](https://github.com/wallabag/wallabag/pull/3546)
- Fix broken link to remove tags from entries [#3536](https://github.com/wallabag/wallabag/pull/3536)
-
-### Changes
-
- Nav actions updated [#3541](https://github.com/wallabag/wallabag/pull/3541)
- Replaced Create new client link with a button [#3539](https://github.com/wallabag/wallabag/pull/3539)
-
 ## [2.3.1](https://github.com/wallabag/wallabag/tree/2.3.1)
   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.0...2.3.1)

--- a/53
+++ b/53
@ -1,53 +0,0 @@
-SHELL=bash
-TMP_FOLDER=/tmp
-RELEASE_FOLDER=wllbg-release
-
-ENV ?= prod
-
-help: ## Display this help menu
-	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
-
-clean: ## Clear the application cache
-	rm -rf var/cache/*
-
-install: ## Install wallabag with the latest version
-	@./scripts/install.sh $(ENV)
-
-update: ## Update the wallabag installation to the latest version
-	@./scripts/update.sh $(ENV)
-
-dev: ## Install the latest dev version
-	@./scripts/dev.sh
-
-run: ## Run the wallabag built-in server
-	@php bin/console server:run --env=dev
-
-build: ## Run webpack
-	@npm run build:$(ENV)
-
-prepare: clean ## Prepare database for testsuite
-ifdef DB
-	cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml
-endif
-	-php bin/console doctrine:database:drop --force --env=test
-	php bin/console doctrine:database:create --env=test
-	php bin/console doctrine:migrations:migrate --no-interaction --env=test
-
-fixtures: ## Load fixtures into database
-	php bin/console doctrine:fixtures:load --no-interaction --env=test
-
-test: prepare fixtures ## Launch wallabag testsuite
-	bin/simple-phpunit -v
-
-release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`).
-ifndef VERSION
-	$(error VERSION is not set)
-endif
-	@./scripts/release.sh $(VERSION) $(TMP_FOLDER) $(RELEASE_FOLDER) $(ENV)
-
-deploy: ## Deploy wallabag
-	@bundle exec cap staging deploy
-
-.PHONY: help clean prepare install fixtures update build test release deploy run dev
-
-.DEFAULT_GOAL := install
--- a/54
+++ b/54
@ -1,2 +1,52 @@
-.DEFAULT:
-	gmake $@
+TMP_FOLDER=/tmp
+RELEASE_FOLDER=wllbg-release
+
+ENV ?= prod
+
+help: ## Display this help menu
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+
+clean: ## Clear the application cache
+	rm -rf var/cache/*
+
+install: ## Install wallabag with the latest version
+	@sh scripts/install.sh $(ENV)
+
+update: ## Update the wallabag installation to the latest version
+	@sh scripts/update.sh $(ENV)
+
+dev: ## Install the latest dev version
+	@sh scripts/dev.sh
+
+run: ## Run the wallabag built-in server
+	@php bin/console server:run --env=dev
+
+build: ## Run webpack
+	@npm run build:$(ENV)
+
+prepare: clean ## Prepare database for testsuite
+ifdef DB
+	cp app/config/tests/parameters_test.$(DB).yml app/config/parameters_test.yml
+endif
+	-php bin/console doctrine:database:drop --force --env=test
+	php bin/console doctrine:database:create --env=test
+	php bin/console doctrine:migrations:migrate --no-interaction --env=test
+
+fixtures: ## Load fixtures into database
+	php bin/console doctrine:fixtures:load --no-interaction --env=test
+
+test: prepare fixtures ## Launch wallabag testsuite
+	bin/simple-phpunit -v
+
+release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`).
+ifndef VERSION
+	$(error VERSION is not set)
+endif
+	@sh scripts/release.sh $(VERSION) $(TMP_FOLDER) $(RELEASE_FOLDER) $(ENV)
+
+deploy: ## Deploy wallabag
+	@bundle exec cap staging deploy
+
+.PHONY: help clean prepare install fixtures update build test release deploy run dev
+
+.DEFAULT_GOAL := install
--- a/README.md
+++ b/README.md
@ -13,7 +13,7 @@ If you do not have your own server, consider [the wallabag.it hosting solution](
 ![wallabag logo](https://raw.githubusercontent.com/wallabag/logo/master/_default/typo-horizontal/png/sm/logo-typo-horizontal-black-no-bg-no-border-sm.png)

 # Install wallabag
-Please read [the documentation to see the wallabag requirements](https://doc.wallabag.org/en/admin/installation/requirements.html).
+Please read [the documentation to see the wallabag requirements](http://doc.wallabag.org/en/master/user/installation.html#requirements).

 Then you can install wallabag by executing the following commands:

@ -24,11 +24,6 @@ cd wallabag && make install

 Now, [configure a virtual host](https://doc.wallabag.org/en/admin/installation/virtualhosts.html) to use your wallabag. 

-# Run on YunoHost
-[![Install Wallabag with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=wallabag2)
-
-Wallabag app for [YunoHost](https://yunohost.org). See [here](https://github.com/YunoHost-Apps/wallabag2_ynh)
-
 # License
 Copyright © 2013-2018 Nicolas Lœuillet <nicolas@loeuillet.org>
 This work is free. You can redistribute it and/or modify it under the
--- a/RELEASE_PROCESS.md
+++ b/RELEASE_PROCESS.md
@ -4,17 +4,14 @@ A release is mostly a git tag of http://github.com/wallabag/wallabag, following

 ### Steps to release

-During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE` (like 2.3.4).
+During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE`.

-#### Prepare the release
+#### Files to edit

- Update these files with new information
-    - `app/config/wallabag.yml` (`wallabag_core.version`)
-    - `CHANGELOG.md`
- Create a PR named "Prepare $LAST_WALLABAG_RELEASE release".
- Wait for test to be ok, merge it.
+- `app/config/wallabag.yml` (`wallabag_core.version`)
+- `CHANGELOG.md`

-#### Create a new release on GitHub
+#### Create release on GitHub

 - Run these commands to create the tag:

@ -29,8 +26,8 @@ SYMFONY_ENV=prod composer up --no-dev

 ```diff
 script:
-    - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist
-+    - travis_wait bash composer update -o --no-interaction --no-progress --prefer-dist
+-    - travis_wait bash composer install -o  --no-interaction --no-progress --prefer-dist
+    - travis_wait composer update --no-interaction --no-progress
 ```

 - Then continue with these commands:
@ -45,15 +42,16 @@ git push origin release-$LAST_WALLABAG_RELEASE
 - Run these command to create the package:

 ```
-make release VERSION=$LAST_WALLABAG_RELEASE
+make release master /tmp wllbg-release prod
 ```

- [Create the new release on GitHub](https://github.com/wallabag/wallabag/releases/new) by targetting the `release-$LAST_WALLABAG_RELEASE` branch. You have to upload the package (generated previously).
- Close the previously created pull request (**DO NOT MERGE IT**) and delete the `release-$LAST_WALLABAG_RELEASE` branch.
+- [Create the new release on GitHub](https://github.com/wallabag/wallabag/releases/new). You have to upload on this page the package.
+- Delete the `release-$LAST_WALLABAG_RELEASE` branch and close the pull request (**DO NOT MERGE IT**).
 - Update the URL shortener (used on `wllbg.org` to generate links like `https://wllbg.org/latest-v2-package` or `http://wllbg.org/latest-v2`)
+- Update [the downloads page](https://github.com/wallabag/wallabag.org/blob/master/content/pages/download.md) on the website (MD5 sum, release date)
 - Update Dockerfile https://github.com/wallabag/docker (and create a new tag)
- Update wallabag.org website (downloads, MD5 sum, releases and new blog post)
- Put the next patch version suffixed with `-dev` in `app/config/wallabag.yml` (`wallabag_core.version`)
+- Update wallabag.org website (downloads, releases and new blog post)
+- Put the next patch version suffixed with `-dev` in `app/config/config.yml` (`wallabag_core.version`)
 - Drink a :beer:!

 ### `composer.lock`
--- a/app/DoctrineMigrations/Version20160401000000.php
+++ b/app/DoctrineMigrations/Version20160401000000.php
@ -2,14 +2,26 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Initial database structure.
 */
-class Version20160401000000 extends WallabagMigration
+class Version20160401000000 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -64,30 +76,30 @@ SQL
            case 'mysql':
                $sql = <<<SQL
 CREATE TABLE {$this->getTable('craue_config_setting')} (name VARCHAR(255) NOT NULL, value VARCHAR(255) DEFAULT NULL, section VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_5D9649505E237E06 (name), PRIMARY KEY(name)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
-CREATE TABLE {$this->getTable('entry')} (id INT AUTO_INCREMENT NOT NULL, user_id INT DEFAULT NULL, title LONGTEXT DEFAULT NULL, url LONGTEXT DEFAULT NULL, is_archived TINYINT(1) NOT NULL, is_starred TINYINT(1) NOT NULL, content LONGTEXT DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype LONGTEXT DEFAULT NULL, language LONGTEXT DEFAULT NULL, reading_time INT DEFAULT NULL, domain_name LONGTEXT DEFAULT NULL, preview_picture LONGTEXT DEFAULT NULL, is_public TINYINT(1) DEFAULT '0', INDEX IDX_F4D18282A76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
+CREATE TABLE `{$this->getTable('entry')}` (id INT AUTO_INCREMENT NOT NULL, user_id INT DEFAULT NULL, title LONGTEXT DEFAULT NULL, url LONGTEXT DEFAULT NULL, is_archived TINYINT(1) NOT NULL, is_starred TINYINT(1) NOT NULL, content LONGTEXT DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype LONGTEXT DEFAULT NULL, language LONGTEXT DEFAULT NULL, reading_time INT DEFAULT NULL, domain_name LONGTEXT DEFAULT NULL, preview_picture LONGTEXT DEFAULT NULL, is_public TINYINT(1) DEFAULT '0', INDEX IDX_F4D18282A76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
 CREATE TABLE {$this->getTable('entry_tag')} (entry_id INT NOT NULL, tag_id INT NOT NULL, INDEX IDX_C9F0DD7CBA364942 (entry_id), INDEX IDX_C9F0DD7CBAD26311 (tag_id), PRIMARY KEY(entry_id, tag_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
-CREATE TABLE {$this->getTable('config')} (id INT AUTO_INCREMENT NOT NULL, user_id INT DEFAULT NULL, theme VARCHAR(255) NOT NULL, items_per_page INT NOT NULL, language VARCHAR(255) NOT NULL, rss_token VARCHAR(255) DEFAULT NULL, rss_limit INT DEFAULT NULL, reading_speed DOUBLE PRECISION DEFAULT NULL, UNIQUE INDEX UNIQ_87E64C53A76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
-CREATE TABLE {$this->getTable('tagging_rule')} (id INT AUTO_INCREMENT NOT NULL, config_id INT DEFAULT NULL, rule VARCHAR(255) NOT NULL, tags LONGTEXT NOT NULL COMMENT '(DC2Type:simple_array)', INDEX IDX_2D9B3C5424DB0683 (config_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
-CREATE TABLE {$this->getTable('tag')} (id INT AUTO_INCREMENT NOT NULL, `label` LONGTEXT NOT NULL, slug VARCHAR(128) NOT NULL, UNIQUE INDEX UNIQ_4CA58A8C989D9B62 (slug), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
+CREATE TABLE `{$this->getTable('config')}` (id INT AUTO_INCREMENT NOT NULL, user_id INT DEFAULT NULL, theme VARCHAR(255) NOT NULL, items_per_page INT NOT NULL, language VARCHAR(255) NOT NULL, rss_token VARCHAR(255) DEFAULT NULL, rss_limit INT DEFAULT NULL, reading_speed DOUBLE PRECISION DEFAULT NULL, UNIQUE INDEX UNIQ_87E64C53A76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
+CREATE TABLE `{$this->getTable('tagging_rule')}` (id INT AUTO_INCREMENT NOT NULL, config_id INT DEFAULT NULL, rule VARCHAR(255) NOT NULL, tags LONGTEXT NOT NULL COMMENT '(DC2Type:simple_array)', INDEX IDX_2D9B3C5424DB0683 (config_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
+CREATE TABLE `{$this->getTable('tag')}` (id INT AUTO_INCREMENT NOT NULL, `label` LONGTEXT NOT NULL, slug VARCHAR(128) NOT NULL, UNIQUE INDEX UNIQ_4CA58A8C989D9B62 (slug), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
 CREATE TABLE {$this->getTable('oauth2_clients')} (id INT AUTO_INCREMENT NOT NULL, random_id VARCHAR(255) NOT NULL, redirect_uris LONGTEXT NOT NULL COMMENT '(DC2Type:array)', secret VARCHAR(255) NOT NULL, allowed_grant_types LONGTEXT NOT NULL COMMENT '(DC2Type:array)', PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
 CREATE TABLE {$this->getTable('oauth2_access_tokens')} (id INT AUTO_INCREMENT NOT NULL, client_id INT NOT NULL, user_id INT DEFAULT NULL, token VARCHAR(255) NOT NULL, expires_at INT DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_368A42095F37A13B (token), INDEX IDX_368A420919EB6921 (client_id), INDEX IDX_368A4209A76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
 CREATE TABLE {$this->getTable('oauth2_refresh_tokens')} (id INT AUTO_INCREMENT NOT NULL, client_id INT NOT NULL, user_id INT DEFAULT NULL, token VARCHAR(255) NOT NULL, expires_at INT DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_20C9FB245F37A13B (token), INDEX IDX_20C9FB2419EB6921 (client_id), INDEX IDX_20C9FB24A76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
 CREATE TABLE {$this->getTable('oauth2_auth_codes')} (id INT AUTO_INCREMENT NOT NULL, client_id INT NOT NULL, user_id INT DEFAULT NULL, token VARCHAR(255) NOT NULL, redirect_uri LONGTEXT NOT NULL, expires_at INT DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_EE52E3FA5F37A13B (token), INDEX IDX_EE52E3FA19EB6921 (client_id), INDEX IDX_EE52E3FAA76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
-CREATE TABLE {$this->getTable('user')} (id INT AUTO_INCREMENT NOT NULL, username VARCHAR(180) NOT NULL, username_canonical VARCHAR(180) NOT NULL, email VARCHAR(180) NOT NULL, email_canonical VARCHAR(180) NOT NULL, enabled TINYINT(1) NOT NULL, salt VARCHAR(255) NOT NULL, password VARCHAR(255) NOT NULL, last_login DATETIME DEFAULT NULL, locked TINYINT(1) NOT NULL, expired TINYINT(1) NOT NULL, expires_at DATETIME DEFAULT NULL, confirmation_token VARCHAR(255) DEFAULT NULL, password_requested_at DATETIME DEFAULT NULL, roles LONGTEXT NOT NULL COMMENT '(DC2Type:array)', credentials_expired TINYINT(1) NOT NULL, credentials_expire_at DATETIME DEFAULT NULL, name LONGTEXT DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, authCode INT DEFAULT NULL, twoFactorAuthentication TINYINT(1) NOT NULL, trusted LONGTEXT DEFAULT NULL COMMENT '(DC2Type:json_array)', UNIQUE INDEX UNIQ_1D63E7E592FC23A8 (username_canonical), UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF (email_canonical), UNIQUE INDEX UNIQ_1D63E7E5C05FB297 (confirmation_token), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
+CREATE TABLE `{$this->getTable('user')}` (id INT AUTO_INCREMENT NOT NULL, username VARCHAR(180) NOT NULL, username_canonical VARCHAR(180) NOT NULL, email VARCHAR(180) NOT NULL, email_canonical VARCHAR(180) NOT NULL, enabled TINYINT(1) NOT NULL, salt VARCHAR(255) NOT NULL, password VARCHAR(255) NOT NULL, last_login DATETIME DEFAULT NULL, locked TINYINT(1) NOT NULL, expired TINYINT(1) NOT NULL, expires_at DATETIME DEFAULT NULL, confirmation_token VARCHAR(255) DEFAULT NULL, password_requested_at DATETIME DEFAULT NULL, roles LONGTEXT NOT NULL COMMENT '(DC2Type:array)', credentials_expired TINYINT(1) NOT NULL, credentials_expire_at DATETIME DEFAULT NULL, name LONGTEXT DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, authCode INT DEFAULT NULL, twoFactorAuthentication TINYINT(1) NOT NULL, trusted LONGTEXT DEFAULT NULL COMMENT '(DC2Type:json_array)', UNIQUE INDEX UNIQ_1D63E7E592FC23A8 (username_canonical), UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF (email_canonical), UNIQUE INDEX UNIQ_1D63E7E5C05FB297 (confirmation_token), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
 CREATE TABLE {$this->getTable('annotation')} (id INT AUTO_INCREMENT NOT NULL, user_id INT DEFAULT NULL, entry_id INT DEFAULT NULL, text LONGTEXT NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, quote VARCHAR(255) NOT NULL, ranges LONGTEXT NOT NULL COMMENT '(DC2Type:array)', INDEX IDX_A7AED006A76ED395 (user_id), INDEX IDX_A7AED006BA364942 (entry_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
-ALTER TABLE {$this->getTable('entry')} ADD CONSTRAINT FK_F4D18282A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id);
-ALTER TABLE {$this->getTable('entry_tag')} ADD CONSTRAINT FK_C9F0DD7CBA364942 FOREIGN KEY (entry_id) REFERENCES {$this->getTable('entry')} (id);
-ALTER TABLE {$this->getTable('entry_tag')} ADD CONSTRAINT FK_C9F0DD7CBAD26311 FOREIGN KEY (tag_id) REFERENCES {$this->getTable('tag')} (id);
-ALTER TABLE {$this->getTable('config')} ADD CONSTRAINT FK_87E64C53A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id);
-ALTER TABLE {$this->getTable('tagging_rule')} ADD CONSTRAINT FK_2D9B3C5424DB0683 FOREIGN KEY (config_id) REFERENCES {$this->getTable('config')} (id);
+ALTER TABLE `{$this->getTable('entry')}` ADD CONSTRAINT FK_F4D18282A76ED395 FOREIGN KEY (user_id) REFERENCES `{$this->getTable('user')}` (id);
+ALTER TABLE {$this->getTable('entry_tag')} ADD CONSTRAINT FK_C9F0DD7CBA364942 FOREIGN KEY (entry_id) REFERENCES `{$this->getTable('entry')}` (id);
+ALTER TABLE {$this->getTable('entry_tag')} ADD CONSTRAINT FK_C9F0DD7CBAD26311 FOREIGN KEY (tag_id) REFERENCES `{$this->getTable('tag')}` (id);
+ALTER TABLE `{$this->getTable('config')}` ADD CONSTRAINT FK_87E64C53A76ED395 FOREIGN KEY (user_id) REFERENCES `{$this->getTable('user')}` (id);
+ALTER TABLE `{$this->getTable('tagging_rule')}` ADD CONSTRAINT FK_2D9B3C5424DB0683 FOREIGN KEY (config_id) REFERENCES `{$this->getTable('config')}` (id);
 ALTER TABLE {$this->getTable('oauth2_access_tokens')} ADD CONSTRAINT FK_368A420919EB6921 FOREIGN KEY (client_id) REFERENCES {$this->getTable('oauth2_clients')} (id);
-ALTER TABLE {$this->getTable('oauth2_access_tokens')} ADD CONSTRAINT FK_368A4209A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id);
+ALTER TABLE {$this->getTable('oauth2_access_tokens')} ADD CONSTRAINT FK_368A4209A76ED395 FOREIGN KEY (user_id) REFERENCES `{$this->getTable('user')}` (id);
 ALTER TABLE {$this->getTable('oauth2_refresh_tokens')} ADD CONSTRAINT FK_20C9FB2419EB6921 FOREIGN KEY (client_id) REFERENCES {$this->getTable('oauth2_clients')} (id);
-ALTER TABLE {$this->getTable('oauth2_refresh_tokens')} ADD CONSTRAINT FK_20C9FB24A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id);
+ALTER TABLE {$this->getTable('oauth2_refresh_tokens')} ADD CONSTRAINT FK_20C9FB24A76ED395 FOREIGN KEY (user_id) REFERENCES `{$this->getTable('user')}` (id);
 ALTER TABLE {$this->getTable('oauth2_auth_codes')} ADD CONSTRAINT FK_EE52E3FA19EB6921 FOREIGN KEY (client_id) REFERENCES {$this->getTable('oauth2_clients')} (id);
-ALTER TABLE {$this->getTable('oauth2_auth_codes')} ADD CONSTRAINT FK_EE52E3FAA76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id);
-ALTER TABLE {$this->getTable('annotation')} ADD CONSTRAINT FK_A7AED006A76ED395 FOREIGN KEY (user_id) REFERENCES {$this->getTable('user')} (id);
-ALTER TABLE {$this->getTable('annotation')} ADD CONSTRAINT FK_A7AED006BA364942 FOREIGN KEY (entry_id) REFERENCES {$this->getTable('entry')} (id);
+ALTER TABLE {$this->getTable('oauth2_auth_codes')} ADD CONSTRAINT FK_EE52E3FAA76ED395 FOREIGN KEY (user_id) REFERENCES `{$this->getTable('user')}` (id);
+ALTER TABLE {$this->getTable('annotation')} ADD CONSTRAINT FK_A7AED006A76ED395 FOREIGN KEY (user_id) REFERENCES `{$this->getTable('user')}` (id);
+ALTER TABLE {$this->getTable('annotation')} ADD CONSTRAINT FK_A7AED006BA364942 FOREIGN KEY (entry_id) REFERENCES `{$this->getTable('entry')}` (id);
 SQL
                ;
                foreach (explode("\n", $sql) as $query) {
@ -185,4 +197,9 @@ SQL
        $this->addSql("DROP TABLE {$this->getTable('user')}");
        $this->addSql("DROP TABLE {$this->getTable('annotation')}");
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20160410190541.php
+++ b/app/DoctrineMigrations/Version20160410190541.php
@ -2,14 +2,26 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Added foreign keys for account resetting.
 */
-class Version20160410190541 extends WallabagMigration
+class Version20160410190541 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -44,4 +56,9 @@ class Version20160410190541 extends WallabagMigration

        $this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'share_public'");
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20160812120952.php
+++ b/app/DoctrineMigrations/Version20160812120952.php
@ -2,14 +2,26 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Added name field on wallabag_oauth2_clients.
 */
-class Version20160812120952 extends WallabagMigration
+class Version20160812120952 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -53,4 +65,9 @@ class Version20160812120952 extends WallabagMigration
            $clientsTable->dropColumn('name');
        }
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20160911214952.php
+++ b/app/DoctrineMigrations/Version20160911214952.php
@ -2,14 +2,26 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Added settings for RabbitMQ and Redis imports.
 */
-class Version20160911214952 extends WallabagMigration
+class Version20160911214952 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -44,4 +56,9 @@ class Version20160911214952 extends WallabagMigration
        $this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'import_with_redis';");
        $this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'import_with_rabbitmq';");
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20160916201049.php
+++ b/app/DoctrineMigrations/Version20160916201049.php
@ -2,14 +2,26 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Added pocket_consumer_key field on wallabag_config.
 */
-class Version20160916201049 extends WallabagMigration
+class Version20160916201049 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -32,4 +44,9 @@ class Version20160916201049 extends WallabagMigration
        $configTable->dropColumn('pocket_consumer_key');
        $this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('pocket_consumer_key', NULL, 'import')");
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20161001072726.php
+++ b/app/DoctrineMigrations/Version20161001072726.php
@ -2,15 +2,27 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Migrations\SkipMigrationException;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Added pocket_consumer_key field on wallabag_config.
 */
-class Version20161001072726 extends WallabagMigration
+class Version20161001072726 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -24,7 +36,7 @@ class Version20161001072726 extends WallabagMigration
                $query = $this->connection->query("
                    SELECT CONSTRAINT_NAME
                    FROM information_schema.key_column_usage
-                    WHERE TABLE_NAME = '" . $this->getTable('entry_tag', WallabagMigration::UN_ESCAPED_TABLE) . "' AND CONSTRAINT_NAME LIKE 'FK_%'
+                    WHERE TABLE_NAME = '" . $this->getTable('entry_tag') . "' AND CONSTRAINT_NAME LIKE 'FK_%'
                    AND TABLE_SCHEMA = '" . $this->connection->getDatabase() . "'"
                );
                $query->execute();
@ -42,7 +54,7 @@ class Version20161001072726 extends WallabagMigration
                    FROM   pg_constraint c
                    JOIN   pg_namespace n ON n.oid = c.connamespace
                    WHERE  contype = 'f'
-                    AND    conrelid::regclass::text = '" . $this->getTable('entry_tag', WallabagMigration::UN_ESCAPED_TABLE) . "'
+                    AND    conrelid::regclass::text = '" . $this->getTable('entry_tag') . "'
                    AND    n.nspname = 'public';"
                );
                $query->execute();
@ -63,7 +75,7 @@ class Version20161001072726 extends WallabagMigration
                $query = $this->connection->query("
                    SELECT CONSTRAINT_NAME
                    FROM information_schema.key_column_usage
-                    WHERE TABLE_NAME = '" . $this->getTable('annotation', WallabagMigration::UN_ESCAPED_TABLE) . "'
+                    WHERE TABLE_NAME = '" . $this->getTable('annotation') . "'
                    AND CONSTRAINT_NAME LIKE 'FK_%'
                    AND COLUMN_NAME = 'entry_id'
                    AND TABLE_SCHEMA = '" . $this->connection->getDatabase() . "'"
@ -83,7 +95,7 @@ class Version20161001072726 extends WallabagMigration
                    FROM   pg_constraint c
                    JOIN   pg_namespace n ON n.oid = c.connamespace
                    WHERE  contype = 'f'
-                    AND    conrelid::regclass::text = '" . $this->getTable('annotation', WallabagMigration::UN_ESCAPED_TABLE) . "'
+                    AND    conrelid::regclass::text = '" . $this->getTable('annotation') . "'
                    AND    n.nspname = 'public'
                    AND    pg_get_constraintdef(c.oid) LIKE '%entry_id%';"
                );
@ -105,4 +117,9 @@ class Version20161001072726 extends WallabagMigration
    {
        throw new SkipMigrationException('Too complex ...');
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20161022134138.php
+++ b/app/DoctrineMigrations/Version20161022134138.php
@ -2,14 +2,26 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Converted database to utf8mb4 encoding (for MySQL only).
 */
-class Version20161022134138 extends WallabagMigration
+class Version20161022134138 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -17,7 +29,7 @@ class Version20161022134138 extends WallabagMigration
    {
        $this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');

-        $this->addSql('ALTER DATABASE `' . $this->connection->getParams()['dbname'] . '` CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci;');
+        $this->addSql('ALTER DATABASE ' . $this->connection->getParams()['dbname'] . ' CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci;');

        // convert field length for utf8mb4
        // http://stackoverflow.com/a/31474509/569101
@ -48,7 +60,7 @@ class Version20161022134138 extends WallabagMigration
    {
        $this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');

-        $this->addSql('ALTER DATABASE `' . $this->connection->getParams()['dbname'] . '` CHARACTER SET = utf8 COLLATE = utf8_unicode_ci;');
+        $this->addSql('ALTER DATABASE ' . $this->connection->getParams()['dbname'] . ' CHARACTER SET = utf8 COLLATE = utf8_unicode_ci;');

        $this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
        $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
@ -65,4 +77,9 @@ class Version20161022134138 extends WallabagMigration

        $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CHANGE `name` `name` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20161024212538.php
+++ b/app/DoctrineMigrations/Version20161024212538.php
@ -2,16 +2,28 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Added user_id column on oauth2_clients to prevent users to delete API clients from other users.
 */
-class Version20161024212538 extends WallabagMigration
+class Version20161024212538 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
    private $constraintName = 'IDX_user_oauth_client';

+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -47,4 +59,9 @@ class Version20161024212538 extends WallabagMigration
            $clientsTable->removeForeignKey($this->constraintName);
        }
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20161031132655.php
+++ b/app/DoctrineMigrations/Version20161031132655.php
@ -2,14 +2,26 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Added the internal setting to enable/disable downloading pictures.
 */
-class Version20161031132655 extends WallabagMigration
+class Version20161031132655 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -32,4 +44,9 @@ class Version20161031132655 extends WallabagMigration
    {
        $this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'download_images_enabled';");
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20161104073720.php
+++ b/app/DoctrineMigrations/Version20161104073720.php
@ -2,16 +2,28 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Added created_at index on entry table.
 */
-class Version20161104073720 extends WallabagMigration
+class Version20161104073720 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
    private $indexName = 'IDX_entry_created_at';

+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -33,4 +45,9 @@ class Version20161104073720 extends WallabagMigration

        $entryTable->dropIndex($this->indexName);
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20161106113822.php
+++ b/app/DoctrineMigrations/Version20161106113822.php
@ -2,14 +2,26 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Added action_mark_as_read field on config table.
 */
-class Version20161106113822 extends WallabagMigration
+class Version20161106113822 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -36,4 +48,9 @@ class Version20161106113822 extends WallabagMigration

        $configTable->dropColumn('action_mark_as_read');
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20161117071626.php
+++ b/app/DoctrineMigrations/Version20161117071626.php
@ -2,14 +2,26 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Added the internal setting to share articles to unmark.it.
 */
-class Version20161117071626 extends WallabagMigration
+class Version20161117071626 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -44,4 +56,9 @@ class Version20161117071626 extends WallabagMigration
        $this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'share_unmark';");
        $this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'unmark_url';");
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20161118134328.php
+++ b/app/DoctrineMigrations/Version20161118134328.php
@ -2,14 +2,26 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Add http_status in `entry_table`.
 */
-class Version20161118134328 extends WallabagMigration
+class Version20161118134328 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -36,4 +48,9 @@ class Version20161118134328 extends WallabagMigration

        $entryTable->dropColumn('http_status');
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20161122144743.php
+++ b/app/DoctrineMigrations/Version20161122144743.php
@ -2,14 +2,26 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Add the restricted_access internal setting for articles with paywall.
 */
-class Version20161122144743 extends WallabagMigration
+class Version20161122144743 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -32,4 +44,9 @@ class Version20161122144743 extends WallabagMigration
    {
        $this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'restricted_access';");
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20161122203647.php
+++ b/app/DoctrineMigrations/Version20161122203647.php
@ -2,8 +2,10 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Methods and properties removed from `FOS\UserBundle\Model\User`.
@ -16,8 +18,18 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 * You need to drop the fields `expired` and `credentials_expired` from your database
 * schema, because they aren't mapped anymore.
 */
-class Version20161122203647 extends WallabagMigration
+class Version20161122203647 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -43,4 +55,9 @@ class Version20161122203647 extends WallabagMigration
        $userTable->addColumn('expired', 'smallint', ['notnull' => false]);
        $userTable->addColumn('credentials_expired', 'smallint', ['notnull' => false]);
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20161128084725.php
+++ b/app/DoctrineMigrations/Version20161128084725.php
@ -2,14 +2,26 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Added list_mode in user config.
 */
-class Version20161128084725 extends WallabagMigration
+class Version20161128084725 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -29,4 +41,9 @@ class Version20161128084725 extends WallabagMigration
        $configTable = $schema->getTable($this->getTable('config'));
        $configTable->dropColumn('list_mode');
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20161128131503.php
+++ b/app/DoctrineMigrations/Version20161128131503.php
@ -2,13 +2,15 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Removed locked, credentials_expire_at and expires_at.
 */
-class Version20161128131503 extends WallabagMigration
+class Version20161128131503 extends AbstractMigration implements ContainerAwareInterface
 {
    private $fields = [
        'locked' => 'smallint',
@ -16,6 +18,16 @@ class Version20161128131503 extends WallabagMigration
        'expires_at' => 'datetime',
    ];

+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -41,4 +53,9 @@ class Version20161128131503 extends WallabagMigration
            $userTable->addColumn($field, $type, ['notnull' => false]);
        }
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20161214094402.php
+++ b/app/DoctrineMigrations/Version20161214094402.php
@ -2,14 +2,26 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Renamed uuid to uid in entry table.
 */
-class Version20161214094402 extends WallabagMigration
+class Version20161214094402 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -55,4 +67,9 @@ class Version20161214094402 extends WallabagMigration
                $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' RENAME uid TO uuid');
        }
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20161214094403.php
+++ b/app/DoctrineMigrations/Version20161214094403.php
@ -2,16 +2,28 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Added index on wallabag_entry.uid.
 */
-class Version20161214094403 extends WallabagMigration
+class Version20161214094403 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
    private $indexName = 'IDX_entry_uid';

+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -33,4 +45,9 @@ class Version20161214094403 extends WallabagMigration

        $entryTable->dropIndex($this->indexName);
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20170127093841.php
+++ b/app/DoctrineMigrations/Version20170127093841.php
@ -2,17 +2,29 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Added indexes on wallabag_entry.is_starred and wallabag_entry.is_archived.
 */
-class Version20170127093841 extends WallabagMigration
+class Version20170127093841 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
    private $indexStarredName = 'IDX_entry_starred';
    private $indexArchivedName = 'IDX_entry_archived';

+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -36,4 +48,9 @@ class Version20170127093841 extends WallabagMigration
        $entryTable->dropIndex($this->indexStarredName);
        $entryTable->dropIndex($this->indexArchivedName);
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20170327194233.php
+++ b/app/DoctrineMigrations/Version20170327194233.php
@ -2,14 +2,26 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Add the share_scuttle internal setting.
 */
-class Version20170327194233 extends WallabagMigration
+class Version20170327194233 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -34,4 +46,9 @@ class Version20170327194233 extends WallabagMigration
        $this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'share_scuttle';");
        $this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'scuttle_url';");
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20170405182620.php
+++ b/app/DoctrineMigrations/Version20170405182620.php
@ -2,14 +2,26 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Add published_at and published_by in `entry` table.
 */
-class Version20170405182620 extends WallabagMigration
+class Version20170405182620 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -45,4 +57,9 @@ class Version20170405182620 extends WallabagMigration

        $entryTable->dropColumn('published_by');
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20170407200919.php
+++ b/app/DoctrineMigrations/Version20170407200919.php
@ -2,14 +2,26 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Remove isPublic in Entry Table.
 */
-class Version20170407200919 extends WallabagMigration
+class Version20170407200919 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -31,4 +43,9 @@ class Version20170407200919 extends WallabagMigration

        $entryTable->addColumn('is_public', 'boolean', ['notnull' => false, 'default' => 0]);
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20170420134133.php
+++ b/app/DoctrineMigrations/Version20170420134133.php
@ -2,14 +2,26 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Remove download_pictures in craue_config_setting.
 */
-class Version20170420134133 extends WallabagMigration
+class Version20170420134133 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -32,4 +44,9 @@ class Version20170420134133 extends WallabagMigration

        $this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('download_pictures', '1', 'entry')");
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20170501115751.php
+++ b/app/DoctrineMigrations/Version20170501115751.php
@ -2,14 +2,26 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Add site credential table to store username & password for some website (behind authentication or paywall).
 */
-class Version20170501115751 extends WallabagMigration
+class Version20170501115751 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -41,4 +53,9 @@ class Version20170501115751 extends WallabagMigration
    {
        $schema->dropTable($this->getTable('site_credential'));
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20170510082609.php
+++ b/app/DoctrineMigrations/Version20170510082609.php
@ -2,13 +2,15 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Changed length for username, username_canonical, email and email_canonical fields in wallabag_user table.
 */
-class Version20170510082609 extends WallabagMigration
+class Version20170510082609 extends AbstractMigration implements ContainerAwareInterface
 {
    private $fields = [
        'username',
@ -17,6 +19,16 @@ class Version20170510082609 extends WallabagMigration
        'email_canonical',
    ];

+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -40,4 +52,9 @@ class Version20170510082609 extends WallabagMigration
            $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CHANGE ' . $field . ' ' . $field . ' VARCHAR(255) NOT NULL;');
        }
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20170511115400.php
+++ b/app/DoctrineMigrations/Version20170511115400.php
@ -2,14 +2,26 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Added `headers` field in entry table.
 */
-class Version20170511115400 extends WallabagMigration
+class Version20170511115400 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -35,4 +47,9 @@ class Version20170511115400 extends WallabagMigration

        $entryTable->dropColumn('headers');
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20170511211659.php
+++ b/app/DoctrineMigrations/Version20170511211659.php
@ -2,15 +2,27 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Migrations\SkipMigrationException;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Increase the length of the "quote" column of "annotation" table.
 */
-class Version20170511211659 extends WallabagMigration
+class Version20170511211659 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    public function up(Schema $schema)
    {
        $tableName = $this->getTable('annotation');
@ -18,8 +30,8 @@ class Version20170511211659 extends WallabagMigration
        switch ($this->connection->getDatabasePlatform()->getName()) {
            case 'sqlite':
                $this->addSql(<<<EOD
-CREATE TEMPORARY TABLE __temp__wallabag_annotation AS
-    SELECT id, user_id, entry_id, text, created_at, updated_at, quote, ranges
+CREATE TEMPORARY TABLE __temp__wallabag_annotation AS 
+    SELECT id, user_id, entry_id, text, created_at, updated_at, quote, ranges 
    FROM ${tableName}
 EOD
                );
@ -44,8 +56,8 @@ EOD
                );

                $this->addSql(<<<EOD
-INSERT INTO ${tableName} (id, user_id, entry_id, text, created_at, updated_at, quote, ranges)
-SELECT id, user_id, entry_id, text, created_at, updated_at, quote, ranges
+INSERT INTO ${tableName} (id, user_id, entry_id, text, created_at, updated_at, quote, ranges) 
+SELECT id, user_id, entry_id, text, created_at, updated_at, quote, ranges 
 FROM __temp__wallabag_annotation;
 EOD
                );
@ -76,4 +88,9 @@ EOD
                break;
        }
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20170602075214.php
+++ b/app/DoctrineMigrations/Version20170602075214.php
@ -2,14 +2,26 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Add api_user_registration in craue_config_setting.
 */
-class Version20170602075214 extends WallabagMigration
+class Version20170602075214 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -32,4 +44,9 @@ class Version20170602075214 extends WallabagMigration
    {
        $this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'api_user_registration';");
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20170606155640.php
+++ b/app/DoctrineMigrations/Version20170606155640.php
@ -2,15 +2,27 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Remove wallabag_url from craue_config_setting.
 * It has been moved into the parameters.yml.
 */
-class Version20170606155640 extends WallabagMigration
+class Version20170606155640 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -33,4 +45,9 @@ class Version20170606155640 extends WallabagMigration
    {
        $this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('wallabag_url', 'wallabag.me', 'misc')");
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20170719231144.php
+++ b/app/DoctrineMigrations/Version20170719231144.php
@ -2,14 +2,26 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Changed tags to lowercase.
 */
-class Version20170719231144 extends WallabagMigration
+class Version20170719231144 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -55,7 +67,7 @@ class Version20170719231144 extends WallabagMigration
            }

            // Just in case...
-            if (\count($ids) > 0) {
+            if (count($ids) > 0) {
                // Merge tags
                $this->addSql('
                    UPDATE ' . $this->getTable('entry_tag') . '
@ -96,4 +108,9 @@ class Version20170719231144 extends WallabagMigration
    {
        throw new SkipMigrationException('Too complex ...');
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20170824113337.php
+++ b/app/DoctrineMigrations/Version20170824113337.php
@ -2,14 +2,26 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Add starred_at column and set its value to updated_at for is_starred entries.
 */
-class Version20170824113337 extends WallabagMigration
+class Version20170824113337 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -48,4 +60,9 @@ class Version20170824113337 extends WallabagMigration

        $entryTable->dropColumn('starred_at');
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20171008195606.php
+++ b/app/DoctrineMigrations/Version20171008195606.php
@ -2,14 +2,26 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Changed reading_time field to prevent null value.
 */
-class Version20171008195606 extends WallabagMigration
+class Version20171008195606 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -45,4 +57,9 @@ class Version20171008195606 extends WallabagMigration
                break;
        }
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20171105202000.php
+++ b/app/DoctrineMigrations/Version20171105202000.php
@ -2,14 +2,26 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Add origin_url column.
 */
-class Version20171105202000 extends WallabagMigration
+class Version20171105202000 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -35,4 +47,9 @@ class Version20171105202000 extends WallabagMigration

        $entryTable->dropColumn('origin_url');
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20171120163128.php
+++ b/app/DoctrineMigrations/Version20171120163128.php
@ -2,14 +2,26 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Add store_article_headers in craue_config_setting.
 */
-class Version20171120163128 extends WallabagMigration
+class Version20171120163128 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -32,4 +44,9 @@ class Version20171120163128 extends WallabagMigration
    {
        $this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'store_article_headers';");
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/DoctrineMigrations/Version20171125164500.php
+++ b/app/DoctrineMigrations/Version20171125164500.php
@ -2,14 +2,26 @@

 namespace Application\Migrations;

+use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;

 /**
 * Add shaarli_share_origin_url in craue_config_setting.
 */
-class Version20171125164500 extends WallabagMigration
+class Version20171125164500 extends AbstractMigration implements ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * @param Schema $schema
     */
@ -32,4 +44,9 @@ class Version20171125164500 extends WallabagMigration
    {
        $this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'shaarli_share_origin_url';");
    }
+
+    private function getTable($tableName)
+    {
+        return $this->container->getParameter('database_table_prefix') . $tableName;
+    }
 }
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
@ -27,7 +27,7 @@ export: "export"
 import: "import"
 misc: "misc"
 modify_settings: "apply"
-piwik_host: Host of your website in Piwik (without http:// or https://)
+piwik_host: Host of your website in Piwik (without http:// ou https://)
 piwik_site_id: ID of your website in Piwik
 piwik_enabled: Enable Piwik
 demo_mode_enabled: "Enable demo mode? (Only used for the public wallabag demo)"
@ -37,4 +37,4 @@ download_images_enabled: Download images locally
 restricted_access: Enable authentication for paywalled websites
 api_user_registration: Enable user to be registered using the API
 store_article_headers: Enable if wallabag stores HTTP headers for each article
-shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
+shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
@ -36,5 +36,5 @@ share_public: Autorizar una URL publica pels articles
 download_images_enabled: Telecargar los imatges en local
 restricted_access: Activar l'autenticacion pels sites amb peatge
 api_user_registration: Autorizar los utilizaires a se marcar amb l'API
-store_article_headers: Activar se wallabag garda las entèstas HTTP per cada article
-shaarli_share_origin_url: Activar lo partatge de l’url amb Shaarli, se lo servici es activat
+# store_article_headers: Enable if wallabag stores HTTP headers for each article
+# shaarli_share_origin_url: Enable sharing origin url to Shaarli, if the service is enabled
--- a/app/Resources/static/themes/_global/img/logo-other_themes.png
+++ b/app/Resources/static/themes/_global/img/logo-other_themes.png
--- a/app/Resources/static/themes/_global/img/logo-square.png
+++ b/app/Resources/static/themes/_global/img/logo-square.png
--- a/app/Resources/static/themes/_global/img/logo-square.svg
+++ b/app/Resources/static/themes/_global/img/logo-square.svg
@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="200" height="200"><path fill="none" d="M0 0h200v200H0z"/><path d="M75.899 72.438c1.597-.981 10.207-5.556 24.098.178 14.289 5.897 23.154.776 24.253.079-3.454-5.678-7.562-10.62-12.104-13.943.303-.083.612-.167.939-.263 6.023-1.742 7.553-6.842 7.875-11.21.364-4.954.616-5.03 1.692-9.487 1.032-4.281-.119-5.137-1.181-4.273-.572.465-5.552 1.616-8.505 3.919-4.768 3.72-7.707 10.794-9.039 14.706-.025.06-.205.604-.265.792-.621 1.498-1.857 1.494-1.857 1.494v.001c-.6-.065-1.202-.1-1.809-.1-.54 0-1.079.029-1.616.081-.012.002-.019 0-.031.001-1.581.233-2.45-1.697-2.632-2.157-1.847-5.304-6.816-15.763-17.984-18.577 0 0-2.028-1.554-1.41 1.074.588 2.511 1.804 5.049 1.534 8.741-.124 1.704-1.181 10.442 6.85 14.99.763.432 1.441.795 2.051 1.101-4.042 3.235-7.716 7.74-10.859 12.853zM128.626 152.353c-9.842-6.098-13.153-8.242-12.946-10.575 0 0 .002-.379.099-.957.239-1.236.995-3.348 3.407-4.552.079-.039.146-.084.208-.129 7.668-4.45 13.27-11.614 15.246-20.56-1.99 4.941-16.735 8.78-34.645 8.78-17.903 0-32.651-3.839-34.641-8.78.442 2.008 1.073 3.923 1.864 5.742.666 3.745 1.562 12.563-2.673 20.282-3.731 6.8-22.15 16.069-49.485 10.748 0 0-1.096-.766-1.428-.136-.491.932 1.517 1.685 3.583 2.229 19.031 5.04 47.756 2.989 56.777-4.443 4.116-3.388 5.704-7.953 6.107-12.865l.003.008s.11-1.287 1.719-.32c.461.277 2.125 1.36 2.39 2.585.232 1.743.248 3.883-.652 5.382-1.287 2.144-1.301 2.452.393 3.662 1.04.742 5.287 3.864 11.198 7.415.015.01.023.019.038.027 1.25.753 2.987 2.597 2.987 2.597 2.662 3.079 8.452 9.275 10.972 8.108 1.19-.551-.051-3.032-.051-3.032s1.98 2.571 3.043 1.694c.809-.668-.473-3.229-.473-3.229s1.729 1.499 2.757.944c1.258-.679-.187-4.614-10.079-10.627-9.896-6.018-12.578-6.94-12.814-9.626 0 0-.004-.135.004-.366.077-.593.414-1.847 1.852-1.712 2.141.346 4.348.531 6.608.531 2.587 0 5.107-.237 7.536-.69l.001.003s.127-.025.164-.031c.284-.036.838-.018.84.671-.09.873-.331 1.751-.845 2.519-1.447 2.168-.972 2.466.54 3.859.933.859 5.211 4.622 11.07 8.264.012.009.017.016.031.023 1.249.752 3.41 2.816 3.41 2.816v-.001c2.428 2.466 6.894 6.596 9.327 6.347 1.646-.168.306-3.002.306-3.002s2.078 2.006 3.099 1.416c1.142-.659-.474-2.755-.474-2.755s1.338.708 2.283.473c.948-.236 1.185-2.644-8.656-8.737z"/><path d="M117.631 83.452c-1.181 0-2.161.355-2.912 1.057-.76.71-1.144 1.531-1.144 2.438v16.056c0 2.154-.382 3.742-1.135 4.721-.728.946-1.892 1.406-3.556 1.406-1.703 0-2.863-.457-3.549-1.396-.716-.979-1.078-2.571-1.078-4.731V86.884c0-1.098-.5-1.996-1.448-2.596-1.289-.812-2.57-1.105-4.129-.587-.476.159-.924.366-1.333.615-.435.265-.802.597-1.093.985-.322.432-.486.901-.486 1.396v16.307c0 2.158-.363 3.75-1.079 4.73-.688.939-1.849 1.396-3.548 1.396-1.705 0-2.877-.459-3.584-1.401-.734-.979-1.107-2.57-1.107-4.726V86.947c0-.908-.384-1.728-1.145-2.438-.751-.702-1.751-1.057-2.973-1.057-1.258 0-2.296.352-3.085 1.045-.811.71-1.222 1.535-1.222 2.45v15.806c0 1.988.194 3.869.575 5.588.393 1.758 1.077 3.3 2.035 4.586.968 1.299 2.282 2.323 3.906 3.05 1.607.716 3.617 1.079 5.975 1.079 2.457 0 4.515-.455 6.115-1.354 1.342-.754 2.473-1.744 3.371-2.951.866 1.207 1.971 2.197 3.294 2.95 1.58.899 3.669 1.354 6.211 1.354 2.357 0 4.359-.364 5.947-1.081 1.601-.726 2.902-1.751 3.872-3.048.96-1.29 1.645-2.833 2.034-4.586.381-1.719.575-3.6.575-5.588V86.947c0-.911-.398-1.733-1.184-2.445-.767-.697-1.818-1.05-3.12-1.05z"/></svg>
--- a/app/Resources/static/themes/_global/img/logo-wallabag.svg
+++ b/app/Resources/static/themes/_global/img/logo-wallabag.svg
--- a/app/Resources/static/themes/_global/index.js
+++ b/app/Resources/static/themes/_global/index.js
@ -13,11 +13,9 @@ import './global.scss';
 import './js/shortcuts/entry';
 import './js/shortcuts/main';

-/* Hightlight */
-import './js/highlight';
-
 import { savePercent, retrievePercent } from './js/tools';

+
 /* ==========================================================================
 Annotations & Remember position
 ========================================================================== */
@ -67,7 +65,7 @@ $(document).ready(() => {
    retrievePercent(x.entryId);

    $(window).resize(() => {
-      retrievePercent(x.entryId, true);
+      retrievePercent(x.entryId);
    });
  }
 });
--- a/app/Resources/static/themes/_global/js/highlight.js
+++ b/app/Resources/static/themes/_global/js/highlight.js
@ -1,8 +0,0 @@
-import 'highlight.js/styles/atom-one-light.css';
-import * as hljs from 'highlight.js';
-
-window.addEventListener('load', () => {
-  document.querySelectorAll('pre').forEach((node) => {
-    hljs.highlightBlock(node);
-  });
-});
--- a/app/Resources/static/themes/_global/js/tools.js
+++ b/app/Resources/static/themes/_global/js/tools.js
@ -19,16 +19,14 @@ function savePercent(id, percent) {
  return true;
 }

-function retrievePercent(id, resized) {
+function retrievePercent(id) {
  if (!supportsLocalStorage()) { return false; }

  const bheight = $(document).height();
  const percent = localStorage[`wallabag.article.${id}.percent`];
  const scroll = bheight * percent;

-  if (!resized) {
-    $('html,body').animate({ scrollTop: scroll }, 'fast');
-  }
+  $('html,body').animate({ scrollTop: scroll }, 'fast');

  return true;
 }
--- a/app/Resources/static/themes/_global/share.scss
+++ b/app/Resources/static/themes/_global/share.scss
@ -221,12 +221,6 @@ ol li:last-child {
  padding-bottom: 0;
 }

-iframe,
-video {
-  max-width: 100%;
-  height: auto;
-}
-
 mark {
  padding: 0 0.2em;
 }
--- a/app/Resources/static/themes/material/css/article.scss
+++ b/app/Resources/static/themes/material/css/article.scss
@ -11,7 +11,6 @@
    color: #424242;
    font-size: 18px;
    line-height: 1.7em;
-    overflow-wrap: break-word;

    h1,
    h2,
--- a/app/Resources/static/themes/material/css/cards.scss
+++ b/app/Resources/static/themes/material/css/cards.scss
@ -18,24 +18,6 @@ main {
  overflow: hidden;
 }

-@mixin mixin-reading-time {
-  .reading-time {
-    display: inline-flex;
-    vertical-align: middle;
-
-    .card-reading-time,
-    .card-created-at {
-      display: inline-flex;
-    }
-
-    span {
-      margin-right: 5px;
-    }
-
-    @content;
-  }
-}
-
 .card {
  .card-content .card-title,
  .card-reveal .card-title {
@ -116,7 +98,14 @@ main {
      margin-right: 5px !important;
    }

-    @include mixin-reading-time;
+    .reading-time {
+      display: inline-flex;
+      vertical-align: middle;
+
+      span {
+        margin-right: 5px;
+      }
+    }
  }

  .card-image {
@ -127,6 +116,13 @@ main {
    height: 13.5em;
  }

+  .card-image .preview,
+  .card-fullimage .preview {
+    height: 14em;
+    background: no-repeat 50%/cover;
+    display: block;
+  }
+
  &.sw {
    max-width: 370px;
    margin-left: auto;
@ -141,19 +137,6 @@ a.original:not(.waves-effect) {
  display: block;
 }

-.card .card-image .preview,
-.card .card-fullimage .preview,
-.card-stacked .preview {
-  height: 100%;
-  background: no-repeat 50%/cover;
-  background-color: #efefef;
-  display: block;
-
-  &--default {
-    background-size: contain;
-  }
-}
-
 .card-entry-labels li,
 .card-tag-labels li {
  margin: 10px 10px 10px auto;
@ -222,29 +205,24 @@ a.original:not(.waves-effect) {
    text-align: right;
  }

-  .card-preview {
+  .preview {
    max-width: 100px;
-    max-height: 50px;
+    height: auto;
    margin-right: 10px;
    flex: 1;
+
+    img {
+      max-width: 100%;
+      max-height: 100%;
+    }
  }

  div.metadata {
-    overflow: hidden;
-    height: 1.5em;
-    display: flex;
-
-    ul.tags {
-      margin-left: 4px;
-    }
-
    .chip {
      background-color: $blueAccentColor;
-      padding: 0 7px;
-      margin: auto 1px;
+      padding: 0 15px 0 10px;
+      margin: auto 2px;
      border-radius: 6px;
-      line-height: 22px;
-      height: 22px;

      a,
      i {
@ -258,16 +236,6 @@ a.original:not(.waves-effect) {
        padding-left: 8px;
      }
    }
-
-    @include mixin-reading-time {
-      padding: 0 5px;
-      flex-wrap: wrap;
-      margin-left: auto;
-
-      i.material-icons {
-        font-size: 20px;
-      }
-    }
  }

  div.card-content {
@ -301,3 +269,9 @@ a.original:not(.waves-effect) {
 .settings .div_tabs {
  padding-bottom: 15px;
 }
+
+@media only screen and (min-width: 992px) {
+  .card-tag-labels li {
+    max-width: 50%;
+  }
+}
--- a/app/Resources/static/themes/material/css/layout.scss
+++ b/app/Resources/static/themes/material/css/layout.scss
@ -24,10 +24,6 @@ main,
  height: 100%;
 }

-.typo-logo {
-  max-width: 150px;
-}
-
 #main {
  flex: 1 0 auto;

--- a/app/Resources/static/themes/material/css/media_queries.scss
+++ b/app/Resources/static/themes/material/css/media_queries.scss
@ -12,16 +12,6 @@
  .pagination {
    margin-left: auto;
  }
-
-  .card-tag-labels li {
-    max-width: 50%;
-  }
-}
-
-@media screen and (min-width: 993px) {
-  body.entry main #content {
-    padding-left: 70px;
-  }
 }

@media only screen and (max-width: 992px) {
@ -32,16 +22,6 @@
    padding-left: 0;
  }

-  table {
-    display: block;
-    overflow: auto;
-  }
-
-  iframe {
-    max-width: 100%;
-    height: auto;
-  }
-
  .nav-panels .action {
    padding-right: 0.75rem;
  }
@ -173,17 +153,4 @@
  .row .col {
    padding: 0;
  }
-
-  .card-stacked div.metadata .reading-time {
-    display: none;
-  }
-}
-
-@media screen and (max-width: 310px),
-  screen and (min-width: 601px) and (max-width: 660px),
-  screen and (min-width: 993px) and (max-width: 1050px),
-  screen and (min-width: 1201px) and (max-width: 1250px) {
-  .card .card-action .reading-time .card-created-at {
-    display: none;
-  }
 }
--- a/app/Resources/static/themes/material/css/nav.scss
+++ b/app/Resources/static/themes/material/css/nav.scss
@ -2,7 +2,8 @@
 /* ==========================================================================
   Nav
   ========================================================================== */
-nav {
+nav,
+.nav-wrapper {
  height: auto;
  line-height: initial;
 }
@ -17,25 +18,25 @@ nav {
  }
 }

-.nav-panel-item .button-collapse {
-  margin-left: 0;
-  margin-right: 0.5rem;
-  padding: 0 0.5rem;
-  height: auto;
-  line-height: 1;
-  background-color: transparent;
-  border: none;
-}
-
-.nav-panel-item {
+.nav-wrapper {
  display: flex;
  padding: 0.6rem 0.4rem 0.6rem 0.75rem;
  flex-wrap: wrap;
  justify-content: space-between;
  align-items: center;
+
+  .button-collapse {
+    margin-left: 0;
+    margin-right: 0.5rem;
+    padding: 0 0.5rem;
+    height: auto;
+    line-height: 1;
+    background-color: transparent;
+    border: none;
+  }
 }

-.nav-panel-item .material-icons {
+nav .nav-wrapper i {
  height: 46px;
  line-height: 46px;
 }
@ -50,8 +51,8 @@ nav {
  justify-content: flex-end;
 }

-.nav-panel-item .add,
-.nav-panel-item .search,
+.nav-panel-add .add,
+.nav-panel-search .search,
 .nav-panels .close {
  color: #444 !important;
 }
@ -67,7 +68,9 @@ nav {
  .input-field input {
    display: block;
    line-height: inherit;
-    height: 3rem;
+    padding-left: 4rem !important;
+    width: calc(100% - 8rem);
+    height: 4.1rem;
  }

  .input-field input:focus {
@ -84,45 +87,36 @@ nav {
 }

 .input-field {
-  &.nav-panel-item label {
+  &.nav-panel-add label,
+  &.nav-panel-search label {
    left: 1rem;
  }

-  &.nav-panel-item .close {
+  &.nav-panel-add .close,
+  &.nav-panel-search .close {
+    position: absolute;
+    top: 0;
+    right: 1rem;
    color: transparent;
    cursor: pointer;
    font-size: 2rem;
    transition: 0.3s color;
  }

-  &.nav-panel-item {
+  &.nav-panel-add,
+  &.nav-panel-add form,
+  &.nav-panel-search,
+  &.nav-panel-search form {
    display: flex;
    flex: 1;
-    flex-wrap: nowrap;
-    align-items: center;
  }

-  &.nav-panel-add.disabled,
-  &.nav-panel-add.disabled input {
+  &.nav-panel-add form.disabled,
+  &.nav-panel-add form.disabled input {
    background-color: whitesmoke;
  }
 }

-.nav-form-button {
-  padding: 0;
-  background-color: transparent;
-  border: none;
-
-  &:focus {
-    background-color: inherit;
-  }
-}
-
-.nav-form-button,
-.nav-panel-item .close {
-  margin: 0 1%;
-}
-
 #button_filters {
  display: none;
 }
--- a/app/Resources/static/themes/material/css/various.scss
+++ b/app/Resources/static/themes/material/css/various.scss
@ -21,7 +21,6 @@ div.settings div.file-field {

 nav .input-field input {
  margin: 0;
-  padding-left: 0.5rem;
 }

 .tabs {
--- a/app/Resources/static/themes/material/index.js
+++ b/app/Resources/static/themes/material/index.js
@ -35,13 +35,6 @@ $(document).ready(() => {
  initFilters();
  initExport();

-  const toggleNav = (toShow, toFocus) => {
-    $('.nav-panel-actions').hide(100);
-    $(toShow).show(100);
-    $('.nav-panels').css('background', 'white');
-    $(toFocus).focus();
-  };
-
  $('#nav-btn-add-tag').on('click', () => {
    $('.nav-panel-add-tag').toggle(100);
    $('.nav-panel-menu').addClass('hidden');
@ -49,21 +42,34 @@ $(document).ready(() => {
    return false;
  });
  $('#nav-btn-add').on('click', () => {
-    toggleNav('.nav-panel-add', '#entry_url');
+    $('.nav-panel-buttom').hide(100);
+    $('.nav-panel-add').show(100);
+    $('.nav-panels .action').hide(100);
+    $('.nav-panel-menu').addClass('hidden');
+    $('.nav-panels').css('background', 'white');
+    $('#entry_url').focus();
    return false;
  });
-  const materialAddForm = $('.nav-panel-add');
+  const materialAddForm = $('.nav-panel-add form[name=entry]');
  materialAddForm.on('submit', () => {
    materialAddForm.addClass('disabled');
    $('input#entry_url', materialAddForm).prop('readonly', true).trigger('blur');
  });
  $('#nav-btn-search').on('click', () => {
-    toggleNav('.nav-panel-search', '#search_entry_term');
+    $('.nav-panel-buttom').hide(100);
+    $('.nav-panel-search').show(100);
+    $('.nav-panels .action').hide(100);
+    $('.nav-panel-menu').addClass('hidden');
+    $('.nav-panels').css('background', 'white');
+    $('#search_entry_term').focus();
    return false;
  });
-  $('.close').on('click', (e) => {
-    $(e.target).parent('.nav-panel-item').hide(100);
-    $('.nav-panel-actions').show(100);
+  $('.close').on('click', () => {
+    $('.nav-panel-add').hide(100);
+    $('.nav-panel-search').hide(100);
+    $('.nav-panel-buttom').show(100);
+    $('.nav-panels .action').show(100);
+    $('.nav-panel-menu').removeClass('hidden');
    $('.nav-panels').css('background', 'transparent');
    return false;
  });
--- a/app/config/config.yml
+++ b/app/config/config.yml
@ -26,6 +26,7 @@ framework:
        engines: ['twig']
    default_locale: "%locale%"
    trusted_hosts: ~
+    trusted_proxies: ~
    session:
        # handler_id set to null will use default session handler from php.ini
        handler_id: session.handler.native_file
@ -147,18 +148,18 @@ nelmio_cors:
    paths:
        '^/api/':
            allow_origin: ['*']
-            allow_headers: ['Authorization','content-type']
+            allow_headers: ['X-Custom-Auth']
            allow_methods: ['POST', 'PUT', 'PATCH','GET', 'DELETE']
            max_age: 3600
        '^/oauth/':
            allow_origin: ['*']
-            allow_headers: ['Authorization','content-type']
+            allow_headers: ['X-Custom-Auth']
            allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
            max_age: 3600
        '^/':
            #origin_regex: true
-            allow_origin: ['*']
-            allow_headers: ['Authorization','content-type']
+            allow_origin: ['^http://localhost:[0-9]+']
+            allow_headers: ['X-Custom-Auth']
            allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
            max_age: 3600
            hosts: ['^api\.']
--- a/app/config/security.yml
+++ b/app/config/security.yml
@ -12,7 +12,7 @@ security:
                class: WallabagUserBundle:User
                property: username
        fos_userbundle:
-            id: fos_user.user_provider.username_email
+            id: fos_user.user_provider.username

    # the main part of the security, where you can set up firewalls
    # for specific sections of your app
--- a/app/config/wallabag.yml
+++ b/app/config/wallabag.yml
@ -1,5 +1,5 @@
 wallabag_core:
-    version: 2.3.8
+    version: 2.3.1
    paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
    languages:
        en: 'English'
--- a/composer.json
+++ b/composer.json
@ -43,7 +43,6 @@
        "ext-iconv": "*",
        "ext-tokenizer": "*",
        "ext-pdo": "*",
-        "ext-tidy": "*",
        "symfony/symfony": "~3.3.13",
        "doctrine/orm": "^2.5.12",
        "doctrine/doctrine-bundle": "^1.8.0",
@ -65,7 +64,7 @@
        "liip/theme-bundle": "^1.4.6",
        "lexik/form-filter-bundle": "^5.0.4",
        "j0k3r/graby": "^1.0",
-        "friendsofsymfony/user-bundle": "2.0.*",
+        "friendsofsymfony/user-bundle": "^2.0.1",
        "friendsofsymfony/oauth-server-bundle": "^1.5.2",
        "stof/doctrine-extensions-bundle": "^1.2",
        "scheb/two-factor-bundle": "^2.14.0",
@ -84,16 +83,15 @@
        "javibravo/simpleue": "^2.0",
        "symfony/dom-crawler": "^3.3.13",
        "friendsofsymfony/jsrouting-bundle": "^1.6.3",
-        "bdunogier/guzzle-site-authenticator": "^1.0.0",
+        "bdunogier/guzzle-site-authenticator": "^1.0.0@dev",
        "defuse/php-encryption": "^2.1",
-        "html2text/html2text": "^4.1",
-        "sulu/symfony-intl-fix": "^1.0"
+        "html2text/html2text": "^4.1"
    },
    "require-dev": {
        "doctrine/doctrine-fixtures-bundle": "~2.2",
        "doctrine/data-fixtures": "~1.1",
        "sensio/generator-bundle": "^3.0",
-        "symfony/phpunit-bridge": "^4.2",
+        "symfony/phpunit-bridge": "^3.3",
        "friendsofphp/php-cs-fixer": "~2.0",
        "m6web/redis-mock": "^2.0",
        "dama/doctrine-test-bundle": "^4.0"
@ -126,11 +124,7 @@
    },
    "autoload": {
        "psr-4": { "Wallabag\\": "src/Wallabag/" },
-        "classmap": [ "app/AppKernel.php", "app/AppCache.php" ],
-        "exclude-from-classmap": [
-             "vendor/symfony/intl/Locale.php",
-             "vendor/symfony/symfony/src/Symfony/Component/Intl/Locale.php"
-        ]
+        "classmap": [ "app/AppKernel.php", "app/AppCache.php" ]
    },
    "autoload-dev": {
        "psr-4": { "Tests\\": "tests/" }
--- a/composer.lock
+++ b/composer.lock
--- a/docker/php/Dockerfile
+++ b/docker/php/Dockerfile
@ -4,10 +4,10 @@ FROM php:fpm
 ARG timezone='Europe/Paris'

 RUN apt-get update && apt-get install -y \
-        libmcrypt-dev libicu-dev libpq-dev libxml2-dev libpng-dev libjpeg-dev \
+        libmcrypt-dev libicu-dev libpq-dev libxml2-dev libpng12-dev libjpeg-dev \
    && /usr/local/bin/docker-php-ext-configure gd --with-jpeg-dir=/usr/include \
    && docker-php-ext-install \
-        iconv mbstring intl pdo pdo_mysql pdo_pgsql gd
+        iconv mcrypt mbstring intl pdo pdo_mysql pdo_pgsql gd

 RUN echo "date.timezone="$timezone > /usr/local/etc/php/conf.d/date_timezone.ini

--- a/package.json
+++ b/package.json
@ -1,13 +1,13 @@
 {
  "name": "wallabag",
-  "version": "2.3.3",
+  "version": "2.2.2",
  "description": "wallabag is a self hostable application for saving web pages",
  "private": true,
  "directories": {
    "doc": "docs"
  },
  "engines": {
-    "node": ">=6.10"
+    "node": ">4.8"
  },
  "repository": {
    "type": "git",
@ -65,7 +65,6 @@
  "dependencies": {
    "annotator": "git://github.com/wallabag/annotator.git#0f076c7d371ed25eb0793346f46982d90f2c4c85",
    "hammerjs": "^2.0.8",
-    "highlight.js": "^9.12.0",
    "icomoon-free-npm": "^0.0.0",
    "jquery": "^2.1.4",
    "jquery.cookie": "^1.4.1",
--- a/scripts/dev.sh
+++ b/scripts/dev.sh
@ -3,14 +3,10 @@
 # eg: `sh dev.sh`

 COMPOSER_COMMAND='composer'
-REQUIRE_FILE='scripts/require.sh'

-if [ ! -f "$REQUIRE_FILE" ]; then
-  echo "Cannot find $REQUIRE_FILE"
-  exit 1
-fi
-
-. "$REQUIRE_FILE"
+DIR="${BASH_SOURCE}"
+if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi
+. "$DIR/require.sh"

 $COMPOSER_COMMAND install
 php bin/console wallabag:install
--- a/scripts/install.sh
+++ b/scripts/install.sh
@ -2,38 +2,13 @@
 # You can execute this file to install wallabag
 # eg: `sh install.sh prod`

-IGNORE_ROOT_ARG="--ignore-root-warning"
-IGNORE_ROOT=0
-
-while :; do
-    case $1 in
-        $IGNORE_ROOT_ARG) IGNORE_ROOT=1
-        ;;
-        *[a-zA-Z]) ENV=$1
-        ;;
-        *) break
-        ;;
-    esac
-    shift
-done
-
-# Abort running this script if root
-if [ "$IGNORE_ROOT" -eq 0 ] && [ "$EUID" == "0" ]; then
-    echo "Do not run this script as root!" >&2
-    echo "Use $IGNORE_ROOT_ARG to ignore this error." >&2
-    exit 1
-fi
-
 COMPOSER_COMMAND='composer'
-REQUIRE_FILE='scripts/require.sh'

-if [ ! -f "$REQUIRE_FILE" ]; then
-  echo "Cannot find $REQUIRE_FILE"
-  exit 1
-fi
-
-. "$REQUIRE_FILE"
+DIR="${BASH_SOURCE}"
+if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi
+. "$DIR/require.sh"

+ENV=$1
 TAG=$(git describe --tags $(git rev-list --tags --max-count=1))

 git checkout $TAG
--- a/scripts/release.sh
+++ b/scripts/release.sh
@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 # You can execute this file to create a new package for wallabag
-# eg: `sh release.sh 2.3.3 /tmp wllbg-release prod`
+# eg: `sh release.sh master /tmp wllbg-release prod`

 VERSION=$1
 TMP_FOLDER=$2
@ -9,12 +9,12 @@ ENV=$4

 rm -rf $TMP_FOLDER/$RELEASE_FOLDER
 mkdir $TMP_FOLDER/$RELEASE_FOLDER
-git clone git@github.com:wallabag/wallabag.git -b release-$VERSION $TMP_FOLDER/$RELEASE_FOLDER/$VERSION
-cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && SYMFONY_ENV=$ENV COMPOSER_MEMORY_LIMIT=-1 composer up -n --no-dev
-cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && php bin/console wallabag:install --env=$ENV -n
+git clone git@github.com:wallabag/wallabag.git -b $VERSION $TMP_FOLDER/$RELEASE_FOLDER/$VERSION
+cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && SYMFONY_ENV=$ENV composer up -n --no-dev
+cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && php bin/console wallabag:install --env=$ENV
 cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && php bin/console assets:install --env=$ENV --symlink --relative
 cd $TMP_FOLDER/$RELEASE_FOLDER && tar czf wallabag-$VERSION.tar.gz --exclude="var/cache/*" --exclude="var/logs/*" --exclude="var/sessions/*" --exclude=".git" $VERSION
 echo "MD5 checksum of the package for wallabag $VERSION"
 md5 $TMP_FOLDER/$RELEASE_FOLDER/wallabag-$VERSION.tar.gz
-echo "Package to upload to the release server:"
-echo $TMP_FOLDER/$RELEASE_FOLDER/wallabag-$VERSION.tar.gz
+scp $TMP_FOLDER/$RELEASE_FOLDER/wallabag-$VERSION.tar.gz framasoft_bag@78.46.248.87:/var/www/framabag.org/web
+rm -rf $TMP_FOLDER/$RELEASE_FOLDER
--- a/scripts/require.sh
+++ b/scripts/require.sh
--- a/scripts/update.sh
+++ b/scripts/update.sh
@ -2,40 +2,13 @@
 # You can execute this file to update wallabag
 # eg: `sh update.sh prod`

-IGNORE_ROOT_ARG="--ignore-root-warning"
-IGNORE_ROOT=0
-
-while :; do
-    case $1 in
-        $IGNORE_ROOT_ARG) IGNORE_ROOT=1
-        ;;
-        *[a-zA-Z]) ENV=$1
-        ;;
-        *) break
-        ;;
-    esac
-    shift
-done
-
-# Abort running this script if root
-if [ "$IGNORE_ROOT" -eq 0 ] && [ "$EUID" == "0" ]; then
-    echo "Do not run this script as root!" >&2
-    echo "Use $IGNORE_ROOT_ARG to ignore this error." >&2
-    exit 1
-fi
-
-set -e
-set -u
-
 COMPOSER_COMMAND='composer'
-REQUIRE_FILE='scripts/require.sh'

-if [ ! -f "$REQUIRE_FILE" ]; then
-  echo "Cannot find $REQUIRE_FILE"
-  exit 1
-fi
+DIR="${BASH_SOURCE}"
+if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi
+. "$DIR/require.sh"

-. "$REQUIRE_FILE"
+ENV=$1

 rm -rf var/cache/*
 git fetch origin
--- a/src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php
+++ b/src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php
@ -28,7 +28,7 @@ class WallabagAnnotationController extends FOSRestController
            ->getDoctrine()
            ->getRepository('WallabagAnnotationBundle:Annotation')
            ->findAnnotationsByPageId($entry->getId(), $this->getUser()->getId());
-        $total = \count($annotationRows);
+        $total = count($annotationRows);
        $annotations = ['total' => $total, 'rows' => $annotationRows];

        $json = $this->get('jms_serializer')->serialize($annotations, 'json');
--- a/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php
+++ b/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php
@ -21,7 +21,7 @@ class AnnotationRepository extends EntityRepository
    public function getBuilderForAllByUser($userId)
    {
        return $this
-            ->getSortedQueryBuilderByUser($userId)
+            ->getBuilderByUser($userId)
        ;
    }

@ -133,7 +133,7 @@ class AnnotationRepository extends EntityRepository
     *
     * @return QueryBuilder
     */
-    private function getSortedQueryBuilderByUser($userId)
+    private function getBuilderByUser($userId)
    {
        return $this->createQueryBuilder('a')
            ->leftJoin('a.user', 'u')
--- a/src/Wallabag/ApiBundle/Controller/EntryRestController.php
+++ b/src/Wallabag/ApiBundle/Controller/EntryRestController.php
@ -9,7 +9,6 @@ use Nelmio\ApiDocBundle\Annotation\ApiDoc;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Wallabag\CoreBundle\Entity\Entry;
@ -99,28 +98,24 @@ class EntryRestController extends WallabagRestController
        $isArchived = (null === $request->query->get('archive')) ? null : (bool) $request->query->get('archive');
        $isStarred = (null === $request->query->get('starred')) ? null : (bool) $request->query->get('starred');
        $isPublic = (null === $request->query->get('public')) ? null : (bool) $request->query->get('public');
-        $sort = strtolower($request->query->get('sort', 'created'));
-        $order = strtolower($request->query->get('order', 'desc'));
+        $sort = $request->query->get('sort', 'created');
+        $order = $request->query->get('order', 'desc');
        $page = (int) $request->query->get('page', 1);
        $perPage = (int) $request->query->get('perPage', 30);
-        $tags = \is_array($request->query->get('tags')) ? '' : (string) $request->query->get('tags', '');
+        $tags = is_array($request->query->get('tags')) ? '' : (string) $request->query->get('tags', '');
        $since = $request->query->get('since', 0);

-        try {
-            /** @var \Pagerfanta\Pagerfanta $pager */
-            $pager = $this->get('wallabag_core.entry_repository')->findEntries(
-                $this->getUser()->getId(),
-                $isArchived,
-                $isStarred,
-                $isPublic,
-                $sort,
-                $order,
-                $since,
-                $tags
-            );
-        } catch (\Exception $e) {
-            throw new BadRequestHttpException($e->getMessage());
-        }
+        /** @var \Pagerfanta\Pagerfanta $pager */
+        $pager = $this->get('wallabag_core.entry_repository')->findEntries(
+            $this->getUser()->getId(),
+            $isArchived,
+            $isStarred,
+            $isPublic,
+            $sort,
+            $order,
+            $since,
+            $tags
+        );

        $pager->setMaxPerPage($perPage);
        $pager->setCurrentPage($page);
@ -258,7 +253,7 @@ class EntryRestController extends WallabagRestController

        $limit = $this->container->getParameter('wallabag_core.api_limit_mass_actions');

-        if (\count($urls) > $limit) {
+        if (count($urls) > $limit) {
            throw new HttpException(400, 'API limit reached');
        }

@ -352,7 +347,7 @@ class EntryRestController extends WallabagRestController
                    'open_graph' => [
                        'og_image' => !empty($data['picture']) ? $data['picture'] : $entry->getPreviewPicture(),
                    ],
-                    'authors' => \is_string($data['authors']) ? explode(',', $data['authors']) : $entry->getPublishedBy(),
+                    'authors' => is_string($data['authors']) ? explode(',', $data['authors']) : $entry->getPublishedBy(),
                ]
            );
        } catch (\Exception $e) {
@ -466,7 +461,7 @@ class EntryRestController extends WallabagRestController
            $contentProxy->updateLanguage($entry, $data['language']);
        }

-        if (!empty($data['authors']) && \is_string($data['authors'])) {
+        if (!empty($data['authors']) && is_string($data['authors'])) {
            $entry->setPublishedBy(explode(',', $data['authors']));
        }

@ -570,31 +565,18 @@ class EntryRestController extends WallabagRestController
     * @ApiDoc(
     *      requirements={
     *          {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"}
-     *      },
-     *      parameters={
-     *          {"name"="expect", "dataType"="string", "required"=false, "format"="id or entry", "description"="Only returns the id instead of the deleted entry's full entity if 'id' is specified. Default to entry"},
     *      }
     * )
     *
     * @return JsonResponse
     */
-    public function deleteEntriesAction(Entry $entry, Request $request)
+    public function deleteEntriesAction(Entry $entry)
    {
-        $expect = $request->query->get('expect', 'entry');
-        if (!\in_array($expect, ['id', 'entry'], true)) {
-            throw new BadRequestHttpException(sprintf("expect: 'id' or 'entry' expected, %s given", $expect));
-        }
        $this->validateAuthentication();
        $this->validateUserAccess($entry->getUser()->getId());

-        $response = $this->sendResponse([
-            'id' => $entry->getId(),
-        ]);
-        // We clone $entry to keep id in returned object
-        if ('entry' === $expect) {
-            $e = clone $entry;
-            $response = $this->sendResponse($e);
-        }
+        // We copy $entry to keep id in returned object
+        $e = $entry;

        $em = $this->getDoctrine()->getManager();
        $em->remove($entry);
@ -603,7 +585,7 @@ class EntryRestController extends WallabagRestController
        // entry deleted, dispatch event about it!
        $this->get('event_dispatcher')->dispatch(EntryDeletedEvent::NAME, new EntryDeletedEvent($entry));

-        return $response;
+        return $this->sendResponse($e);
    }

    /**
--- a/src/Wallabag/ApiBundle/Controller/TagRestController.php
+++ b/src/Wallabag/ApiBundle/Controller/TagRestController.php
@ -46,14 +46,12 @@ class TagRestController extends WallabagRestController
        $this->validateAuthentication();
        $label = $request->get('tag', '');

-        $tags = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findByLabelsAndUser([$label], $this->getUser()->getId());
+        $tag = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findOneByLabel($label);

-        if (empty($tags)) {
+        if (empty($tag)) {
            throw $this->createNotFoundException('Tag not found');
        }

-        $tag = $tags[0];
-
        $this->getDoctrine()
            ->getRepository('WallabagCoreBundle:Entry')
            ->removeTag($this->getUser()->getId(), $tag);
@ -82,7 +80,15 @@ class TagRestController extends WallabagRestController

        $tagsLabels = $request->get('tags', '');

-        $tags = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findByLabelsAndUser(explode(',', $tagsLabels), $this->getUser()->getId());
+        $tags = [];
+
+        foreach (explode(',', $tagsLabels) as $tagLabel) {
+            $tagEntity = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findOneByLabel($tagLabel);
+
+            if (!empty($tagEntity)) {
+                $tags[] = $tagEntity;
+            }
+        }

        if (empty($tags)) {
            throw $this->createNotFoundException('Tags not found');
@ -114,12 +120,6 @@ class TagRestController extends WallabagRestController
    {
        $this->validateAuthentication();

-        $tagFromDb = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findByLabelsAndUser([$tag->getLabel()], $this->getUser()->getId());
-
-        if (empty($tagFromDb)) {
-            throw $this->createNotFoundException('Tag not found');
-        }
-
        $this->getDoctrine()
            ->getRepository('WallabagCoreBundle:Entry')
            ->removeTag($this->getUser()->getId(), $tag);
@ -138,14 +138,14 @@ class TagRestController extends WallabagRestController
     */
    private function cleanOrphanTag($tags)
    {
-        if (!\is_array($tags)) {
+        if (!is_array($tags)) {
            $tags = [$tags];
        }

        $em = $this->getDoctrine()->getManager();

        foreach ($tags as $tag) {
-            if (0 === \count($tag->getEntries())) {
+            if (0 === count($tag->getEntries())) {
                $em->remove($tag);
            }
        }
--- a/src/Wallabag/ApiBundle/Entity/Client.php
+++ b/src/Wallabag/ApiBundle/Entity/Client.php
@ -11,7 +11,7 @@ use Wallabag\UserBundle\Entity\User;

 /**
 * @ORM\Table("oauth2_clients")
- * @ORM\Entity(repositoryClass="Wallabag\ApiBundle\Repository\ClientRepository")
+ * @ORM\Entity
 */
 class Client extends BaseClient
 {
--- a/src/Wallabag/ApiBundle/Repository/ClientRepository.php
+++ b/src/Wallabag/ApiBundle/Repository/ClientRepository.php
@ -1,19 +0,0 @@
-<?php
-
-namespace Wallabag\ApiBundle\Repository;
-
-use Doctrine\ORM\EntityRepository;
-
-class ClientRepository extends EntityRepository
-{
-    public function findOneBy(array $criteria, array $orderBy = null)
-    {
-        if (!empty($criteria['id'])) {
-            // cast client id to be an integer to avoid postgres error:
-            // "invalid input syntax for integer"
-            $criteria['id'] = (int) $criteria['id'];
-        }
-
-        return parent::findOneBy($criteria, $orderBy);
-    }
-}
--- a/src/Wallabag/CoreBundle/Command/CleanDuplicatesCommand.php
+++ b/src/Wallabag/CoreBundle/Command/CleanDuplicatesCommand.php
@ -51,7 +51,7 @@ class CleanDuplicatesCommand extends ContainerAwareCommand
        } else {
            $users = $this->getContainer()->get('wallabag_user.user_repository')->findAll();

-            $this->io->text(sprintf('Cleaning through <info>%d</info> user accounts', \count($users)));
+            $this->io->text(sprintf('Cleaning through <info>%d</info> user accounts', count($users)));

            foreach ($users as $user) {
                $this->io->text(sprintf('Processing user <info>%s</info>', $user->getUsername()));
@ -79,7 +79,7 @@ class CleanDuplicatesCommand extends ContainerAwareCommand
            $url = $this->similarUrl($entry['url']);

            /* @var $entry Entry */
-            if (\in_array($url, $urls, true)) {
+            if (in_array($url, $urls, true)) {
                ++$duplicatesCount;

                $em->remove($repo->find($entry['id']));
@ -96,8 +96,8 @@ class CleanDuplicatesCommand extends ContainerAwareCommand

    private function similarUrl($url)
    {
-        if (\in_array(substr($url, -1), ['/', '#'], true)) { // get rid of "/" and "#" and the end of urls
-            return substr($url, 0, \strlen($url));
+        if (in_array(substr($url, -1), ['/', '#'], true)) { // get rid of "/" and "#" and the end of urls
+            return substr($url, 0, strlen($url));
        }

        return $url;
--- a/src/Wallabag/CoreBundle/Command/ExportCommand.php
+++ b/src/Wallabag/CoreBundle/Command/ExportCommand.php
@ -47,7 +47,7 @@ class ExportCommand extends ContainerAwareCommand
            ->getQuery()
            ->getResult();

-        $io->text(sprintf('Exporting <info>%d</info> entrie(s) for user <info>%s</info>...', \count($entries), $user->getUserName()));
+        $io->text(sprintf('Exporting <info>%d</info> entrie(s) for user <info>%s</info>...', count($entries), $user->getUserName()));

        $filePath = $input->getArgument('filepath');

--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@ -81,7 +81,7 @@ class InstallCommand extends ContainerAwareCommand
        $status = '<info>OK!</info>';
        $help = '';

-        if (!\extension_loaded($this->getContainer()->getParameter('database_driver'))) {
+        if (!extension_loaded($this->getContainer()->getParameter('database_driver'))) {
            $fulfilled = false;
            $status = '<error>ERROR!</error>';
            $help = 'Database driver "' . $this->getContainer()->getParameter('database_driver') . '" is not installed.';
@ -146,7 +146,7 @@ class InstallCommand extends ContainerAwareCommand
            $status = '<info>OK!</info>';
            $help = '';

-            if (!\function_exists($functionRequired)) {
+            if (!function_exists($functionRequired)) {
                $fulfilled = false;
                $status = '<error>ERROR!</error>';
                $help = 'You need the ' . $functionRequired . ' function activated';
@ -371,7 +371,7 @@ class InstallCommand extends ContainerAwareCommand
        }

        try {
-            return \in_array($databaseName, $schemaManager->listDatabases(), true);
+            return in_array($databaseName, $schemaManager->listDatabases(), true);
        } catch (\Doctrine\DBAL\Exception\DriverException $e) {
            // it means we weren't able to get database list, assume the database doesn't exist

@ -389,6 +389,6 @@ class InstallCommand extends ContainerAwareCommand
    {
        $schemaManager = $this->getContainer()->get('doctrine')->getManager()->getConnection()->getSchemaManager();

-        return \count($schemaManager->listTableNames()) > 0 ? true : false;
+        return count($schemaManager->listTableNames()) > 0 ? true : false;
    }
 }
--- a/src/Wallabag/CoreBundle/Command/ListUserCommand.php
+++ b/src/Wallabag/CoreBundle/Command/ListUserCommand.php
@ -50,7 +50,7 @@ class ListUserCommand extends ContainerAwareCommand
        $io->success(
            sprintf(
                '%s/%s%s user(s) displayed.',
-                \count($users),
+                count($users),
                $nbUsers,
                null === $input->getArgument('search') ? '' : ' (filtered)'
            )
--- a/src/Wallabag/CoreBundle/Command/ReloadEntryCommand.php
+++ b/src/Wallabag/CoreBundle/Command/ReloadEntryCommand.php
@ -43,7 +43,7 @@ class ReloadEntryCommand extends ContainerAwareCommand
        $entryRepository = $this->getContainer()->get('wallabag_core.entry_repository');
        $entryIds = $entryRepository->findAllEntriesIdByUserId($userId);

-        $nbEntries = \count($entryIds);
+        $nbEntries = count($entryIds);
        if (!$nbEntries) {
            $io->success('No entry to reload.');

--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@ -348,7 +348,7 @@ class ConfigController extends Controller
        $em = $this->getDoctrine()->getManager();

        foreach ($tags as $tag) {
-            if (0 === \count($tag->getEntries())) {
+            if (0 === count($tag->getEntries())) {
                $em->remove($tag);
            }
        }
--- a/src/Wallabag/CoreBundle/Controller/ExportController.php
+++ b/src/Wallabag/CoreBundle/Controller/ExportController.php
@ -58,7 +58,6 @@ class ExportController extends Controller
        $method = ucfirst($category);
        $methodBuilder = 'getBuilderFor' . $method . 'ByUser';
        $repository = $this->get('wallabag_core.entry_repository');
-        $title = $method;

        if ('tag_entries' === $category) {
            $tag = $this->get('wallabag_core.tag_repository')->findOneBySlug($request->query->get('tag'));
@ -67,8 +66,6 @@ class ExportController extends Controller
                $this->getUser()->getId(),
                $tag->getId()
            );
-
-            $title = 'Tag ' . $tag->getLabel();
        } else {
            $entries = $repository
                ->$methodBuilder($this->getUser()->getId())
@ -79,7 +76,7 @@ class ExportController extends Controller
        try {
            return $this->get('wallabag_core.helper.entries_export')
                ->setEntries($entries)
-                ->updateTitle($title)
+                ->updateTitle($method)
                ->updateAuthor($method)
                ->exportAs($format);
        } catch (\InvalidArgumentException $e) {
--- a/src/Wallabag/CoreBundle/Controller/RssController.php
+++ b/src/Wallabag/CoreBundle/Controller/RssController.php
@ -12,6 +12,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Wallabag\CoreBundle\Entity\Entry;
 use Wallabag\CoreBundle\Entity\Tag;
 use Wallabag\UserBundle\Entity\User;

--- a/src/Wallabag/CoreBundle/Controller/TagController.php
+++ b/src/Wallabag/CoreBundle/Controller/TagController.php
@ -65,7 +65,7 @@ class TagController extends Controller
        $em->flush();

        // remove orphan tag in case no entries are associated to it
-        if (0 === \count($tag->getEntries())) {
+        if (0 === count($tag->getEntries())) {
            $em->remove($tag);
            $em->flush();
        }
--- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadEntryData.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadEntryData.php
@ -14,112 +14,97 @@ class LoadEntryData extends AbstractFixture implements OrderedFixtureInterface
     */
    public function load(ObjectManager $manager)
    {
-        $entries = [
-            'entry1' => [
-                'user' => 'admin-user',
-                'url' => 'http://0.0.0.0/entry1',
-                'reading_time' => 11,
-                'domain' => 'domain.io',
-                'mime' => 'text/html',
-                'title' => 'test title entry1',
-                'content' => 'This is my content /o/',
-                'language' => 'en',
-                'tags' => ['foo-tag', 'baz-tag'],
-            ],
-            'entry2' => [
-                'user' => 'admin-user',
-                'url' => 'http://0.0.0.0/entry2',
-                'reading_time' => 1,
-                'domain' => 'domain.io',
-                'mime' => 'text/html',
-                'title' => 'test title entry2',
-                'content' => 'This is my content /o/',
-                'origin' => 'ftp://oneftp.tld',
-                'language' => 'fr',
-            ],
-            'entry3' => [
-                'user' => 'bob-user',
-                'url' => 'http://0.0.0.0/entry3',
-                'reading_time' => 1,
-                'domain' => 'domain.io',
-                'mime' => 'text/html',
-                'title' => 'test title entry3',
-                'content' => 'This is my content /o/',
-                'language' => 'en',
-                'tags' => ['foo-tag', 'bar-tag', 'bob-tag'],
-            ],
-            'entry4' => [
-                'user' => 'admin-user',
-                'url' => 'http://0.0.0.0/entry4',
-                'reading_time' => 12,
-                'domain' => 'domain.io',
-                'mime' => 'text/html',
-                'title' => 'test title entry4',
-                'content' => 'This is my content /o/',
-                'language' => 'en',
-                'tags' => ['foo-tag', 'bar-tag'],
-            ],
-            'entry5' => [
-                'user' => 'admin-user',
-                'url' => 'http://0.0.0.0/entry5',
-                'reading_time' => 12,
-                'domain' => 'domain.io',
-                'mime' => 'text/html',
-                'title' => 'test title entry5',
-                'content' => 'This is my content /o/',
-                'language' => 'fr',
-                'starred' => true,
-                'preview' => 'http://0.0.0.0/image.jpg',
-            ],
-            'entry6' => [
-                'user' => 'admin-user',
-                'url' => 'http://0.0.0.0/entry6',
-                'reading_time' => 12,
-                'domain' => 'domain.io',
-                'mime' => 'text/html',
-                'title' => 'test title entry6',
-                'content' => 'This is my content /o/',
-                'language' => 'de',
-                'archived' => true,
-                'tags' => ['bar-tag'],
-            ],
-        ];
+        $entry1 = new Entry($this->getReference('admin-user'));
+        $entry1->setUrl('http://0.0.0.0/entry1');
+        $entry1->setReadingTime(11);
+        $entry1->setDomainName('domain.io');
+        $entry1->setMimetype('text/html');
+        $entry1->setTitle('test title entry1');
+        $entry1->setContent('This is my content /o/');
+        $entry1->setLanguage('en');

-        foreach ($entries as $reference => $item) {
-            $entry = new Entry($this->getReference($item['user']));
-            $entry->setUrl($item['url']);
-            $entry->setReadingTime($item['reading_time']);
-            $entry->setDomainName($item['domain']);
-            $entry->setMimetype($item['mime']);
-            $entry->setTitle($item['title']);
-            $entry->setContent($item['content']);
-            $entry->setLanguage($item['language']);
+        $entry1->addTag($this->getReference('foo-tag'));
+        $entry1->addTag($this->getReference('baz-tag'));

-            if (isset($item['tags'])) {
-                foreach ($item['tags'] as $tag) {
-                    $entry->addTag($this->getReference($tag));
-                }
-            }
+        $manager->persist($entry1);

-            if (isset($item['origin'])) {
-                $entry->setOriginUrl($item['origin']);
-            }
+        $this->addReference('entry1', $entry1);

-            if (isset($item['starred'])) {
-                $entry->setStarred($item['starred']);
-            }
+        $entry2 = new Entry($this->getReference('admin-user'));
+        $entry2->setUrl('http://0.0.0.0/entry2');
+        $entry2->setReadingTime(1);
+        $entry2->setDomainName('domain.io');
+        $entry2->setMimetype('text/html');
+        $entry2->setTitle('test title entry2');
+        $entry2->setContent('This is my content /o/');
+        $entry2->setOriginUrl('ftp://oneftp.tld');
+        $entry2->setLanguage('fr');

-            if (isset($item['archived'])) {
-                $entry->setArchived($item['archived']);
-            }
+        $manager->persist($entry2);

-            if (isset($item['preview'])) {
-                $entry->setPreviewPicture($item['preview']);
-            }
+        $this->addReference('entry2', $entry2);

-            $manager->persist($entry);
-            $this->addReference($reference, $entry);
-        }
+        $entry3 = new Entry($this->getReference('bob-user'));
+        $entry3->setUrl('http://0.0.0.0/entry3');
+        $entry3->setReadingTime(1);
+        $entry3->setDomainName('domain.io');
+        $entry3->setMimetype('text/html');
+        $entry3->setTitle('test title entry3');
+        $entry3->setContent('This is my content /o/');
+        $entry3->setLanguage('en');
+
+        $entry3->addTag($this->getReference('foo-tag'));
+        $entry3->addTag($this->getReference('bar-tag'));
+
+        $manager->persist($entry3);
+
+        $this->addReference('entry3', $entry3);
+
+        $entry4 = new Entry($this->getReference('admin-user'));
+        $entry4->setUrl('http://0.0.0.0/entry4');
+        $entry4->setReadingTime(12);
+        $entry4->setDomainName('domain.io');
+        $entry4->setMimetype('text/html');
+        $entry4->setTitle('test title entry4');
+        $entry4->setContent('This is my content /o/');
+        $entry4->setLanguage('en');
+
+        $entry4->addTag($this->getReference('foo-tag'));
+        $entry4->addTag($this->getReference('bar-tag'));
+
+        $manager->persist($entry4);
+
+        $this->addReference('entry4', $entry4);
+
+        $entry5 = new Entry($this->getReference('admin-user'));
+        $entry5->setUrl('http://0.0.0.0/entry5');
+        $entry5->setReadingTime(12);
+        $entry5->setDomainName('domain.io');
+        $entry5->setMimetype('text/html');
+        $entry5->setTitle('test title entry5');
+        $entry5->setContent('This is my content /o/');
+        $entry5->setStarred(true);
+        $entry5->setLanguage('fr');
+        $entry5->setPreviewPicture('http://0.0.0.0/image.jpg');
+
+        $manager->persist($entry5);
+
+        $this->addReference('entry5', $entry5);
+
+        $entry6 = new Entry($this->getReference('admin-user'));
+        $entry6->setUrl('http://0.0.0.0/entry6');
+        $entry6->setReadingTime(12);
+        $entry6->setDomainName('domain.io');
+        $entry6->setMimetype('text/html');
+        $entry6->setTitle('test title entry6');
+        $entry6->setContent('This is my content /o/');
+        $entry6->setArchived(true);
+        $entry6->setLanguage('de');
+        $entry6->addTag($this->getReference('bar-tag'));
+
+        $manager->persist($entry6);
+
+        $this->addReference('entry6', $entry6);

        $manager->flush();
    }
--- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSiteCredentialData.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSiteCredentialData.php
@ -5,38 +5,19 @@ namespace Wallabag\CoreBundle\DataFixtures\ORM;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Wallabag\CoreBundle\Entity\SiteCredential;

-class LoadSiteCredentialData extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
+class LoadSiteCredentialData extends AbstractFixture implements OrderedFixtureInterface
 {
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
-
-    public function setContainer(ContainerInterface $container = null)
-    {
-        $this->container = $container;
-    }
-
    /**
     * {@inheritdoc}
     */
    public function load(ObjectManager $manager)
    {
        $credential = new SiteCredential($this->getReference('admin-user'));
-        $credential->setHost('.super.com');
-        $credential->setUsername($this->container->get('wallabag_core.helper.crypto_proxy')->crypt('.super'));
-        $credential->setPassword($this->container->get('wallabag_core.helper.crypto_proxy')->crypt('bar'));
-
-        $manager->persist($credential);
-
-        $credential = new SiteCredential($this->getReference('admin-user'));
-        $credential->setHost('paywall.example.com');
-        $credential->setUsername($this->container->get('wallabag_core.helper.crypto_proxy')->crypt('paywall.example'));
-        $credential->setPassword($this->container->get('wallabag_core.helper.crypto_proxy')->crypt('bar'));
+        $credential->setHost('example.com');
+        $credential->setUsername('foo');
+        $credential->setPassword('bar');

        $manager->persist($credential);

--- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadTagData.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadTagData.php
@ -14,22 +14,33 @@ class LoadTagData extends AbstractFixture implements OrderedFixtureInterface
     */
    public function load(ObjectManager $manager)
    {
-        $tags = [
-            'foo-bar-tag' => 'foo bar', //tag used for EntryControllerTest
-            'bar-tag' => 'bar',
-            'baz-tag' => 'baz', // tag used for ExportControllerTest
-            'foo-tag' => 'foo',
-            'bob-tag' => 'bob', // tag used for TagRestControllerTest
-        ];
+        $tag1 = new Tag();
+        $tag1->setLabel('foo bar');

-        foreach ($tags as $reference => $label) {
-            $tag = new Tag();
-            $tag->setLabel($label);
+        $manager->persist($tag1);

-            $manager->persist($tag);
+        $this->addReference('foo-bar-tag', $tag1);

-            $this->addReference($reference, $tag);
-        }
+        $tag2 = new Tag();
+        $tag2->setLabel('bar');
+
+        $manager->persist($tag2);
+
+        $this->addReference('bar-tag', $tag2);
+
+        $tag3 = new Tag();
+        $tag3->setLabel('baz');
+
+        $manager->persist($tag3);
+
+        $this->addReference('baz-tag', $tag3);
+
+        $tag4 = new Tag();
+        $tag4->setLabel('foo');
+
+        $manager->persist($tag4);
+
+        $this->addReference('foo-tag', $tag4);

        $manager->flush();
    }
--- a/src/Wallabag/CoreBundle/Doctrine/WallabagMigration.php
+++ b/src/Wallabag/CoreBundle/Doctrine/WallabagMigration.php
@ -1,49 +0,0 @@
-<?php
-
-namespace Wallabag\CoreBundle\Doctrine;
-
-use Doctrine\DBAL\Migrations\AbstractMigration;
-use Doctrine\DBAL\Schema\Schema;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-abstract class WallabagMigration extends AbstractMigration implements ContainerAwareInterface
-{
-    const UN_ESCAPED_TABLE = true;
-
-    /**
-     * @var ContainerInterface
-     */
-    protected $container;
-
-    // because there are declared as abstract in `AbstractMigration` we need to delarer here too
-    public function up(Schema $schema)
-    {
-    }
-
-    public function down(Schema $schema)
-    {
-    }
-
-    public function setContainer(ContainerInterface $container = null)
-    {
-        $this->container = $container;
-    }
-
-    protected function getTable($tableName, $unEscaped = false)
-    {
-        $table = $this->container->getParameter('database_table_prefix') . $tableName;
-
-        if (self::UN_ESCAPED_TABLE === $unEscaped) {
-            return $table;
-        }
-
-        // escape table name is handled using " on postgresql
-        if ('postgresql' === $this->connection->getDatabasePlatform()->getName()) {
-            return '"' . $table . '"';
-        }
-
-        // return escaped table
-        return '`' . $table . '`';
-    }
-}
--- a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
@ -33,7 +33,7 @@ class EntryFilterType extends AbstractType

        $this->user = $tokenStorage->getToken() ? $tokenStorage->getToken()->getUser() : null;

-        if (null === $this->user || !\is_object($this->user)) {
+        if (null === $this->user || !is_object($this->user)) {
            return;
        }
    }
@ -96,7 +96,7 @@ class EntryFilterType extends AbstractType
            ->add('domainName', TextFilterType::class, [
                'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
                    $value = $values['value'];
-                    if (\strlen($value) <= 2 || empty($value)) {
+                    if (strlen($value) <= 2 || empty($value)) {
                        return;
                    }
                    $expression = $filterQuery->getExpr()->like($field, $filterQuery->getExpr()->lower($filterQuery->getExpr()->literal('%' . $value . '%')));
@ -108,7 +108,7 @@ class EntryFilterType extends AbstractType
            ->add('httpStatus', TextFilterType::class, [
                'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
                    $value = $values['value'];
-                    if (false === \array_key_exists($value, Response::$statusTexts)) {
+                    if (false === array_key_exists($value, Response::$statusTexts)) {
                        return;
                    }

--- a/src/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilder.php
+++ b/src/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilder.php
@ -62,24 +62,11 @@ class GrabySiteConfigBuilder implements SiteConfigBuilder
            $host = substr($host, 4);
        }

-        if (!$this->currentUser) {
-            $this->logger->debug('Auth: no current user defined.');
-
-            return false;
+        $credentials = null;
+        if ($this->currentUser) {
+            $credentials = $this->credentialRepository->findOneByHostAndUser($host, $this->currentUser->getId());
        }

-        $hosts = [$host];
-        // will try to see for a host without the first subdomain (fr.example.org & .example.org)
-        $split = explode('.', $host);
-
-        if (\count($split) > 1) {
-            // remove first subdomain
-            array_shift($split);
-            $hosts[] = '.' . implode('.', $split);
-        }
-
-        $credentials = $this->credentialRepository->findOneByHostsAndUser($hosts, $this->currentUser->getId());
-
        if (null === $credentials) {
            $this->logger->debug('Auth: no credentials available for host.', ['host' => $host]);

@ -120,7 +107,7 @@ class GrabySiteConfigBuilder implements SiteConfigBuilder
     */
    protected function processExtraFields($extraFieldsStrings)
    {
-        if (!\is_array($extraFieldsStrings)) {
+        if (!is_array($extraFieldsStrings)) {
            return [];
        }

--- a/src/Wallabag/CoreBundle/Helper/ContentProxy.php
+++ b/src/Wallabag/CoreBundle/Helper/ContentProxy.php
@ -47,14 +47,12 @@ class ContentProxy
     */
    public function updateEntry(Entry $entry, $url, array $content = [], $disableContentUpdate = false)
    {
-        $this->graby->toggleImgNoReferrer(true);
        if (!empty($content['html'])) {
            $content['html'] = $this->graby->cleanupHtml($content['html'], $url);
        }

        if ((empty($content) || false === $this->validateContent($content)) && false === $disableContentUpdate) {
            $fetchedContent = $this->graby->fetchContent($url);
-            $fetchedContent['title'] = $this->sanitizeContentTitle($fetchedContent['title'], $fetchedContent['content_type']);

            // when content is imported, we have information in $content
            // in case fetching content goes bad, we'll keep the imported information instead of overriding them
@ -67,13 +65,6 @@ class ContentProxy
        // so we'll be able to refetch it in the future
        $content['url'] = !empty($content['url']) ? $content['url'] : $url;

-        // In one case (at least in tests), url is empty here
-        // so we set it using $url provided in the updateEntry call.
-        // Not sure what are the other possible cases where this property is empty
-        if (empty($entry->getUrl()) && !empty($url)) {
-            $entry->setUrl($url);
-        }
-
        $this->stockEntry($entry, $content);
    }

@ -94,7 +85,7 @@ class ContentProxy
            (new LocaleConstraint())
        );

-        if (0 === \count($errors)) {
+        if (0 === count($errors)) {
            $entry->setLanguage($value);

            return;
@ -116,7 +107,7 @@ class ContentProxy
            (new UrlConstraint())
        );

-        if (0 === \count($errors)) {
+        if (0 === count($errors)) {
            $entry->setPreviewPicture($value);

            return;
@ -185,59 +176,6 @@ class ContentProxy
        $entry->setTitle($path);
    }

-    /**
-     * Try to sanitize the title of the fetched content from wrong character encodings and invalid UTF-8 character.
-     *
-     * @param $title
-     * @param $contentType
-     *
-     * @return string
-     */
-    private function sanitizeContentTitle($title, $contentType)
-    {
-        if ('application/pdf' === $contentType) {
-            $title = $this->convertPdfEncodingToUTF8($title);
-        }
-
-        return $this->sanitizeUTF8Text($title);
-    }
-
-    /**
-     * If the title from the fetched content comes from a PDF, then its very possible that the character encoding is not
-     * UTF-8. This methods tries to identify the character encoding and translate the title to UTF-8.
-     *
-     * @param $title
-     *
-     * @return string (maybe contains invalid UTF-8 character)
-     */
-    private function convertPdfEncodingToUTF8($title)
-    {
-        // first try UTF-8 because its easier to detect its present/absence
-        foreach (['UTF-8', 'UTF-16BE', 'WINDOWS-1252'] as $encoding) {
-            if (mb_check_encoding($title, $encoding)) {
-                return mb_convert_encoding($title, 'UTF-8', $encoding);
-            }
-        }
-
-        return $title;
-    }
-
-    /**
-     * Remove invalid UTF-8 characters from the given string.
-     *
-     * @param string $rawText
-     *
-     * @return string
-     */
-    private function sanitizeUTF8Text($rawText)
-    {
-        if (mb_check_encoding($rawText, 'UTF-8')) {
-            return $rawText;
-        }
-
-        return iconv('UTF-8', 'UTF-8//IGNORE', $rawText);
-    }
-
    /**
     * Stock entry with fetched or imported content.
     * Will fall back to OpenGraph data if available.
@ -247,7 +185,7 @@ class ContentProxy
     */
    private function stockEntry(Entry $entry, array $content)
    {
-        $this->updateOriginUrl($entry, $content['url']);
+        $entry->setUrl($content['url']);

        $this->setEntryDomainName($entry);

@ -257,23 +195,24 @@ class ContentProxy
            $entry->setTitle($content['open_graph']['og_title']);
        }

-        if (empty($content['html'])) {
-            $content['html'] = $this->fetchingErrorMessage;
+        $html = $content['html'];
+        if (false === $html) {
+            $html = $this->fetchingErrorMessage;

            if (!empty($content['open_graph']['og_description'])) {
-                $content['html'] .= '<p><i>But we found a short description: </i></p>';
-                $content['html'] .= $content['open_graph']['og_description'];
+                $html .= '<p><i>But we found a short description: </i></p>';
+                $html .= $content['open_graph']['og_description'];
            }
        }

-        $entry->setContent($content['html']);
-        $entry->setReadingTime(Utils::getReadingTime($content['html']));
+        $entry->setContent($html);
+        $entry->setReadingTime(Utils::getReadingTime($html));

        if (!empty($content['status'])) {
            $entry->setHttpStatus($content['status']);
        }

-        if (!empty($content['authors']) && \is_array($content['authors'])) {
+        if (!empty($content['authors']) && is_array($content['authors'])) {
            $entry->setPublishedBy($content['authors']);
        }

@ -294,7 +233,7 @@ class ContentProxy
        }

        // if content is an image, define it as a preview too
-        if (!empty($content['content_type']) && \in_array($this->mimeGuesser->guess($content['content_type']), ['jpeg', 'jpg', 'gif', 'png'], true)) {
+        if (!empty($content['content_type']) && in_array($this->mimeGuesser->guess($content['content_type']), ['jpeg', 'jpg', 'gif', 'png'], true)) {
            $this->updatePreviewPicture($entry, $content['url']);
        }

@ -312,115 +251,6 @@ class ContentProxy
        }
    }

-    /**
-     * Update the origin_url field when a redirection occurs
-     * This field is set if it is empty and new url does not match ignore list.
-     *
-     * @param Entry  $entry
-     * @param string $url
-     */
-    private function updateOriginUrl(Entry $entry, $url)
-    {
-        if (empty($url) || $entry->getUrl() === $url) {
-            return false;
-        }
-
-        $parsed_entry_url = parse_url($entry->getUrl());
-        $parsed_content_url = parse_url($url);
-
-        /**
-         * The following part computes the list of part changes between two
-         * parse_url arrays.
-         *
-         * As array_diff_assoc only computes changes to go from the left array
-         * to the right one, we make two differents arrays to have both
-         * directions. We merge these two arrays and sort keys before passing
-         * the result to the switch.
-         *
-         * The resulting array gives us all changing parts between the two
-         * urls: scheme, host, path, query and/or fragment.
-         */
-        $diff_ec = array_diff_assoc($parsed_entry_url, $parsed_content_url);
-        $diff_ce = array_diff_assoc($parsed_content_url, $parsed_entry_url);
-
-        $diff = array_merge($diff_ec, $diff_ce);
-        $diff_keys = array_keys($diff);
-        sort($diff_keys);
-
-        if ($this->ignoreUrl($entry->getUrl())) {
-            $entry->setUrl($url);
-
-            return false;
-        }
-
-        /**
-         * This switch case lets us apply different behaviors according to
-         * changing parts of urls.
-         *
-         * As $diff_keys is an array, we provide arrays as cases. ['path'] means
-         * 'only the path is different between the two urls' whereas
-         * ['fragment', 'query'] means 'only fragment and query string parts are
-         * different between the two urls'.
-         *
-         * Note that values in $diff_keys are sorted.
-         */
-        switch ($diff_keys) {
-            case ['path']:
-                if (($parsed_entry_url['path'] . '/' === $parsed_content_url['path']) // diff is trailing slash, we only replace the url of the entry
-                    || ($url === urldecode($entry->getUrl()))) { // we update entry url if new url is a decoded version of it, see EntryRepository#findByUrlAndUserId
-                    $entry->setUrl($url);
-                }
-                break;
-            case ['scheme']:
-                $entry->setUrl($url);
-                break;
-            case ['fragment']:
-                // noop
-                break;
-            default:
-                if (empty($entry->getOriginUrl())) {
-                    $entry->setOriginUrl($entry->getUrl());
-                }
-                $entry->setUrl($url);
-                break;
-        }
-    }
-
-    /**
-     * Check entry url against an ignore list to replace with content url.
-     *
-     * XXX: move the ignore list in the database to let users handle it
-     *
-     * @param string $url url to test
-     *
-     * @return bool true if url matches ignore list otherwise false
-     */
-    private function ignoreUrl($url)
-    {
-        $ignored_hosts = ['feedproxy.google.com', 'feeds.reuters.com'];
-        $ignored_patterns = ['https?://www\.lemonde\.fr/tiny.*'];
-
-        $parsed_url = parse_url($url);
-
-        $filtered = array_filter($ignored_hosts, function ($var) use ($parsed_url) {
-            return $var === $parsed_url['host'];
-        });
-
-        if ([] !== $filtered) {
-            return true;
-        }
-
-        $filtered = array_filter($ignored_patterns, function ($var) use ($url) {
-            return preg_match("`$var`i", $url);
-        });
-
-        if ([] !== $filtered) {
-            return true;
-        }
-
-        return false;
-    }
-
    /**
     * Validate that the given content has at least a title, an html and a url.
     *
--- a/src/Wallabag/CoreBundle/Helper/CryptoProxy.php
+++ b/src/Wallabag/CoreBundle/Helper/CryptoProxy.php
@ -81,6 +81,6 @@ class CryptoProxy
     */
    private function mask($value)
    {
-        return \strlen($value) > 0 ? $value[0] . '*****' . $value[\strlen($value) - 1] : 'Empty value';
+        return strlen($value) > 0 ? $value[0] . '*****' . $value[strlen($value) - 1] : 'Empty value';
    }
 }
--- a/src/Wallabag/CoreBundle/Helper/DownloadImages.php
+++ b/src/Wallabag/CoreBundle/Helper/DownloadImages.php
@ -42,17 +42,14 @@ class DownloadImages
    public function processHtml($entryId, $html, $url)
    {
        $crawler = new Crawler($html);
-        $imagesCrawler = $crawler
-            ->filterXpath('//img');
-        $imagesUrls = $imagesCrawler
+        $result = $crawler
+            ->filterXpath('//img')
            ->extract(['src']);
-        $imagesSrcsetUrls = $this->getSrcsetUrls($imagesCrawler);
-        $imagesUrls = array_unique(array_merge($imagesUrls, $imagesSrcsetUrls));

        $relativePath = $this->getRelativePath($entryId);

        // download and save the image to the folder
-        foreach ($imagesUrls as $image) {
+        foreach ($result as $image) {
            $imagePath = $this->processSingleImage($entryId, $image, $url, $relativePath);

            if (false === $imagePath) {
@ -85,10 +82,6 @@ class DownloadImages
     */
    public function processSingleImage($entryId, $imagePath, $url, $relativePath = null)
    {
-        if (null === $imagePath) {
-            return false;
-        }
-
        if (null === $relativePath) {
            $relativePath = $this->getRelativePath($entryId);
        }
@ -178,38 +171,6 @@ class DownloadImages
        @rmdir($folderPath);
    }

-    /**
-     * Get images urls from the srcset image attribute.
-     *
-     * @param Crawler $imagesCrawler
-     *
-     * @return array An array of urls
-     */
-    private function getSrcsetUrls(Crawler $imagesCrawler)
-    {
-        $urls = [];
-        $iterator = $imagesCrawler
-            ->getIterator();
-        while ($iterator->valid()) {
-            $srcsetAttribute = $iterator->current()->getAttribute('srcset');
-            if ('' !== $srcsetAttribute) {
-                // Couldn't start with " OR ' OR a white space
-                // Could be one or more white space
-                // Must be one or more digits followed by w OR x
-                $pattern = "/(?:[^\"'\s]+\s*(?:\d+[wx])+)/";
-                preg_match_all($pattern, $srcsetAttribute, $matches);
-                $srcset = \call_user_func_array('array_merge', $matches);
-                $srcsetUrls = array_map(function ($src) {
-                    return trim(explode(' ', $src, 2)[0]);
-                }, $srcset);
-                $urls = array_merge($srcsetUrls, $urls);
-            }
-            $iterator->next();
-        }
-
-        return $urls;
-    }
-
    /**
     * Setup base folder where all images are going to be saved.
     */
@ -308,7 +269,7 @@ class DownloadImages
            $this->logger->debug('DownloadImages: Checking extension (alternative)', ['ext' => $ext]);
        }

-        if (!\in_array($ext, ['jpeg', 'jpg', 'gif', 'png'], true)) {
+        if (!in_array($ext, ['jpeg', 'jpg', 'gif', 'png'], true)) {
            $this->logger->error('DownloadImages: Processed image with not allowed extension. Skipping: ' . $imagePath);

            return false;
--- a/src/Wallabag/CoreBundle/Helper/EntriesExport.php
+++ b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
@ -45,7 +45,7 @@ class EntriesExport
     */
    public function setEntries($entries)
    {
-        if (!\is_array($entries)) {
+        if (!is_array($entries)) {
            $this->language = $entries->getLanguage();
            $entries = [$entries];
        }
@ -85,7 +85,7 @@ class EntriesExport
    public function updateAuthor($method)
    {
        if ('entry' !== $method) {
-            $this->author = 'Various authors';
+            $this->author = $method . ' authors';

            return $this;
        }
@ -150,6 +150,8 @@ class EntriesExport
         */

        $book->setTitle($this->title);
+        // Could also be the ISBN number, prefered for published books, or a UUID.
+        $book->setIdentifier($this->title, EPub::IDENTIFIER_URI);
        // Not needed, but included for the example, Language is mandatory, but EPub defaults to "en". Use RFC3066 Language codes, such as "en", "da", "fr" etc.
        $book->setLanguage($this->language);
        $book->setDescription('Some articles saved on my wallabag');
@ -165,9 +167,12 @@ class EntriesExport
        $book->addDublinCoreMetadata(DublinCore::CONTRIBUTOR, 'PHP');
        $book->addDublinCoreMetadata(DublinCore::CONTRIBUTOR, 'wallabag');

-        $entryIds = [];
-        $entryCount = \count($this->entries);
-        $i = 0;
+        /*
+         * Front page
+         */
+        if (file_exists($this->logoPath)) {
+            $book->setCoverImage('Cover.png', file_get_contents($this->logoPath), 'image/png');
+        }

        /*
         * Adding actual entries
@ -175,48 +180,21 @@ class EntriesExport

        // set tags as subjects
        foreach ($this->entries as $entry) {
-            ++$i;
-
-            /*
-             * Front page
-             * Set if there's only one entry in the given set
-             */
-            if (1 === $entryCount && null !== $entry->getPreviewPicture()) {
-                $book->setCoverImage($entry->getPreviewPicture());
-            }
-
            foreach ($entry->getTags() as $tag) {
                $book->setSubject($tag->getLabel());
            }
-            $filename = sha1(sprintf('%s:%s', $entry->getUrl(), $entry->getTitle()));

-            $publishedBy = $entry->getPublishedBy();
-            $authors = $this->translator->trans('export.unknown');
-            if (!empty($publishedBy)) {
-                $authors = implode(',', $publishedBy);
-            }
+            // the reader in Kobo Devices doesn't likes special caracters
+            // in filenames, we limit to A-z/0-9
+            $filename = preg_replace('/[^A-Za-z0-9\-]/', '', $entry->getTitle());

-            $titlepage = $content_start .
-                '<h1>' . $entry->getTitle() . '</h1>' .
-                '<dl>' .
-                '<dt>' . $this->translator->trans('entry.view.published_by') . '</dt><dd>' . $authors . '</dd>' .
-                '<dt>' . $this->translator->trans('entry.metadata.reading_time') . '</dt><dd>' . $this->translator->trans('entry.metadata.reading_time_minutes_short', ['%readingTime%' => $entry->getReadingTime()]) . '</dd>' .
-                '<dt>' . $this->translator->trans('entry.metadata.added_on') . '</dt><dd>' . $entry->getCreatedAt()->format('Y-m-d') . '</dd>' .
-                '<dt>' . $this->translator->trans('entry.metadata.address') . '</dt><dd><a href="' . $entry->getUrl() . '">' . $entry->getUrl() . '</a></dd>' .
-                '</dl>' .
-                $bookEnd;
-            $book->addChapter("Entry {$i} of {$entryCount}", "{$filename}_cover.html", $titlepage, true, EPub::EXTERNAL_REF_ADD);
+            $titlepage = $content_start . '<h1>' . $entry->getTitle() . '</h1>' . $this->getExportInformation('PHPePub') . $bookEnd;
+            $book->addChapter('Title', 'Title.html', $titlepage, true, EPub::EXTERNAL_REF_ADD);
            $chapter = $content_start . $entry->getContent() . $bookEnd;
-
-            $entryIds[] = $entry->getId();
-            $book->addChapter($entry->getTitle(), "{$filename}.html", $chapter, true, EPub::EXTERNAL_REF_ADD);
+            $book->addChapter($entry->getTitle(), htmlspecialchars($filename) . '.html', $chapter, true, EPub::EXTERNAL_REF_ADD);
        }

-        $book->addChapter('Notices', 'Cover2.html', $content_start . $this->getExportInformation('PHPePub') . $bookEnd);
-
-        // Could also be the ISBN number, prefered for published books, or a UUID.
-        $hash = sha1(sprintf('%s:%s', $this->wallabagUrl, implode(',', $entryIds)));
-        $book->setIdentifier(sprintf('urn:wallabag:%s', $hash), EPub::IDENTIFIER_URI);
+        $book->buildTOC();

        return Response::create(
            $book->getBook(),
@ -224,7 +202,7 @@ class EntriesExport
            [
                'Content-Description' => 'File Transfer',
                'Content-type' => 'application/epub+zip',
-                'Content-Disposition' => 'attachment; filename="' . $this->getSanitizedFilename() . '.epub"',
+                'Content-Disposition' => 'attachment; filename="' . $this->title . '.epub"',
                'Content-Transfer-Encoding' => 'binary',
            ]
        );
@ -266,6 +244,9 @@ class EntriesExport
        }
        $mobi->setContentProvider($content);

+        // the browser inside Kindle Devices doesn't likes special caracters either, we limit to A-z/0-9
+        $this->title = preg_replace('/[^A-Za-z0-9\-]/', '', $this->title);
+
        return Response::create(
            $mobi->toString(),
            200,
@ -273,7 +254,7 @@ class EntriesExport
                'Accept-Ranges' => 'bytes',
                'Content-Description' => 'File Transfer',
                'Content-type' => 'application/x-mobipocket-ebook',
-                'Content-Disposition' => 'attachment; filename="' . $this->getSanitizedFilename() . '.mobi"',
+                'Content-Disposition' => 'attachment; filename="' . $this->title . '.mobi"',
                'Content-Transfer-Encoding' => 'binary',
            ]
        );
@ -297,6 +278,14 @@ class EntriesExport
        $pdf->SetSubject('Articles via wallabag');
        $pdf->SetKeywords('wallabag');

+        /*
+         * Front page
+         */
+        $pdf->AddPage();
+        $intro = '<h1>' . $this->title . '</h1>' . $this->getExportInformation('tcpdf');
+
+        $pdf->writeHTMLCell(0, 0, '', '', $intro, 0, 1, 0, true, '', true);
+
        /*
         * Adding actual entries
         */
@ -305,22 +294,6 @@ class EntriesExport
                $pdf->SetKeywords($tag->getLabel());
            }

-            $publishedBy = $entry->getPublishedBy();
-            $authors = $this->translator->trans('export.unknown');
-            if (!empty($publishedBy)) {
-                $authors = implode(',', $publishedBy);
-            }
-
-            $pdf->addPage();
-            $html = '<h1>' . $entry->getTitle() . '</h1>' .
-                '<dl>' .
-                '<dt>' . $this->translator->trans('entry.view.published_by') . '</dt><dd>' . $authors . '</dd>' .
-                '<dt>' . $this->translator->trans('entry.metadata.reading_time') . '</dt><dd>' . $this->translator->trans('entry.metadata.reading_time_minutes_short', ['%readingTime%' => $entry->getReadingTime()]) . '</dd>' .
-                '<dt>' . $this->translator->trans('entry.metadata.added_on') . '</dt><dd>' . $entry->getCreatedAt()->format('Y-m-d') . '</dd>' .
-                '<dt>' . $this->translator->trans('entry.metadata.address') . '</dt><dd><a href="' . $entry->getUrl() . '">' . $entry->getUrl() . '</a></dd>' .
-                '</dl>';
-            $pdf->writeHTMLCell(0, 0, '', '', $html, 0, 1, 0, true, '', true);
-
            $pdf->AddPage();
            $html = '<h1>' . $entry->getTitle() . '</h1>';
            $html .= $entry->getContent();
@ -328,14 +301,6 @@ class EntriesExport
            $pdf->writeHTMLCell(0, 0, '', '', $html, 0, 1, 0, true, '', true);
        }

-        /*
-         * Last page
-         */
-        $pdf->AddPage();
-        $html = $this->getExportInformation('tcpdf');
-
-        $pdf->writeHTMLCell(0, 0, '', '', $html, 0, 1, 0, true, '', true);
-
        // set image scale factor
        $pdf->setImageScale(PDF_IMAGE_SCALE_RATIO);

@ -345,7 +310,7 @@ class EntriesExport
            [
                'Content-Description' => 'File Transfer',
                'Content-type' => 'application/pdf',
-                'Content-Disposition' => 'attachment; filename="' . $this->getSanitizedFilename() . '.pdf"',
+                'Content-Disposition' => 'attachment; filename="' . $this->title . '.pdf"',
                'Content-Transfer-Encoding' => 'binary',
            ]
        );
@ -360,7 +325,7 @@ class EntriesExport
    {
        $delimiter = ';';
        $enclosure = '"';
-        $handle = fopen('php://memory', 'b+r');
+        $handle = fopen('php://memory', 'rb+');

        fputcsv($handle, ['Title', 'URL', 'Content', 'Tags', 'MIME Type', 'Language', 'Creation date'], $delimiter, $enclosure);

@ -391,7 +356,7 @@ class EntriesExport
            200,
            [
                'Content-type' => 'application/csv',
-                'Content-Disposition' => 'attachment; filename="' . $this->getSanitizedFilename() . '.csv"',
+                'Content-Disposition' => 'attachment; filename="' . $this->title . '.csv"',
                'Content-Transfer-Encoding' => 'UTF-8',
            ]
        );
@ -409,7 +374,7 @@ class EntriesExport
            200,
            [
                'Content-type' => 'application/json',
-                'Content-Disposition' => 'attachment; filename="' . $this->getSanitizedFilename() . '.json"',
+                'Content-Disposition' => 'attachment; filename="' . $this->title . '.json"',
                'Content-Transfer-Encoding' => 'UTF-8',
            ]
        );
@ -427,7 +392,7 @@ class EntriesExport
            200,
            [
                'Content-type' => 'application/xml',
-                'Content-Disposition' => 'attachment; filename="' . $this->getSanitizedFilename() . '.xml"',
+                'Content-Disposition' => 'attachment; filename="' . $this->title . '.xml"',
                'Content-Transfer-Encoding' => 'UTF-8',
            ]
        );
@ -453,7 +418,7 @@ class EntriesExport
            200,
            [
                'Content-type' => 'text/plain',
-                'Content-Disposition' => 'attachment; filename="' . $this->getSanitizedFilename() . '.txt"',
+                'Content-Disposition' => 'attachment; filename="' . $this->title . '.txt"',
                'Content-Transfer-Encoding' => 'UTF-8',
            ]
        );
@ -496,15 +461,4 @@ class EntriesExport

        return str_replace('%IMAGE%', '', $info);
    }
-
-    /**
-     * Return a sanitized version of the title by applying translit iconv
-     * and removing non alphanumeric characters, - and space.
-     *
-     * @return string Sanitized filename
-     */
-    private function getSanitizedFilename()
-    {
-        return preg_replace('/[^A-Za-z0-9\- \']/', '', iconv('utf-8', 'us-ascii//TRANSLIT', $this->title));
-    }
 }
--- a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php
+++ b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php
@ -23,7 +23,7 @@ class PreparePagerForEntries
     * @param AdapterInterface $adapter
     * @param User             $user    If user isn't logged in, we can force it (like for rss)
     *
-     * @return Pagerfanta|null
+     * @return null|Pagerfanta
     */
    public function prepare(AdapterInterface $adapter, User $user = null)
    {
@ -31,7 +31,7 @@ class PreparePagerForEntries
            $user = $this->tokenStorage->getToken() ? $this->tokenStorage->getToken()->getUser() : null;
        }

-        if (null === $user || !\is_object($user)) {
+        if (null === $user || !is_object($user)) {
            return;
        }

--- a/src/Wallabag/CoreBundle/Helper/Redirect.php
+++ b/src/Wallabag/CoreBundle/Helper/Redirect.php
@ -31,7 +31,7 @@ class Redirect
    {
        $user = $this->tokenStorage->getToken() ? $this->tokenStorage->getToken()->getUser() : null;

-        if (null === $user || !\is_object($user)) {
+        if (null === $user || !is_object($user)) {
            return $url;
        }

--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" width="200" height="200"><path fill="none" d="M0 0h200v200H0z"/><path d="M75.899 72.438c1.597-.981 10.207-5.556 24.098.178 14.289 5.897 23.154.776 24.253.079-3.454-5.678-7.562-10.62-12.104-13.943.303-.083.612-.167.939-.263 6.023-1.742 7.553-6.842 7.875-11.21.364-4.954.616-5.03 1.692-9.487 1.032-4.281-.119-5.137-1.181-4.273-.572.465-5.552 1.616-8.505 3.919-4.768 3.72-7.707 10.794-9.039 14.706-.025.06-.205.604-.265.792-.621 1.498-1.857 1.494-1.857 1.494v.001c-.6-.065-1.202-.1-1.809-.1-.54 0-1.079.029-1.616.081-.012.002-.019 0-.031.001-1.581.233-2.45-1.697-2.632-2.157-1.847-5.304-6.816-15.763-17.984-18.577 0 0-2.028-1.554-1.41 1.074.588 2.511 1.804 5.049 1.534 8.741-.124 1.704-1.181 10.442 6.85 14.99.763.432 1.441.795 2.051 1.101-4.042 3.235-7.716 7.74-10.859 12.853zM128.626 152.353c-9.842-6.098-13.153-8.242-12.946-10.575 0 0 .002-.379.099-.957.239-1.236.995-3.348 3.407-4.552.079-.039.146-.084.208-.129 7.668-4.45 13.27-11.614 15.246-20.56-1.99 4.941-16.735 8.78-34.645 8.78-17.903 0-32.651-3.839-34.641-8.78.442 2.008 1.073 3.923 1.864 5.742.666 3.745 1.562 12.563-2.673 20.282-3.731 6.8-22.15 16.069-49.485 10.748 0 0-1.096-.766-1.428-.136-.491.932 1.517 1.685 3.583 2.229 19.031 5.04 47.756 2.989 56.777-4.443 4.116-3.388 5.704-7.953 6.107-12.865l.003.008s.11-1.287 1.719-.32c.461.277 2.125 1.36 2.39 2.585.232 1.743.248 3.883-.652 5.382-1.287 2.144-1.301 2.452.393 3.662 1.04.742 5.287 3.864 11.198 7.415.015.01.023.019.038.027 1.25.753 2.987 2.597 2.987 2.597 2.662 3.079 8.452 9.275 10.972 8.108 1.19-.551-.051-3.032-.051-3.032s1.98 2.571 3.043 1.694c.809-.668-.473-3.229-.473-3.229s1.729 1.499 2.757.944c1.258-.679-.187-4.614-10.079-10.627-9.896-6.018-12.578-6.94-12.814-9.626 0 0-.004-.135.004-.366.077-.593.414-1.847 1.852-1.712 2.141.346 4.348.531 6.608.531 2.587 0 5.107-.237 7.536-.69l.001.003s.127-.025.164-.031c.284-.036.838-.018.84.671-.09.873-.331 1.751-.845 2.519-1.447 2.168-.972 2.466.54 3.859.933.859 5.211 4.622 11.07 8.264.012.009.017.016.031.023 1.249.752 3.41 2.816 3.41 2.816v-.001c2.428 2.466 6.894 6.596 9.327 6.347 1.646-.168.306-3.002.306-3.002s2.078 2.006 3.099 1.416c1.142-.659-.474-2.755-.474-2.755s1.338.708 2.283.473c.948-.236 1.185-2.644-8.656-8.737z"/><path d="M117.631 83.452c-1.181 0-2.161.355-2.912 1.057-.76.71-1.144 1.531-1.144 2.438v16.056c0 2.154-.382 3.742-1.135 4.721-.728.946-1.892 1.406-3.556 1.406-1.703 0-2.863-.457-3.549-1.396-.716-.979-1.078-2.571-1.078-4.731V86.884c0-1.098-.5-1.996-1.448-2.596-1.289-.812-2.57-1.105-4.129-.587-.476.159-.924.366-1.333.615-.435.265-.802.597-1.093.985-.322.432-.486.901-.486 1.396v16.307c0 2.158-.363 3.75-1.079 4.73-.688.939-1.849 1.396-3.548 1.396-1.705 0-2.877-.459-3.584-1.401-.734-.979-1.107-2.57-1.107-4.726V86.947c0-.908-.384-1.728-1.145-2.438-.751-.702-1.751-1.057-2.973-1.057-1.258 0-2.296.352-3.085 1.045-.811.71-1.222 1.535-1.222 2.45v15.806c0 1.988.194 3.869.575 5.588.393 1.758 1.077 3.3 2.035 4.586.968 1.299 2.282 2.323 3.906 3.05 1.607.716 3.617 1.079 5.975 1.079 2.457 0 4.515-.455 6.115-1.354 1.342-.754 2.473-1.744 3.371-2.951.866 1.207 1.971 2.197 3.294 2.95 1.58.899 3.669 1.354 6.211 1.354 2.357 0 4.359-.364 5.947-1.081 1.601-.726 2.902-1.751 3.872-3.048.96-1.29 1.645-2.833 2.034-4.586.381-1.719.575-3.6.575-5.588V86.947c0-.911-.398-1.733-1.184-2.445-.767-.697-1.818-1.05-3.12-1.05z"/></svg>