Release wallabag 2.3.3

.babelrc

@@ -1,10 +1,5 @@
 {
-  "presets": [
-    [
-      "@babel/preset-env",
-      {
-        "modules": false
-      }
+    "presets": [
+        ["env", {"modules": false}]
     ]
-  ]
 }

.editorconfig

@@ -13,8 +13,5 @@ insert_final_newline = true
 indent_style = space
 indent_size = 2
 
-[*akefile]
+[Makefile]
 indent_style = tab
-
-[.github/**.yml]
-indent_size = 2

.github/CONTRIBUTING.md

@@ -1,41 +1,11 @@
 # How to contribute
 
-## Test it locally
-
-### Using Docker
-
-- Clone the repository
-- Ensure your Docker daemon is running
-- Launch `docker-compose up`
-
-You'll then have:
-- a web server (nginx)
-- a PHP daemon (using FPM)
-- a Redis database (to handle imports)
-- a SQLite database to store articles
-
-You can now access your wallabag instance using that url: `http://127.0.0.1:8000`
-
-If you want to test using an other database than SQLite, uncomment the `postgres` or `mariadb` code from the `docker-compose.yml` file at the root of the repo. Also uncomment related line in the `php` section so the database will be linked to your PHP instance.
-
-### Using your own PHP server
-
-- Ensure you are running PHP > 7.1.
-- Clone the repository
-- Launch `composer install`
-- If you got some errors, fix them (they might be related to some missing PHP extension from your machine)
-- Then `php bin/console wallabag:install`
-- If you got some errors, fix them (they might be related to some missing PHP extension from your machine)
-- Run `php bin/console server:run`
-
-You can now access your wallabag instance using that url: `http://127.0.0.1:8000`
-
 ## You found a bug
 Please [open a new issue](https://github.com/wallabag/wallabag/issues/new).
 
 To fix the bug quickly, we need some infos: please answer to the questions in the issue form.
 
-If you have the skills, look for errors into PHP, server and application logs (see `var/logs`).
+If you have the skills, look for errors into php, server and application (see `var/logs`) logs.
 
 Note : If you have large portions of text, use [Github's Gist service](https://gist.github.com/) or other pastebin-like.
 

.github/FUNDING.yml

@@ -1,2 +0,0 @@
-# github: [nicosomb, j0k3r, tcitworld, Kdecherf]
-liberapay: wallabag

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,21 @@
+:warning: If your issue is about an error during fetching a link, please read: http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that
+
+### Issue details
+
+Please provide issue details here.
+Remember, this is _not_ a place to ask questions. For that, go to https://community.wallabag.org/ (forum) or http://gitter.im/wallabag/wallabag (chat).
+
+### Environment
+
+* wallabag version (or git revision) that exhibits the issue:
+* How did you install wallabag? Via `git clone` or by downloading the package?
+* Last wallabag version that did not exhibit the issue (if applicable):
+* php version:
+* OS:
+* type of hosting (shared or dedicated):
+* which storage system you choose at install (SQLite, MySQL/MariaDB or PostgreSQL):
+
+### Steps to reproduce/test case
+
+Please provide necessary steps for reproduction of this issue, or better the
+reduced test case (without any external dependencies, if possible).

.github/ISSUE_TEMPLATE/1-fetching-content.md

@@ -1,30 +0,0 @@
----
-name: Fetching content
-about: If wallabag can't extract content for an URL
-title: Wrong display in wallabag (HOST)
-labels: Site Config
-assignees: ''
-
----
-
-<!--
-Thank you for reporting a fetching issue.
-
-Please fill in as much of the template below as you're able.
--->
-
-**Before submitting the issue, please read:**
-If wallabag can't parse / extract content for a given link, please first read the documentation about it:
-http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that
-
-We have a lot of requests about fetching config issue. It'll help us A LOT if you give a try to fix it on your own following the doc.
-If you failed to fix it yourself, tick the following boxes:
-- [ ] I've tried myself without success
-- [ ] I've replaced `HOST` in the issue title with the host of the URL that can't be fetched (ie: `nytimes.com`, `20minutes.fr`, `bbc.com`, etc.)
-
-**Content related:**
- - URL: [full url of the content]
- - wallabag version: [e.g. 2.4.0]
-
-**Describe what's wrong:**
-A clear and concise description of what you expected to happen.

.github/ISSUE_TEMPLATE/2-bug-report.md

@@ -1,43 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
----
-
-<!--
-Thank you for reporting an issue.
-
-Please fill in as much of the template below as you're able.
-
-Version:      if you know it, otherwise use the git revision
-Installation: How did you install wallabag? Using git clone, the docker image, an installer, downloading the package, etc.
-PHP version:  The version of PHP you are using
-OS:           The host running wallabag
-Database:     The storage system your instance is using (SQLite, MySQL/MariaDB or PostgreSQL) with the version
-Parameters:   Paste the content of your app/config/parameters.yml (hide sensitive stuff if you want)
--->
-### Environment
-
-* **Version**:
-* **Installation**:
-* **PHP version**:
-* **OS**:
-* **Database**:
-* **Parameters**:
-
-<details>
-  <summary>My <code>app/config/parameters.yml</code> is:</summary>
-
-  ```
-  PASTE HERE
-  ```
-</details>
-
-### What steps will reproduce the bug?
-
-<!--
-Enter details about your bug and how to reproduce it
--->

.github/ISSUE_TEMPLATE/3-feature-request.md

@@ -1,26 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: Feature
-assignees: ''
-
----
-
-<!--
-Thank you for suggesting an idea to make wallabag better.
-
-Please fill in as much of the template below as you're able.
--->
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Want to ask something?
-    url: https://gitter.im/wallabag/wallabag
-    about: Use Gitter to ask questions.

.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.

.github/dependabot.yml

@@ -1,36 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: daily
-    time: "04:00"
-    timezone: Europe/Paris
-  open-pull-requests-limit: 10
-  ignore:
-  - dependency-name: materialize-css
-    versions:
-    - "> 0.98.2"
-- package-ecosystem: composer
-  directory: "/"
-  schedule:
-    interval: daily
-    time: "04:00"
-    timezone: Europe/Paris
-  open-pull-requests-limit: 10
-  reviewers:
-  - j0k3r
-  - tcitworld
-  - Kdecherf
-  labels:
-  - Ready for review
-  ignore:
-  - dependency-name: doctrine/doctrine-migrations-bundle
-    versions:
-    - "> 1.3.2"
-  - dependency-name: friendsofsymfony/user-bundle
-    versions:
-    - "> 2.0.2"
-  - dependency-name: nelmio/api-doc-bundle
-    versions:
-    - "> 2.13.4"

.github/workflows/assets.yml

@@ -1,41 +0,0 @@
-name: "Assets"
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - 2.*
-
-jobs:
-  js:
-    name: "Building assets"
-    runs-on: "ubuntu-20.04"
-
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v2"
-
-      - name: "Install Node"
-        uses: actions/setup-node@v1
-        with:
-          node-version: "12"
-
-      - name: "Install dependencies with Yarn"
-        run: "yarn install"
-
-      - name: "Build dev assets"
-        run: "yarn run build:dev"
-
-      - name: "Build prod assets"
-        run: "yarn run build:prod"
-
-      - name: "Validate no change were created"
-        run: |
-          GITDIFF=`git diff`
-          if [ "$GITDIFF" == "" ]; then
-            exit 0
-          else
-            git diff
-            exit 1
-          fi

.github/workflows/coding-standards.yml

@@ -1,45 +0,0 @@
-name: "CS"
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - 2.*
-
-jobs:
-  coding-standards:
-    name: "CS Fixer & PHPStan"
-    runs-on: "ubuntu-18.04"
-
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v2"
-
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          coverage: "none"
-          php-version: "7.3"
-          tools: cs2pr, pecl, composer:v1
-          extensions: pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy
-          ini-values: "date.timezone=Europe/Paris"
-        env:
-          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v1"
-        with:
-          composer-options: "--optimize-autoloader --prefer-dist"
-
-      - name: "Run PHP CS Fixer"
-        run: "bin/php-cs-fixer fix --verbose --dry-run --format=checkstyle | cs2pr"
-
-      - name: "Generate test cache for PHPStan"
-        run: "php bin/console cache:clear --env=test"
-
-      - name: "Install PHPUnit for PHPStan"
-        run: "php bin/simple-phpunit install"
-
-      - name: "Run PHPStan"
-        run: "php bin/phpstan analyse --no-progress --error-format=checkstyle | cs2pr"

.github/workflows/continuous-integration.yml

@@ -1,81 +0,0 @@
-name: "CI"
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - 2.*
-
-env:
-  PGPASSWORD: wallabagrocks
-  COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-jobs:
-  phpunit:
-    name: "PHP ${{ matrix.php }} using ${{ matrix.database }}"
-    runs-on: "ubuntu-18.04"
-    services:
-      rabbitmq:
-        image: rabbitmq:3-alpine
-        ports:
-          - 5672:5672
-      redis:
-        image: redis:6-alpine
-        ports:
-          - 6379:6379
-
-    strategy:
-      fail-fast: false
-      matrix:
-        php:
-          - "7.2"
-          - "7.3"
-          - "7.4"
-        database:
-          - "sqlite"
-          - "mysql"
-          - "pgsql"
-
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v2"
-        with:
-          fetch-depth: 2
-
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          php-version: "${{ matrix.php }}"
-          coverage: none
-          tools: pecl, composer:v1
-          extensions: json, pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy
-          ini-values: "date.timezone=Europe/Paris"
-
-      - name: "Setup MySQL"
-        if: "${{ matrix.database == 'mysql' }}"
-        run: |
-          sudo systemctl start mysql.service
-          sudo mysql -u root -proot -e "CREATE DATABASE wallabag_test"
-
-      - name: "Setup PostgreSQL"
-        if: "${{ matrix.database == 'pgsql' }}"
-        run: |
-          sudo systemctl start postgresql
-          sudo -u postgres psql -d template1 -c "CREATE USER wallabag WITH PASSWORD 'wallabagrocks' CREATEDB"
-          createdb -h localhost -p 5432 -U wallabag wallabag_test
-          pg_isready -d wallabag_test -h localhost -p 5432 -U wallabag
-
-      - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v1"
-        with:
-          composer-options: "--optimize-autoloader --prefer-dist"
-
-      - name: "Prepare database"
-        run: "make prepare DB=${{ matrix.database }}"
-
-      - name: "Prepare fixtures"
-        run: "make fixtures"
-
-      - name: "Run PHPUnit"
-        run: "php bin/simple-phpunit -v"

.github/workflows/translations.yml

@@ -1,47 +0,0 @@
-name: "Translations"
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - 2.*
-
-jobs:
-  translations:
-    name: "Translations"
-    runs-on: "ubuntu-18.04"
-
-    strategy:
-      matrix:
-        php:
-          - "7.3"
-
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v2"
-
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          coverage: "none"
-          php-version: "${{ matrix.php }}"
-          tools: pecl, composer:v1
-          extensions: pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy
-          ini-values: "date.timezone=Europe/Paris"
-        env:
-          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v1"
-        with:
-          composer-options: "--optimize-autoloader --prefer-dist"
-
-      - name: "Validate Core translations"
-        run: "php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v"
-
-      - name: "Validate CraueConfig translations"
-        run: "php bin/console lint:yaml app/Resources/CraueConfigBundle/translations -v"
-
-      - name: "Validate User translations"
-        run: "php bin/console lint:yaml src/Wallabag/UserBundle/Resources/translations -v"

.gitignore

@@ -14,7 +14,6 @@
 !/bin/console
 !/bin/symfony_requirements
 .php_cs.cache
-.phpunit.result.cache
 
 # Parameters
 /app/config/parameters.yml
@@ -33,7 +32,6 @@ web/uploads/
 # Build
 /app/build
 /build
-/coverage
 
 # Composer PHAR
 /composer.phar
@@ -45,6 +43,9 @@ data/db/wallabag*.sqlite
 docker/logs/
 docker/data/
 
+# To avoid crazy stuff on some PR, we must manually FORCE ADD IT on each new release
+composer.lock
+
 # assets stuff
 node_modules/
 bin
@@ -56,6 +57,3 @@ app/Resources/build/
 admin-export.json
 specialexport.json
 /data/site-credentials-secret-key.txt
-
-# Custom CSS file
-web/custom.css

.php_cs

@@ -38,7 +38,6 @@ return PhpCsFixer\Config::create()
     ->setFinder(
         PhpCsFixer\Finder::create()
             ->exclude([
-                'node_modules',
                 'vendor',
                 'var',
                 'web'

.scrutinizer.yml

@@ -26,22 +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:
-    environment:
-        php:
-            version: 7.4
-
-    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

.stylelintrc

@@ -1,13 +1,3 @@
 {
-  "extends": "stylelint-config-standard",
-  "plugins": [
-    "stylelint-scss"
-  ],
-  rules: {
-    'at-rule-no-unknown': null,
-    'no-duplicate-selectors': null,
-    'font-family-no-missing-generic-family-keyword': null,
-    'no-descending-specificity': null,
-    'scss/at-rule-no-unknown': true,
-  },
+  "extends": "stylelint-config-standard"
 }

.travis.yml

@@ -0,0 +1,86 @@
+language: php
+
+services:
+  - rabbitmq
+  - redis
+
+# faster builds on docker-container setup
+sudo: false
+
+# used for HHVM
+addons:
+  apt:
+    packages:
+      - tidy
+
+# cache vendor dirs
+cache:
+    apt: true
+    directories:
+        - vendor
+        - $HOME/.composer/cache
+        - node_modules
+        - $HOME/.npm
+        - $HOME/.yarn-cache
+
+php:
+    - 5.6
+    - 7.0
+    - 7.1
+    - 7.2
+    - nightly
+
+node_js:
+    - "5"
+
+env:
+    - DB=mysql
+    - DB=pgsql
+    - DB=sqlite
+
+matrix:
+    fast_finish: true
+    include:
+        - 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
+branches:
+    except:
+        - legacy
+
+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;
+    # xdebug isn't enable for PHP 7.1
+    - 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;
+
+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 composer update --no-interaction --no-progress
+    - echo "travis_fold:start:prepare"
+    - make prepare DB=$DB
+    - echo "travis_fold:end:prepare"
+
+    - echo "travis_fold:start:fixtures"
+    - php bin/console doctrine:fixtures:load --no-interaction --env=test
+    - echo "travis_fold:end:fixtures"
+
+    - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then ./bin/simple-phpunit -v ; fi;
+    - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix --verbose --dry-run ; fi;
+    - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;
+    - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml app/Resources/CraueConfigBundle/translations -v ; fi;
+    - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/UserBundle/Resources/translations -v ; fi;
+    - if [[ $ASSETS = build ]]; then yarn run build:prod; fi;

.zappr.yaml

@@ -0,0 +1,26 @@
+# see https://zappr.opensource.zalan.do/
+autobranch: false
+commit: false
+approvals:
+  minimum: 1
+  ignore: pr_opener
+  pattern: "^(:\\+1:|👍)$"
+  veto:
+    pattern: "^(:\\-1:|👎)$"
+  from:
+    orgs:
+      - wallabag
+    collaborators: true
+specification:
+  title:
+    minimum-length:
+      enabled: true
+      length: 8
+  body:
+    minimum-length:
+      enabled: true
+      length: 8
+    contains-url: false
+    contains-issue-number: false
+  template:
+    differs-from-body: true

CHANGELOG.md

@@ -1,235 +1,5 @@
 # Changelog
 
-## [2.4.2](https://github.com/wallabag/wallabag/tree/2.4.2)
-   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.4.1...2.4.2)
-
-### Fixes
-- Fix nav lang filter [#4908](https://github.com/wallabag/wallabag/pull/4908)
-- Fix accessibility problem with the 2FA QR code [#4915](https://github.com/wallabag/wallabag/pull/4915)
-- Preselect currently active section in the filter menu [#4972](https://github.com/wallabag/wallabag/pull/4972)
-- Fix translation of date in the footer using IntlDateFormatter [#4971](https://github.com/wallabag/wallabag/pull/4971)
-- Update dark theme [#4921](https://github.com/wallabag/wallabag/pull/4921)
-- Dark theme updated [#4983](https://github.com/wallabag/wallabag/pull/4983)
-- Fix account dropdown width [#4969](https://github.com/wallabag/wallabag/pull/4969)
-- Fix auto prefered color scheme [#5071](https://github.com/wallabag/wallabag/pull/5071)
-- Convert tag label to lowercase in RuleBasedTagger [#5111](https://github.com/wallabag/wallabag/pull/5111)
-- Fix myreadspeed links [#5113](https://github.com/wallabag/wallabag/pull/5113)
-- Internal server error while exporting to epub [#5052](https://github.com/wallabag/wallabag/issues/5052)
-- Error parsing image URL (with scrset) [#4914](https://github.com/wallabag/wallabag/issues/4914)
-
-## [2.4.1](https://github.com/wallabag/wallabag/tree/2.4.1)
-   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.4.0...2.4.1)
-
-### Fixes
-- Fix path icons from manifest.json [#4811](https://github.com/wallabag/wallabag/pull/4811)
-- Fix missing apple-touch-icon-512.png from manifest.json [#4823](https://github.com/wallabag/wallabag/pull/4823)
-- migrations: fix mysql migration for an edge case [#4832](https://github.com/wallabag/wallabag/pull/4832)
-- Add a command to clean downloaded images [#4844](https://github.com/wallabag/wallabag/pull/4844)
-- Add a query to parse only non-hashed URL [#4865](https://github.com/wallabag/wallabag/pull/4865) [#4878](https://github.com/wallabag/wallabag/pull/4878)
-- material: fix issue with cookie check for light/dark theme [#4866](https://github.com/wallabag/wallabag/pull/4866)
-- Show OTP secret next to the QR Code [#4868](https://github.com/wallabag/wallabag/pull/4868)
-- views: add title to tag li elements, for consistency [#4894](https://github.com/wallabag/wallabag/pull/4894)
-- Add label and issuer to otp config [#4301](https://github.com/wallabag/wallabag/pull/4301)
-
-### Meta
-- Update release process and introduce 2.4.1-dev [#4808](https://github.com/wallabag/wallabag/pull/4808)
-- Remove community.wallabag.org from the issue template [#4817](https://github.com/wallabag/wallabag/pull/4817)
-- Update issue templates [#4843](https://github.com/wallabag/wallabag/pull/4843)
-- Allow GitHub Actions to run on 2.* branches [#4896](https://github.com/wallabag/wallabag/pull/4896)
-- Prepare 2.4.1 [#4904](https://github.com/wallabag/wallabag/pull/4904)
-
-## [2.4.0](https://github.com/wallabag/wallabag/tree/2.4.0)
-   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.8...2.4.0)
-
-### Features
-
-- Allow to rename tags from the web interface [#3574](https://github.com/wallabag/wallabag/pull/3574)
-- Added possibility to change locale from login/register pages [#3216](https://github.com/wallabag/wallabag/pull/3216)
-- Add ability to import/export tagging rules [#4028](https://github.com/wallabag/wallabag/pull/4028)
-- Add quickstart into the menu [#3992](https://github.com/wallabag/wallabag/pull/3992)
-- Enable OTP 2FA via third apps (Google Authenticator, Authy or FreeOTP) [#3798](https://github.com/wallabag/wallabag/pull/3798)
-- Show untagged entries count on tag list [#3993](https://github.com/wallabag/wallabag/pull/3993)
-- Add random feature [#3526](https://github.com/wallabag/wallabag/pull/3526)
-- Added ability to revoke feed token [#3994](https://github.com/wallabag/wallabag/pull/3994)
-- Display login in config / user [#3995](https://github.com/wallabag/wallabag/pull/3995)
-- Move Ignore Origin rules to database [#4026](https://github.com/wallabag/wallabag/pull/4026)
-- Add ability to manually define the reading speed [#4053](https://github.com/wallabag/wallabag/pull/4053)
-- Added MathJax support [#4128](https://github.com/wallabag/wallabag/pull/4128)
-- Improved tags list [#4136](https://github.com/wallabag/wallabag/pull/4136)
-- Add untagged list link to filter menu [#4150](https://github.com/wallabag/wallabag/pull/4150)
-- Allow custom styles system wide [#4151](https://github.com/wallabag/wallabag/pull/4151)
-- Added elCurator import [#4175](https://github.com/wallabag/wallabag/pull/4175)
-- Added language support for Simplified Chinese（简体中文）[#4281](https://github.com/wallabag/wallabag/pull/4281)
-- Added publication date on epub export [#4315](https://github.com/wallabag/wallabag/pull/4315)
-- Enhanced article display [#4317](https://github.com/wallabag/wallabag/pull/4317)
-- Added mass actions for Material design in list view [#4326](https://github.com/wallabag/wallabag/pull/4326)
-- Added a button to disable 2FA when enabled [#4329](https://github.com/wallabag/wallabag/pull/4329)
-- Enhanced navigation menu in material theme [#4343](https://github.com/wallabag/wallabag/pull/4343)
-- Copy client info to clipboard [#4058](https://github.com/wallabag/wallabag/pull/4058)
-- Upgrade Piwik Twig Extension to Matomo [#4363](https://github.com/wallabag/wallabag/pull/4363)
-- Dark theme to Material [#4725](https://github.com/wallabag/wallabag/pull/4725)
-
-### API
-
-- Storage of hash of URL to check if pages already saved [#3158](https://github.com/wallabag/wallabag/pull/3158)
-- Added a basic search endpoint [#3627](https://github.com/wallabag/wallabag/pull/3627)
-- Entries: added add parameter detail to exclude or include content in response [#3960](https://github.com/wallabag/wallabag/pull/3960)
-- Add a new endpoint to retrieve information from the wallabag instance [#3845](https://github.com/wallabag/wallabag/pull/3845)
-- API return an error with empty quote [#4161](https://github.com/wallabag/wallabag/pull/4161)
-- Fixed bug when we delete entry via API [#4316](https://github.com/wallabag/wallabag/pull/4316)
-- Add ability to define lifetime token for the API [#4319](https://github.com/wallabag/wallabag/pull/4319)
-- Added archived_at property and updateArchived method [#3630](https://github.com/wallabag/wallabag/pull/3630)
-- Add `given_url` in Entry table to check if a redirected url has already added [#3271](https://github.com/wallabag/wallabag/pull/3271)
-
-### Technical stuff
-
-- Added support for secured emails via SMTP [#3596](https://github.com/wallabag/wallabag/pull/3596)
-- Changed RSS to Atom feed and improve paging [#3223](https://github.com/wallabag/wallabag/pull/3223)
-- MySQL: change collation of tag label [#3959](https://github.com/wallabag/wallabag/pull/3959)
-- Use httplug and graby 2.0 [#3390](https://github.com/wallabag/wallabag/pull/3390)
-- Use Imagick to keep GIF animation [#3955](https://github.com/wallabag/wallabag/pull/3955)
-- Jump to Symfony 3.4 [#3731](https://github.com/wallabag/wallabag/pull/3731)
-- Removed hardcoded database version [#3864](https://github.com/wallabag/wallabag/pull/3864)
-- Dropping PHP < 7.1 [#3758](https://github.com/wallabag/wallabag/pull/3758)
-- Dropping PHP < 7.2 [#4441](https://github.com/wallabag/wallabag/pull/4441)
-- Force default_protocol to generate an url input [#3879](https://github.com/wallabag/wallabag/pull/3879)
-- Cascade delete on oauth2 table when deleting a user [#3956](https://github.com/wallabag/wallabag/pull/3956)
-- Preview picture: use the 1st pic retrieved if no og:image set [#3965](https://github.com/wallabag/wallabag/pull/3965)
-- Force PHP version in Dockerfile [#3977](https://github.com/wallabag/wallabag/pull/3977)
-- Add Sentry support [#3990](https://github.com/wallabag/wallabag/pull/3990)
-- Fix slow/unindexed queries [#4081](https://github.com/wallabag/wallabag/pull/4081)
-- Rename internal settings table [#4084](https://github.com/wallabag/wallabag/pull/4084)
-- Add environment variables to control scripts/dev.sh behavior [#4152](https://github.com/wallabag/wallabag/pull/4152)
-- Increase php memory limit PHP Docker [#4163](https://github.com/wallabag/wallabag/pull/4163)
-- Ensure ENV is well defined when using make [#4249](https://github.com/wallabag/wallabag/pull/4249)
-- Update translations from Weblate [#4442](https://github.com/wallabag/wallabag/pull/4442)
-- Ditch Travis to use GitHub Actions [#4747](https://github.com/wallabag/wallabag/pull/4747)
-- Upgrade Webpack from v4 to v5 [#4727](https://github.com/wallabag/wallabag/pull/4727)
-
-### Translations
-
-- Add Japanese translation [#4274](https://github.com/wallabag/wallabag/pull/4274)
-- Add Croatian translation [#4518](https://github.com/wallabag/wallabag/pull/4518), [#4517](https://github.com/wallabag/wallabag/pull/4517)
-- Add Ukrainian translation [#4489](https://github.com/wallabag/wallabag/pull/4489)
-- Add language support for Simplified Chinese（简体中文）[#4281](https://github.com/wallabag/wallabag/pull/4281)
-- Add Dutch translation to the settings [#4632](https://github.com/wallabag/wallabag/pull/4632)
-- Support for Weblate [#4442](https://github.com/wallabag/wallabag/pull/4442) & [#4447](https://github.com/wallabag/wallabag/pull/4447)
-
-### Fixes
-
-- Fixed Instapaper import date order [#3980](https://github.com/wallabag/wallabag/pull/3980)
-- Add missing entries in craue_config_setting. [#3868](https://github.com/wallabag/wallabag/pull/3868)
-- Fix `reading_time` being NULL on SQLite [#4020](https://github.com/wallabag/wallabag/pull/4020)
-- Fix createdAt filter on material [#4299](https://github.com/wallabag/wallabag/pull/4299)
-- Fix duplicated icons on "Search engine" and "new link" forms [#4149](https://github.com/wallabag/wallabag/pull/4149)
-- Fix entries export from search view [#4278](https://github.com/wallabag/wallabag/pull/4278)
-- Fixed URL to share entry via twitter [#4250](https://github.com/wallabag/wallabag/pull/4250)
-- Sidebar sub entries not conditioned by hover anymore [#4254](https://github.com/wallabag/wallabag/pull/4254)
-- Fix print of long pages [#4263](https://github.com/wallabag/wallabag/pull/4263)
-- Fixed duplicated tags when renaming them [#4310](https://github.com/wallabag/wallabag/pull/4310)
-- Added authentication during import command for paywalled websites [#4325](https://github.com/wallabag/wallabag/pull/4325)
-- Added more coherence with color links for material theme [#4346](https://github.com/wallabag/wallabag/pull/4346)
-- Changed visibility for article stats [#4347](https://github.com/wallabag/wallabag/pull/4347)
-- PHP 7.4 support [#4309](https://github.com/wallabag/wallabag/pull/4309)
-
-## [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)
 

CODE_OF_CONDUCT.md

@@ -1,76 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
- advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
- address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
- professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at hello@wallabag.org. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq

COPYING.md

@@ -1,4 +1,4 @@
-Copyright (c) 2013-current Nicolas Lœuillet
+Copyright (c) 2013-2017 Nicolas Lœuillet
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Capfile

@@ -0,0 +1,15 @@
+set :deploy_config_path, 'app/config/capistrano/deploy.rb'
+set :stage_config_path, 'app/config/capistrano/deploy'
+
+# Load DSL and set up stages
+require 'capistrano/setup'
+
+# Include default deployment tasks
+require 'capistrano/deploy'
+
+require 'capistrano/composer'
+require 'capistrano/file-permissions'
+require 'capistrano/symfony'
+
+# Load custom tasks from `lib/capistrano/tasks` if you have any defined
+Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }

GNUmakefile

@@ -1,62 +0,0 @@
-SHELL=bash
-TMP_FOLDER=/tmp
-RELEASE_FOLDER=wllbg-release
-
-# ensure the ENV variable is well defined
-AVAILABLE_ENV := prod dev test
-ifneq ($(filter $(ENV),$(AVAILABLE_ENV)),)
-	# all good
-else
-	# not good, force it to "prod"
-	override ENV = prod
-endif
-
-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: ENV=dev
-dev: build ## 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
-	@yarn install
-	@yarn 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

Gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem 'capistrano',  '~> 3.4'
+gem 'capistrano-composer'
+gem 'capistrano-symfony', '~> 1.0.0.rc1'
+gem 'capistrano-file-permissions'

Gemfile.lock

@@ -0,0 +1,37 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    capistrano (3.4.0)
+      i18n
+      rake (>= 10.0.0)
+      sshkit (~> 1.3)
+    capistrano-composer (0.0.6)
+      capistrano (>= 3.0.0.pre)
+    capistrano-file-permissions (1.0.0)
+      capistrano (~> 3.0)
+    capistrano-symfony (1.0.0.rc1)
+      capistrano (~> 3.1)
+      capistrano-composer (~> 0.0.3)
+      capistrano-file-permissions (~> 1.0)
+    colorize (0.7.7)
+    i18n (0.7.0)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.2)
+    rake (10.4.2)
+    sshkit (1.7.1)
+      colorize (>= 0.7.0)
+      net-scp (>= 1.1.2)
+      net-ssh (>= 2.8.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  capistrano (~> 3.4)
+  capistrano-composer
+  capistrano-file-permissions
+  capistrano-symfony (~> 1.0.0.rc1)
+
+BUNDLED WITH
+   1.13.5

Makefile

@@ -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

README.md

@@ -1,10 +1,6 @@
-<img src="https://raw.githubusercontent.com/wallabag/logo/master/_default/typo-horizontal/png/sm/logo-typo-horizontal-black-no-bg-no-border-sm.png" align="right" />
-
-![CI](https://github.com/wallabag/wallabag/workflows/CI/badge.svg)
+[![Build Status](https://api.travis-ci.org/wallabag/wallabag.svg?branch=master)](https://travis-ci.org/wallabag/wallabag)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=master)
 [![Gitter](https://badges.gitter.im/gitterHQ/gitter.svg)](https://gitter.im/wallabag/wallabag)
-[![Donation Status](https://img.shields.io/liberapay/goal/wallabag.svg?logo=liberapay)](https://liberapay.com/wallabag/donate)
-[![Translation status](https://hosted.weblate.org/widgets/wallabag/-/svg-badge.svg)](https://hosted.weblate.org/engage/wallabag/?utm_source=widget)
 
 # What is wallabag?
 wallabag is a self-hostable PHP application allowing you to not miss any content anymore.
@@ -14,28 +10,21 @@ More information on our website: [wallabag.org](https://wallabag.org).
 
 If you do not have your own server, consider [the wallabag.it hosting solution](https://wallabag.it).
 
+![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:
 
-```bash
+```
 git clone https://github.com/wallabag/wallabag.git
-cd wallabag && make install
+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)
-
-# Translate wallabag
-
-[wallabag](https://hosted.weblate.org/projects/wallabag/) is being translated using [Weblate](https://weblate.org/), a web tool designed to ease translating for both developers and translators. Feel free to help us [translate wallabag](https://hosted.weblate.org/projects/wallabag/)!
+Now, [configure a virtual host](https://doc.wallabag.org/en/admin/installation/virtualhosts.html) to use your wallabag. 
 
 # License
-Copyright © 2013-current Nicolas Lœuillet <nicolas@loeuillet.org>
+Copyright © 2013-2018 Nicolas Lœuillet <nicolas@loeuillet.org>
 This work is free. You can redistribute it and/or modify it under the
 terms of the MIT License. See the COPYING file for more details.

RELEASE_PROCESS.md

@@ -4,41 +4,74 @@ 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 this command to create the package:
+- Run these commands to create the tag:
 
 ```
-make release VERSION=$LAST_WALLABAG_RELEASE
+git checkout master
+git pull origin master
+git checkout -b release-$LAST_WALLABAG_RELEASE
+SYMFONY_ENV=prod composer up --no-dev
 ```
 
-- [Create the new release on GitHub](https://github.com/wallabag/wallabag/releases/new) by targetting the `master` branch or any appropriate branch (for instance backports). You have to upload the package (generated previously).
-- Update nginx config to change the redirect rule for `https://wllbg.org/latest-v2-package` & `http://wllbg.org/latest-v2` (they both redirect to the asset of the GitHub release)
+- Update `.travis.yml` file and replace the composer line with this one:
+
+```diff
+script:
+-    - 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:
+
+```
+git add --force composer.lock .travis.yml
+git commit -m "Release wallabag $LAST_WALLABAG_RELEASE"
+git push origin release-$LAST_WALLABAG_RELEASE
+```
+
+- Create a new pull request with this title `DON'T MERGE Release wallabag $LAST_WALLABAG_RELEASE`. This pull request is used to launch builds on Travis-CI.
+- Run these command to create the package:
+
+```
+make release master /tmp wllbg-release prod
+```
+
+- [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 release tag must contain a `composer.lock` file. It sets which dependencies were available at the time a release was done,
+making it easier to fix issues after the release. It also speeds up `composer install` on stable versions a LOT, by skipping the
+dependencies resolution part.
+
+Since `composer.lock` is ignored by default, either it must be removed from `.gitignore` _in the release branch_,
+or it must be added using `git add --force composer.lock`.
+
 ### Target PHP version
 `composer.lock` is _always_ built for a particular version, by default the one it is generated (with `composer update`).
 
-If the PHP version used to generate the .lock isn't a widely available one (like PHP 8), a more common one should
+If the PHP version used to generate the .lock isn't a widely available one (like PHP 7), a more common one should
 be locally specified in `composer.lock`:
 
 ```json
     "config": {
         "platform": {
-            "php": "7.1.3",
+            "php": "5.5.9",
             "ext-something": "4.0"
         }
     }

app/AppKernel.php

@@ -1,7 +1,6 @@
 <?php
 
 use Symfony\Component\Config\Loader\LoaderInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel;
 
 class AppKernel extends Kernel
@@ -30,12 +29,9 @@ class AppKernel extends Kernel
             new KPhoen\RulerZBundle\KPhoenRulerZBundle(),
             new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
             new Craue\ConfigBundle\CraueConfigBundle(),
-            new BabDev\PagerfantaBundle\BabDevPagerfantaBundle(),
+            new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
             new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
             new BD\GuzzleSiteAuthenticatorBundle\BDGuzzleSiteAuthenticatorBundle(),
-            new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),
-            new Http\HttplugBundle\HttplugBundle(),
-            new Sentry\SentryBundle\SentryBundle(),
 
             // wallabag bundles
             new Wallabag\CoreBundle\WallabagCoreBundle(),
@@ -43,32 +39,25 @@ class AppKernel extends Kernel
             new Wallabag\UserBundle\WallabagUserBundle(),
             new Wallabag\ImportBundle\WallabagImportBundle(),
             new Wallabag\AnnotationBundle\WallabagAnnotationBundle(),
+            new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
             $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
             $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
             $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
+            $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
             $bundles[] = new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle();
+            $bundles[] = new Symfony\Bundle\WebServerBundle\WebServerBundle();
 
             if ('test' === $this->getEnvironment()) {
                 $bundles[] = new DAMA\DoctrineTestBundle\DAMADoctrineTestBundle();
             }
-
-            if ('dev' === $this->getEnvironment()) {
-                $bundles[] = new Symfony\Bundle\MakerBundle\MakerBundle();
-                $bundles[] = new Symfony\Bundle\WebServerBundle\WebServerBundle();
-            }
         }
 
         return $bundles;
     }
 
-    public function getRootDir()
-    {
-        return __DIR__;
-    }
-
     public function getCacheDir()
     {
         return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment();
@@ -81,8 +70,7 @@ class AppKernel extends Kernel
 
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml');
-
+        $loader->load($this->getProjectDir() . '/app/config/config_' . $this->getEnvironment() . '.yml');
         $loader->load(function ($container) {
             if ($container->getParameter('use_webpack_dev_server')) {
                 $container->loadFromExtension('framework', [
@@ -98,11 +86,5 @@ class AppKernel extends Kernel
                 ]);
             }
         });
-
-        $loader->load(function (ContainerBuilder $container) {
-            // $container->setParameter('container.autowiring.strict_mode', true);
-            // $container->setParameter('container.dumper.inline_class_loader', true);
-            $container->addObjectResource($this);
-        });
     }
 }

app/DoctrineMigrations/Version20160401000000.php

@@ -10,6 +10,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20160401000000 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $this->skipIf($schema->hasTable($this->getTable('entry')), 'Database already initialized');
@@ -164,6 +167,9 @@ SQL
         }
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $this->addSql("DROP TABLE {$this->getTable('craue_config_setting')}");

app/DoctrineMigrations/Version20160410190541.php

@@ -10,6 +10,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20160410190541 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $entryTable = $schema->getTable($this->getTable('entry'));
@@ -31,6 +34,9 @@ class Version20160410190541 extends WallabagMigration
         }
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $entryTable = $schema->getTable($this->getTable('entry'));

app/DoctrineMigrations/Version20160812120952.php

@@ -10,6 +10,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20160812120952 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $clientsTable = $schema->getTable($this->getTable('oauth2_clients'));
@@ -31,6 +34,9 @@ class Version20160812120952 extends WallabagMigration
         }
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $clientsTable = $schema->getTable($this->getTable('oauth2_clients'));

app/DoctrineMigrations/Version20160911214952.php

@@ -10,6 +10,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20160911214952 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $redis = $this->container
@@ -33,6 +36,9 @@ class Version20160911214952 extends WallabagMigration
         $this->skipIf(false !== $rabbitmq && false !== $redis, 'It seems that you already played this migration.');
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'import_with_redis';");

app/DoctrineMigrations/Version20160916201049.php

@@ -10,6 +10,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20160916201049 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $configTable = $schema->getTable($this->getTable('config'));
@@ -20,6 +23,9 @@ class Version20160916201049 extends WallabagMigration
         $this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'pocket_consumer_key';");
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $configTable = $schema->getTable($this->getTable('config'));

app/DoctrineMigrations/Version20161001072726.php

@@ -11,6 +11,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20161001072726 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $this->skipIf('sqlite' === $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
@@ -95,6 +98,9 @@ class Version20161001072726 extends WallabagMigration
         $this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' ADD CONSTRAINT FK_annotation_entry FOREIGN KEY (entry_id) REFERENCES ' . $this->getTable('entry') . ' (id) ON DELETE CASCADE');
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         throw new SkipMigrationException('Too complex ...');

app/DoctrineMigrations/Version20161022134138.php

@@ -10,6 +10,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20161022134138 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');
@@ -38,6 +41,9 @@ class Version20161022134138 extends WallabagMigration
         $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CHANGE `name` `name` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');

app/DoctrineMigrations/Version20161024212538.php

@@ -12,6 +12,9 @@ class Version20161024212538 extends WallabagMigration
 {
     private $constraintName = 'IDX_user_oauth_client';
 
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $clientsTable = $schema->getTable($this->getTable('oauth2_clients'));
@@ -29,6 +32,9 @@ class Version20161024212538 extends WallabagMigration
         );
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $clientsTable = $schema->getTable($this->getTable('oauth2_clients'));

app/DoctrineMigrations/Version20161031132655.php

@@ -10,6 +10,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20161031132655 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $images = $this->container
@@ -22,6 +25,9 @@ class Version20161031132655 extends WallabagMigration
         $this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('download_images_enabled', 0, 'misc')");
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'download_images_enabled';");

app/DoctrineMigrations/Version20161104073720.php

@@ -12,6 +12,9 @@ class Version20161104073720 extends WallabagMigration
 {
     private $indexName = 'IDX_entry_created_at';
 
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $entryTable = $schema->getTable($this->getTable('entry'));
@@ -20,6 +23,9 @@ class Version20161104073720 extends WallabagMigration
         $entryTable->addIndex(['created_at'], $this->indexName);
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $entryTable = $schema->getTable($this->getTable('entry'));

app/DoctrineMigrations/Version20161106113822.php

@@ -10,6 +10,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20161106113822 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $configTable = $schema->getTable($this->getTable('config'));
@@ -22,6 +25,9 @@ class Version20161106113822 extends WallabagMigration
         ]);
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $configTable = $schema->getTable($this->getTable('config'));

app/DoctrineMigrations/Version20161117071626.php

@@ -10,6 +10,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20161117071626 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $share = $this->container
@@ -33,6 +36,9 @@ class Version20161117071626 extends WallabagMigration
         $this->skipIf(false !== $share && false !== $unmark, 'It seems that you already played this migration.');
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'share_unmark';");

app/DoctrineMigrations/Version20161118134328.php

@@ -10,6 +10,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20161118134328 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $entryTable = $schema->getTable($this->getTable('entry'));
@@ -22,6 +25,9 @@ class Version20161118134328 extends WallabagMigration
         ]);
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $entryTable = $schema->getTable($this->getTable('entry'));

app/DoctrineMigrations/Version20161122144743.php

@@ -10,6 +10,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20161122144743 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $access = $this->container
@@ -22,6 +25,9 @@ class Version20161122144743 extends WallabagMigration
         $this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('restricted_access', 0, 'entry')");
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'restricted_access';");

app/DoctrineMigrations/Version20161122203647.php

@@ -18,6 +18,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20161122203647 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $userTable = $schema->getTable($this->getTable('user'));
@@ -28,6 +31,9 @@ class Version20161122203647 extends WallabagMigration
         $userTable->dropColumn('credentials_expired');
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $userTable = $schema->getTable($this->getTable('user'));

app/DoctrineMigrations/Version20161128084725.php

@@ -10,6 +10,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20161128084725 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $configTable = $schema->getTable($this->getTable('config'));
@@ -18,6 +21,9 @@ class Version20161128084725 extends WallabagMigration
         $configTable->addColumn('list_mode', 'integer', ['notnull' => false]);
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $configTable = $schema->getTable($this->getTable('config'));

app/DoctrineMigrations/Version20161128131503.php

@@ -16,6 +16,9 @@ class Version20161128131503 extends WallabagMigration
         'expires_at' => 'datetime',
     ];
 
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $userTable = $schema->getTable($this->getTable('user'));
@@ -26,6 +29,9 @@ class Version20161128131503 extends WallabagMigration
         }
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $userTable = $schema->getTable($this->getTable('user'));

app/DoctrineMigrations/Version20161214094402.php

@@ -10,6 +10,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20161214094402 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $entryTable = $schema->getTable($this->getTable('entry'));
@@ -32,6 +35,9 @@ class Version20161214094402 extends WallabagMigration
         }
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $entryTable = $schema->getTable($this->getTable('entry'));

app/DoctrineMigrations/Version20161214094403.php

@@ -12,6 +12,9 @@ class Version20161214094403 extends WallabagMigration
 {
     private $indexName = 'IDX_entry_uid';
 
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $entryTable = $schema->getTable($this->getTable('entry'));
@@ -20,6 +23,9 @@ class Version20161214094403 extends WallabagMigration
         $entryTable->addIndex(['uid'], $this->indexName);
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $entryTable = $schema->getTable($this->getTable('entry'));

app/DoctrineMigrations/Version20170127093841.php

@@ -13,6 +13,9 @@ class Version20170127093841 extends WallabagMigration
     private $indexStarredName = 'IDX_entry_starred';
     private $indexArchivedName = 'IDX_entry_archived';
 
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $entryTable = $schema->getTable($this->getTable('entry'));
@@ -22,6 +25,9 @@ class Version20170127093841 extends WallabagMigration
         $entryTable->addIndex(['is_archived'], $this->indexArchivedName);
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $entryTable = $schema->getTable($this->getTable('entry'));

app/DoctrineMigrations/Version20170327194233.php

@@ -10,6 +10,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20170327194233 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $scuttle = $this->container
@@ -23,6 +26,9 @@ class Version20170327194233 extends WallabagMigration
         $this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('scuttle_url', 'http://scuttle.org', 'entry')");
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'share_scuttle';");

app/DoctrineMigrations/Version20170405182620.php

@@ -10,6 +10,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20170405182620 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $entryTable = $schema->getTable($this->getTable('entry'));
@@ -27,6 +30,9 @@ class Version20170405182620 extends WallabagMigration
         ]);
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $entryTable = $schema->getTable($this->getTable('entry'));

app/DoctrineMigrations/Version20170407200919.php

@@ -10,6 +10,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20170407200919 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $entryTable = $schema->getTable($this->getTable('entry'));
@@ -18,6 +21,9 @@ class Version20170407200919 extends WallabagMigration
         $entryTable->dropColumn('is_public');
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $entryTable = $schema->getTable($this->getTable('entry'));

app/DoctrineMigrations/Version20170420134133.php

@@ -10,11 +10,17 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20170420134133 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'download_pictures';");
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $downloadPictures = $this->container

app/DoctrineMigrations/Version20170501115751.php

@@ -10,6 +10,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20170501115751 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $this->skipIf($schema->hasTable($this->getTable('site_credential')), 'It seems that you already played this migration.');
@@ -31,6 +34,9 @@ class Version20170501115751 extends WallabagMigration
         }
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $schema->dropTable($this->getTable('site_credential'));

app/DoctrineMigrations/Version20170510082609.php

@@ -17,6 +17,9 @@ class Version20170510082609 extends WallabagMigration
         'email_canonical',
     ];
 
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');
@@ -26,6 +29,9 @@ class Version20170510082609 extends WallabagMigration
         }
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');

app/DoctrineMigrations/Version20170511115400.php

@@ -10,6 +10,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20170511115400 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $entryTable = $schema->getTable($this->getTable('entry'));
@@ -21,6 +24,9 @@ class Version20170511115400 extends WallabagMigration
         ]);
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $entryTable = $schema->getTable($this->getTable('entry'));

app/DoctrineMigrations/Version20170511211659.php

@@ -13,21 +13,19 @@ class Version20170511211659 extends WallabagMigration
 {
     public function up(Schema $schema)
     {
+        $tableName = $this->getTable('annotation');
+
         switch ($this->connection->getDatabasePlatform()->getName()) {
             case 'sqlite':
-                $annotationTableName = $this->getTable('annotation', true);
-                $userTableName = $this->getTable('user', true);
-                $entryTableName = $this->getTable('entry', true);
-
                 $this->addSql(<<<EOD
 CREATE TEMPORARY TABLE __temp__wallabag_annotation AS
     SELECT id, user_id, entry_id, text, created_at, updated_at, quote, ranges
-    FROM ${annotationTableName}
+    FROM ${tableName}
 EOD
                 );
-                $this->addSql('DROP TABLE ' . $annotationTableName);
+                $this->addSql('DROP TABLE ' . $tableName);
                 $this->addSql(<<<EOD
-CREATE TABLE ${annotationTableName}
+CREATE TABLE ${tableName}
 (
     id INTEGER PRIMARY KEY NOT NULL,
     user_id INTEGER DEFAULT NULL,
@@ -37,16 +35,16 @@ CREATE TABLE ${annotationTableName}
     updated_at DATETIME NOT NULL,
     quote CLOB NOT NULL,
     ranges CLOB NOT NULL,
-    CONSTRAINT FK_A7AED006A76ED395 FOREIGN KEY (user_id) REFERENCES ${userTableName} (id),
-    CONSTRAINT FK_A7AED006BA364942 FOREIGN KEY (entry_id) REFERENCES ${entryTableName} (id) ON DELETE CASCADE
+    CONSTRAINT FK_A7AED006A76ED395 FOREIGN KEY (user_id) REFERENCES wallabag_user (id),
+    CONSTRAINT FK_A7AED006BA364942 FOREIGN KEY (entry_id) REFERENCES wallabag_entry (id) ON DELETE CASCADE
 );
-CREATE INDEX IDX_A7AED006A76ED395 ON ${annotationTableName} (user_id);
-CREATE INDEX IDX_A7AED006BA364942 ON ${annotationTableName} (entry_id);
+CREATE INDEX IDX_A7AED006A76ED395 ON wallabag_annotation (user_id);
+CREATE INDEX IDX_A7AED006BA364942 ON wallabag_annotation (entry_id);
 EOD
                 );
 
                 $this->addSql(<<<EOD
-INSERT INTO ${annotationTableName} (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
@@ -54,10 +52,10 @@ EOD
                 $this->addSql('DROP TABLE __temp__wallabag_annotation');
                 break;
             case 'mysql':
-                $this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' MODIFY quote TEXT NOT NULL');
+                $this->addSql('ALTER TABLE ' . $tableName . ' MODIFY quote TEXT NOT NULL');
                 break;
             case 'postgresql':
-                $this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' ALTER COLUMN quote TYPE TEXT');
+                $this->addSql('ALTER TABLE ' . $tableName . ' ALTER COLUMN quote TYPE TEXT');
                 break;
         }
     }

app/DoctrineMigrations/Version20170602075214.php

@@ -10,6 +10,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20170602075214 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $apiUserRegistration = $this->container
@@ -22,6 +25,9 @@ class Version20170602075214 extends WallabagMigration
         $this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('api_user_registration', '0', 'api')");
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'api_user_registration';");

app/DoctrineMigrations/Version20170606155640.php

@@ -11,6 +11,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20170606155640 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $apiUserRegistration = $this->container
@@ -23,6 +26,9 @@ class Version20170606155640 extends WallabagMigration
         $this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'wallabag_url'");
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('wallabag_url', 'wallabag.me', 'misc')");

app/DoctrineMigrations/Version20170719231144.php

@@ -10,6 +10,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20170719231144 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $this->skipIf('sqlite' === $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
@@ -52,7 +55,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') . '
@@ -86,6 +89,9 @@ class Version20170719231144 extends WallabagMigration
         );
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         throw new SkipMigrationException('Too complex ...');

app/DoctrineMigrations/Version20170824113337.php

@@ -10,6 +10,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20170824113337 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $entryTable = $schema->getTable($this->getTable('entry'));
@@ -34,6 +37,9 @@ class Version20170824113337 extends WallabagMigration
         );
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $entryTable = $schema->getTable($this->getTable('entry'));

app/DoctrineMigrations/Version20171008195606.php

@@ -10,6 +10,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20171008195606 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $this->skipIf('sqlite' === $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
@@ -26,6 +29,9 @@ class Version20171008195606 extends WallabagMigration
         }
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $this->skipIf('sqlite' === $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');

app/DoctrineMigrations/Version20171105202000.php

@@ -10,6 +10,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20171105202000 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $entryTable = $schema->getTable($this->getTable('entry'));
@@ -21,6 +24,9 @@ class Version20171105202000 extends WallabagMigration
         ]);
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $entryTable = $schema->getTable($this->getTable('entry'));

app/DoctrineMigrations/Version20171120163128.php

@@ -10,6 +10,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20171120163128 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $storeArticleHeaders = $this->container
@@ -22,6 +25,9 @@ class Version20171120163128 extends WallabagMigration
         $this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('store_article_headers', '0', 'entry')");
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'store_article_headers';");

app/DoctrineMigrations/Version20171125164500.php

@@ -10,6 +10,9 @@ use Wallabag\CoreBundle\Doctrine\WallabagMigration;
  */
 class Version20171125164500 extends WallabagMigration
 {
+    /**
+     * @param Schema $schema
+     */
     public function up(Schema $schema)
     {
         $shaarliShareOriginUrl = $this->container
@@ -22,6 +25,9 @@ class Version20171125164500 extends WallabagMigration
         $this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('shaarli_share_origin_url', '0', 'entry')");
     }
 
+    /**
+     * @param Schema $schema
+     */
     public function down(Schema $schema)
     {
         $this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'shaarli_share_origin_url';");

app/DoctrineMigrations/Version20180405182455.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace Application\Migrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
-
-/**
- * Add archived_at column and set its value to updated_at for is_archived entries.
- */
-class Version20180405182455 extends WallabagMigration
-{
-    public function up(Schema $schema)
-    {
-        $entryTable = $schema->getTable($this->getTable('entry'));
-
-        $this->skipIf($entryTable->hasColumn('archived_at'), 'It seems that you already played this migration.');
-
-        $entryTable->addColumn('archived_at', 'datetime', [
-            'notnull' => false,
-        ]);
-    }
-
-    public function postUp(Schema $schema)
-    {
-        $entryTable = $schema->getTable($this->getTable('entry'));
-        $this->skipIf(!$entryTable->hasColumn('archived_at'), 'Unable to add archived_at colum');
-
-        $this->connection->executeQuery(
-            'UPDATE ' . $this->getTable('entry') . ' SET archived_at = updated_at WHERE is_archived = :is_archived',
-            [
-                'is_archived' => true,
-            ]
-        );
-    }
-
-    public function down(Schema $schema)
-    {
-        $entryTable = $schema->getTable($this->getTable('entry'));
-
-        $this->skipIf(!$entryTable->hasColumn('archived_at'), 'It seems that you already played this migration.');
-
-        $entryTable->dropColumn('archived_at');
-    }
-}

app/DoctrineMigrations/Version20181128203230.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace Application\Migrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
-
-/**
- * Fix varchar field from vendor to work with utf8mb4.
- */
-class Version20181128203230 extends WallabagMigration
-{
-    public function up(Schema $schema)
-    {
-        $this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration can only be applied on \'mysql\'.');
-
-        $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_access_tokens') . ' CHANGE `token` `token` varchar(191) NOT NULL');
-        $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_access_tokens') . ' CHANGE `scope` `scope` varchar(191)');
-        $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_auth_codes') . ' CHANGE `token` `token` varchar(191) NOT NULL');
-        $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_auth_codes') . ' CHANGE `scope` `scope` varchar(191)');
-        $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_refresh_tokens') . ' CHANGE `token` `token` varchar(191) NOT NULL');
-        $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_refresh_tokens') . ' CHANGE `scope` `scope` varchar(191)');
-        $this->addSql('ALTER TABLE ' . $this->getTable('craue_config_setting') . ' CHANGE `name` `name` varchar(191)');
-        $this->addSql('ALTER TABLE ' . $this->getTable('craue_config_setting') . ' CHANGE `section` `section` varchar(191)');
-        $this->addSql('ALTER TABLE ' . $this->getTable('craue_config_setting') . ' CHANGE `value` `value` varchar(191)');
-    }
-
-    public function down(Schema $schema)
-    {
-        $this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration can only be applied on \'mysql\'.');
-
-        $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_access_tokens') . ' CHANGE `token` `token` varchar(255) NOT NULL');
-        $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_access_tokens') . ' CHANGE `scope` `scope` varchar(255)');
-        $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_auth_codes') . ' CHANGE `token` `token` varchar(255) NOT NULL');
-        $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_auth_codes') . ' CHANGE `scope` `scope` varchar(255)');
-        $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_refresh_tokens') . ' CHANGE `token` `token` varchar(255) NOT NULL');
-        $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_refresh_tokens') . ' CHANGE `scope` `scope` varchar(255)');
-        $this->addSql('ALTER TABLE ' . $this->getTable('craue_config_setting') . ' CHANGE `name` `name` varchar(255)');
-        $this->addSql('ALTER TABLE ' . $this->getTable('craue_config_setting') . ' CHANGE `section` `section` varchar(255)');
-        $this->addSql('ALTER TABLE ' . $this->getTable('craue_config_setting') . ' CHANGE `value` `value` varchar(255)');
-    }
-}

app/DoctrineMigrations/Version20181202073750.php

@@ -1,76 +0,0 @@
-<?php
-
-namespace Application\Migrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
-
-/**
- * Add 2fa OTP stuff.
- */
-final class Version20181202073750 extends WallabagMigration
-{
-    public function up(Schema $schema): void
-    {
-        switch ($this->connection->getDatabasePlatform()->getName()) {
-            case 'sqlite':
-                $this->addSql('DROP INDEX UNIQ_1D63E7E5C05FB297');
-                $this->addSql('DROP INDEX UNIQ_1D63E7E5A0D96FBF');
-                $this->addSql('DROP INDEX UNIQ_1D63E7E592FC23A8');
-                $this->addSql('CREATE TEMPORARY TABLE __temp__' . $this->getTable('user', true) . ' AS SELECT id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, confirmation_token, password_requested_at, roles, name, created_at, updated_at, authCode, twoFactorAuthentication FROM ' . $this->getTable('user', true) . '');
-                $this->addSql('DROP TABLE ' . $this->getTable('user', true) . '');
-                $this->addSql('CREATE TABLE ' . $this->getTable('user', true) . ' (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, username VARCHAR(180) NOT NULL COLLATE BINARY, username_canonical VARCHAR(180) NOT NULL COLLATE BINARY, email VARCHAR(180) NOT NULL COLLATE BINARY, email_canonical VARCHAR(180) NOT NULL COLLATE BINARY, enabled BOOLEAN NOT NULL, password VARCHAR(255) NOT NULL COLLATE BINARY, last_login DATETIME DEFAULT NULL, password_requested_at DATETIME DEFAULT NULL, name CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, authCode INTEGER DEFAULT NULL, emailTwoFactor BOOLEAN NOT NULL, salt VARCHAR(255) DEFAULT NULL, confirmation_token VARCHAR(180) DEFAULT NULL, roles CLOB NOT NULL --(DC2Type:array)
-                , googleAuthenticatorSecret VARCHAR(255) DEFAULT NULL, backupCodes CLOB DEFAULT NULL --(DC2Type:json_array)
-                )');
-                $this->addSql('INSERT INTO ' . $this->getTable('user', true) . ' (id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, confirmation_token, password_requested_at, roles, name, created_at, updated_at, authCode, emailTwoFactor) SELECT id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, confirmation_token, password_requested_at, roles, name, created_at, updated_at, authCode, twoFactorAuthentication FROM __temp__' . $this->getTable('user', true) . '');
-                $this->addSql('DROP TABLE __temp__' . $this->getTable('user', true) . '');
-                $this->addSql('CREATE UNIQUE INDEX UNIQ_1D63E7E5C05FB297 ON ' . $this->getTable('user', true) . ' (confirmation_token)');
-                $this->addSql('CREATE UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF ON ' . $this->getTable('user', true) . ' (email_canonical)');
-                $this->addSql('CREATE UNIQUE INDEX UNIQ_1D63E7E592FC23A8 ON ' . $this->getTable('user', true) . ' (username_canonical)');
-                break;
-            case 'mysql':
-                $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' ADD googleAuthenticatorSecret VARCHAR(191) DEFAULT NULL');
-                $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CHANGE twoFactorAuthentication emailTwoFactor BOOLEAN NOT NULL');
-                $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' DROP trusted');
-                $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' ADD backupCodes LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:json_array)\'');
-                break;
-            case 'postgresql':
-                $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' ADD googleAuthenticatorSecret VARCHAR(191) DEFAULT NULL');
-                $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' RENAME COLUMN twofactorauthentication TO emailTwoFactor');
-                $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' DROP trusted');
-                $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' ADD backupCodes TEXT DEFAULT NULL');
-                break;
-        }
-    }
-
-    public function down(Schema $schema): void
-    {
-        switch ($this->connection->getDatabasePlatform()->getName()) {
-            case 'sqlite':
-                $this->addSql('DROP INDEX UNIQ_1D63E7E592FC23A8');
-                $this->addSql('DROP INDEX UNIQ_1D63E7E5A0D96FBF');
-                $this->addSql('DROP INDEX UNIQ_1D63E7E5C05FB297');
-                $this->addSql('CREATE TEMPORARY TABLE __temp__' . $this->getTable('user', true) . ' AS SELECT id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, confirmation_token, password_requested_at, roles, name, created_at, updated_at, authCode, emailTwoFactor FROM "' . $this->getTable('user', true) . '"');
-                $this->addSql('DROP TABLE "' . $this->getTable('user', true) . '"');
-                $this->addSql('CREATE TABLE "' . $this->getTable('user', true) . '" (id INTEGER PRIMARY KEY AUTOINCREMENT 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 BOOLEAN NOT NULL, password VARCHAR(255) NOT NULL, last_login DATETIME DEFAULT NULL, password_requested_at DATETIME DEFAULT NULL, name CLOB DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, authCode INTEGER DEFAULT NULL, twoFactorAuthentication BOOLEAN NOT NULL, salt VARCHAR(255) NOT NULL COLLATE BINARY, confirmation_token VARCHAR(255) DEFAULT NULL COLLATE BINARY, roles CLOB NOT NULL COLLATE BINARY, trusted CLOB DEFAULT NULL COLLATE BINARY)');
-                $this->addSql('INSERT INTO "' . $this->getTable('user', true) . '" (id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, confirmation_token, password_requested_at, roles, name, created_at, updated_at, authCode, twoFactorAuthentication) SELECT id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, confirmation_token, password_requested_at, roles, name, created_at, updated_at, authCode, emailTwoFactor FROM __temp__' . $this->getTable('user', true) . '');
-                $this->addSql('DROP TABLE __temp__' . $this->getTable('user', true) . '');
-                $this->addSql('CREATE UNIQUE INDEX UNIQ_1D63E7E592FC23A8 ON "' . $this->getTable('user', true) . '" (username_canonical)');
-                $this->addSql('CREATE UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF ON "' . $this->getTable('user', true) . '" (email_canonical)');
-                $this->addSql('CREATE UNIQUE INDEX UNIQ_1D63E7E5C05FB297 ON "' . $this->getTable('user', true) . '" (confirmation_token)');
-                break;
-            case 'mysql':
-                $this->addSql('ALTER TABLE `' . $this->getTable('user') . '` DROP googleAuthenticatorSecret');
-                $this->addSql('ALTER TABLE `' . $this->getTable('user') . '` CHANGE emailtwofactor twoFactorAuthentication BOOLEAN NOT NULL');
-                $this->addSql('ALTER TABLE `' . $this->getTable('user') . '` ADD trusted TEXT DEFAULT NULL');
-                $this->addSql('ALTER TABLE `' . $this->getTable('user') . '` DROP backupCodes');
-                break;
-            case 'postgresql':
-                $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' DROP googleAuthenticatorSecret');
-                $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' RENAME COLUMN emailTwoFactor TO twofactorauthentication');
-                $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' ADD trusted TEXT DEFAULT NULL');
-                $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' DROP backupCodes');
-                break;
-        }
-    }
-}

app/DoctrineMigrations/Version20190117131816.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace Application\Migrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
-
-/**
- * Add updated_at fields to site_credential table.
- */
-final class Version20190117131816 extends WallabagMigration
-{
-    public function up(Schema $schema): void
-    {
-        $siteCredentialTable = $schema->getTable($this->getTable('site_credential'));
-
-        $this->skipIf($siteCredentialTable->hasColumn('updated_at'), 'It seems that you already played this migration.');
-
-        $siteCredentialTable->addColumn('updated_at', 'datetime', [
-            'notnull' => false,
-        ]);
-    }
-
-    public function down(Schema $schema): void
-    {
-        $siteCredentialTable = $schema->getTable($this->getTable('site_credential'));
-
-        $this->skipIf(!$siteCredentialTable->hasColumn('updated_at'), 'It seems that you already played this migration.');
-
-        $siteCredentialTable->dropColumn('updated_at');
-    }
-}

app/DoctrineMigrations/Version20190129120000.php

@@ -1,141 +0,0 @@
-<?php
-
-namespace Application\Migrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
-
-/**
- * Add missing entries in craue_config_setting.
- */
-final class Version20190129120000 extends WallabagMigration
-{
-    private $settings = [
-        [
-            'name' => 'carrot',
-            'value' => '1',
-            'section' => 'entry',
-        ],
-        [
-            'name' => 'share_diaspora',
-            'value' => '1',
-            'section' => 'entry',
-        ],
-        [
-            'name' => 'diaspora_url',
-            'value' => 'http://diasporapod.com',
-            'section' => 'entry',
-        ],
-        [
-            'name' => 'share_shaarli',
-            'value' => '1',
-            'section' => 'entry',
-        ],
-        [
-            'name' => 'shaarli_url',
-            'value' => 'http://myshaarli.com',
-            'section' => 'entry',
-        ],
-        [
-            'name' => 'share_mail',
-            'value' => '1',
-            'section' => 'entry',
-        ],
-        [
-            'name' => 'share_twitter',
-            'value' => '1',
-            'section' => 'entry',
-        ],
-        [
-            'name' => 'show_printlink',
-            'value' => '1',
-            'section' => 'entry',
-        ],
-        [
-            'name' => 'export_epub',
-            'value' => '1',
-            'section' => 'export',
-        ],
-        [
-            'name' => 'export_mobi',
-            'value' => '1',
-            'section' => 'export',
-        ],
-        [
-            'name' => 'export_pdf',
-            'value' => '1',
-            'section' => 'export',
-        ],
-        [
-            'name' => 'export_csv',
-            'value' => '1',
-            'section' => 'export',
-        ],
-        [
-            'name' => 'export_json',
-            'value' => '1',
-            'section' => 'export',
-        ],
-        [
-            'name' => 'export_txt',
-            'value' => '1',
-            'section' => 'export',
-        ],
-        [
-            'name' => 'export_xml',
-            'value' => '1',
-            'section' => 'export',
-        ],
-        [
-            'name' => 'piwik_enabled',
-            'value' => '0',
-            'section' => 'analytics',
-        ],
-        [
-            'name' => 'piwik_host',
-            'value' => 'v2.wallabag.org',
-            'section' => 'analytics',
-        ],
-        [
-            'name' => 'piwik_site_id',
-            'value' => '1',
-            'section' => 'analytics',
-        ],
-        [
-            'name' => 'demo_mode_enabled',
-            'value' => '0',
-            'section' => 'misc',
-        ],
-        [
-            'name' => 'demo_mode_username',
-            'value' => 'wallabag',
-            'section' => 'misc',
-        ],
-        [
-            'name' => 'wallabag_support_url',
-            'value' => 'https://www.wallabag.org/pages/support.html',
-            'section' => 'misc',
-        ],
-    ];
-
-    public function up(Schema $schema)
-    {
-        foreach ($this->settings as $setting) {
-            $settingEnabled = $this->container
-                ->get('doctrine.orm.default_entity_manager')
-                ->getConnection()
-                ->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = '" . $setting['name'] . "'");
-
-            if (false !== $settingEnabled) {
-                continue;
-            }
-
-            $this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('" . $setting['name'] . "', '" . $setting['value'] . "', '" . $setting['section'] . "');");
-        }
-    }
-
-    public function down(Schema $schema)
-    {
-        $this->skipIf(true, 'These settings are required and should not be removed.');
-    }
-}

app/DoctrineMigrations/Version20190401105353.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace Application\Migrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
-
-/**
- * Add hashed_url in entry.
- */
-class Version20190401105353 extends WallabagMigration
-{
-    public function up(Schema $schema)
-    {
-        $entryTable = $schema->getTable($this->getTable('entry'));
-
-        $this->skipIf($entryTable->hasColumn('hashed_url'), 'It seems that you already played this migration.');
-
-        $entryTable->addColumn('hashed_url', 'text', [
-            'length' => 40,
-            'notnull' => false,
-        ]);
-
-        $entryTable->addIndex(['user_id', 'hashed_url'], 'hashed_url_user_id', [], ['lengths' => [null, 40]]);
-    }
-
-    public function down(Schema $schema)
-    {
-        $entryTable = $schema->getTable($this->getTable('entry'));
-
-        $this->skipIf(!$entryTable->hasColumn('hashed_url'), 'It seems that you already played this migration.');
-
-        $entryTable->dropIndex('hashed_url_user_id');
-        $entryTable->dropColumn('hashed_url');
-    }
-}

app/DoctrineMigrations/Version20190425115043.php

@@ -1,58 +0,0 @@
-<?php
-
-namespace Application\Migrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
-
-/**
- * Rename rss_token & rss_limit to feed_token & feed_limit.
- */
-final class Version20190425115043 extends WallabagMigration
-{
-    public function up(Schema $schema): void
-    {
-        switch ($this->connection->getDatabasePlatform()->getName()) {
-            case 'sqlite':
-                $this->addSql('DROP INDEX UNIQ_87E64C53A76ED395');
-                $this->addSql('CREATE TEMPORARY TABLE __temp__' . $this->getTable('config', true) . ' AS SELECT id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key, action_mark_as_read, list_mode FROM ' . $this->getTable('config', true));
-                $this->addSql('DROP TABLE ' . $this->getTable('config', true));
-                $this->addSql('CREATE TABLE ' . $this->getTable('config', true) . ' (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, user_id INTEGER DEFAULT NULL, theme VARCHAR(255) NOT NULL COLLATE BINARY, items_per_page INTEGER NOT NULL, language VARCHAR(255) NOT NULL COLLATE BINARY, reading_speed DOUBLE PRECISION DEFAULT NULL, pocket_consumer_key VARCHAR(255) DEFAULT NULL COLLATE BINARY, action_mark_as_read INTEGER DEFAULT 0, list_mode INTEGER DEFAULT NULL, feed_token VARCHAR(255) DEFAULT NULL, feed_limit INTEGER DEFAULT NULL, CONSTRAINT FK_87E64C53A76ED395 FOREIGN KEY (user_id) REFERENCES "' . $this->getTable('user', true) . '" (id) NOT DEFERRABLE INITIALLY IMMEDIATE)');
-                $this->addSql('INSERT INTO ' . $this->getTable('config', true) . ' (id, user_id, theme, items_per_page, language, feed_token, feed_limit, reading_speed, pocket_consumer_key, action_mark_as_read, list_mode) SELECT id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key, action_mark_as_read, list_mode FROM __temp__' . $this->getTable('config', true));
-                $this->addSql('DROP TABLE __temp__' . $this->getTable('config', true));
-                $this->addSql('CREATE UNIQUE INDEX UNIQ_87E64C53A76ED395 ON ' . $this->getTable('config', true) . ' (user_id)');
-                break;
-            case 'mysql':
-                $this->addSql('ALTER TABLE ' . $this->getTable('config') . ' CHANGE rss_token feed_token VARCHAR(255) DEFAULT NULL');
-                $this->addSql('ALTER TABLE ' . $this->getTable('config') . ' CHANGE rss_limit feed_limit INT DEFAULT NULL');
-                break;
-            case 'postgresql':
-                $this->addSql('ALTER TABLE ' . $this->getTable('config') . ' RENAME COLUMN rss_token TO feed_token');
-                $this->addSql('ALTER TABLE ' . $this->getTable('config') . ' RENAME COLUMN rss_limit TO feed_limit');
-                break;
-        }
-    }
-
-    public function down(Schema $schema): void
-    {
-        switch ($this->connection->getDatabasePlatform()->getName()) {
-            case 'sqlite':
-                $this->addSql('DROP INDEX UNIQ_87E64C53A76ED395');
-                $this->addSql('CREATE TEMPORARY TABLE __temp__' . $this->getTable('config', true) . ' AS SELECT id, user_id, theme, items_per_page, language, feed_token, feed_limit, reading_speed, pocket_consumer_key, action_mark_as_read, list_mode FROM "' . $this->getTable('config', true) . '"');
-                $this->addSql('DROP TABLE "' . $this->getTable('config', true) . '"');
-                $this->addSql('CREATE TABLE "' . $this->getTable('config', true) . '" (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, user_id INTEGER DEFAULT NULL, theme VARCHAR(255) NOT NULL, items_per_page INTEGER NOT NULL, language VARCHAR(255) NOT NULL, reading_speed DOUBLE PRECISION DEFAULT NULL, pocket_consumer_key VARCHAR(255) DEFAULT NULL, action_mark_as_read INTEGER DEFAULT 0, list_mode INTEGER DEFAULT NULL, rss_token VARCHAR(255) DEFAULT NULL COLLATE BINARY, rss_limit INTEGER DEFAULT NULL)');
-                $this->addSql('INSERT INTO "' . $this->getTable('config', true) . '" (id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key, action_mark_as_read, list_mode) SELECT id, user_id, theme, items_per_page, language, feed_token, feed_limit, reading_speed, pocket_consumer_key, action_mark_as_read, list_mode FROM __temp__' . $this->getTable('config', true));
-                $this->addSql('DROP TABLE __temp__' . $this->getTable('config', true));
-                $this->addSql('CREATE UNIQUE INDEX UNIQ_87E64C53A76ED395 ON "' . $this->getTable('config', true) . '" (user_id)');
-                break;
-            case 'mysql':
-                $this->addSql('ALTER TABLE ' . $this->getTable('config') . ' CHANGE feed_token rss_token');
-                $this->addSql('ALTER TABLE ' . $this->getTable('config') . ' CHANGE feed_limit rss_limit');
-                break;
-            case 'postgresql':
-                $this->addSql('ALTER TABLE ' . $this->getTable('config') . ' RENAME COLUMN feed_token TO rss_token');
-                $this->addSql('ALTER TABLE ' . $this->getTable('config') . ' RENAME COLUMN feed_limit TO rss_limit');
-                break;
-        }
-    }
-}

app/DoctrineMigrations/Version20190510141130.php

@@ -1,98 +0,0 @@
-<?php
-
-namespace Application\Migrations;
-
-use Doctrine\DBAL\Migrations\SkipMigrationException;
-use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
-
-/**
- * Enable cascade delete when deleting a user on:
- *     - oauth2_access_tokens
- *     - oauth2_clients
- *     - oauth2_refresh_tokens
- *     - oauth2_auth_codes.
- */
-final class Version20190510141130 extends WallabagMigration
-{
-    public function up(Schema $schema): void
-    {
-        switch ($this->connection->getDatabasePlatform()->getName()) {
-            case 'sqlite':
-                $this->addSql('DROP INDEX IDX_368A4209A76ED395');
-                $this->addSql('DROP INDEX IDX_368A420919EB6921');
-                $this->addSql('DROP INDEX UNIQ_368A42095F37A13B');
-                $this->addSql('CREATE TEMPORARY TABLE __temp__' . $this->getTable('oauth2_access_tokens', true) . ' AS SELECT id, client_id, user_id, token, expires_at, scope FROM ' . $this->getTable('oauth2_access_tokens', true));
-                $this->addSql('DROP TABLE ' . $this->getTable('oauth2_access_tokens', true));
-                $this->addSql('CREATE TABLE ' . $this->getTable('oauth2_access_tokens', true) . ' (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, client_id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, expires_at INTEGER DEFAULT NULL, token VARCHAR(191) NOT NULL, scope VARCHAR(191) NULL, CONSTRAINT FK_368A420919EB6921 FOREIGN KEY (client_id) REFERENCES ' . $this->getTable('oauth2_clients', true) . ' (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_368A4209A76ED395 FOREIGN KEY (user_id) REFERENCES "' . $this->getTable('oauth2_clients', true) . '" (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE)');
-                $this->addSql('INSERT INTO ' . $this->getTable('oauth2_access_tokens', true) . ' (id, client_id, user_id, token, expires_at, scope) SELECT id, client_id, user_id, token, expires_at, scope FROM __temp__' . $this->getTable('oauth2_access_tokens', true));
-                $this->addSql('DROP TABLE __temp__' . $this->getTable('oauth2_access_tokens', true));
-                $this->addSql('CREATE INDEX IDX_368A4209A76ED395 ON ' . $this->getTable('oauth2_access_tokens', true) . ' (user_id)');
-                $this->addSql('CREATE INDEX IDX_368A420919EB6921 ON ' . $this->getTable('oauth2_access_tokens', true) . ' (client_id)');
-
-                $this->addSql('DROP INDEX IDX_635D765EA76ED395');
-                $this->addSql('CREATE TEMPORARY TABLE __temp__' . $this->getTable('oauth2_clients', true) . ' AS SELECT id, user_id, random_id, secret, redirect_uris, allowed_grant_types, name FROM ' . $this->getTable('oauth2_clients', true));
-                $this->addSql('DROP TABLE ' . $this->getTable('oauth2_clients', true));
-                $this->addSql('CREATE TABLE ' . $this->getTable('oauth2_clients', true) . ' (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, user_id INTEGER DEFAULT NULL, random_id VARCHAR(255) NOT NULL COLLATE BINARY, secret VARCHAR(255) NOT NULL COLLATE BINARY, name CLOB NOT NULL COLLATE BINARY, redirect_uris CLOB NOT NULL, allowed_grant_types CLOB NOT NULL, CONSTRAINT FK_635D765EA76ED395 FOREIGN KEY (user_id) REFERENCES "' . $this->getTable('oauth2_clients', true) . '" (id) NOT DEFERRABLE INITIALLY IMMEDIATE)');
-                $this->addSql('INSERT INTO ' . $this->getTable('oauth2_clients', true) . ' (id, user_id, random_id, secret, redirect_uris, allowed_grant_types, name) SELECT id, user_id, random_id, secret, redirect_uris, allowed_grant_types, name FROM __temp__' . $this->getTable('oauth2_clients', true));
-                $this->addSql('DROP TABLE __temp__' . $this->getTable('oauth2_clients', true));
-                $this->addSql('CREATE INDEX IDX_635D765EA76ED395 ON ' . $this->getTable('oauth2_clients', true) . ' (user_id)');
-
-                $this->addSql('DROP INDEX IDX_20C9FB24A76ED395');
-                $this->addSql('DROP INDEX IDX_20C9FB2419EB6921');
-                $this->addSql('DROP INDEX UNIQ_20C9FB245F37A13B');
-                $this->addSql('CREATE TEMPORARY TABLE __temp__' . $this->getTable('oauth2_refresh_tokens', true) . ' AS SELECT id, client_id, user_id, token, expires_at, scope FROM ' . $this->getTable('oauth2_refresh_tokens', true));
-                $this->addSql('DROP TABLE ' . $this->getTable('oauth2_refresh_tokens', true));
-                $this->addSql('CREATE TABLE ' . $this->getTable('oauth2_refresh_tokens', true) . ' (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, client_id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, expires_at INTEGER DEFAULT NULL, token VARCHAR(191) NOT NULL, scope VARCHAR(191) NULL, CONSTRAINT FK_20C9FB2419EB6921 FOREIGN KEY (client_id) REFERENCES ' . $this->getTable('oauth2_clients', true) . ' (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_20C9FB24A76ED395 FOREIGN KEY (user_id) REFERENCES "' . $this->getTable('oauth2_clients', true) . '" (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE)');
-                $this->addSql('INSERT INTO ' . $this->getTable('oauth2_refresh_tokens', true) . ' (id, client_id, user_id, token, expires_at, scope) SELECT id, client_id, user_id, token, expires_at, scope FROM __temp__' . $this->getTable('oauth2_refresh_tokens', true));
-                $this->addSql('DROP TABLE __temp__' . $this->getTable('oauth2_refresh_tokens', true));
-                $this->addSql('CREATE INDEX IDX_20C9FB24A76ED395 ON ' . $this->getTable('oauth2_refresh_tokens', true) . ' (user_id)');
-                $this->addSql('CREATE INDEX IDX_20C9FB2419EB6921 ON ' . $this->getTable('oauth2_refresh_tokens', true) . ' (client_id)');
-
-                $this->addSql('DROP INDEX IDX_EE52E3FAA76ED395');
-                $this->addSql('DROP INDEX IDX_EE52E3FA19EB6921');
-                $this->addSql('DROP INDEX UNIQ_EE52E3FA5F37A13B');
-                $this->addSql('CREATE TEMPORARY TABLE __temp__' . $this->getTable('oauth2_auth_codes', true) . ' AS SELECT id, client_id, user_id, token, redirect_uri, expires_at, scope FROM ' . $this->getTable('oauth2_auth_codes', true));
-                $this->addSql('DROP TABLE ' . $this->getTable('oauth2_auth_codes', true));
-                $this->addSql('CREATE TABLE ' . $this->getTable('oauth2_auth_codes', true) . ' (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, client_id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, redirect_uri CLOB NOT NULL COLLATE BINARY, expires_at INTEGER DEFAULT NULL, token VARCHAR(191) NOT NULL, scope VARCHAR(191) NULL, CONSTRAINT FK_EE52E3FA19EB6921 FOREIGN KEY (client_id) REFERENCES ' . $this->getTable('oauth2_clients', true) . ' (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_EE52E3FAA76ED395 FOREIGN KEY (user_id) REFERENCES "' . $this->getTable('oauth2_clients', true) . '" (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE)');
-                $this->addSql('INSERT INTO ' . $this->getTable('oauth2_auth_codes', true) . ' (id, client_id, user_id, token, redirect_uri, expires_at, scope) SELECT id, client_id, user_id, token, redirect_uri, expires_at, scope FROM __temp__' . $this->getTable('oauth2_auth_codes', true));
-                $this->addSql('DROP TABLE __temp__' . $this->getTable('oauth2_auth_codes', true));
-                $this->addSql('CREATE INDEX IDX_EE52E3FAA76ED395 ON ' . $this->getTable('oauth2_auth_codes', true) . ' (user_id)');
-                $this->addSql('CREATE INDEX IDX_EE52E3FA19EB6921 ON ' . $this->getTable('oauth2_auth_codes', true) . ' (client_id)');
-                break;
-            case 'mysql':
-                $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_access_tokens') . ' DROP FOREIGN KEY FK_368A4209A76ED395');
-                $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_access_tokens') . ' ADD CONSTRAINT FK_368A4209A76ED395 FOREIGN KEY (user_id) REFERENCES ' . $this->getTable('user') . ' (id) ON DELETE CASCADE');
-
-                if ($schema->getTable($this->getTable('oauth2_clients'))->hasForeignKey('IDX_user_oauth_client')) {
-                    $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_clients') . ' DROP FOREIGN KEY IDX_user_oauth_client');
-                    $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_clients') . ' ADD CONSTRAINT FK_635D765EA76ED395 FOREIGN KEY (user_id) REFERENCES ' . $this->getTable('user') . ' (id)');
-                }
-
-                $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_refresh_tokens') . ' DROP FOREIGN KEY FK_20C9FB24A76ED395');
-                $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_refresh_tokens') . ' ADD CONSTRAINT FK_20C9FB24A76ED395 FOREIGN KEY (user_id) REFERENCES ' . $this->getTable('user') . ' (id) ON DELETE CASCADE');
-
-                $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_auth_codes') . ' DROP FOREIGN KEY FK_EE52E3FAA76ED395');
-                $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_auth_codes') . ' ADD CONSTRAINT FK_EE52E3FAA76ED395 FOREIGN KEY (user_id) REFERENCES ' . $this->getTable('user') . ' (id) ON DELETE CASCADE');
-                break;
-            case 'postgresql':
-                $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_access_tokens') . ' DROP CONSTRAINT FK_368A4209A76ED395');
-                $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_access_tokens') . ' ADD CONSTRAINT FK_368A4209A76ED395 FOREIGN KEY (user_id) REFERENCES ' . $this->getTable('user') . ' (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-
-                $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_clients') . ' DROP CONSTRAINT idx_user_oauth_client');
-                $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_clients') . ' ADD CONSTRAINT FK_635D765EA76ED395 FOREIGN KEY (user_id) REFERENCES ' . $this->getTable('user') . ' (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
-
-                $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_refresh_tokens') . ' DROP CONSTRAINT FK_20C9FB24A76ED395');
-                $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_refresh_tokens') . ' ADD CONSTRAINT FK_20C9FB24A76ED395 FOREIGN KEY (user_id) REFERENCES ' . $this->getTable('user') . ' (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-
-                $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_auth_codes') . ' DROP CONSTRAINT FK_EE52E3FAA76ED395');
-                $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_auth_codes') . ' ADD CONSTRAINT FK_EE52E3FAA76ED395 FOREIGN KEY (user_id) REFERENCES ' . $this->getTable('user') . ' (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
-                break;
-        }
-    }
-
-    public function down(Schema $schema): void
-    {
-        throw new SkipMigrationException('Too complex ...');
-    }
-}

app/DoctrineMigrations/Version20190511165128.php

@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Application\Migrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
-
-/**
- * Convert tab label to utf8mb4_bin (MySQL only).
- */
-final class Version20190511165128 extends WallabagMigration
-{
-    public function up(Schema $schema): void
-    {
-        $this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');
-
-        $this->addSql('ALTER TABLE ' . $this->getTable('tag') . ' CHANGE `label` `label` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;');
-        $this->addSql('ALTER TABLE ' . $this->getTable('tag') . ' CHANGE `slug` `slug` VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');
-
-        $this->addSql('ALTER TABLE ' . $this->getTable('tag') . ' CHANGE `slug` `slug` VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
-        $this->addSql('ALTER TABLE ' . $this->getTable('tag') . ' CHANGE `label` `label` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
-    }
-}

app/DoctrineMigrations/Version20190601125843.php

@@ -1,48 +0,0 @@
-<?php
-
-namespace Application\Migrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
-
-/**
- * Added `given_url` & `hashed_given_url` field in entry table.
- */
-class Version20190601125843 extends WallabagMigration
-{
-    public function up(Schema $schema)
-    {
-        $entryTable = $schema->getTable($this->getTable('entry'));
-
-        if (!$entryTable->hasColumn('given_url')) {
-            $entryTable->addColumn('given_url', 'text', [
-                'notnull' => false,
-            ]);
-        }
-
-        if (!$entryTable->hasColumn('hashed_given_url')) {
-            $entryTable->addColumn('hashed_given_url', 'text', [
-                'length' => 40,
-                'notnull' => false,
-            ]);
-        }
-
-        // 40 = length of sha1 field hashed_given_url
-        $entryTable->addIndex(['user_id', 'hashed_given_url'], 'hashed_given_url_user_id', [], ['lengths' => [null, 40]]);
-    }
-
-    public function down(Schema $schema)
-    {
-        $entryTable = $schema->getTable($this->getTable('entry'));
-
-        if ($entryTable->hasColumn('given_url')) {
-            $entryTable->dropColumn('given_url');
-        }
-
-        if ($entryTable->hasColumn('hashed_given_url')) {
-            $entryTable->dropColumn('hashed_given_url');
-        }
-
-        $entryTable->dropIndex('hashed_given_url_user_id');
-    }
-}

app/DoctrineMigrations/Version20190619093534.php

@@ -1,65 +0,0 @@
-<?php
-
-namespace Application\Migrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
-
-/**
- * Change reading_time field on SQLite to be integer NOT NULL
- * It was forgotten in a previous migration (Version20171008195606.php).
- */
-final class Version20190619093534 extends WallabagMigration
-{
-    public function up(Schema $schema): void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->skipIf('sqlite' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'sqlite\'.');
-
-        $this->addSql('UPDATE ' . $this->getTable('entry', true) . ' SET reading_time = 0 WHERE reading_time IS NULL;');
-
-        $this->addSql('DROP INDEX hashed_given_url_user_id');
-        $this->addSql('DROP INDEX IDX_entry_uid');
-        $this->addSql('DROP INDEX IDX_F4D18282A76ED395');
-        $this->addSql('DROP INDEX IDX_entry_created_at');
-        $this->addSql('DROP INDEX IDX_entry_starred');
-        $this->addSql('DROP INDEX IDX_entry_archived');
-        $this->addSql('DROP INDEX hashed_url_user_id');
-        $this->addSql('CREATE TEMPORARY TABLE __temp__' . $this->getTable('entry', true) . ' AS SELECT id, user_id, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, uid, http_status, published_at, published_by, headers, starred_at, origin_url, archived_at, hashed_url, given_url, hashed_given_url FROM ' . $this->getTable('entry', true) . '');
-        $this->addSql('DROP TABLE ' . $this->getTable('entry', true) . '');
-        $this->addSql('CREATE TABLE ' . $this->getTable('entry', true) . ' (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, user_id INTEGER DEFAULT NULL, title CLOB DEFAULT NULL COLLATE BINARY, url CLOB DEFAULT NULL COLLATE BINARY, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL COLLATE BINARY, language CLOB DEFAULT NULL COLLATE BINARY, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, uid VARCHAR(23) DEFAULT NULL COLLATE BINARY, http_status VARCHAR(3) DEFAULT NULL COLLATE BINARY, published_at DATETIME DEFAULT NULL, starred_at DATETIME DEFAULT NULL, origin_url CLOB DEFAULT NULL COLLATE BINARY, archived_at DATETIME DEFAULT NULL, given_url CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER NOT NULL, published_by CLOB DEFAULT NULL --(DC2Type:array)
-        , headers CLOB DEFAULT NULL --(DC2Type:array)
-        , hashed_url VARCHAR(40) DEFAULT NULL, hashed_given_url VARCHAR(40) DEFAULT NULL, CONSTRAINT FK_F4D18282A76ED395 FOREIGN KEY (user_id) REFERENCES "' . $this->getTable('user', true) . '" (id) NOT DEFERRABLE INITIALLY IMMEDIATE)');
-        $this->addSql('INSERT INTO ' . $this->getTable('entry', true) . ' (id, user_id, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, uid, http_status, published_at, published_by, headers, starred_at, origin_url, archived_at, hashed_url, given_url, hashed_given_url) SELECT id, user_id, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, uid, http_status, published_at, published_by, headers, starred_at, origin_url, archived_at, hashed_url, given_url, hashed_given_url FROM __temp__' . $this->getTable('entry', true) . '');
-        $this->addSql('DROP TABLE __temp__' . $this->getTable('entry', true) . '');
-        $this->addSql('CREATE INDEX hashed_given_url_user_id ON ' . $this->getTable('entry', true) . ' (user_id, hashed_given_url)');
-        $this->addSql('CREATE INDEX IDX_F4D18282A76ED395 ON ' . $this->getTable('entry', true) . ' (user_id)');
-        $this->addSql('CREATE INDEX hashed_url_user_id ON ' . $this->getTable('entry', true) . ' (user_id, hashed_url)');
-        $this->addSql('CREATE INDEX created_at ON ' . $this->getTable('entry', true) . ' (created_at)');
-        $this->addSql('CREATE INDEX uid ON ' . $this->getTable('entry', true) . ' (uid)');
-    }
-
-    public function down(Schema $schema): void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->skipIf('sqlite' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'sqlite\'.');
-
-        $this->addSql('DROP INDEX IDX_F4D18282A76ED395');
-        $this->addSql('DROP INDEX created_at');
-        $this->addSql('DROP INDEX uid');
-        $this->addSql('DROP INDEX hashed_url_user_id');
-        $this->addSql('DROP INDEX hashed_given_url_user_id');
-        $this->addSql('CREATE TEMPORARY TABLE __temp__' . $this->getTable('entry', true) . ' AS SELECT id, user_id, uid, title, url, hashed_url, origin_url, given_url, hashed_given_url, is_archived, archived_at, is_starred, content, created_at, updated_at, published_at, published_by, starred_at, mimetype, language, reading_time, domain_name, preview_picture, http_status, headers FROM "' . $this->getTable('entry', true) . '"');
-        $this->addSql('DROP TABLE "' . $this->getTable('entry', true) . '"');
-        $this->addSql('CREATE TABLE "' . $this->getTable('entry', true) . '" (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, user_id INTEGER DEFAULT NULL, uid VARCHAR(23) DEFAULT NULL, title CLOB DEFAULT NULL, url CLOB DEFAULT NULL, origin_url CLOB DEFAULT NULL, given_url CLOB DEFAULT NULL, is_archived BOOLEAN NOT NULL, archived_at DATETIME DEFAULT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, published_at DATETIME DEFAULT NULL, starred_at DATETIME DEFAULT NULL, mimetype CLOB DEFAULT NULL, language CLOB DEFAULT NULL, domain_name CLOB DEFAULT NULL, preview_picture CLOB DEFAULT NULL, http_status VARCHAR(3) DEFAULT NULL, hashed_url CLOB DEFAULT NULL COLLATE BINARY, hashed_given_url CLOB DEFAULT NULL COLLATE BINARY, published_by CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER DEFAULT NULL, headers CLOB DEFAULT NULL COLLATE BINARY)');
-        $this->addSql('INSERT INTO "' . $this->getTable('entry', true) . '" (id, user_id, uid, title, url, hashed_url, origin_url, given_url, hashed_given_url, is_archived, archived_at, is_starred, content, created_at, updated_at, published_at, published_by, starred_at, mimetype, language, reading_time, domain_name, preview_picture, http_status, headers) SELECT id, user_id, uid, title, url, hashed_url, origin_url, given_url, hashed_given_url, is_archived, archived_at, is_starred, content, created_at, updated_at, published_at, published_by, starred_at, mimetype, language, reading_time, domain_name, preview_picture, http_status, headers FROM __temp__' . $this->getTable('entry', true) . '');
-        $this->addSql('DROP TABLE __temp__' . $this->getTable('entry', true) . '');
-        $this->addSql('CREATE INDEX IDX_F4D18282A76ED395 ON "' . $this->getTable('entry', true) . '" (user_id)');
-        $this->addSql('CREATE INDEX hashed_url_user_id ON "' . $this->getTable('entry', true) . '" (user_id, hashed_url)');
-        $this->addSql('CREATE INDEX hashed_given_url_user_id ON "' . $this->getTable('entry', true) . '" (user_id, hashed_given_url)');
-        $this->addSql('CREATE INDEX IDX_entry_starred ON "' . $this->getTable('entry', true) . '" (is_starred)');
-        $this->addSql('CREATE INDEX IDX_entry_archived ON "' . $this->getTable('entry', true) . '" (is_archived)');
-        $this->addSql('CREATE INDEX IDX_entry_uid ON "' . $this->getTable('entry', true) . '" (uid)');
-        $this->addSql('CREATE INDEX IDX_entry_created_at ON "' . $this->getTable('entry', true) . '" (created_at)');
-    }
-}

app/DoctrineMigrations/Version20190708122957.php

@@ -1,22 +0,0 @@
-<?php
-
-namespace Application\Migrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
-
-/**
- * Change reading speed value.
- */
-final class Version20190708122957 extends WallabagMigration
-{
-    public function up(Schema $schema): void
-    {
-        $this->addSql('UPDATE ' . $this->getTable('config', true) . ' SET reading_speed = reading_speed*200');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('UPDATE ' . $this->getTable('config', true) . ' SET reading_speed = reading_speed/200');
-    }
-}

app/DoctrineMigrations/Version20190806130304.php

@@ -1,116 +0,0 @@
-<?php
-
-namespace Application\Migrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
-
-/**
- * Adding more index to kill some slow queries:
- *     - user_language
- *     - user_archived
- *     - user_created
- *     - user_starred
- *     - tag_label
- *     - config_feed_token.
- */
-final class Version20190806130304 extends WallabagMigration
-{
-    public function up(Schema $schema): void
-    {
-        switch ($this->connection->getDatabasePlatform()->getName()) {
-            case 'sqlite':
-                $this->addSql('DROP INDEX uid');
-                $this->addSql('DROP INDEX created_at');
-                $this->addSql('DROP INDEX hashed_url_user_id');
-                $this->addSql('DROP INDEX IDX_F4D18282A76ED395');
-                $this->addSql('DROP INDEX hashed_given_url_user_id');
-                $this->addSql('CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, domain_name, preview_picture, uid, http_status, published_at, starred_at, origin_url, archived_at, given_url, reading_time, published_by, headers, hashed_url, hashed_given_url FROM ' . $this->getTable('entry', true));
-                $this->addSql('DROP TABLE ' . $this->getTable('entry', true));
-                $this->addSql('CREATE TABLE ' . $this->getTable('entry', true) . ' (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, user_id INTEGER DEFAULT NULL, title CLOB DEFAULT NULL COLLATE BINARY, url CLOB DEFAULT NULL COLLATE BINARY, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL COLLATE BINARY, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, uid VARCHAR(23) DEFAULT NULL COLLATE BINARY, http_status VARCHAR(3) DEFAULT NULL COLLATE BINARY, published_at DATETIME DEFAULT NULL, starred_at DATETIME DEFAULT NULL, origin_url CLOB DEFAULT NULL COLLATE BINARY, archived_at DATETIME DEFAULT NULL, given_url CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER NOT NULL, published_by CLOB DEFAULT NULL COLLATE BINARY --(DC2Type:array)
-                , headers CLOB DEFAULT NULL COLLATE BINARY --(DC2Type:array)
-                , hashed_url VARCHAR(40) DEFAULT NULL COLLATE BINARY, hashed_given_url VARCHAR(40) DEFAULT NULL COLLATE BINARY, language VARCHAR(20) DEFAULT NULL, CONSTRAINT FK_F4D18282A76ED395 FOREIGN KEY (user_id) REFERENCES "wallabag_user" (id) NOT DEFERRABLE INITIALLY IMMEDIATE)');
-                $this->addSql('INSERT INTO ' . $this->getTable('entry', true) . ' (id, user_id, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, domain_name, preview_picture, uid, http_status, published_at, starred_at, origin_url, archived_at, given_url, reading_time, published_by, headers, hashed_url, hashed_given_url) SELECT id, user_id, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, domain_name, preview_picture, uid, http_status, published_at, starred_at, origin_url, archived_at, given_url, reading_time, published_by, headers, hashed_url, hashed_given_url FROM __temp__wallabag_entry');
-                $this->addSql('DROP TABLE __temp__wallabag_entry');
-                $this->addSql('CREATE INDEX uid ON ' . $this->getTable('entry', true) . ' (uid)');
-                $this->addSql('CREATE INDEX created_at ON ' . $this->getTable('entry', true) . ' (created_at)');
-                $this->addSql('CREATE INDEX hashed_url_user_id ON ' . $this->getTable('entry', true) . ' (user_id, hashed_url)');
-                $this->addSql('CREATE INDEX IDX_F4D18282A76ED395 ON ' . $this->getTable('entry', true) . ' (user_id)');
-                $this->addSql('CREATE INDEX hashed_given_url_user_id ON ' . $this->getTable('entry', true) . ' (user_id, hashed_given_url)');
-                $this->addSql('CREATE INDEX user_language ON ' . $this->getTable('entry', true) . ' (language, user_id)');
-                $this->addSql('CREATE INDEX user_archived ON ' . $this->getTable('entry', true) . ' (user_id, is_archived, archived_at)');
-                $this->addSql('CREATE INDEX user_created ON ' . $this->getTable('entry', true) . ' (user_id, created_at)');
-                $this->addSql('CREATE INDEX user_starred ON ' . $this->getTable('entry', true) . ' (user_id, is_starred, starred_at)');
-                $this->addSql('CREATE INDEX tag_label ON ' . $this->getTable('tag', true) . ' (label)');
-                $this->addSql('CREATE INDEX config_feed_token ON ' . $this->getTable('config', true) . ' (feed_token)');
-                break;
-            case 'mysql':
-                $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' MODIFY language VARCHAR(20) DEFAULT NULL');
-                $this->addSql('CREATE INDEX user_language ON ' . $this->getTable('entry') . ' (language, user_id)');
-                $this->addSql('CREATE INDEX user_archived ON ' . $this->getTable('entry') . ' (user_id, is_archived, archived_at)');
-                $this->addSql('CREATE INDEX user_created ON ' . $this->getTable('entry') . ' (user_id, created_at)');
-                $this->addSql('CREATE INDEX user_starred ON ' . $this->getTable('entry') . ' (user_id, is_starred, starred_at)');
-                $this->addSql('CREATE INDEX tag_label ON ' . $this->getTable('tag') . ' (label (255))');
-                $this->addSql('CREATE INDEX config_feed_token ON ' . $this->getTable('config') . ' (feed_token (255))');
-                break;
-            case 'postgresql':
-                $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' ALTER language TYPE VARCHAR(20)');
-                $this->addSql('CREATE INDEX user_language ON ' . $this->getTable('entry') . ' (language, user_id)');
-                $this->addSql('CREATE INDEX user_archived ON ' . $this->getTable('entry') . ' (user_id, is_archived, archived_at)');
-                $this->addSql('CREATE INDEX user_created ON ' . $this->getTable('entry') . ' (user_id, created_at)');
-                $this->addSql('CREATE INDEX user_starred ON ' . $this->getTable('entry') . ' (user_id, is_starred, starred_at)');
-                $this->addSql('CREATE INDEX tag_label ON ' . $this->getTable('tag') . ' (label)');
-                $this->addSql('CREATE INDEX config_feed_token ON ' . $this->getTable('config') . ' (feed_token)');
-                break;
-        }
-    }
-
-    public function down(Schema $schema): void
-    {
-        switch ($this->connection->getDatabasePlatform()->getName()) {
-            case 'sqlite':
-                $this->addSql('DROP INDEX IDX_F4D18282A76ED395');
-                $this->addSql('DROP INDEX created_at');
-                $this->addSql('DROP INDEX uid');
-                $this->addSql('DROP INDEX hashed_url_user_id');
-                $this->addSql('DROP INDEX hashed_given_url_user_id');
-                $this->addSql('DROP INDEX user_language');
-                $this->addSql('DROP INDEX user_archived');
-                $this->addSql('DROP INDEX user_created');
-                $this->addSql('DROP INDEX user_starred');
-                $this->addSql('DROP INDEX tag_label');
-                $this->addSql('DROP INDEX config_feed_token');
-                $this->addSql('CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, uid, title, url, hashed_url, origin_url, given_url, hashed_given_url, is_archived, archived_at, is_starred, content, created_at, updated_at, published_at, published_by, starred_at, mimetype, language, reading_time, domain_name, preview_picture, http_status, headers FROM ' . $this->getTable('entry', true));
-                $this->addSql('DROP TABLE ' . $this->getTable('entry', true));
-                $this->addSql('CREATE TABLE ' . $this->getTable('entry', true) . ' (id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, user_id INTEGER DEFAULT NULL, uid VARCHAR(23) DEFAULT NULL, title CLOB DEFAULT NULL, url CLOB DEFAULT NULL, hashed_url VARCHAR(40) DEFAULT NULL, origin_url CLOB DEFAULT NULL, given_url CLOB DEFAULT NULL, hashed_given_url VARCHAR(40) DEFAULT NULL, is_archived BOOLEAN NOT NULL, archived_at DATETIME DEFAULT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, published_at DATETIME DEFAULT NULL, published_by CLOB DEFAULT NULL --(DC2Type:array)
-                , starred_at DATETIME DEFAULT NULL, mimetype CLOB DEFAULT NULL, reading_time INTEGER NOT NULL, domain_name CLOB DEFAULT NULL, preview_picture CLOB DEFAULT NULL, http_status VARCHAR(3) DEFAULT NULL, headers CLOB DEFAULT NULL --(DC2Type:array)
-                , language CLOB DEFAULT NULL COLLATE BINARY)');
-                $this->addSql('INSERT INTO ' . $this->getTable('entry', true) . ' (id, user_id, uid, title, url, hashed_url, origin_url, given_url, hashed_given_url, is_archived, archived_at, is_starred, content, created_at, updated_at, published_at, published_by, starred_at, mimetype, language, reading_time, domain_name, preview_picture, http_status, headers) SELECT id, user_id, uid, title, url, hashed_url, origin_url, given_url, hashed_given_url, is_archived, archived_at, is_starred, content, created_at, updated_at, published_at, published_by, starred_at, mimetype, language, reading_time, domain_name, preview_picture, http_status, headers FROM __temp__wallabag_entry');
-                $this->addSql('DROP TABLE __temp__wallabag_entry');
-                $this->addSql('CREATE INDEX IDX_F4D18282A76ED395 ON ' . $this->getTable('entry', true) . ' (user_id)');
-                $this->addSql('CREATE INDEX created_at ON ' . $this->getTable('entry', true) . ' (created_at)');
-                $this->addSql('CREATE INDEX uid ON ' . $this->getTable('entry', true) . ' (uid)');
-                $this->addSql('CREATE INDEX hashed_url_user_id ON ' . $this->getTable('entry', true) . ' (user_id, hashed_url)');
-                $this->addSql('CREATE INDEX hashed_given_url_user_id ON ' . $this->getTable('entry', true) . ' (user_id, hashed_given_url)');
-                break;
-            case 'mysql':
-                $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' MODIFY language LONGTEXT DEFAULT NULL');
-                $this->addSql('DROP INDEX user_language ON ' . $this->getTable('entry'));
-                $this->addSql('DROP INDEX user_archived ON ' . $this->getTable('entry'));
-                $this->addSql('DROP INDEX user_created ON ' . $this->getTable('entry'));
-                $this->addSql('DROP INDEX user_starred ON ' . $this->getTable('entry'));
-                $this->addSql('DROP INDEX tag_label ON ' . $this->getTable('tag'));
-                $this->addSql('DROP INDEX config_feed_token ON ' . $this->getTable('config'));
-                break;
-            case 'postgresql':
-                $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' ALTER language TYPE TEXT');
-                $this->addSql('DROP INDEX user_language ON ' . $this->getTable('entry'));
-                $this->addSql('DROP INDEX user_archived ON ' . $this->getTable('entry'));
-                $this->addSql('DROP INDEX user_created ON ' . $this->getTable('entry'));
-                $this->addSql('DROP INDEX user_starred ON ' . $this->getTable('entry'));
-                $this->addSql('DROP INDEX tag_label ON ' . $this->getTable('tag'));
-                $this->addSql('DROP INDEX config_feed_token ON ' . $this->getTable('config'));
-                break;
-        }
-    }
-}

app/DoctrineMigrations/Version20190808124957.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace Application\Migrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
-
-/**
- * Change the internal setting table name.
- */
-final class Version20190808124957 extends WallabagMigration
-{
-    public function up(Schema $schema): void
-    {
-        switch ($this->connection->getDatabasePlatform()->getName()) {
-            case 'sqlite':
-                $this->addSql('ALTER TABLE ' . $this->getTable('craue_config_setting', true) . ' RENAME TO ' . $this->getTable('internal_setting', true));
-                break;
-            case 'mysql':
-                $this->addSql('ALTER TABLE ' . $this->getTable('craue_config_setting') . ' RENAME ' . $this->getTable('internal_setting'));
-                break;
-            case 'postgresql':
-                $this->addSql('ALTER TABLE ' . $this->getTable('craue_config_setting') . ' RENAME TO ' . $this->getTable('internal_setting'));
-                break;
-        }
-    }
-
-    public function down(Schema $schema): void
-    {
-        switch ($this->connection->getDatabasePlatform()->getName()) {
-            case 'sqlite':
-                $this->addSql('ALTER TABLE ' . $this->getTable('internal_setting', true) . ' RENAME TO ' . $this->getTable('craue_config_setting', true));
-                break;
-            case 'mysql':
-                $this->addSql('ALTER TABLE ' . $this->getTable('internal_setting') . ' RENAME ' . $this->getTable('craue_config_setting'));
-                break;
-            case 'postgresql':
-                $this->addSql('ALTER TABLE ' . $this->getTable('internal_setting') . ' RENAME TO ' . $this->getTable('craue_config_setting'));
-                break;
-        }
-    }
-}

app/DoctrineMigrations/Version20190826204730.php

@@ -1,64 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Application\Migrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
-
-/**
- * Add tables for the ignore origin rules.
- */
-final class Version20190826204730 extends WallabagMigration
-{
-    public function up(Schema $schema): void
-    {
-        if (false === $schema->hasTable($this->getTable('ignore_origin_user_rule'))) {
-            $userTable = $schema->createTable($this->getTable('ignore_origin_user_rule', true));
-            $userTable->addColumn('id', 'integer', ['autoincrement' => true]);
-            $userTable->addColumn('config_id', 'integer');
-            $userTable->addColumn('rule', 'string', ['length' => 255]);
-            $userTable->addIndex(['config_id'], 'idx_config');
-            $userTable->setPrimaryKey(['id']);
-            $userTable->addForeignKeyConstraint($this->getTable('config'), ['config_id'], ['id'], [], 'fk_config');
-
-            if ('postgresql' === $this->connection->getDatabasePlatform()->getName()) {
-                $schema->dropSequence('ignore_origin_user_rule_id_seq');
-                $schema->createSequence('ignore_origin_user_rule_id_seq');
-            }
-        }
-
-        if (false === $schema->hasTable($this->getTable('ignore_origin_instance_rule'))) {
-            $instanceTable = $schema->createTable($this->getTable('ignore_origin_instance_rule', true));
-            $instanceTable->addColumn('id', 'integer', ['autoincrement' => true]);
-            $instanceTable->addColumn('rule', 'string', ['length' => 255]);
-            $instanceTable->setPrimaryKey(['id']);
-
-            if ('postgresql' === $this->connection->getDatabasePlatform()->getName()) {
-                $schema->dropSequence('ignore_origin_instance_rule_id_seq');
-                $schema->createSequence('ignore_origin_instance_rule_id_seq');
-            }
-        }
-    }
-
-    public function postUp(Schema $schema): void
-    {
-        foreach ($this->container->getParameter('wallabag_core.default_ignore_origin_instance_rules') as $entity) {
-            $previous_rule = $this->container
-                ->get('doctrine.orm.default_entity_manager')
-                ->getConnection()
-                ->fetchArray('SELECT * FROM ' . $this->getTable('ignore_origin_instance_rule') . " WHERE rule = '" . $entity['rule'] . "'");
-
-            if (false === $previous_rule) {
-                $this->addSql('INSERT INTO ' . $this->getTable('ignore_origin_instance_rule') . " (rule) VALUES ('" . $entity['rule'] . "');");
-            }
-        }
-    }
-
-    public function down(Schema $schema): void
-    {
-        $schema->dropTable($this->getTable('ignore_origin_user_rule'));
-        $schema->dropTable($this->getTable('ignore_origin_instance_rule'));
-    }
-}

app/DoctrineMigrations/Version20200428072628.php

@@ -1,28 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Application\Migrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
-
-/**
- * Renamed Piwik to Matomo in configuration.
- */
-final class Version20200428072628 extends WallabagMigration
-{
-    public function up(Schema $schema): void
-    {
-        $this->addSql('UPDATE ' . $this->getTable('internal_setting', true) . " SET name = 'matomo_enabled' where name = 'piwik_enabled';");
-        $this->addSql('UPDATE ' . $this->getTable('internal_setting', true) . " SET name = 'matomo_host' where name = 'piwik_host';");
-        $this->addSql('UPDATE ' . $this->getTable('internal_setting', true) . " SET name = 'matomo_site_id' where name = 'piwik_site_id';");
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('UPDATE ' . $this->getTable('internal_setting', true) . " SET name = 'piwik_enabled' where name = 'matomo_enabled';");
-        $this->addSql('UPDATE ' . $this->getTable('internal_setting', true) . " SET name = 'piwik_host' where name = 'matomo_host';");
-        $this->addSql('UPDATE ' . $this->getTable('internal_setting', true) . " SET name = 'piwik_site_id' where name = 'matomo_site_id';");
-    }
-}

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.an.yml

@@ -1 +0,0 @@
-{}

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ar.yml

@@ -1 +0,0 @@
-{}

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.cs.yml

@@ -1,21 +0,0 @@
-matomo_enabled: Povolit Matomo
-unmark_url: Unmark URL adresa, pokud je služba povolena
-scuttle_url: Scuttle URL adresa, pokud je služba povolena
-shaarli_url: Shaarli URL adresa, pokud je služba povolena
-share_unmark: Povolit sdílení na Unmark.it
-share_twitter: Povolit sdílení na Twitteru
-share_scuttle: Povolit sdílení na Scuttle
-share_shaarli: Povolit sdílení na Shaarli
-share_mail: Povolit sdílení emailem
-share_diaspora: Povolit sdílení na diaspora*
-export_xml: Povolit export do XML
-export_txt: Povolit export do TXT
-export_epub: Povolit export do ePub
-export_json: Povolit export do JSON
-export_csv: Povolit export do CSV
-export_pdf: Povolit export do PDF
-export_mobi: Povolit export do .mobi
-diaspora_url: diaspora* URL adresa, pokud je služba povolena
-carrot: Povolit sdílet na Carrot
-download_pictures: Stáhnout obrázky na váš server
-settings_changed: Nastavení bylo aktualizováno

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml

@@ -1,6 +1,7 @@
+# settings_changed: Configuration updated
 download_pictures: Download billeder på din server
 carrot: Aktiver deling til Carrot
-diaspora_url: diaspora* URL, hvis tjenesten er aktiv
+diaspora_url: Diaspora URL, hvis tjenesten er aktiv
 export_epub: Aktiver eksport til ePub
 export_mobi: Aktiver eksport til .mobi
 export_pdf: Aktiver eksport til PDF
@@ -8,10 +9,12 @@ export_csv: Aktiver eksport til CSV
 export_json: Aktiver eksport til JSON
 export_txt: Aktiver eksport til TXT
 export_xml: Aktiver eksport til XML
+# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
+# import_with_redis: Enable Redis to import data asynchronously
 shaarli_url: Shaarli-URL, hvis tjenesten er aktiv
 scuttle_url: Scuttle-URL, hvis tjenesten er aktiv
 unmark_url: Unmark-URL, hvis tjenesten er aktiv
-share_diaspora: Aktiver deling til diaspora*
+share_diaspora: Aktiver deling til Diaspora
 share_mail: Aktiver deling med email
 share_shaarli: Aktiver deling gennem Shaarli
 share_scuttle: Aktiver deling gennem Scuttle
@@ -24,8 +27,14 @@ export: "eksport"
 import: "import"
 misc: "misc"
 modify_settings: "Gem ændring"
-matomo_host: Hosting af din side hos Matomo (uden http:// eller https://)
-matomo_site_id: ID for din side hos Matomo
-matomo_enabled: Aktiver Matomo
+piwik_host: Hosting af din side hos Piwik (uden http:// eller https://)
+piwik_site_id: ID for din side hos Piwik
+piwik_enabled: Aktiver Piwik
 demo_mode_enabled: "Aktiver demo-indstilling? (anvendes kun til wallabags offentlige demo)"
 demo_mode_username: "Demobruger"
+# share_public: Allow public url for entries
+# download_images_enabled: Download images locally
+# restricted_access: Enable authentication for websites with paywall
+# 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

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml

@@ -1,43 +1,40 @@
-settings_changed: Konfiguration aktualisiert
-download_pictures: Bilder auf den Server herunterladen
-carrot: Teilen zu Carrot aktivieren
-diaspora_url: diaspora*-URL, sofern der Service aktiviert ist
-export_epub: ePUB-Export aktivieren
-export_mobi: mobi-Export aktivieren
-export_pdf: PDF-Export aktivieren
-export_csv: CSV-Export aktivieren
-export_json: JSON-Export aktivieren
-export_txt: TXT-Export aktivieren
-export_xml: XML-Export aktivieren
-import_with_rabbitmq: Aktiviere RabbitMQ, um Artikel asynchron zu importieren
-import_with_redis: Aktiviere Redis, um Artikel asynchron zu importieren
-shaarli_url: Shaarli-URL, sofern der Service aktiviert ist
-scuttle_url: Scuttle-URL, sofern der Service aktiviert ist
-unmark_url: Unmark-URL, sofern der Service aktiviert ist
-share_diaspora: Freigabe für diaspora* aktivieren
-share_mail: Freigabe per E-Mail aktivieren
-share_shaarli: Freigabe für Shaarli aktivieren
-share_twitter: Freigabe für Twitter aktivieren
-share_unmark: Freigabe für Unmark.it aktivieren
-show_printlink: Link anzeigen, um den Inhalt auszudrucken
-wallabag_support_url: Support-URL für wallabag
-wallabag_url: URL von *deiner* wallabag-Instanz
-entry: Artikel
-export: Export
-import: Import
-misc: Verschiedenes
-modify_settings: Übernehmen
-matomo_host: Host deiner Webseite in Matomo (ohne http:// oder https://)
-matomo_site_id: ID deiner Webseite in Matomo
-matomo_enabled: Matomo aktivieren
-demo_mode_enabled: Demo-Modus aktivieren? (Wird nur für die öffentliche Wallabag-Demo
-  verwendet)
-demo_mode_username: Test-Benutzer
-share_public: Öffentliche URLs für Einträge zulassen
-download_images_enabled: Bilder lokal herunterladen
-restricted_access: Authentifizierung für Webseiten mit Paywall aktivieren
-api_user_registration: Registrierung eines Benutzers über die API ermöglichen
-store_article_headers: Speichern von HTTP-Headern für jeden Artikel aktivieren
-shaarli_share_origin_url: Original-URL mit Shaarli teilen, wenn der Service aktiviert
-  ist
-share_scuttle: Freigabe für Scuttle aktivieren
+settings_changed: 'Konfiguration aktualisiert'
+download_pictures: 'Bilder auf den Server herunterladen'
+carrot: 'Teilen zu Carrot aktivieren'
+diaspora_url: 'Diaspora-URL, sofern der Service aktiviert ist'
+export_epub: 'ePUB-Export aktivieren'
+export_mobi: 'mobi-Export aktivieren'
+export_pdf: 'PDF-Export aktivieren'
+export_csv: 'CSV-Export aktivieren'
+export_json: 'JSON-Export aktivieren'
+export_txt: 'TXT-Export aktivieren'
+export_xml: 'XML-Export aktivieren'
+import_with_rabbitmq: 'Aktiviere RabbitMQ, um Artikel asynchron zu importieren'
+import_with_redis: 'Aktiviere Redis, um Artikel asynchron zu importieren'
+shaarli_url: 'Shaarli-URL, sofern der Service aktiviert ist'
+scuttle_url: 'Scuttle-URL, sofern der Service aktiviert ist'
+unmark_url: 'Unmark-URL, sofern der Service aktiviert ist'
+share_diaspora: 'Teilen zu Diaspora aktiveren'
+share_mail: 'Teilen via E-Mail aktiveren'
+share_shaarli: 'Teilen zu Shaarli aktiveren'
+share_twitter: 'Teilen zu Twitter aktiveren'
+share_unmark: 'Teilen zu Unmark.it aktiveren'
+show_printlink: 'Link anzeigen, um den Inhalt auszudrucken'
+wallabag_support_url: 'Support-URL für wallabag'
+wallabag_url: 'URL von *deiner* wallabag-Instanz'
+entry: 'Artikel'
+export: 'Export'
+import: 'Import'
+misc: 'Verschiedenes'
+modify_settings: 'Übernehmen'
+piwik_host: 'Host deiner Webseite in Piwik (ohne http:// oder https://)'
+piwik_site_id: 'ID deiner Webseite in Piwik'
+piwik_enabled: 'Piwik aktivieren'
+demo_mode_enabled: 'Test-Modus aktivieren? (nur für die öffentliche wallabag-Demo genutzt)'
+demo_mode_username: 'Test-Benutzer'
+share_public: 'Erlaube eine öffentliche URL für Einträge'
+download_images_enabled: 'Bilder lokal herunterladen'
+restricted_access: 'Authentifizierung für Webseiten mit Paywall aktivieren'
+api_user_registration: 'Registrierung eines Benutzers über die API ermöglichen'
+store_article_headers: 'Speichern von HTTP-Headern für jeden Artikel aktivieren'
+shaarli_share_origin_url: 'Original-URL mit Shaarli teilen, wenn der Service aktiviert ist'

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.el.yml

@@ -1,40 +0,0 @@
-shaarli_share_origin_url: Ενεργοποίηση κοινοποίησης πρωτότυπου URL στο Shaarli, αν είναι ενεργοποιημένη η υπηρεσία
-store_article_headers: Ενεργοποίηση αποθήκευσης επικεφαλίδων HTTP για κάθε άρθρο
-api_user_registration: Ενεργοποίηση εγγραφής χρήστη μέσω του API
-restricted_access: Ενεργοποίηση επαλήθευσης για ιστοσελίδες με paywall
-download_images_enabled: Λήψη εικόνων τοπικά
-share_public: Να επιτρέπονται URL για τα άρθρα
-demo_mode_username: Χρήστης demo
-demo_mode_enabled: Ενεργοποίηση λειτουργίας demo; (Χρησιμοποιείται μόνο για το δημόσιο demo του wallabag)
-matomo_enabled: Ενεργοποίηση Matomo
-matomo_site_id: ID της ιστοσελίδας σας στο Matomo
-matomo_host: Διεύθυνση της ιστοσελίδας σας στο Matomo (χωρίς http:// ή https://)
-modify_settings: εφαρμογή
-misc: ποικίλα
-import: εισαγωγή
-export: εξαγωγή
-entry: άρθρο
-wallabag_support_url: Υποστήριξη URL για wallabag
-show_printlink: Προβολή συνδέσμου για εκτύπωση περιεχομένου
-share_unmark: Ενεργοποίηση κοινοποίησης στο Unmark.it
-share_twitter: Ενεργοποίηση κοινοποίησης στο Twitter
-share_scuttle: Ενεργοποίηση κοινοποίησης στο Scuttle
-share_shaarli: Ενεργοποίηση κοινοποίησης στο Shaarli
-share_mail: Ενεργοποίηση κοινοποίησης με ηλεκτρονικό ταχυδρομείο
-share_diaspora: Ενεργοποίηση κοινοποίησης στο diaspora*
-unmark_url: URL του Unmark, αν είναι ενεργοποιημένη η υπηρεσία
-scuttle_url: URL του Scuttle, αν είναι ενεργοποιημένη η υπηρεσία
-shaarli_url: URL του Shaarli, αν είναι ενεργοποιημένη η υπηρεσία
-import_with_redis: Ενεργοποίηση Redis για την ασύγχρονη εισαγωγή δεδομένων
-import_with_rabbitmq: Ενεργοποίηση RabbitMQ για την ασύγχρονη εισαγωγή δεδομένων
-export_xml: Ενεργοποίηση εξαγωγής ΧΜΛ
-export_txt: Ενεργοποίηση εξαγωγής TXT
-export_json: Ενεργοποίηση εξαγωγής JSON
-export_csv: Ενεργοποίηση εξαγωγής CSV
-export_pdf: Ενεργοποίηση εξαγωγής PDF
-export_mobi: Ενεργοποίηση εξαγωγής .mobi
-export_epub: Ενεργοποίηση εξαγωγής ePub
-diaspora_url: URL του diaspora*, αν είναι ενεργοποιημένη η υπηρεσία
-carrot: Ενεργοποίηση κοινοποίησης στο Carrot
-download_pictures: Λήψη των εικόνων στον διακομιστή σας
-settings_changed: Η ρύθμιση παραμέτρων ενημερώθηκε

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml

@@ -1,5 +1,5 @@
 settings_changed: Configuration updated
-download_pictures: Download pictures onto your server
+download_pictures: Download pictures on your server
 carrot: Enable share to Carrot
 diaspora_url: diaspora* URL, if the service is enabled
 export_epub: Enable ePub export
@@ -22,19 +22,19 @@ share_twitter: Enable sharing to Twitter
 share_unmark: Enable sharing to Unmark.it
 show_printlink: Display a link to print content
 wallabag_support_url: Support URL for wallabag
-entry: article
-export: export
-import: import
-misc: misc
-modify_settings: apply
-matomo_host: Host of your website in Matomo (without http:// or https://)
-matomo_site_id: ID of your website in Matomo
-matomo_enabled: Enable Matomo
-demo_mode_enabled: Enable demo mode? (Only used for the public wallabag demo)
-demo_mode_username: Demo user
-share_public: Allow public URLs for entries
+entry: "article"
+export: "export"
+import: "import"
+misc: "misc"
+modify_settings: "apply"
+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)"
+demo_mode_username: "Demo user"
+share_public: Allow public URL for entries
 download_images_enabled: Download images locally
 restricted_access: Enable authentication for paywalled websites
-api_user_registration: Turn on user registration via the API
+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

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml

@@ -1,7 +1,7 @@
 settings_changed: Configuración actualizada
 download_pictures: Descargar imágenes en el servidor
-carrot: Activar compartir en Carrot
-diaspora_url: URL de diaspora*, si el servicio está activado
+carrot: Activar compartir con Carrot
+diaspora_url: URL de Diaspora, si el servicio está activado
 export_epub: Activar exportación a ePub
 export_mobi: Activar exportación a .mobi
 export_pdf: Activar exportación a PDF
@@ -14,27 +14,27 @@ import_with_redis: Activar Redis para importar datos de forma asíncrona
 shaarli_url: URL de Shaarli, si el servicio está activado
 scuttle_url: URL de Scuttle, si el servicio está activado
 unmark_url: URL de Unmark, si el servicio está activado
-share_diaspora: Activar compartir en diaspora*
-share_mail: Activar compartir por correo electrónico
-share_shaarli: Activar compartir en Shaarli
-share_scuttle: Activar compartir en Scuttle
-share_twitter: Activar compartir en Twitter
-share_unmark: Activar compartir en Unmark.it
-show_printlink: Mostrar un enlace para imprimir el contenido
+share_diaspora: Activar compartir con Diaspora
+share_mail: Activar compartir con Email
+share_shaarli: Activar compartir con Shaarli
+share_scuttle: Activar compartir con Scuttle
+share_twitter: Activar compartir con Twitter
+share_unmark: Activar compartir con Unmark.it
+show_printlink: Mostrar un enlace para imprimir contenido
 wallabag_support_url: URL de soporte de wallabag
 entry: "artículo"
 export: "exportar"
 import: "importar"
 misc: "misc"
 modify_settings: "guardar"
-matomo_host: Host de tu website en Matomo (sin http:// o https://)
-matomo_site_id: ID de tu website en Matomo
-matomo_enabled: Activar Matomo
+piwik_host: Host de tu website en Piwik (sin http:// o https://)
+piwik_site_id: ID de tu website en Piwik
+piwik_enabled: Activar Piwik
 demo_mode_enabled: "Activar modo demo (sólo usado en la demo pública de wallabag)"
 demo_mode_username: "Nombre de usuario demo"
-share_public: Permitir URLs públicas para los artículos
+share_public: Permitir URL pública para los artículos
 download_images_enabled: Descargar imágenes localmente
 restricted_access: Activar autenticación para websites con paywall
-api_user_registration: Permitir el registro de usuarios utilizando el API
-shaarli_share_origin_url: Activar compartir en Shaarli, si el servicio está habilitado
-store_article_headers: Activar si wallabag almacena encabezados HTTP para cada artículo
+# 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

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.eu.yml

@@ -1 +0,0 @@
-{}

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml

@@ -1,3 +1,4 @@
+# settings_changed: Configuration updated
 download_pictures: تصاویر را در کارگزار خودتان باربگیرید
 carrot: فعال‌سازی هم‌رسانی به Carrot
 diaspora_url: نشانی Diaspora، اگر فعال بود
@@ -8,6 +9,8 @@ export_csv:  فعال‌سازی برون‌سپاری به CSV
 export_json:  فعال‌سازی برون‌سپاری به JSON
 export_txt:  فعال‌سازی برون‌سپاری به TXT
 export_xml:  فعال‌سازی برون‌سپاری به XML
+# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
+# import_with_redis: Enable Redis to import data asynchronously
 shaarli_url: نشانی Shaarli، اگر فعال بود
 scuttle_url: نشانی Scuttle، اگر فعال بود
 unmark_url: نشانی Unmark، اگر فعال بود
@@ -24,3 +27,14 @@ export: "برون‌سپاری"
 import: "درون‌ریزی"
 misc: "غیره"
 modify_settings: "اعمال"
+# piwik_host: Host of your website in Piwik (without http:// or https://)
+# piwik_site_id: ID of your website in Piwik
+# piwik_enabled: Enable Piwik
+# demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
+# demo_mode_username: "Demo user"
+# share_public: Allow public url for entries
+# download_images_enabled: Download images locally
+# restricted_access: Enable authentication for websites with paywall
+# 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

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml

@@ -1,7 +1,7 @@
 settings_changed: Configuration mise à jour
 download_pictures: Télécharger les images sur le serveur
 carrot: Activer le partage vers Carrot
-diaspora_url: URL de diaspora*, si le service est activé
+diaspora_url: URL de Diaspora, si le service Diaspora est activé
 export_epub: Activer l'export ePub
 export_mobi: Activer l'export .mobi
 export_pdf: Activer l'export PDF
@@ -14,27 +14,27 @@ import_with_redis: Activer Redis pour gérer les imports de façon asynchrone
 shaarli_url: URL de Shaarli, si le service Shaarli est activé
 scuttle_url: URL de Scuttle, si le service Scuttle est activé
 unmark_url: URL de Unmark, si le service Unmark est activé
-share_diaspora: Activer le partage vers diaspora*
-share_mail: Activer le partage par courriel
+share_diaspora: Activer le partage vers Diaspora
+share_mail: Activer le partage par email
 share_shaarli: Activer le partage vers Shaarli
 share_scuttle: Activer le partage vers Scuttle
 share_twitter: Activer le partage vers Twitter
 share_unmark: Activer le partage vers Unmark.it
 show_printlink: Afficher un lien pour imprimer
 wallabag_support_url: URL de support de wallabag
-entry: article
-export: export
-import: import
-misc: divers
-modify_settings: appliquer
-matomo_host: URL de votre site dans Matomo (sans http:// ou https://)
-matomo_site_id: ID de votre site dans Matomo
-matomo_enabled: Activer Matomo
-demo_mode_enabled: Activer le mode démo ? (Utiliser uniquement pour la démo publique de wallabag)
-demo_mode_username: Utilisateur de la démo
-share_public: Autoriser les URL publiques pour les articles
+entry: "article"
+export: "export"
+import: "import"
+misc: "divers"
+modify_settings: "appliquer"
+piwik_host: URL de votre site dans Piwik (sans http:// ou https://)
+piwik_site_id: ID de votre site dans Piwik
+piwik_enabled: Activer Piwik
+demo_mode_enabled: "Activer le mode démo ? (utiliser uniquement pour la démo publique de wallabag)"
+demo_mode_username: "Utilisateur de la démo"
+share_public: Autoriser une URL publique pour les articles
 download_images_enabled: Télécharger les images en local
-restricted_access: Activer l'authentification pour les sites avec paywall
+restricted_access: Activer l'authentification pour les articles derrière un paywall
 api_user_registration: Activer la création de compte depuis l'API
 store_article_headers: Activer le stockage des en-têtes HTTP de chaque article
 shaarli_share_origin_url: Activer le partage de l'adresse d'origine vers Shaarli, si le service est activé

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.gl.yml

@@ -1,40 +0,0 @@
-shaarli_share_origin_url: Activar a compartición do URL de orixe en Shaarli, se o servizo está activo
-store_article_headers: Activar se wallabag garda cabeceiras HTTP para cada artigo
-api_user_registration: Activar rexistro de usuarias a través da API
-restricted_access: Activar autenticación para sitios web con acceso de pagamento
-download_images_enabled: Descargar imaxes localmente
-share_public: Permitir URLs públicos para entradas
-demo_mode_username: Usuaria Demo
-demo_mode_enabled: Activar modo demostración? (Só se usa na demo pública de wallabag)
-matomo_enabled: Activar Matomo
-matomo_site_id: ID do teu sitio web en Matomo
-matomo_host: Servidor do teu sitio web en Matomo (sen http:// ou https://)
-modify_settings: aplicar
-misc: varios
-import: importar
-export: exportar
-entry: artigo
-wallabag_support_url: URL de axuda de wallabag
-show_printlink: Mostrar unha ligazón para imprimir o contido
-share_unmark: Activar a compartición en Unmark.it
-share_twitter: Activar a compartición en Twitter
-share_scuttle: Activar a compartición en Scuttle
-share_shaarli: Activar a compartición en Shaarli
-share_mail: Activar a compartición por email
-share_diaspora: Activar a compartición en diaspora*
-unmark_url: URL Unmark, se o servizo está activo
-scuttle_url: URL Scuttle, se o servizo está activo
-shaarli_url: URL Shaarli, se o servizo está activo
-import_with_redis: Activar a importación asíncrona con Redis
-import_with_rabbitmq: Activar a importación asíncrona con RabbitMQ
-export_xml: Activar exportación XML
-export_txt: Activar exportación TXT
-export_json: Activar exportación JSON
-export_csv: Activar exportación CSV
-export_pdf: Activar exportación PDF
-export_mobi: Activar exportación .mobi
-export_epub: Activar exportación ePub
-diaspora_url: URL de diaspora*, se o servizo está activo
-carrot: Activar compartir en Carrot
-download_pictures: Descargar imaxes no teu servidor
-settings_changed: Configuración actualizada

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.hi.yml

@@ -1 +0,0 @@
-{}

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.hr.yml

@@ -1,40 +0,0 @@
-share_diaspora: Aktiviraj dijeljenje na diaspora*
-share_twitter: Aktiviraj dijeljenje na Twitter
-shaarli_share_origin_url: Aktiviraj dijeljenje URL-a izvora na Shaarli, ako je usluga aktivirana
-export_csv: Aktiviraj CSV izvoz
-matomo_site_id: ID tvoje web-stranice u Matomo
-share_mail: Aktiviraj dijeljenje putem e-maila
-export_txt: Aktiviraj TXT izvoz
-download_images_enabled: Preuzmi slike lokalno
-share_scuttle: Aktiviraj dijeljenje na Scuttle
-export: izvezi
-export_json: Aktiviraj JSON izvoz
-store_article_headers: Aktiviraj, ako wallabag sprema HTTP zaglavlja za svaki članak
-entry: članak
-share_shaarli: Aktiviraj dijeljenje na Shaarli
-scuttle_url: Scuttle URL, ako je usluga aktivirana
-share_unmark: Aktiviraj dijeljenje na Unmark.it
-export_pdf: Aktiviraj PDF izvoz
-matomo_enabled: Aktiviraj Matomo
-import_with_redis: Aktiviraj Redis za asinkroni uvoz podataka
-restricted_access: Aktiviraj autentifikaciju za naplatne web-stranice
-export_mobi: Aktiviraj .mobi izvoz
-demo_mode_enabled: Aktivirati demo modus? (Koristi se samo za javnu wallabag demonstraciju)
-carrot: Aktiviraj dijeljenje na Carrot
-diaspora_url: diaspora* URL, ako je usluga aktivirana
-import_with_rabbitmq: Aktiviraj RabbitMQ za asinkroni uvoz podataka
-api_user_registration: Aktiviraj korisničku registraciju putem sučelja
-settings_changed: Konfiguracija aktualizirana
-matomo_host: Računalo tvoje web-stranice u Matomo (bez http:// ili https://)
-unmark_url: Unmark URL, ako je usluga aktivirana
-shaarli_url: Shaarli URL, ako je usluga aktivirana
-download_pictures: Preuzmi slike na vlastiti poslužitelj
-modify_settings: primijeni
-export_epub: Aktiviraj ePub izvoz
-misc: razno
-wallabag_support_url: URL podrške za wallabag
-export_xml: Aktiviraj XML izvoz
-show_printlink: Za ispis sadržaja, prikaži poveznicu
-demo_mode_username: Demo korisnik
-import: uvezi
-share_public: Dozvoli javne URL-ove za zapise

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.hu.yml

@@ -1,42 +0,0 @@
-settings_changed: Beállítások frissítve
-download_pictures: Képek letöltése a kiszolgálóra
-carrot: Megosztás engedélyezése a Carrot-ra
-diaspora_url: diaspora* URL, ha a szolgáltatás engedélyezett
-export_epub: ePub-ba exportálás engedélyezése
-export_mobi: .mobi-ba exportálás engedélyezése
-export_pdf: PDF-be exportálás engedélyezése
-export_csv: CSV-be exportálás engedélyezése
-export_json: JSON-ba exportálás engedélyezése
-export_txt: TXT-be exportálás engedélyezése
-export_xml: XML-be exportálás engedélyezése
-import_with_rabbitmq: A RabbitMQ aszinkron adatimportálásának engedélyezése
-import_with_redis: A Redis aszinkron adatimportálásának engedélyezése
-shaarli_url: Shaarli URL, ha a szolgáltatás engedélyezett
-scuttle_url: Scuttle URL, ha a szolgáltatás engedélyezett
-unmark_url: Unmark URL, ha a szolgáltatás engedélyezett
-share_diaspora: Megosztás engedélyezése a diaspora*-ra
-share_mail: Megosztás engedélyezése e-mail-ben
-share_shaarli: Megosztás engedélyezése a Shaarli-ra
-share_scuttle: Megosztás engedélyezése a Scuttle-ra
-share_twitter: Megosztás engedélyezése a Twitter-re
-share_unmark: Megosztás engedélyezése az Unmark.it-ra
-show_printlink: Hivatkozás mutatása a tartalom nyomtatására
-wallabag_support_url: Támogatási URL a wallabag-hoz
-entry: cikk
-export: exportál
-import: importál
-misc: egyéb
-modify_settings: alkalmaz
-piwik_host: Weboldalának hosztja a Piwik-en (http:// vagy https:// nélkül)
-piwik_site_id: Weboldalának azonosítója (ID-je) a Piwik-en
-piwik_enabled: Piwik engedélyezése
-demo_mode_enabled: Engedélyezi a bemutató (demó) módot? (Csak a nyilvános wallabag
-  demóhoz használva)
-demo_mode_username: Demó felhasználó
-share_public: Nyilvános URL-ek engedélyezése a bejegyzésekhez
-download_images_enabled: Képek letöltése helyileg
-restricted_access: Hitelesítés engedélyezése paywalled weboldalakhoz
-api_user_registration: Felhasználó API-n keresztüli regisztrálásának engedélyezése
-store_article_headers: HTTP fejlécek tárolása az összes cikkhez
-shaarli_share_origin_url: Az eredeti URL megosztásának engedélyezése a Shaarli-n,
-  ha a szolgáltatás engedélyezett

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml

@@ -1,6 +1,7 @@
+# settings_changed: Configuration updated
 download_pictures: Scarica le immagini sul tuo server
 carrot: Abilita la condivisione con Carrot
-diaspora_url: URL di diaspora*, se il servizio è abilitato
+diaspora_url: Diaspora URL, se il servizio è abilitato
 export_epub: Abilita esportazione ePub
 export_mobi: Abilita esportazione .mobi
 export_pdf: Abilita esportazione PDF
@@ -8,11 +9,13 @@ export_csv: Abilita esportazione CSV
 export_json: Abilita esportazione JSON
 export_txt: Abilita esportazione TXT
 export_xml: Abilita esportazione XML
+# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
+# import_with_redis: Enable Redis to import data asynchronously
 shaarli_url: Shaarli URL, se il servizio è abilitato
 scuttle_url: Scuttle URL, se il servizio è abilitato
 unmark_url: Unmark URL, se il servizio è abilitato
-share_diaspora: Abilita la condivisione con diaspora*
-share_mail: Abilita la condivisione per e-mail
+share_diaspora: Abilita la condivisione con Diaspora
+share_mail: Abilita la condivisione per email
 share_shaarli: Abilita la condivisione con Shaarli
 share_scuttle: Abilita la condivisione con Scuttle
 share_twitter: Abilita la condivisione con Twitter
@@ -24,10 +27,14 @@ export: "esporta"
 import: "importa"
 misc: "misc"
 modify_settings: "applica"
-matomo_host: Host del tuo sito in Matomo (senza http:// o https://)
-matomo_site_id: ID del tuo sito in Matomo
-matomo_enabled: Abilita Matomo
+piwik_host: Host del tuo sito in Piwik (senza http:// o https://)
+piwik_site_id: ID del tuo sito in Piwik
+piwik_enabled: Abilita Piwik
 demo_mode_enabled: "Abilita modalità demo ? (usato solo per la demo pubblica di wallabag)"
 demo_mode_username: "Utente Demo"
+# share_public: Allow public url for entries
+# download_images_enabled: Download images locally
+# restricted_access: Enable authentication for websites with paywall
 api_user_registration: Abilita la registrazione dell'utente attraverso l'API
-settings_changed: Configurazione aggiornata
+# 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