Remove duplicate message when trying to create a user with same username

.babelrc

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

.editorconfig

@@ -9,7 +9,7 @@ indent_size = 4
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.{js,css,scss}]
+[*.{js,css}]
 indent_style = space
 indent_size = 2
 
@@ -18,6 +18,3 @@ indent_style = tab
 
 [.github/**.yml]
 indent_size = 2
-
-[phpstan-baseline.neon]
-indent_style = tab

.eslintrc.json

@@ -1,9 +1,6 @@
 {
     "extends": "airbnb-base",
     "parser": "@babel/eslint-parser",
-    "parserOptions": {
-        "requireConfigFile": false
-    },
     "env": {
         "browser": true,
         "es6": true

.github/CONTRIBUTING.md

@@ -7,11 +7,11 @@
 - Clone the repository
 - Ensure your Docker daemon is running
 - Copy `docker/php/env.example` to `docker/php/env` and customize
-- Launch `docker compose run --rm php composer install` to bootstrap php dependencies
-- Launch `docker compose run --rm php bin/console wallabag:install` to bootstrap your installation
-- Launch `docker compose run --rm php yarn install` to bootstrap dependencies for the frontend
-- Launch `docker compose run --rm php yarn build:dev` to build assets for the frontend
-- Launch `docker compose up -d` to start the stack
+- Launch `docker-compose run --rm php composer install` to bootstrap php dependencies
+- Launch `docker-compose run --rm php bin/console wallabag:install` to bootstrap your installation
+- Launch `docker-compose run --rm php yarn install` to bootstrap dependencies for the frontend
+- Launch `docker-compose run --rm php yarn build:dev` to build assets for the frontend
+- Launch `docker-compose up -d` to start the stack
 
 You'll then have:
 - a PHP daemon with standalone web server
@@ -20,11 +20,11 @@ You'll then have:
 
 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 `compose.yaml` 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.
+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 >= 8.2.
+- Ensure you are running PHP >= 7.4.
 - 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)
@@ -50,12 +50,12 @@ Please fork wallabag and work with **the master branch**.
 
 All pull requests need to pass the tests and the code needs match the style guide.
 
-To run the tests locally run `make test`.
+To run the tests locally run:
 
-To run the PHP formatter run `make fix-cs`.
+- when testing using Docker: `docker-compose run --rm php make test`
+- otherwise: `make test`
 
-To run the PHPStan static analysis run `make phpstan`.
+To run the PHP formatter:
 
-To run the JS linter run `make lint-js`.
-
-To run the SCSS linter run `make lint-scss`.
+- when testing using Docker: `docker-compose run --rm php bin/php-cs-fixer fix`
+- otherwise: `php bin/php-cs-fixer fix`

.github/ISSUE_TEMPLATE/config.yml

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

.github/dependabot.yml

@@ -7,41 +7,25 @@ updates:
     time: "04:00"
     timezone: Europe/Paris
   open-pull-requests-limit: 10
-  groups:
-    babel-dependencies:
-      patterns:
-        - "*babel*"
-    fontsource-dependencies:
-      patterns:
-        - "*fontsource*"
   ignore:
-  - dependency-name: "@materializecss/materialize"
+  - dependency-name: materialize-css
     versions:
-    - "> 1.2.2"
+    - "> 0.98.2"
 - package-ecosystem: composer
   directory: "/"
   schedule:
-    interval: weekly
+    interval: daily
     time: "04:00"
     timezone: Europe/Paris
   open-pull-requests-limit: 10
-  groups:
-    symfony-dependencies:
-      patterns:
-        - "symfony/*"
-    twig-dependencies:
-      patterns:
-        - "twig/*"
-    phpstan-dependencies:
-      patterns:
-        - "phpstan/*"
   reviewers:
   - j0k3r
-  - yguedidi
+  - tcitworld
   - Kdecherf
   ignore:
-  - dependency-name: symfony/*
-    update-types: [ "version-update:semver-major" ]
+  - dependency-name: lcobucci/jwt
+    versions:
+    - ">= 4.2.0"
 - package-ecosystem: github-actions
   directory: "/"
   schedule:

.github/workflows/assets.yml

@@ -0,0 +1,44 @@
+name: "Assets"
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - 2.*
+
+permissions:
+  contents: read
+
+jobs:
+  js:
+    name: "Building assets"
+    runs-on: "ubuntu-20.04"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v3"
+
+      - name: "Install Node"
+        uses: actions/setup-node@v3
+        with:
+          node-version: "16"
+
+      - 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

@@ -5,7 +5,7 @@ on:
   push:
     branches:
       - master
-      - "2.**"
+      - 2.*
 
 permissions:
   contents: read
@@ -13,78 +13,42 @@ permissions:
 jobs:
   coding-standards:
     name: "CS Fixer, PHPStan & TwigCS"
-    runs-on: ubuntu-latest
+    runs-on: "ubuntu-20.04"
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v4"
+        uses: "actions/checkout@v3"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
         with:
           coverage: "none"
-          php-version: "8.2"
+          php-version: "7.4"
           tools: cs2pr, pecl
           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 Node"
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: ".nvmrc"
-          cache: 'yarn'
-
-      - name: "Setup MySQL"
-        run: |
-          sudo systemctl start mysql.service
-          sudo mysql -u root -proot -h 127.0.0.1 -e "CREATE DATABASE wallabag_test"
-          cp app/config/tests/parameters_test.mysql.yml app/config/parameters_test.yml
-
       - name: "Install dependencies with Composer"
-        id: composer-install
-        uses: "ramsey/composer-install@v3"
+        uses: "ramsey/composer-install@v2"
         with:
           composer-options: "--optimize-autoloader --prefer-dist"
 
-      - name: "Install dependencies with Yarn"
-        id: yarn-install
-        run: yarn install
-
-      - name: "Run Composer validate"
-        if: always() && steps.composer-install.outcome == 'success'
-        run: "composer validate"
-
-      - name: "Run Composer dependency analyser"
-        if: always() && steps.composer-install.outcome == 'success'
-        run: "bin/composer-dependency-analyser"
-
       - name: "Run PHP CS Fixer"
-        if: always() && steps.composer-install.outcome == 'success'
         run: "bin/php-cs-fixer fix --verbose --dry-run --format=checkstyle | cs2pr"
 
       - name: "Generate test cache for PHPStan"
-        id: test-cache
-        if: always() && steps.composer-install.outcome == 'success'
         run: "php bin/console cache:clear --env=test"
 
+      - name: "Install PHPUnit for PHPStan"
+        run: "php bin/simple-phpunit install"
+
       - name: "Run PHPStan"
-        if: always() && steps.test-cache.outcome == 'success'
         run: "php bin/phpstan analyse --no-progress --error-format=checkstyle | cs2pr"
 
       - name: "Run TwigCS"
-        if: always() && steps.composer-install.outcome == 'success'
         run: "php bin/twigcs --severity=error --display=blocking --reporter checkstyle app/ src/ | cs2pr"
 
       - name: "Run ergebnis/composer-normalize"
-        if: always() && steps.composer-install.outcome == 'success'
         run: "composer normalize --dry-run --no-check-lock"
-
-      - name: "Run ESLint"
-        if: always() && steps.yarn-install.outcome == 'success'
-        run: "yarn lint:js"
-
-      - name: "Run Stylelint"
-        if: always() && steps.yarn-install.outcome == 'success'
-        run: "yarn lint:scss"

.github/workflows/continuous-integration.yml

@@ -5,18 +5,16 @@ on:
   push:
     branches:
       - master
-      - "2.**"
+      - 2.*
 
 env:
-  # Force disabling the reporting of Doctrine deprecation notices for now
-  DOCTRINE_DEPRECATIONS: none
   PGPASSWORD: wallabagrocks
   COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
   phpunit:
     name: "PHP ${{ matrix.php }} using ${{ matrix.database }}"
-    runs-on: ubuntu-latest
+    runs-on: "ubuntu-20.04"
     services:
       rabbitmq:
         image: rabbitmq:3-alpine
@@ -31,9 +29,10 @@ jobs:
       fail-fast: false
       matrix:
         php:
+          - "7.4"
+          - "8.0"
+          - "8.1"
           - "8.2"
-          - "8.3"
-          - "8.4"
         database:
           - "sqlite"
           - "mysql"
@@ -41,7 +40,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v4"
+        uses: "actions/checkout@v3"
         with:
           fetch-depth: 2
 
@@ -54,12 +53,6 @@ jobs:
           extensions: json, pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy
           ini-values: "date.timezone=Europe/Paris"
 
-      - name: "Install Node"
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: ".nvmrc"
-          cache: 'yarn'
-
       - name: "Setup MySQL"
         if: "${{ matrix.database == 'mysql' }}"
         run: |
@@ -75,25 +68,22 @@ jobs:
           pg_isready -d wallabag_test -h localhost -p 5432 -U wallabag
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v3"
+        uses: "ramsey/composer-install@v2"
         with:
           composer-options: "--optimize-autoloader --prefer-dist"
 
-      - name: "Install dependencies with Yarn"
-        run: yarn install
+      - name: "Prepare database"
+        run: "make prepare DB=${{ matrix.database }}"
 
-      - name: "Build assets with Yarn"
-        run: yarn build:dev
-
-      - name: "Prepare database configuration"
-        run: cp app/config/tests/parameters_test.${{ matrix.database }}.yml app/config/parameters_test.yml
+      - name: "Prepare fixtures"
+        run: "make fixtures"
 
       - name: "Run PHPUnit"
-        run: "php bin/phpunit -v"
+        run: "php bin/simple-phpunit -v"
 
   phpunit_no_prefix:
     name: "PHP ${{ matrix.php }} using ${{ matrix.database }} without prefix"
-    runs-on: ubuntu-latest
+    runs-on: "ubuntu-20.04"
     services:
       rabbitmq:
         image: rabbitmq:3-alpine
@@ -116,7 +106,7 @@ jobs:
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v4"
+        uses: "actions/checkout@v3"
         with:
           fetch-depth: 2
 
@@ -129,12 +119,6 @@ jobs:
           extensions: json, pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy
           ini-values: "date.timezone=Europe/Paris"
 
-      - name: "Install Node"
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: ".nvmrc"
-          cache: 'yarn'
-
       - name: "Remove database prefix"
         run: |
           pip install --user yq
@@ -155,84 +139,15 @@ jobs:
           pg_isready -d wallabag_test -h localhost -p 5432 -U wallabag
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v3"
+        uses: "ramsey/composer-install@v2"
         with:
           composer-options: "--optimize-autoloader --prefer-dist"
 
-      - name: "Install dependencies with Yarn"
-        run: yarn install
+      - name: "Prepare database"
+        run: "make prepare DB=${{ matrix.database }}"
 
-      - name: "Build assets with Yarn"
-        run: yarn build:dev
-
-      - name: "Prepare database configuration"
-        run: cp app/config/tests/parameters_test.${{ matrix.database }}.yml app/config/parameters_test.yml
+      - name: "Prepare fixtures"
+        run: "make fixtures"
 
       - name: "Run PHPUnit"
-        run: "php bin/phpunit -v"
-
-  phpunit-without-rmq-redis:
-    name: "PHP ${{ matrix.php }} using ${{ matrix.database }} without Rabbit & Redis"
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        php:
-          - "8.3"
-        database:
-          - "sqlite"
-          - "mysql"
-          - "pgsql"
-
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v4"
-        with:
-          fetch-depth: 2
-
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          php-version: "${{ matrix.php }}"
-          coverage: none
-          tools: pecl
-          extensions: json, pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy
-          ini-values: "date.timezone=Europe/Paris"
-
-      - name: "Install Node"
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: ".nvmrc"
-          cache: 'yarn'
-
-      - name: "Setup MySQL"
-        if: "${{ matrix.database == 'mysql' }}"
-        run: |
-          sudo systemctl start mysql.service
-          sudo mysql -u root -proot -h 127.0.0.1 -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@v3"
-        with:
-          composer-options: "--optimize-autoloader --prefer-dist"
-
-      - name: "Install dependencies with Yarn"
-        run: yarn install
-
-      - name: "Build assets with Yarn"
-        run: yarn build:dev
-
-      - name: "Prepare database configuration"
-        run: cp app/config/tests/parameters_test.${{ matrix.database }}.yml app/config/parameters_test.yml
-
-      - name: "Run PHPUnit"
-        run: "php bin/phpunit -v"
+        run: "php bin/simple-phpunit -v"

.github/workflows/dependabot-automerge-js.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v2.4.0
+        uses: dependabot/fetch-metadata@v1.6.0
         with:
           github-token: '${{ secrets.GITHUB_TOKEN }}'
       - name: Approve and merge minor updates

.github/workflows/translations.yml

@@ -5,7 +5,7 @@ on:
   push:
     branches:
       - master
-      - "2.**"
+      - 2.*
 
 permissions:
   contents: read
@@ -13,16 +13,16 @@ permissions:
 jobs:
   translations:
     name: "Translations"
-    runs-on: ubuntu-latest
+    runs-on: "ubuntu-20.04"
 
     strategy:
       matrix:
         php:
-          - "8.2"
+          - "7.4"
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v4"
+        uses: "actions/checkout@v3"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
@@ -36,7 +36,7 @@ jobs:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v3"
+        uses: "ramsey/composer-install@v2"
         with:
           composer-options: "--optimize-autoloader --prefer-dist"
 

.github/workflows/upload-release-package.yml

@@ -12,11 +12,11 @@ jobs:
     strategy:
       matrix:
         php:
-          - "8.2"
+          - "7.4"
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v4"
+        uses: "actions/checkout@v3"
 
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
@@ -29,12 +29,6 @@ jobs:
         env:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: "Install Node"
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: ".nvmrc"
-          cache: "yarn"
-
       - name: Create the package
         run: make release VERSION=${{ github.event.release.tag_name }}
 

.gitignore

@@ -15,7 +15,6 @@
 .php-cs-fixer.cache
 .phpunit.result.cache
 phpunit.xml
-compose.override.yaml
 
 # Parameters
 /app/config/parameters.yml
@@ -29,7 +28,7 @@ web/uploads/
 !/web/bundles/.gitkeep
 /web/assets/images/*
 !web/assets/images/.gitkeep
-/web/build/*
+/web/wallassets/*.dev.js
 
 # Build
 /app/build
@@ -38,7 +37,6 @@ web/uploads/
 
 # Development
 docker/php/env
-docker/php/blackfire
 
 # Composer PHAR
 /composer.phar
@@ -49,7 +47,9 @@ data/db/wallabag*.sqlite
 # assets stuff
 node_modules/
 bin
-package-lock.json
+app/Resources/build/
+!/src/Wallabag/CoreBundle/Resources/public
+/src/Wallabag/CoreBundle/Resources/public/*
 
 # Test-generated files
 admin-export.json
@@ -58,7 +58,3 @@ specialexport.json
 
 # Custom CSS file
 web/custom.css
-
-.env.local
-
-yarn-error.log

.nvmrc

@@ -1 +1 @@
-20
+16

.php-cs-fixer.dist.php

@@ -1,14 +1,13 @@
 <?php
 
 $config = new PhpCsFixer\Config();
-
 return $config
     ->setRiskyAllowed(true)
     ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
         'array_syntax' => [
-            'syntax' => 'short',
+            'syntax' => 'short'
         ],
         'combine_consecutive_unsets' => true,
         'heredoc_to_nowdoc' => true,
@@ -22,23 +21,21 @@ return $config
                 'use',
                 'parenthesis_brace_block',
                 'square_brace_block',
-                'curly_brace_block',
+                'curly_brace_block'
             ],
         ],
         'no_unreachable_default_argument_value' => true,
-        'no_useless_concat_operator' => false,
         'no_useless_else' => true,
         'no_useless_return' => true,
         'ordered_class_elements' => true,
         'ordered_imports' => true,
         'php_unit_strict' => true,
         'phpdoc_order' => true,
-        'phpdoc_separation' => false,
         // 'psr_autoloading' => true,
         'strict_comparison' => true,
         'strict_param' => true,
         'concat_space' => [
-            'spacing' => 'one',
+            'spacing' => 'one'
         ],
     ])
     ->setFinder(
@@ -47,7 +44,7 @@ return $config
                 'node_modules',
                 'vendor',
                 'var',
-                'web',
+                'web'
             ])
             ->in(__DIR__)
     )

CHANGELOG.md

@@ -1,155 +1,5 @@
 # Changelog
 
-## Upcoming changes
-
-* **[BC BREAK]** Convert 403 errors to 404 errors by @yguedidi in https://github.com/wallabag/wallabag/pull/8075
-* `wallassets/` folder renamed to `build/`
-
-## [2.6.13](https://github.com/wallabag/wallabag/tree/2.6.13)
-[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.12...2.6.13)
-
-### Improvements
-
-* Add support of Pocket CSV import by @kdecherf and @nicosomb in [https://github.com/wallabag/wallabag/pull/8240](https://github.com/wallabag/wallabag/pull/8240)
-* Backport Pocket and Shaarli HTML imports from master by @nicosomb in [https://github.com/wallabag/wallabag/pull/8193](https://github.com/wallabag/wallabag/pull/8193)
-
-### Fixes
-
-*  Avoid non-validated OTP to be enabled #8139 by @j0k3r in [https://github.com/wallabag/wallabag/pull/8139](https://github.com/wallabag/wallabag/pull/8139)
-
-### Technical stuff
-
-* Update j0k3r/php-readability:1.2.13 to fix regression (about latin1 instead of UTF-8 used for entries) by @nicosomb [https://github.com/wallabag/wallabag/pull/8194](https://github.com/wallabag/wallabag/pull/8194)
-
-## [2.6.12](https://github.com/wallabag/wallabag/tree/2.6.12)
-[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.11...2.6.12)
-
-### Technical stuff
-
-* Fix changelog by @yguedidi in [https://github.com/wallabag/wallabag/pull/8135](https://github.com/wallabag/wallabag/pull/8135)
-* Update dependencies by @yguedidi in [https://github.com/wallabag/wallabag/pull/8136](https://github.com/wallabag/wallabag/pull/8136)
-
-## [2.6.11](https://github.com/wallabag/wallabag/tree/2.6.11)
-[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.10...2.6.11)
-
-### Security fix
-* Protect actions with a CSRF token by @yguedidi in https://github.com/wallabag/wallabag/commit/99c8a06594d6ee7480ce4d041ccff3025b353656
-
-### Fixes
-
-* Fix redirection after action in search results by @nicosomb in [https://github.com/wallabag/wallabag/pull/7827](https://github.com/wallabag/wallabag/pull/7827)
-* Fix title tag filter by @nicosomb in [https://github.com/wallabag/wallabag/pull/7846](https://github.com/wallabag/wallabag/pull/7846)
-* Change NB_ELEMENTS in pocket importer to 30 by @j0k3r in [https://github.com/wallabag/wallabag/pull/7993](https://github.com/wallabag/wallabag/pull/7993)
-* Fix entries counter for annotated entries in the menu by @j0k3r in [https://github.com/wallabag/wallabag/pull/7999](https://github.com/wallabag/wallabag/pull/7999)
-
-### Technical stuff
-
-* Prepare 2.6.11 release by @yguedidi in [https://github.com/wallabag/wallabag/pull/8133](https://github.com/wallabag/wallabag/pull/8133)
-
-## [2.6.10](https://github.com/wallabag/wallabag/tree/2.6.10)
-[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.9...2.6.10)
-
-### Improvement
-
-* Add Omnivore import by @nicosomb in https://github.com/wallabag/wallabag/pull/7754
-
-### Fixes
-
-* Update site config & tests by @j0k3r in https://github.com/wallabag/wallabag/pull/7582 (fixes "Key provided is shorter
-  than 256 bits, only 240 bits provided" https://github.com/wallabag/wallabag/issues/7531)
-* Update site config by @yguedidi in https://github.com/wallabag/wallabag/pull/7623
-* Replace gitter with matrix by @nicosomb in https://github.com/wallabag/wallabag/pull/7753
-
-## [2.6.9](https://github.com/wallabag/wallabag/tree/2.6.9)
-[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.8...2.6.9)
-
-### Fixes
-* Fix same domain pagination by @yguedidi in https://github.com/wallabag/wallabag/pull/7266
-* Upgrade PHP dependencies by @yguedidi in https://github.com/wallabag/wallabag/pull/7272
-* Use a proper "how to" for elCurator by @j0k3r in https://github.com/wallabag/wallabag/pull/7323
-
-## [2.6.8](https://github.com/wallabag/wallabag/tree/2.6.8)
-[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.7...2.6.8)
-
-### Fixes
-* Update deps & Node 20 by @j0k3r in https://github.com/wallabag/wallabag/pull/7134
-* Fix dark mode disabled url 2.6 by @Simounet in https://github.com/wallabag/wallabag/pull/7133
-* Make database dependent commands lazy by @yguedidi in https://github.com/wallabag/wallabag/pull/7142
-* Fix docker setup by @yguedidi in https://github.com/wallabag/wallabag/pull/7141
-* Remove session-based redirection by @yguedidi in https://github.com/wallabag/wallabag/pull/7140
-
-## [2.6.7](https://github.com/wallabag/wallabag/tree/2.6.7)
-[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.6...2.6.7)
-
-### Security fix
-* A user can disable her 2FA unintentionally by @kdecherf in https://github.com/wallabag/wallabag/commit/0cfdddc2eb0aee5ffb69bf499d377d75655ba157
-
-### Fixes
-* Fix deprecated null tag parameter by @Simounet in https://github.com/wallabag/wallabag/pull/6985
-* Full clickable card on mass action by @Simounet in https://github.com/wallabag/wallabag/pull/6991
-* Add tag form submit button always displayed by @Simounet in https://github.com/wallabag/wallabag/pull/6986
-
-## [2.6.6](https://github.com/wallabag/wallabag/tree/2.6.6)
-[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.5...2.6.6)
-
-### Security fix
-* Force secure cookie on HTTPS connection by @j0k3r in https://github.com/wallabag/wallabag/pull/6924
-
-### Fixes
-* Fix checkboxes pointer events issue by @Simounet in https://github.com/wallabag/wallabag/pull/6897
-* Add Google mailer by @j0k3r in https://github.com/wallabag/wallabag/pull/6899
-* Improve performance on homepage by @Simounet in https://github.com/wallabag/wallabag/pull/6909
-* Mass action layout improved by @Simounet in https://github.com/wallabag/wallabag/pull/6912
-
-## [2.6.5](https://github.com/wallabag/wallabag/tree/2.6.5)
-[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.4...2.6.5)
-
-### Fixes
-* "Fix checkboxes pointer-events disabled" by @Simounet https://github.com/wallabag/wallabag/pull/6874
-* "Fix nav input styles" by @Simounet https://github.com/wallabag/wallabag/pull/6877
-* "Change domain status filters html types" by @Simounet https://github.com/wallabag/wallabag/pull/6888
-
-## [2.6.4](https://github.com/wallabag/wallabag/tree/2.6.4)
-[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.3...2.6.4)
-
-### Fixes
-* Fix API token generation by @nicosomb https://github.com/wallabag/wallabag/pull/6869
-* Fix checkboxes which were broken by @nicosomb https://github.com/wallabag/wallabag/pull/6864
-
-## [2.6.3](https://github.com/wallabag/wallabag/tree/2.6.3)
-[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.2...2.6.3)
-
-### Security fixes
-* Replace GET way to POST way to reset data user by @nicosomb https://github.com/wallabag/wallabag/commit/78b0b55c40511e1f22d5bbb4897aa10fca68441c
-* Replace GET way to POST way to delete API client by @nicosomb https://github.com/wallabag/wallabag/commit/ffcc5c9062fcc8cd922d7d6d65edbe5efae96806
-
-### Improvement
-* Add confirmation before reload entry by @nicosomb https://github.com/wallabag/wallabag/pull/6778
-* Remove external dependencies on howto page by @viktoriussuwandi https://github.com/wallabag/wallabag/pull/6775
-
-### Fixes
-* Use Session instead of Referrer for Redirection by @Spoons https://github.com/wallabag/wallabag/pull/6119
-* Reduce risk of collision for #content by @kdecherf https://github.com/wallabag/wallabag/pull/6829
-* Update dependencies to fix vulnerabilities by @nicosomb https://github.com/wallabag/wallabag/pull/6783
-* Fix failing randomly test by @nicosomb https://github.com/wallabag/wallabag/pull/6763
-
-### Technical stuff
-* Add check if git is installed by @nicosomb https://github.com/wallabag/wallabag/pull/6788
-* Replace kernel.root_dir by kernel.project_dir by @yguedidi https://github.com/wallabag/wallabag/pull/6809
-* Split symfony/symfony by @yguedidi https://github.com/wallabag/wallabag/pull/6817
-* Make Crawler::extract get an array by @yguedidi https://github.com/wallabag/wallabag/pull/6812
-* Use PSR-17 and PSR-18 by @yguedidi https://github.com/wallabag/wallabag/pull/6816
-* Replace Client by KernelBrowser by @yguedidi https://github.com/wallabag/wallabag/pull/6813
-* Replace Debug component by ErrorHandler component by @yguedidi https://github.com/wallabag/wallabag/pull/6810
-* Make ImportController extends AbstractController by @yguedidi https://github.com/wallabag/wallabag/pull/6808
-* Use Twig instead of templating by @yguedidi https://github.com/wallabag/wallabag/pull/6797
-* Identify platforms by their class by @yguedidi https://github.com/wallabag/wallabag/pull/6799
-* Move from transchoice to trans by @yguedidi https://github.com/wallabag/wallabag/pull/6800
-* Replace GetResponseEvent by RequestEvent by @yguedidi https://github.com/wallabag/wallabag/pull/6811
-* Ensure the kernel is shut down before calling createClient by @yguedidi https://github.com/wallabag/wallabag/pull/6803
-* Ignore docker-compose.override.yml by @yguedidi https://github.com/wallabag/wallabag/pull/6814
-* Add composer normalizer by @nicosomb https://github.com/wallabag/wallabag/pull/6762
-
 ## [2.6.2](https://github.com/wallabag/wallabag/tree/2.6.2)
 [Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.1...2.6.2)
 

GNUmakefile

@@ -11,21 +11,12 @@ else
 	override ENV = prod
 endif
 
-DOCKER_COMPOSE_RUNNING := $(shell docker compose ps -q | grep -q . && echo 1 || echo 0)
-
-ifeq ($(DOCKER_COMPOSE_RUNNING), 1)
-  PHP := docker compose run --rm php php
-  PHP_NO_XDEBUG := docker compose run -e XDEBUG_MODE=off --rm php php
-  YARN := docker compose run --rm php yarn
-else
-  PHP := php
-  PHP_NO_XDEBUG := XDEBUG_MODE=off php
-  YARN := yarn
-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)
 
@@ -37,29 +28,25 @@ dev: build ## Install the latest dev version
 	@./scripts/dev.sh
 
 run: ## Run the wallabag built-in server
-	@$(PHP) bin/console server:run --env=dev
+	@php bin/console server:run --env=dev
 
 build: ## Run webpack
-	@$(YARN) install
-	@$(YARN) build:$(ENV)
+	@yarn install
+	@yarn build:$(ENV)
 
-test: ## Launch wallabag testsuite
-	@$(PHP_NO_XDEBUG) -dmemory_limit=-1 bin/phpunit -v
+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 -vv
 
-fix-cs: ## Run PHP-CS-Fixer
-	@$(PHP_NO_XDEBUG) bin/php-cs-fixer fix
+fixtures: ## Load fixtures into database
+	php bin/console doctrine:fixtures:load --no-interaction --env=test
 
-phpstan: ## Run PHPStan
-	@$(PHP_NO_XDEBUG) bin/phpstan analyse
-
-phpstan-baseline: ## Generate PHPStan baseline
-	@$(PHP_NO_XDEBUG) bin/phpstan analyse --generate-baseline
-
-lint-js: ## Run ESLint
-	@$(YARN) lint:js
-
-lint-scss: ## Run Stylelint
-	@$(YARN) lint:scss
+test: prepare fixtures ## Launch wallabag testsuite
+	XDEBUG_MODE=off php -dmemory_limit=-1 bin/simple-phpunit -v
 
 release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`).
 ifndef VERSION
@@ -70,6 +57,6 @@ endif
 deploy: ## Deploy wallabag
 	@bundle exec cap staging deploy
 
-.PHONY: help install update build test release deploy run dev fix-cs phpstan
+.PHONY: help clean prepare install fixtures update build test release deploy run dev
 
 .DEFAULT_GOAL := install

README.md

@@ -1,7 +1,7 @@
 # wallabag
 
 ![CI](https://github.com/wallabag/wallabag/workflows/CI/badge.svg)
-[![Matrix](https://matrix.to/img/matrix-badge.svg)](https://matrix.to/#/#wallabag:matrix.org)
+[![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)
 ![License](https://img.shields.io/github/license/wallabag/wallabag)
@@ -55,10 +55,6 @@ To learn more about developing wallabag, please refer to the [contribution guide
 
 Content extraction relies on [Graby](https://github.com/j0k3r/graby), [php-readability](https://github.com/j0k3r/php-readability) and [ftr-site-config](https://github.com/fivefilters/ftr-site-config).
 
-## Sponsors
-
-<img src="https://api.blackfire.io/blackfire-logo.png" alt="Blackfire" width="200" />
-
 ## License
 Copyright © 2013-current Nicolas Lœuillet <nicolas@loeuillet.org>
 

RELEASE_PROCESS.md

@@ -9,7 +9,7 @@ During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE` (li
 #### Prepare the release
 
 - Update these files with new information
-    - `app/config/wallabag.yml` (`wallabag.version`)
+    - `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.
@@ -19,19 +19,19 @@ During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE` (li
 - [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).
 - Update [website](https://github.com/wallabag/website) to change MD5 sum and create the release blog post (based on the changelog).
 - Update Dockerfile https://github.com/wallabag/docker (and create a new tag)
-- Put the next patch version suffixed with `-dev` in `app/config/wallabag.yml` (`wallabag.version`)
+- Put the next patch version suffixed with `-dev` in `app/config/wallabag.yml` (`wallabag_core.version`)
 - Drink a :beer:!
 
 ### 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 latest PHP versions), a more common one should
+If the PHP version used to generate the .lock isn't a widely available one (like PHP 8), a more common one should
 be locally specified in `composer.lock`:
 
 ```json
     "config": {
         "platform": {
-            "php": "8.2.27",
+            "php": "7.4.29",
             "ext-something": "4.0"
         }
     }

app/AppKernel.php

@@ -1,91 +1,72 @@
 <?php
 
-use BabDev\PagerfantaBundle\BabDevPagerfantaBundle;
-use Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle;
-use Craue\ConfigBundle\CraueConfigBundle;
-use DAMA\DoctrineTestBundle\DAMADoctrineTestBundle;
-use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
-use Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle;
-use Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle;
-use FOS\JsRoutingBundle\FOSJsRoutingBundle;
-use FOS\OAuthServerBundle\FOSOAuthServerBundle;
-use FOS\RestBundle\FOSRestBundle;
-use FOS\UserBundle\FOSUserBundle;
-use JMS\SerializerBundle\JMSSerializerBundle;
-use KPhoen\RulerZBundle\KPhoenRulerZBundle;
-use Nelmio\ApiDocBundle\NelmioApiDocBundle;
-use Nelmio\CorsBundle\NelmioCorsBundle;
-use OldSound\RabbitMqBundle\OldSoundRabbitMqBundle;
-use Scheb\TwoFactorBundle\SchebTwoFactorBundle;
-use Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle;
-use Sentry\SentryBundle\SentryBundle;
-use Spiriit\Bundle\FormFilterBundle\SpiriitFormFilterBundle;
-use Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle;
-use Symfony\Bundle\DebugBundle\DebugBundle;
-use Symfony\Bundle\FrameworkBundle\FrameworkBundle;
-use Symfony\Bundle\MakerBundle\MakerBundle;
-use Symfony\Bundle\MonologBundle\MonologBundle;
-use Symfony\Bundle\SecurityBundle\SecurityBundle;
-use Symfony\Bundle\TwigBundle\TwigBundle;
-use Symfony\Bundle\WebProfilerBundle\WebProfilerBundle;
-use Symfony\Bundle\WebServerBundle\WebServerBundle;
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel;
-use Symfony\WebpackEncoreBundle\WebpackEncoreBundle;
-use Twig\Extra\TwigExtraBundle\TwigExtraBundle;
-use Wallabag\Import\ImportCompilerPass;
 
 class AppKernel extends Kernel
 {
     public function registerBundles()
     {
         $bundles = [
-            new FrameworkBundle(),
-            new SecurityBundle(),
-            new TwigBundle(),
-            new MonologBundle(),
-            new DoctrineBundle(),
-            new SensioFrameworkExtraBundle(),
-            new FOSRestBundle(),
-            new FOSUserBundle(),
-            new JMSSerializerBundle(),
-            new NelmioApiDocBundle(),
-            new NelmioCorsBundle(),
-            new BazingaHateoasBundle(),
-            new SpiriitFormFilterBundle(),
-            new FOSOAuthServerBundle(),
-            new StofDoctrineExtensionsBundle(),
-            new SchebTwoFactorBundle(),
-            new KPhoenRulerZBundle(),
-            new DoctrineMigrationsBundle(),
-            new CraueConfigBundle(),
-            new BabDevPagerfantaBundle(),
-            new FOSJsRoutingBundle(),
-            new OldSoundRabbitMqBundle(),
-            new SentryBundle(),
-            new TwigExtraBundle(),
-            new WebpackEncoreBundle(),
+            new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
+            new Symfony\Bundle\SecurityBundle\SecurityBundle(),
+            new Symfony\Bundle\TwigBundle\TwigBundle(),
+            new Symfony\Bundle\MonologBundle\MonologBundle(),
+            new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
+            new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
+            new FOS\RestBundle\FOSRestBundle(),
+            new FOS\UserBundle\FOSUserBundle(),
+            new JMS\SerializerBundle\JMSSerializerBundle(),
+            new Nelmio\ApiDocBundle\NelmioApiDocBundle(),
+            new Nelmio\CorsBundle\NelmioCorsBundle(),
+            new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle(),
+            new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(),
+            new FOS\OAuthServerBundle\FOSOAuthServerBundle(),
+            new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
+            new Scheb\TwoFactorBundle\SchebTwoFactorBundle(),
+            new KPhoen\RulerZBundle\KPhoenRulerZBundle(),
+            new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
+            new Craue\ConfigBundle\CraueConfigBundle(),
+            new BabDev\PagerfantaBundle\BabDevPagerfantaBundle(),
+            new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
+            new BD\GuzzleSiteAuthenticatorBundle\BDGuzzleSiteAuthenticatorBundle(),
+            new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),
+            new Http\HttplugBundle\HttplugBundle(),
+            new Sentry\SentryBundle\SentryBundle(),
+            new Twig\Extra\TwigExtraBundle\TwigExtraBundle(),
+
+            // wallabag bundles
+            new Wallabag\CoreBundle\WallabagCoreBundle(),
+            new Wallabag\ApiBundle\WallabagApiBundle(),
+            new Wallabag\UserBundle\WallabagUserBundle(),
+            new Wallabag\ImportBundle\WallabagImportBundle(),
+            new Wallabag\AnnotationBundle\WallabagAnnotationBundle(),
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
-            $bundles[] = new DebugBundle();
-            $bundles[] = new WebProfilerBundle();
-            $bundles[] = new DoctrineFixturesBundle();
+            $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
+            $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
+            $bundles[] = new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle();
 
             if ('test' === $this->getEnvironment()) {
-                $bundles[] = new DAMADoctrineTestBundle();
+                $bundles[] = new DAMA\DoctrineTestBundle\DAMADoctrineTestBundle();
             }
 
             if ('dev' === $this->getEnvironment()) {
-                $bundles[] = new MakerBundle();
-                $bundles[] = new WebServerBundle();
+                $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();
@@ -98,85 +79,28 @@ class AppKernel extends Kernel
 
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $loader->load($this->getProjectDir() . '/app/config/config_' . $this->getEnvironment() . '.yml');
+        $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml');
 
-        $loader->load(function (ContainerBuilder $container): void {
+        $loader->load(function ($container) {
+            if ($container->getParameter('use_webpack_dev_server')) {
+                $container->loadFromExtension('framework', [
+                   'assets' => [
+                       'base_url' => 'http://localhost:8080/',
+                   ],
+               ]);
+            } else {
+                $container->loadFromExtension('framework', [
+                    'assets' => [
+                        'base_url' => $container->getParameter('domain_name'),
+                    ],
+                ]);
+            }
+        });
+
+        $loader->load(function (ContainerBuilder $container) {
             // $container->setParameter('container.autowiring.strict_mode', true);
             // $container->setParameter('container.dumper.inline_class_loader', true);
             $container->addObjectResource($this);
         });
-
-        $loader->load(function (ContainerBuilder $container): void {
-            $this->processDatabaseParameters($container);
-            $this->defineRedisUrlEnvVar($container);
-            $this->defineRabbitMqUrlEnvVar($container);
-        });
-    }
-
-    protected function build(ContainerBuilder $container)
-    {
-        $container->addCompilerPass(new ImportCompilerPass());
-    }
-
-    private function processDatabaseParameters(ContainerBuilder $container)
-    {
-        $scheme = match ($container->getParameter('database_driver')) {
-            'pdo_mysql' => 'mysql',
-            'pdo_pgsql' => 'pgsql',
-            'pdo_sqlite' => 'sqlite',
-            default => throw new RuntimeException('Unsupported database driver: ' . $container->getParameter('database_driver')),
-        };
-
-        $container->setParameter('database_scheme', $scheme);
-
-        if ('sqlite' === $scheme) {
-            $container->setParameter('database_name', $container->getParameter('database_path'));
-        }
-
-        $container->setParameter('database_user', (string) $container->getParameter('database_user'));
-        $container->setParameter('database_password', (string) $container->getParameter('database_password'));
-        $container->setParameter('database_port', (string) $container->getParameter('database_port'));
-        $container->setParameter('database_socket', (string) $container->getParameter('database_socket'));
-    }
-
-    private function defineRedisUrlEnvVar(ContainerBuilder $container)
-    {
-        $scheme = $container->getParameter('redis_scheme');
-        $host = $container->getParameter('redis_host');
-        $port = $container->getParameter('redis_port');
-        $path = $container->getParameter('redis_path');
-        $password = $container->getParameter('redis_password');
-
-        $url = $scheme . '://';
-
-        if ($password) {
-            $url .= $password . '@';
-        }
-
-        $url .= $host;
-
-        if ($port) {
-            $url .= ':' . $port;
-        }
-
-        $url .= '/' . ltrim($path, '/');
-
-        $container->setParameter('env(REDIS_URL)', $url);
-    }
-
-    private function defineRabbitMqUrlEnvVar(ContainerBuilder $container)
-    {
-        $host = $container->getParameter('rabbitmq_host');
-        $port = $container->getParameter('rabbitmq_port');
-        $user = $container->getParameter('rabbitmq_user');
-        $password = $container->getParameter('rabbitmq_password');
-
-        $url = 'amqp://' . $user . ':' . $password . '@' . $host;
-
-        if ($port) {
-            $url .= ':' . $port;
-        }
-
-        $container->setParameter('env(RABBITMQ_URL)', $url);
     }
 }

app/DoctrineMigrations/Version20160401000000.php

@@ -2,11 +2,8 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\MySQLPlatform;
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Initial database structure.
@@ -17,10 +14,8 @@ class Version20160401000000 extends WallabagMigration
     {
         $this->skipIf($schema->hasTable($this->getTable('entry')), 'Database already initialized');
 
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'sqlite':
                 $sql = <<<SQL
 CREATE TABLE {$this->getTable('craue_config_setting')} (name VARCHAR(255) NOT NULL, value VARCHAR(255) DEFAULT NULL, section VARCHAR(255) DEFAULT NULL, PRIMARY KEY(name));
 CREATE UNIQUE INDEX UNIQ_5D9649505E237E06 ON {$this->getTable('craue_config_setting')} (name);
@@ -63,7 +58,7 @@ SQL
                 }
 
                 break;
-            case $platform instanceof MySQLPlatform:
+            case 'mysql':
                 $sql = <<<SQL
 CREATE TABLE {$this->getTable('craue_config_setting')} (name VARCHAR(255) NOT NULL, value VARCHAR(255) DEFAULT NULL, section VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_5D9649505E237E06 (name), PRIMARY KEY(name)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
 CREATE TABLE {$this->getTable('entry')} (id INT AUTO_INCREMENT NOT NULL, user_id INT DEFAULT NULL, title LONGTEXT DEFAULT NULL, url LONGTEXT DEFAULT NULL, is_archived TINYINT(1) NOT NULL, is_starred TINYINT(1) NOT NULL, content LONGTEXT DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype LONGTEXT DEFAULT NULL, language LONGTEXT DEFAULT NULL, reading_time INT DEFAULT NULL, domain_name LONGTEXT DEFAULT NULL, preview_picture LONGTEXT DEFAULT NULL, is_public TINYINT(1) DEFAULT '0', INDEX IDX_F4D18282A76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
@@ -96,7 +91,7 @@ SQL
                     $this->addSql($query);
                 }
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 $sql = <<<SQL
 CREATE TABLE {$this->getTable('craue_config_setting')} (name VARCHAR(255) NOT NULL, value VARCHAR(255) DEFAULT NULL, section VARCHAR(255) DEFAULT NULL, PRIMARY KEY(name));
 CREATE UNIQUE INDEX UNIQ_5D9649505E237E06 ON {$this->getTable('craue_config_setting')} (name);

app/DoctrineMigrations/Version20160410190541.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added foreign keys for account resetting.
@@ -21,7 +21,9 @@ class Version20160410190541 extends WallabagMigration
             'length' => 23,
         ]);
 
-        $sharePublic = $this->connection
+        $sharePublic = $this->container
+            ->get('doctrine.orm.default_entity_manager')
+            ->getConnection()
             ->fetchOne('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'share_public'");
 
         if (false === $sharePublic) {

app/DoctrineMigrations/Version20160812120952.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace Application\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+
+/**
+ * Added name field on wallabag_oauth2_clients.
+ */
+class Version20160812120952 extends WallabagMigration
+{
+    public function up(Schema $schema): void
+    {
+        $clientsTable = $schema->getTable($this->getTable('oauth2_clients'));
+        $this->skipIf($clientsTable->hasColumn('name'), 'It seems that you already played this migration.');
+
+        if ('sqlite' === $this->connection->getDatabasePlatform()->getName()) {
+            // Can't use $clientsTable->addColumn('name', 'blob');
+            // because of the error:
+            // SQLSTATE[HY000]: General error: 1 Cannot add a NOT NULL column with default value NULL
+            $databaseTablePrefix = $this->container->getParameter('database_table_prefix');
+            $this->addSql('CREATE TEMPORARY TABLE __temp__' . $databaseTablePrefix . 'oauth2_clients AS SELECT id, random_id, redirect_uris, secret, allowed_grant_types FROM ' . $databaseTablePrefix . 'oauth2_clients');
+            $this->addSql('DROP TABLE ' . $databaseTablePrefix . 'oauth2_clients');
+            $this->addSql('CREATE TABLE ' . $databaseTablePrefix . 'oauth2_clients (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, random_id VARCHAR(255) NOT NULL COLLATE BINARY, secret VARCHAR(255) NOT NULL COLLATE BINARY, redirect_uris CLOB NOT NULL, allowed_grant_types CLOB NOT NULL, name CLOB NOT NULL, PRIMARY KEY(id), CONSTRAINT FK_635D765EA76ED395 FOREIGN KEY (user_id) REFERENCES "' . $databaseTablePrefix . 'user" (id) NOT DEFERRABLE INITIALLY IMMEDIATE)');
+            $this->addSql('INSERT INTO ' . $databaseTablePrefix . 'oauth2_clients (id, random_id, redirect_uris, secret, allowed_grant_types) SELECT id, random_id, redirect_uris, secret, allowed_grant_types FROM __temp__' . $databaseTablePrefix . 'oauth2_clients');
+            $this->addSql('DROP TABLE __temp__' . $databaseTablePrefix . 'oauth2_clients');
+            $this->addSql('CREATE INDEX IDX_635D765EA76ED395 ON ' . $databaseTablePrefix . 'oauth2_clients (user_id)');
+        } else {
+            $clientsTable->addColumn('name', 'blob');
+        }
+    }
+
+    public function down(Schema $schema): void
+    {
+        $clientsTable = $schema->getTable($this->getTable('oauth2_clients'));
+
+        if ('sqlite' === $this->connection->getDatabasePlatform()->getName()) {
+            $databaseTablePrefix = $this->container->getParameter('database_table_prefix');
+            $this->addSql('DROP INDEX IDX_635D765EA76ED395');
+            $this->addSql('CREATE TEMPORARY TABLE __temp__' . $databaseTablePrefix . 'oauth2_clients AS SELECT id, random_id, redirect_uris, secret, allowed_grant_types FROM ' . $databaseTablePrefix . 'oauth2_clients');
+            $this->addSql('DROP TABLE ' . $databaseTablePrefix . 'oauth2_clients');
+            $this->addSql('CREATE TABLE ' . $databaseTablePrefix . 'oauth2_clients (id INTEGER NOT NULL, random_id VARCHAR(255) NOT NULL, secret VARCHAR(255) NOT NULL, redirect_uris CLOB NOT NULL COLLATE BINARY, allowed_grant_types CLOB NOT NULL COLLATE BINARY, PRIMARY KEY(id))');
+            $this->addSql('INSERT INTO ' . $databaseTablePrefix . 'oauth2_clients (id, random_id, redirect_uris, secret, allowed_grant_types) SELECT id, random_id, redirect_uris, secret, allowed_grant_types FROM __temp__' . $databaseTablePrefix . 'oauth2_clients');
+            $this->addSql('DROP TABLE __temp__' . $databaseTablePrefix . 'oauth2_clients');
+        } else {
+            $clientsTable->dropColumn('name');
+        }
+    }
+}

app/DoctrineMigrations/Version20160911214952.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added settings for RabbitMQ and Redis imports.
@@ -12,14 +12,18 @@ class Version20160911214952 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $redis = $this->connection
+        $redis = $this->container
+            ->get('doctrine.orm.default_entity_manager')
+            ->getConnection()
             ->fetchOne('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'import_with_redis'");
 
         if (false === $redis) {
             $this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('import_with_redis', 0, 'import')");
         }
 
-        $rabbitmq = $this->connection
+        $rabbitmq = $this->container
+            ->get('doctrine.orm.default_entity_manager')
+            ->getConnection()
             ->fetchOne('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'import_with_rabbitmq'");
 
         if (false === $rabbitmq) {

app/DoctrineMigrations/Version20160916201049.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added pocket_consumer_key field on wallabag_config.

app/DoctrineMigrations/Version20161001072726.php

@@ -2,12 +2,9 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\MySQLPlatform;
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
+use Doctrine\DBAL\Migrations\SkipMigrationException;
 use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\Exception\SkipMigration;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added pocket_consumer_key field on wallabag_config.
@@ -16,18 +13,12 @@ class Version20161001072726 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $platform = $this->connection->getDatabasePlatform();
-
-        if ($platform instanceof SqlitePlatform) {
-            $this->write('Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
-
-            return;
-        }
+        $this->skipIf('sqlite' === $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
 
         // remove all FK from entry_tag
-        switch (true) {
-            case $platform instanceof MySQLPlatform:
-                $query = $this->connection->executeQuery("
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'mysql':
+                $query = $this->connection->query("
                     SELECT CONSTRAINT_NAME
                     FROM information_schema.key_column_usage
                     WHERE TABLE_NAME = '" . $this->getTable('entry_tag', WallabagMigration::UN_ESCAPED_TABLE) . "' AND CONSTRAINT_NAME LIKE 'FK_%'
@@ -38,9 +29,9 @@ class Version20161001072726 extends WallabagMigration
                     $this->addSql('ALTER TABLE ' . $this->getTable('entry_tag') . ' DROP FOREIGN KEY ' . $fk['CONSTRAINT_NAME']);
                 }
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 // http://dba.stackexchange.com/questions/36979/retrieving-all-pk-and-fk
-                $query = $this->connection->executeQuery("
+                $query = $this->connection->query("
                     SELECT conrelid::regclass AS table_from
                           ,conname
                           ,pg_get_constraintdef(c.oid)
@@ -62,9 +53,9 @@ class Version20161001072726 extends WallabagMigration
 
         // remove entry FK from annotation
 
-        switch (true) {
-            case $platform instanceof MySQLPlatform:
-                $query = $this->connection->executeQuery("
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'mysql':
+                $query = $this->connection->query("
                     SELECT CONSTRAINT_NAME
                     FROM information_schema.key_column_usage
                     WHERE TABLE_NAME = '" . $this->getTable('annotation', WallabagMigration::UN_ESCAPED_TABLE) . "'
@@ -77,9 +68,9 @@ class Version20161001072726 extends WallabagMigration
                     $this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' DROP FOREIGN KEY ' . $fk['CONSTRAINT_NAME']);
                 }
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 // http://dba.stackexchange.com/questions/36979/retrieving-all-pk-and-fk
-                $query = $this->connection->executeQuery("
+                $query = $this->connection->query("
                     SELECT conrelid::regclass AS table_from
                           ,conname
                           ,pg_get_constraintdef(c.oid)
@@ -102,6 +93,6 @@ class Version20161001072726 extends WallabagMigration
 
     public function down(Schema $schema): void
     {
-        throw new SkipMigration('Too complex ...');
+        throw new SkipMigrationException('Too complex ...');
     }
 }

app/DoctrineMigrations/Version20161022134138.php

@@ -2,9 +2,8 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Converted database to utf8mb4 encoding (for MySQL only).
@@ -13,11 +12,7 @@ class Version20161022134138 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        if (!$this->connection->getDatabasePlatform() instanceof MySQLPlatform) {
-            $this->write('This migration only apply to MySQL');
-
-            return;
-        }
+        $this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');
 
         $this->addSql('ALTER DATABASE `' . $this->connection->getParams()['dbname'] . '` CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci;');
 
@@ -45,11 +40,7 @@ class Version20161022134138 extends WallabagMigration
 
     public function down(Schema $schema): void
     {
-        if (!$this->connection->getDatabasePlatform() instanceof MySQLPlatform) {
-            $this->write('This migration only apply to MySQL');
-
-            return;
-        }
+        $this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');
 
         $this->addSql('ALTER DATABASE `' . $this->connection->getParams()['dbname'] . '` CHARACTER SET = utf8 COLLATE = utf8_unicode_ci;');
 

app/DoctrineMigrations/Version20161024212538.php

@@ -2,9 +2,8 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added user_id column on oauth2_clients to prevent users to delete API clients from other users.
@@ -17,11 +16,7 @@ class Version20161024212538 extends WallabagMigration
     {
         $clientsTable = $schema->getTable($this->getTable('oauth2_clients'));
 
-        if ($clientsTable->hasColumn('user_id')) {
-            $this->write('It seems that you already played this migration.');
-
-            return;
-        }
+        $this->skipIf($clientsTable->hasColumn('user_id'), 'It seems that you already played this migration.');
 
         $clientsTable->addColumn('user_id', 'integer', ['notnull' => false]);
 
@@ -38,15 +33,11 @@ class Version20161024212538 extends WallabagMigration
     {
         $clientsTable = $schema->getTable($this->getTable('oauth2_clients'));
 
-        if ($clientsTable->hasColumn('user_id')) {
-            $this->write('It seems that you already played this migration.');
-
-            return;
-        }
+        $this->skipIf(!$clientsTable->hasColumn('user_id'), 'It seems that you already played this migration.');
 
         $clientsTable->dropColumn('user_id', 'integer');
 
-        if (!$this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
+        if ('sqlite' !== $this->connection->getDatabasePlatform()->getName()) {
             $clientsTable->removeForeignKey($this->constraintName);
         }
     }

app/DoctrineMigrations/Version20161031132655.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added the internal setting to enable/disable downloading pictures.
@@ -12,7 +12,9 @@ class Version20161031132655 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $images = $this->connection
+        $images = $this->container
+            ->get('doctrine.orm.default_entity_manager')
+            ->getConnection()
             ->fetchOne('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'download_images_enabled'");
 
         $this->skipIf(false !== $images, 'It seems that you already played this migration.');

app/DoctrineMigrations/Version20161104073720.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added created_at index on entry table.

app/DoctrineMigrations/Version20161106113822.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added action_mark_as_read field on config table.

app/DoctrineMigrations/Version20161117071626.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added the internal setting to share articles to unmark.it.
@@ -12,14 +12,18 @@ class Version20161117071626 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $share = $this->connection
+        $share = $this->container
+            ->get('doctrine.orm.default_entity_manager')
+            ->getConnection()
             ->fetchOne('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'share_unmark'");
 
         if (false === $share) {
             $this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('share_unmark', 0, 'entry')");
         }
 
-        $unmark = $this->connection
+        $unmark = $this->container
+            ->get('doctrine.orm.default_entity_manager')
+            ->getConnection()
             ->fetchOne('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'unmark_url'");
 
         if (false === $unmark) {

app/DoctrineMigrations/Version20161118134328.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add http_status in `entry_table`.

app/DoctrineMigrations/Version20161122144743.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add the restricted_access internal setting for articles with paywall.
@@ -12,7 +12,9 @@ class Version20161122144743 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $access = $this->connection
+        $access = $this->container
+            ->get('doctrine.orm.default_entity_manager')
+            ->getConnection()
             ->fetchOne('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'restricted_access'");
 
         $this->skipIf(false !== $access, 'It seems that you already played this migration.');

app/DoctrineMigrations/Version20161122203647.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Methods and properties removed from `FOS\UserBundle\Model\User`.

app/DoctrineMigrations/Version20161128084725.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added list_mode in user config.

app/DoctrineMigrations/Version20161128131503.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Removed locked, credentials_expire_at and expires_at.

app/DoctrineMigrations/Version20161214094402.php

@@ -2,11 +2,8 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\MySQLPlatform;
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Renamed uuid to uid in entry table.
@@ -17,26 +14,20 @@ class Version20161214094402 extends WallabagMigration
     {
         $entryTable = $schema->getTable($this->getTable('entry'));
 
-        if ($entryTable->hasColumn('uid')) {
-            $this->write('It seems that you already played this migration.');
+        $this->skipIf($entryTable->hasColumn('uid'), 'It seems that you already played this migration.');
 
-            return;
-        }
-
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'sqlite':
                 $this->addSql('CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM ' . $this->getTable('entry'));
                 $this->addSql('DROP TABLE ' . $this->getTable('entry'));
                 $this->addSql('CREATE TABLE ' . $this->getTable('entry') . ' (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, uid CLOB DEFAULT NULL COLLATE BINARY, 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, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, is_public BOOLEAN DEFAULT "0", PRIMARY KEY(id));');
                 $this->addSql('INSERT INTO ' . $this->getTable('entry') . ' (id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public) SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM __temp__wallabag_entry;');
                 $this->addSql('DROP TABLE __temp__wallabag_entry');
                 break;
-            case $platform instanceof MySQLPlatform:
+            case 'mysql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE uuid uid VARCHAR(23)');
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' RENAME uuid TO uid');
         }
     }
@@ -45,22 +36,16 @@ class Version20161214094402 extends WallabagMigration
     {
         $entryTable = $schema->getTable($this->getTable('entry'));
 
-        if ($entryTable->hasColumn('uuid')) {
-            $this->write('It seems that you already played this migration.');
+        $this->skipIf($entryTable->hasColumn('uuid'), 'It seems that you already played this migration.');
 
-            return;
-        }
-
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'sqlite':
                 throw new SkipMigrationException('Too complex ...');
                 break;
-            case $platform instanceof MySQLPlatform:
+            case 'mysql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE uid uuid VARCHAR(23)');
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' RENAME uid TO uuid');
         }
     }

app/DoctrineMigrations/Version20161214094403.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added index on wallabag_entry.uid.

app/DoctrineMigrations/Version20170127093841.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added indexes on wallabag_entry.is_starred and wallabag_entry.is_archived.

app/DoctrineMigrations/Version20170327194233.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add the share_scuttle internal setting.
@@ -12,7 +12,9 @@ class Version20170327194233 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $scuttle = $this->connection
+        $scuttle = $this->container
+            ->get('doctrine.orm.default_entity_manager')
+            ->getConnection()
             ->fetchOne('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'share_scuttle'");
 
         $this->skipIf(false !== $scuttle, 'It seems that you already played this migration.');

app/DoctrineMigrations/Version20170405182620.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add published_at and published_by in `entry` table.

app/DoctrineMigrations/Version20170407200919.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Remove isPublic in Entry Table.

app/DoctrineMigrations/Version20170420134133.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Remove download_pictures in craue_config_setting.
@@ -17,7 +17,9 @@ class Version20170420134133 extends WallabagMigration
 
     public function down(Schema $schema): void
     {
-        $downloadPictures = $this->connection
+        $downloadPictures = $this->container
+            ->get('doctrine.orm.default_entity_manager')
+            ->getConnection()
             ->fetchOne('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'download_pictures'");
 
         $this->skipIf(false !== $downloadPictures, 'It seems that you already played this migration.');

app/DoctrineMigrations/Version20170501115751.php

@@ -2,9 +2,8 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add site credential table to store username & password for some website (behind authentication or paywall).
@@ -26,7 +25,7 @@ class Version20170501115751 extends WallabagMigration
         $table->setPrimaryKey(['id']);
         $table->addForeignKeyConstraint($this->getTable('user'), ['user_id'], ['id'], [], 'fk_user');
 
-        if ($this->connection->getDatabasePlatform() instanceof PostgreSQLPlatform) {
+        if ('postgresql' === $this->connection->getDatabasePlatform()->getName()) {
             $schema->dropSequence('site_credential_id_seq');
             $schema->createSequence('site_credential_id_seq');
         }

app/DoctrineMigrations/Version20170510082609.php

@@ -2,9 +2,8 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Changed length for username, username_canonical, email and email_canonical fields in wallabag_user table.
@@ -20,11 +19,7 @@ class Version20170510082609 extends WallabagMigration
 
     public function up(Schema $schema): void
     {
-        if (!$this->connection->getDatabasePlatform() instanceof MySQLPlatform) {
-            $this->write('This migration only apply to MySQL');
-
-            return;
-        }
+        $this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');
 
         foreach ($this->fields as $field) {
             $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CHANGE ' . $field . ' ' . $field . ' VARCHAR(180) NOT NULL;');
@@ -33,11 +28,7 @@ class Version20170510082609 extends WallabagMigration
 
     public function down(Schema $schema): void
     {
-        if (!$this->connection->getDatabasePlatform() instanceof MySQLPlatform) {
-            $this->write('This migration only apply to MySQL');
-
-            return;
-        }
+        $this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');
 
         foreach ($this->fields as $field) {
             $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CHANGE ' . $field . ' ' . $field . ' VARCHAR(255) NOT NULL;');

app/DoctrineMigrations/Version20170511115400.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added `headers` field in entry table.

app/DoctrineMigrations/Version20170511211659.php

@@ -2,12 +2,9 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\MySQLPlatform;
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
+use Doctrine\DBAL\Migrations\SkipMigrationException;
 use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\Exception\SkipMigration;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Increase the length of the "quote" column of "annotation" table.
@@ -16,10 +13,8 @@ class Version20170511211659 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'sqlite':
                 $annotationTableName = $this->getTable('annotation', true);
                 $userTableName = $this->getTable('user', true);
                 $entryTableName = $this->getTable('entry', true);
@@ -27,12 +22,12 @@ class Version20170511211659 extends WallabagMigration
                 $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 ${annotationTableName}
 EOD
                 );
                 $this->addSql('DROP TABLE ' . $annotationTableName);
                 $this->addSql(<<<EOD
-CREATE TABLE {$annotationTableName}
+CREATE TABLE ${annotationTableName}
 (
     id INTEGER PRIMARY KEY NOT NULL,
     user_id INTEGER DEFAULT NULL,
@@ -42,26 +37,26 @@ 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 ${userTableName} (id),
+    CONSTRAINT FK_A7AED006BA364942 FOREIGN KEY (entry_id) REFERENCES ${entryTableName} (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 ${annotationTableName} (user_id);
+CREATE INDEX IDX_A7AED006BA364942 ON ${annotationTableName} (entry_id);
 EOD
                 );
 
                 $this->addSql(<<<EOD
-INSERT INTO {$annotationTableName} (id, user_id, entry_id, text, created_at, updated_at, quote, ranges)
+INSERT INTO ${annotationTableName} (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
                 );
                 $this->addSql('DROP TABLE __temp__wallabag_annotation');
                 break;
-            case $platform instanceof MySQLPlatform:
+            case 'mysql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' MODIFY quote TEXT NOT NULL');
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' ALTER COLUMN quote TYPE TEXT');
                 break;
         }
@@ -71,16 +66,14 @@ EOD
     {
         $tableName = $this->getTable('annotation');
 
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
-                throw new SkipMigration('Too complex ...');
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'sqlite':
+                throw new SkipMigrationException('Too complex ...');
                 break;
-            case $platform instanceof MySQLPlatform:
+            case 'mysql':
                 $this->addSql('ALTER TABLE ' . $tableName . ' MODIFY quote VARCHAR(255) NOT NULL');
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 $this->addSql('ALTER TABLE ' . $tableName . ' ALTER COLUMN quote TYPE VARCHAR(255)');
                 break;
         }

app/DoctrineMigrations/Version20170602075214.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add api_user_registration in craue_config_setting.
@@ -12,7 +12,9 @@ class Version20170602075214 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $apiUserRegistration = $this->connection
+        $apiUserRegistration = $this->container
+            ->get('doctrine.orm.default_entity_manager')
+            ->getConnection()
             ->fetchOne('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'api_user_registration'");
 
         $this->skipIf(false !== $apiUserRegistration, 'It seems that you already played this migration.');

app/DoctrineMigrations/Version20170606155640.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Remove wallabag_url from craue_config_setting.
@@ -13,20 +13,14 @@ class Version20170606155640 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        if (!$schema->hasTable($this->getTable('craue_config_setting'))) {
-            $this->write('Table already renamed');
+        $this->skipIf(!$schema->hasTable($this->getTable('craue_config_setting')), 'Table already renamed');
 
-            return;
-        }
-
-        $apiUserRegistration = $this->connection
+        $apiUserRegistration = $this->container
+            ->get('doctrine.orm.default_entity_manager')
+            ->getConnection()
             ->fetchOne('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'wallabag_url'");
 
-        if (false === $apiUserRegistration) {
-            $this->write('It seems that you already played this migration.');
-
-            return;
-        }
+        $this->skipIf(false === $apiUserRegistration, 'It seems that you already played this migration.');
 
         $this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'wallabag_url'");
     }

app/DoctrineMigrations/Version20170719231144.php

@@ -2,9 +2,8 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Changed tags to lowercase.
@@ -13,14 +12,10 @@ class Version20170719231144 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        if ($this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
-            $this->write('Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
-
-            return;
-        }
+        $this->skipIf('sqlite' === $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
 
         // Find tags which need to be merged
-        $dupTags = $this->connection->executeQuery('
+        $dupTags = $this->connection->query('
             SELECT LOWER(label) AS lower_label
             FROM   ' . $this->getTable('tag') . '
             GROUP BY LOWER(label)
@@ -31,13 +26,13 @@ class Version20170719231144 extends WallabagMigration
             $label = $duplicates['lower_label'];
 
             // Retrieve all duplicate tags for a given tag
-            $tags = $this->connection->executeQuery('
+            $tags = $this->connection->query('
                 SELECT id
                 FROM   ' . $this->getTable('tag') . '
                 WHERE  LOWER(label) = :label
                 ORDER BY id ASC',
                 [
-                    'label' => $label,
+                  'label' => $label,
                 ]
             );
 

app/DoctrineMigrations/Version20170824113337.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add starred_at column and set its value to updated_at for is_starred entries.

app/DoctrineMigrations/Version20171008195606.php

@@ -2,11 +2,8 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\MySQLPlatform;
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Changed reading_time field to prevent null value.
@@ -15,20 +12,14 @@ class Version20171008195606 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $platform = $this->connection->getDatabasePlatform();
+        $this->skipIf('sqlite' === $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
 
-        if ($platform instanceof SqlitePlatform) {
-            $this->write('Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
-
-            return;
-        }
-
-        switch (true) {
-            case $platform instanceof MySQLPlatform:
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'mysql':
                 $this->addSql('UPDATE ' . $this->getTable('entry') . ' SET reading_time = 0 WHERE reading_time IS NULL;');
                 $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE reading_time reading_time INT(11) NOT NULL;');
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 $this->addSql('UPDATE ' . $this->getTable('entry') . ' SET reading_time = 0 WHERE reading_time IS NULL;');
                 $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' ALTER COLUMN reading_time SET NOT NULL;');
                 break;
@@ -37,19 +28,13 @@ class Version20171008195606 extends WallabagMigration
 
     public function down(Schema $schema): void
     {
-        $platform = $this->connection->getDatabasePlatform();
+        $this->skipIf('sqlite' === $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
 
-        if ($platform instanceof SqlitePlatform) {
-            $this->write('Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
-
-            return;
-        }
-
-        switch (true) {
-            case $platform instanceof MySQLPlatform:
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'mysql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE reading_time reading_time INT(11);');
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' ALTER COLUMN reading_time DROP NOT NULL;');
                 break;
         }

app/DoctrineMigrations/Version20171105202000.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add origin_url column.

app/DoctrineMigrations/Version20171120163128.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add store_article_headers in craue_config_setting.
@@ -12,7 +12,9 @@ class Version20171120163128 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $storeArticleHeaders = $this->connection
+        $storeArticleHeaders = $this->container
+            ->get('doctrine.orm.default_entity_manager')
+            ->getConnection()
             ->fetchOne('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'store_article_headers'");
 
         $this->skipIf(false !== $storeArticleHeaders, 'It seems that you already played this migration.');

app/DoctrineMigrations/Version20171125164500.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add shaarli_share_origin_url in craue_config_setting.
@@ -12,7 +12,9 @@ class Version20171125164500 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $shaarliShareOriginUrl = $this->connection
+        $shaarliShareOriginUrl = $this->container
+            ->get('doctrine.orm.default_entity_manager')
+            ->getConnection()
             ->fetchOne('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'shaarli_share_origin_url'");
 
         $this->skipIf(false !== $shaarliShareOriginUrl, 'It seems that you already played this migration.');

app/DoctrineMigrations/Version20180405182455.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add archived_at column and set its value to updated_at for is_archived entries.

app/DoctrineMigrations/Version20181128203230.php

@@ -2,9 +2,8 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Fix varchar field from vendor to work with utf8mb4.
@@ -13,11 +12,7 @@ class Version20181128203230 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        if (!$this->connection->getDatabasePlatform() instanceof MySQLPlatform) {
-            $this->write('This migration can only be applied on \'mysql\'.');
-
-            return;
-        }
+        $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)');
@@ -32,11 +27,7 @@ class Version20181128203230 extends WallabagMigration
 
     public function down(Schema $schema): void
     {
-        if (!$this->connection->getDatabasePlatform() instanceof MySQLPlatform) {
-            $this->write('This migration can only be applied on \'mysql\'.');
-
-            return;
-        }
+        $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)');

app/DoctrineMigrations/Version20181202073750.php

@@ -2,11 +2,8 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\MySQLPlatform;
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add 2fa OTP stuff.
@@ -15,10 +12,8 @@ final class Version20181202073750 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        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');
@@ -33,13 +28,13 @@ final class Version20181202073750 extends WallabagMigration
                 $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 $platform instanceof MySQLPlatform:
+            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 $platform instanceof PostgreSQLPlatform:
+            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');
@@ -50,10 +45,8 @@ final class Version20181202073750 extends WallabagMigration
 
     public function down(Schema $schema): void
     {
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        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');
@@ -66,13 +59,13 @@ final class Version20181202073750 extends WallabagMigration
                 $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 $platform instanceof MySQLPlatform:
+            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 $platform instanceof PostgreSQLPlatform:
+            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');

app/DoctrineMigrations/Version20190117131816.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add updated_at fields to site_credential table.

app/DoctrineMigrations/Version20190129120000.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add missing entries in craue_config_setting.
@@ -121,7 +121,9 @@ final class Version20190129120000 extends WallabagMigration
     public function up(Schema $schema): void
     {
         foreach ($this->settings as $setting) {
-            $settingEnabled = $this->connection
+            $settingEnabled = $this->container
+                ->get('doctrine.orm.default_entity_manager')
+                ->getConnection()
                 ->fetchOne('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = '" . $setting['name'] . "'");
 
             if (false !== $settingEnabled) {

app/DoctrineMigrations/Version20190401105353.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add hashed_url in entry.

app/DoctrineMigrations/Version20190425115043.php

@@ -2,11 +2,8 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\MySQLPlatform;
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Rename rss_token & rss_limit to feed_token & feed_limit.
@@ -15,10 +12,8 @@ final class Version20190425115043 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        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));
@@ -27,11 +22,11 @@ final class Version20190425115043 extends WallabagMigration
                 $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 $platform instanceof MySQLPlatform:
+            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 $platform instanceof PostgreSQLPlatform:
+            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;
@@ -40,10 +35,8 @@ final class Version20190425115043 extends WallabagMigration
 
     public function down(Schema $schema): void
     {
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        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) . '"');
@@ -52,11 +45,11 @@ final class Version20190425115043 extends WallabagMigration
                 $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 $platform instanceof MySQLPlatform:
+            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 $platform instanceof PostgreSQLPlatform:
+            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

@@ -2,12 +2,9 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\MySQLPlatform;
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
+use Doctrine\DBAL\Migrations\SkipMigrationException;
 use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\Exception\SkipMigration;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Enable cascade delete when deleting a user on:
@@ -20,10 +17,8 @@ final class Version20190510141130 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        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');
@@ -65,7 +60,7 @@ final class Version20190510141130 extends WallabagMigration
                 $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 $platform instanceof MySQLPlatform:
+            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');
 
@@ -80,7 +75,7 @@ final class Version20190510141130 extends WallabagMigration
                 $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 $platform instanceof PostgreSQLPlatform:
+            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');
 
@@ -98,6 +93,6 @@ final class Version20190510141130 extends WallabagMigration
 
     public function down(Schema $schema): void
     {
-        throw new SkipMigration('Too complex ...');
+        throw new SkipMigrationException('Too complex ...');
     }
 }

app/DoctrineMigrations/Version20190511165128.php

@@ -4,9 +4,8 @@ declare(strict_types=1);
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Convert tab label to utf8mb4_bin (MySQL only).
@@ -15,11 +14,7 @@ final class Version20190511165128 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        if (!$this->connection->getDatabasePlatform() instanceof MySQLPlatform) {
-            $this->write('This migration only apply to MySQL');
-
-            return;
-        }
+        $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;');
@@ -27,11 +22,7 @@ final class Version20190511165128 extends WallabagMigration
 
     public function down(Schema $schema): void
     {
-        if (!$this->connection->getDatabasePlatform() instanceof MySQLPlatform) {
-            $this->write('This migration only apply to MySQL');
-
-            return;
-        }
+        $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

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added `given_url` & `hashed_given_url` field in entry table.

app/DoctrineMigrations/Version20190619093534.php

@@ -2,9 +2,8 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Change reading_time field on SQLite to be integer NOT NULL
@@ -15,11 +14,7 @@ final class Version20190619093534 extends WallabagMigration
     public function up(Schema $schema): void
     {
         // this up() migration is auto-generated, please modify it to your needs
-        if (!$this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
-            $this->write('Migration can only be executed safely on \'sqlite\'.');
-
-            return;
-        }
+        $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;');
 
@@ -47,11 +42,7 @@ final class Version20190619093534 extends WallabagMigration
     public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
-        if (!$this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
-            $this->write('Migration can only be executed safely on \'sqlite\'.');
-
-            return;
-        }
+        $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');

app/DoctrineMigrations/Version20190708122957.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Change reading speed value.

app/DoctrineMigrations/Version20190806130304.php

@@ -2,11 +2,8 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\MySQLPlatform;
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Adding more index to kill some slow queries:
@@ -21,10 +18,8 @@ final class Version20190806130304 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        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');
@@ -49,7 +44,7 @@ final class Version20190806130304 extends WallabagMigration
                 $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 $platform instanceof MySQLPlatform:
+            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)');
@@ -58,7 +53,7 @@ final class Version20190806130304 extends WallabagMigration
                 $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 $platform instanceof PostgreSQLPlatform:
+            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)');
@@ -72,10 +67,8 @@ final class Version20190806130304 extends WallabagMigration
 
     public function down(Schema $schema): void
     {
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'sqlite':
                 $this->addSql('DROP INDEX IDX_F4D18282A76ED395');
                 $this->addSql('DROP INDEX created_at');
                 $this->addSql('DROP INDEX uid');
@@ -100,7 +93,7 @@ final class Version20190806130304 extends WallabagMigration
                 $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 $platform instanceof MySQLPlatform:
+            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'));
@@ -109,7 +102,7 @@ final class Version20190806130304 extends WallabagMigration
                 $this->addSql('DROP INDEX tag_label ON ' . $this->getTable('tag'));
                 $this->addSql('DROP INDEX config_feed_token ON ' . $this->getTable('config'));
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            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'));

app/DoctrineMigrations/Version20190808124957.php

@@ -2,11 +2,8 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\MySQLPlatform;
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Change the internal setting table name.
@@ -15,16 +12,14 @@ final class Version20190808124957 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        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 $platform instanceof MySQLPlatform:
+            case 'mysql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('craue_config_setting') . ' RENAME ' . $this->getTable('internal_setting'));
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('craue_config_setting') . ' RENAME TO ' . $this->getTable('internal_setting'));
                 break;
         }
@@ -32,16 +27,14 @@ final class Version20190808124957 extends WallabagMigration
 
     public function down(Schema $schema): void
     {
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        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 $platform instanceof MySQLPlatform:
+            case 'mysql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('internal_setting') . ' RENAME ' . $this->getTable('craue_config_setting'));
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('internal_setting') . ' RENAME TO ' . $this->getTable('craue_config_setting'));
                 break;
         }

app/DoctrineMigrations/Version20190826204730.php

@@ -4,9 +4,8 @@ declare(strict_types=1);
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add tables for the ignore origin rules.
@@ -24,7 +23,7 @@ final class Version20190826204730 extends WallabagMigration
             $userTable->setPrimaryKey(['id']);
             $userTable->addForeignKeyConstraint($this->getTable('config'), ['config_id'], ['id'], [], 'fk_config');
 
-            if ($this->connection->getDatabasePlatform() instanceof PostgreSQLPlatform) {
+            if ('postgresql' === $this->connection->getDatabasePlatform()->getName()) {
                 $schema->dropSequence('ignore_origin_user_rule_id_seq');
                 $schema->createSequence('ignore_origin_user_rule_id_seq');
             }
@@ -36,7 +35,7 @@ final class Version20190826204730 extends WallabagMigration
             $instanceTable->addColumn('rule', 'string', ['length' => 255]);
             $instanceTable->setPrimaryKey(['id']);
 
-            if ($this->connection->getDatabasePlatform() instanceof PostgreSQLPlatform) {
+            if ('postgresql' === $this->connection->getDatabasePlatform()->getName()) {
                 $schema->dropSequence('ignore_origin_instance_rule_id_seq');
                 $schema->createSequence('ignore_origin_instance_rule_id_seq');
             }
@@ -45,12 +44,14 @@ final class Version20190826204730 extends WallabagMigration
 
     public function postUp(Schema $schema): void
     {
-        foreach ($this->defaultIgnoreOriginInstanceRules as $entity) {
-            $previous_rule = $this->connection
+        foreach ($this->container->getParameter('wallabag_core.default_ignore_origin_instance_rules') as $entity) {
+            $previous_rule = $this->container
+                ->get('doctrine.orm.default_entity_manager')
+                ->getConnection()
                 ->fetchOne('SELECT * FROM ' . $this->getTable('ignore_origin_instance_rule') . " WHERE rule = '" . $entity['rule'] . "'");
 
             if (false === $previous_rule) {
-                $this->connection->executeQuery('INSERT INTO ' . $this->getTable('ignore_origin_instance_rule') . " (rule) VALUES ('" . $entity['rule'] . "');");
+                $this->addSql('INSERT INTO ' . $this->getTable('ignore_origin_instance_rule') . " (rule) VALUES ('" . $entity['rule'] . "');");
             }
         }
     }

app/DoctrineMigrations/Version20200414120227.php

@@ -2,9 +2,9 @@
 
 namespace Application\Migrations;
 
+use Doctrine\DBAL\Migrations\SkipMigrationException;
 use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\Exception\SkipMigration;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Remove baggy theme.
@@ -18,6 +18,6 @@ final class Version20200414120227 extends WallabagMigration
 
     public function down(Schema $schema): void
     {
-        throw new SkipMigration('Not possible ... ');
+        throw new SkipMigrationException('Not possible ... ');
     }
 }

app/DoctrineMigrations/Version20200428072628.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Renamed Piwik to Matomo in configuration.

app/DoctrineMigrations/Version20221123132612.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Drop theme fields from config table.

app/DoctrineMigrations/Version20221221092957.php

@@ -2,11 +2,8 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\MySQLPlatform;
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Remove the deprecated (and removed in DBAL v3) `json_array` type.
@@ -16,10 +13,8 @@ final class Version20221221092957 extends WallabagMigration
     public function up(Schema $schema): void
     {
         $userTable = $this->getTable('user');
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'sqlite':
                 $this->addSql('CREATE TEMPORARY TABLE __temp__wallabag_user AS SELECT id, username, username_canonical, email, email_canonical, enabled, password, last_login, password_requested_at, name, created_at, updated_at, authCode, emailTwoFactor, salt, confirmation_token, roles, googleAuthenticatorSecret, backupCodes FROM ' . $userTable);
                 $this->addSql('DROP TABLE ' . $userTable);
                 $this->addSql('CREATE TABLE ' . $userTable . ' (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, salt VARCHAR(255) DEFAULT NULL, password VARCHAR(255) NOT NULL, last_login DATETIME DEFAULT NULL, confirmation_token VARCHAR(180) DEFAULT NULL, password_requested_at DATETIME DEFAULT NULL, roles CLOB NOT NULL --(DC2Type:array)
@@ -31,10 +26,10 @@ final class Version20221221092957 extends WallabagMigration
                 $this->addSql('CREATE UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF ON ' . $userTable . ' (email_canonical)');
                 $this->addSql('CREATE UNIQUE INDEX UNIQ_1D63E7E5C05FB297 ON ' . $userTable . ' (confirmation_token)');
                 break;
-            case $platform instanceof MySQLPlatform:
+            case 'mysql':
                 $this->addSql('ALTER TABLE ' . $userTable . ' CHANGE backupCodes backupCodes JSON DEFAULT NULL');
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 $this->addSql('ALTER TABLE ' . $userTable . ' ALTER backupcodes TYPE JSON USING backupcodes::json');
                 break;
         }
@@ -43,10 +38,8 @@ final class Version20221221092957 extends WallabagMigration
     public function down(Schema $schema): void
     {
         $userTable = $this->getTable('user');
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'sqlite':
                 $this->addSql('CREATE TEMPORARY TABLE __temp__wallabag_user 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, googleAuthenticatorSecret, backupCodes, emailTwoFactor FROM ' . $userTable);
                 $this->addSql('DROP TABLE ' . $userTable);
                 $this->addSql('CREATE TABLE ' . $userTable . ' (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, salt VARCHAR(255) DEFAULT NULL, password VARCHAR(255) NOT NULL, last_login DATETIME DEFAULT NULL, confirmation_token VARCHAR(180) DEFAULT NULL, password_requested_at DATETIME DEFAULT NULL, roles CLOB NOT NULL --(DC2Type:array)
@@ -58,10 +51,10 @@ final class Version20221221092957 extends WallabagMigration
                 $this->addSql('CREATE UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF ON ' . $userTable . ' (email_canonical)');
                 $this->addSql('CREATE UNIQUE INDEX UNIQ_1D63E7E5C05FB297 ON ' . $userTable . ' (confirmation_token)');
                 break;
-            case $platform instanceof MySQLPlatform:
+            case 'mysql':
                 $this->addSql('ALTER TABLE ' . $userTable . ' CHANGE backupCodes backupCodes JSON DEFAULT NULL COMMENT \'(DC2Type:json_array)\'');
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 $this->addSql('ALTER TABLE ' . $userTable . ' ALTER backupCodes TYPE TEXT');
                 break;
         }

app/DoctrineMigrations/Version20230613121354.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\Doctrine\WallabagMigration;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added a new setting to display or not thumbnails.

app/Resources/static/themes/_global/img/icons/Diaspora-asterisk.svg

@@ -0,0 +1,261 @@
+<svg height="770" width="800" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g transform="translate(21.42857 -101.6479)"><image height="770" width="800" x="-21.42857" xlink:href="data:image/png;base64,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" y="101.6479"/><path d="m482.45517 806.8979c-21.575-30.1125-55.23748-77.12866-74.80551-104.48035-19.98598-27.9359-36.2457-49.73896-37.10125-49.75-.87914-.0113-32.32337 42.25713-74.37706 99.98035-40.06973 55-73.18741 100-73.59485 100-1.1396 0-144.46068-100.94983-144.829571-102.01235-.178476-.51406 32.221521-48.07611 72.000001-105.69344 39.77847-57.61732 72.3245-105.66675 72.3245-106.77649 0-1.78957-12.89022-6.31508-114-40.0232-62.7-20.90302-114.613999-38.24519-115.364443-38.53815-1.043816-.4075 4.925559-20.38013 25.402971-84.99452 14.722078-46.45402 27.100359-84.84113 27.507293-85.3047.406933-.46357 54.900599 16.97442 121.097029 38.75107 66.19643 21.77666 120.91108 39.59345 121.5881 39.59285.67702-.00059 1.44284-1.01357 1.70181-2.25107.25898-1.2375.83006-57.6 1.26906-125.25s1.16224-123.5625 1.6072-124.25c.63709-.98436 19.23178-1.24675 87.5-1.23469 47.68004.008 87.18776.34593 87.79493.75.76529.50931 2.07325 37.70117 4.26357 121.23469 3.5965 137.16189 3.67401 139 5.86123 139 .84816 0 53.3106-17.56056 116.58321-39.02347 63.2726-21.46291 115.34958-38.67541 115.72663-38.25 1.27822 1.44219 53.1745 170.39371 52.53554 171.03267-.34901.34901-53.15524 18.43347-117.34717 40.18769-88.30357 29.92548-116.78951 39.96068-117.02855 41.22754-.17651.93542 30.19001 46.31568 68.80279 102.8201 38.0153 55.63011 68.97925 101.56053 68.80877 102.06759-.39157 1.16463-142.63129 105.93788-143.82081 105.93788-.48298 0-18.53042-24.6375-40.10542-54.75z" fill="#fff"/></g></svg>

app/Resources/static/themes/_global/index.js

@@ -0,0 +1,119 @@
+/* jQuery */
+import $ from 'jquery';
+
+/* Annotations */
+import annotator from 'annotator';
+
+import ClipboardJS from 'clipboard';
+import 'mathjax/es5/tex-svg';
+
+/* Fonts */
+import 'material-design-icons-iconfont/dist/material-design-icons.css';
+import 'lato-font/css/lato-font.css';
+import './global.scss';
+
+/* Shortcuts */
+import './js/shortcuts/entry';
+import './js/shortcuts/main';
+
+/* Hightlight */
+import './js/highlight';
+
+import { savePercent, retrievePercent } from './js/tools';
+
+/* ==========================================================================
+ Annotations & Remember position
+ ========================================================================== */
+
+$(document).ready(() => {
+  if ($('article').length) {
+    const app = new annotator.App();
+
+    app.include(annotator.ui.main, {
+      element: document.querySelector('article'),
+    });
+
+    const authorization = {
+      permits() { return true; },
+    };
+    app.registry.registerUtility(authorization, 'authorizationPolicy');
+
+    const x = JSON.parse($('#annotationroutes').html());
+    app.include(annotator.storage.http, $.extend({}, x, {
+      onError(msg, xhr) {
+        if (!Object.prototype.hasOwnProperty.call(xhr, 'responseJSON')) {
+          annotator.notification.banner('An error occurred', 'error');
+          return;
+        }
+        $.each(xhr.responseJSON.children, (k, v) => {
+          if (v.errors) {
+            $.each(v.errors, (n, errorText) => {
+              annotator.notification.banner(errorText, 'error');
+            });
+          }
+        });
+      },
+    }));
+
+    app.start().then(() => {
+      app.annotations.load({ entry: x.entryId });
+    });
+
+    $(window).scroll(() => {
+      const scrollTop = $(window).scrollTop();
+      const docHeight = $(document).height();
+      const scrollPercent = (scrollTop) / (docHeight);
+      const scrollPercentRounded = Math.round(scrollPercent * 100) / 100;
+      savePercent(x.entryId, scrollPercentRounded);
+    });
+
+    retrievePercent(x.entryId);
+
+    $(window).resize(() => {
+      retrievePercent(x.entryId, true);
+    });
+  }
+
+  document.querySelectorAll('[data-handler=tag-rename]').forEach((item) => {
+    const current = item;
+    current.wallabag_edit_mode = false;
+    current.onclick = (event) => {
+      const target = event.currentTarget;
+
+      if (target.wallabag_edit_mode === false) {
+        $(target.parentNode.querySelector('[data-handle=tag-link]')).addClass('hidden');
+        $(target.parentNode.querySelector('[data-handle=tag-rename-form]')).removeClass('hidden');
+        target.parentNode.querySelector('[data-handle=tag-rename-form] input').focus();
+        target.querySelector('.material-icons').innerHTML = 'done';
+
+        target.wallabag_edit_mode = true;
+      } else {
+        target.parentNode.querySelector('[data-handle=tag-rename-form]').submit();
+      }
+    };
+  });
+
+  // mimic radio button because emailTwoFactor is a boolean
+  $('#update_user_googleTwoFactor').on('change', () => {
+    $('#update_user_emailTwoFactor').prop('checked', false);
+  });
+
+  $('#update_user_emailTwoFactor').on('change', () => {
+    $('#update_user_googleTwoFactor').prop('checked', false);
+  });
+
+  // same mimic for super admin
+  $('#user_googleTwoFactor').on('change', () => {
+    $('#user_emailTwoFactor').prop('checked', false);
+  });
+
+  $('#user_emailTwoFactor').on('change', () => {
+    $('#user_googleTwoFactor').prop('checked', false);
+  });
+
+  // handle copy to clipboard for developer stuff
+  const clipboard = new ClipboardJS('.btn');
+  clipboard.on('success', (e) => {
+    e.clearSelection();
+  });
+});

app/Resources/static/themes/_global/js/bookmarklet.js

@@ -0,0 +1,4 @@
+top['bookmarklet-url@wallabag.org'] = '<!DOCTYPE html><html><head><title>bag it!</title>'
+    + '<link rel="icon" href="tpl/img/favicon.ico" />'
+    + '</head><body><script>window.onload=function(){window.setTimeout'
+    + '(function(){history.back();},250);};</script></body></html>';

app/Resources/static/themes/_global/js/highlight.js

@@ -0,0 +1,8 @@
+import 'highlight.js/styles/atom-one-light.css';
+import hljs from 'highlight.js';
+
+window.addEventListener('load', () => {
+  document.querySelectorAll('pre').forEach((element) => {
+    hljs.highlightElement(element);
+  });
+});

app/Resources/static/themes/_global/js/shortcuts/main.js

@@ -0,0 +1,15 @@
+import Mousetrap from 'mousetrap';
+
+/* Shortcuts */
+
+/* Go to */
+Mousetrap.bind('g u', () => { window.location.href = Routing.generate('homepage'); });
+Mousetrap.bind('g s', () => { window.location.href = Routing.generate('starred'); });
+Mousetrap.bind('g r', () => { window.location.href = Routing.generate('archive'); });
+Mousetrap.bind('g a', () => { window.location.href = Routing.generate('all'); });
+Mousetrap.bind('g t', () => { window.location.href = Routing.generate('tag'); });
+Mousetrap.bind('g c', () => { window.location.href = Routing.generate('config'); });
+Mousetrap.bind('g i', () => { window.location.href = Routing.generate('import'); });
+Mousetrap.bind('g d', () => { window.location.href = Routing.generate('developer'); });
+Mousetrap.bind('?', () => { window.location.href = Routing.generate('howto'); });
+Mousetrap.bind('g l', () => { window.location.href = Routing.generate('fos_user_security_logout'); });

app/Resources/static/themes/_global/js/tools.js

@@ -0,0 +1,36 @@
+import $ from 'jquery';
+import './shortcuts/main';
+import './shortcuts/entry';
+
+/* Allows inline call qr-code call */
+import jrQrcode from 'jr-qrcode'; // eslint-disable-line
+
+function supportsLocalStorage() {
+  try {
+    return 'localStorage' in window && window.localStorage !== null;
+  } catch (e) {
+    return false;
+  }
+}
+
+function savePercent(id, percent) {
+  if (!supportsLocalStorage()) { return false; }
+  localStorage[`wallabag.article.${id}.percent`] = percent;
+  return true;
+}
+
+function retrievePercent(id, resized) {
+  if (!supportsLocalStorage()) { return false; }
+
+  const bheight = $(document).height();
+  const percent = localStorage[`wallabag.article.${id}.percent`];
+  const scroll = bheight * percent;
+
+  if (!resized) {
+    $('html,body').animate({ scrollTop: scroll }, 'fast');
+  }
+
+  return true;
+}
+
+export { savePercent, retrievePercent };

app/Resources/static/themes/_global/share.js

@@ -0,0 +1 @@
+import './share.scss';

app/Resources/static/themes/material/css/article.scss

@@ -1,10 +1,8 @@
-@use "variables";
-
 /* ==========================================================================
    Article
    ========================================================================== */
 
-#article, #preview-article {
+#article {
   font-size: 20px;
   margin: 0 auto;
   max-width: 45em;
@@ -56,7 +54,7 @@
     }
 
     a {
-      border-bottom: 1px dotted variables.$blue-accent-color;
+      border-bottom: 1px dotted $blue-accent-color;
       text-decoration: none;
     }
 
@@ -237,12 +235,6 @@
   z-index: 9999;
 }
 
-.tags-add-form {
-  display: flex;
-  align-items: center;
-  gap: 20px;
-}
-
 @media only screen and (max-width: 640px) {
   .entry-info {
     margin-bottom: 20px;
@@ -266,12 +258,4 @@
   #article .entry-info .chip-action {
     min-width: 40px;
   }
-
-  .tags-add-form {
-    display: block;
-  }
-
-  .tags-add-form-submit {
-    margin-top: 10px;
-  }
 }

app/Resources/static/themes/material/css/cards.scss

@@ -1,11 +1,9 @@
-@use "variables";
-
 /* ==========================================================================
    Cards
    ========================================================================== */
 
 main {
-  div#content {
+  #content {
     padding: 0 0.5rem;
   }
 }
@@ -75,7 +73,7 @@ main {
 
   .card-entry-labels-hidden li {
     display: inline-block;
-    background-color: variables.$blue-accent-color;
+    background-color: $blue-accent-color;
     margin: 0 5px;
     padding: 5px 12px;
     border-radius: 3px;
@@ -154,20 +152,11 @@ a.original:not(.waves-effect) {
   }
 }
 
-.card .card-content .card-title,
-.card-stacked .card-content .card-title {
-  display: -webkit-box;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
-}
-
 .card-entry-labels li,
 .card-tag-labels li {
   margin: 10px 10px 10px auto;
   padding: 5px 12px 5px 16px !important;
-  background-color: variables.$blue-accent-color;
+  background-color: $blue-accent-color;
   border-radius: 3px;
   color: #fff;
   cursor: default;
@@ -188,7 +177,6 @@ a.original:not(.waves-effect) {
 .card-entry-tags a,
 .card-entry-labels a,
 .card-tag-labels a,
-.card-tag-labels button,
 .card-entry-labels-hidden a,
 #list .chip a {
   text-decoration: none;
@@ -196,14 +184,6 @@ a.original:not(.waves-effect) {
   color: #fff;
 }
 
-.card-tag-labels button {
-  background: transparent;
-  border: none;
-  font-weight: normal;
-  color: #fff;
-  cursor: pointer;
-}
-
 .card-tag-link {
   width: calc(100% - 24px);
   line-height: 1.3;
@@ -214,7 +194,6 @@ a.original:not(.waves-effect) {
 
 .card-tag-form {
   display: flex;
-  align-items: center;
   min-width: 100px;
   flex-grow: 1;
 }
@@ -268,7 +247,7 @@ a.original:not(.waves-effect) {
     }
 
     .chip {
-      background-color: variables.$blue-accent-color;
+      background-color: $blue-accent-color;
       padding: 0 7px;
       margin: auto 1px;
       border-radius: 6px;
@@ -289,11 +268,9 @@ a.original:not(.waves-effect) {
     }
 
     @include mixin-reading-time {
-      & {
-        padding: 0 5px;
-        flex-wrap: wrap;
-        margin-left: auto;
-      }
+      padding: 0 5px;
+      flex-wrap: wrap;
+      margin-left: auto;
 
       i.material-icons {
         font-size: 20px;
@@ -347,12 +324,6 @@ a.original:not(.waves-effect) {
   height: 3rem;
 }
 
-.settings .settings-range-label {
-  position: absolute;
-  top: -14px;
-  font-size: 0.8rem;
-}
-
 .entries-row {
   display: grid;
   margin: 0.4rem 0 0;

app/Resources/static/themes/material/css/dark_theme.scss

@@ -12,9 +12,9 @@
   .collapsible-header,
   .collection,
   .dropdown-content,
-  .sidenav,
-  .sidenav .collapsible-body,
-  .sidenav.sidenav-fixed .collapsible-body,
+  .side-nav,
+  .side-nav .collapsible-body,
+  .side-nav.fixed .collapsible-body,
   .tabs {
     background-color: #131716;
   }
@@ -59,13 +59,10 @@
   #article article h5,
   #article article h6,
   .dropdown-content li > a,
-  .input-field input,
-  .input-field input:focus,
+  .nav-panels .input-field input:focus,
   .results-item,
-  .sidenav li > a,
-  .sidenav li > a > i.material-icons,
-  .sidenav li button,
-  .sidenav li button > i.material-icons {
+  .side-nav li > a,
+  .side-nav li > a > i.material-icons {
     color: #dfdfdf;
   }
 
@@ -84,15 +81,13 @@
     color: #dfdfdf !important;
   }
 
-  .sidenav li.active {
+  .side-nav li.active {
     background-color: #2f2f2f;
   }
 
-  .mass-action-tags .mass-action-tags-input.mass-action-tags-input,
-  .sidenav li:not(.logo) > a:hover,
-  .sidenav li:not(.logo) button:hover,
-  .sidenav .collapsible-header:hover,
-  .sidenav.sidenav-fixed .collapsible-header:hover {
+  .side-nav li:not(.logo) > a:hover,
+  .side-nav .collapsible-header:hover,
+  .side-nav.fixed .collapsible-header:hover {
     background-color: #1d1d1d;
   }
 
@@ -136,21 +131,11 @@
     color: #abb2bf;
   }
 
-  input[type="url"]:not(.browser-default):disabled {
-    color: #9e9e9e;
-  }
-
   .input-field.nav-panel-add.disabled,
   .input-field.nav-panel-add.disabled input {
     background-color: transparent;
   }
 
-  .z-depth-4 {
-    box-shadow: 0 16px 24px 2px rgba(255 255 255 / 14%),
-                0 6px 30px 5px rgba(255 255 255 / 12%),
-                0 8px 10px -7px rgba(255 255 255 / 20%);
-  }
-
   @media only screen and (min-width: 992px) {
     #article {
       background-color: #101010;

app/Resources/static/themes/material/css/entries.scss

@@ -1,5 +1,3 @@
-@use "variables";
-
 /* ==========================================================================
  * Entries
  * ========================================================================== */
@@ -16,53 +14,44 @@
 }
 
 .mass-action {
-  margin: 20px 5px 10px 20px;
+  margin: 10px 5px 10px 20px;
 }
 
 .mass-action-group {
   display: flex;
   padding: 3px;
-  align-items: center;
-  gap: 30px;
+  gap: 10px;
 }
 
 .mass-action-button {
-  height: 36px;
-  line-height: 36px;
-  padding: 0 0.7rem;
+  height: 24px;
+  line-height: 24px;
+  padding: 0 0.5rem;
 
   i {
     font-size: 1rem;
   }
 }
 
-.mass-action-button--tags {
-  border-radius: 2px 0 0 2px;
-}
-
-.card-stacked .entry-checkbox {
+.entry-checkbox {
   margin: 10px 15px 10px 5px;
-}
 
-.card .entry-checkbox {
-  position: absolute;
-  display: flex;
-  padding: 10px;
-  inset: 0;
-  justify-content: flex-end;
-  align-items: start;
-  background-color: rgb(0 172 193 / 20%);
-  cursor: pointer;
-  z-index: 10;
+  .card & {
+    float: right;
+    margin-right: 0;
+    padding: 10px;
+  }
 }
 
 .entries .entry-checkbox-input,
 .mass-action .entry-checkbox-input {
   position: relative;
+  left: 0;
   width: 20px;
   min-height: 25px;
+  height: 100%;
+  vertical-align: middle;
   opacity: initial;
-  cursor: pointer;
   z-index: 10;
 }
 
@@ -75,19 +64,11 @@
 
 .mass-action-tags {
   display: flex;
-  margin-top: 10px;
+  align-items: center;
+  gap: 10px;
 
-  .mass-action-tags-input.mass-action-tags-input {
+  .mass-action-tags-input {
     margin: 0;
-    padding: 0 5px;
-    height: 34px;
-    background: white;
-    border-bottom: 3px solid #c5ebef;
-  }
-
-  .mass-action-tags-input.mass-action-tags-input.mass-action-tags-input:focus {
-    border-bottom: 3px solid variables.$blue-accent-color;
-    box-shadow: none;
   }
 }
 
@@ -107,16 +88,13 @@
 
 .results {
   display: flex;
-  margin-bottom: 10px;
   padding: 1rem 1rem 0;
   flex-wrap: wrap;
   justify-content: space-between;
-}
 
-.nb-results {
-  display: inline-flex;
-  margin-bottom: 20px;
-  gap: 30px;
+  .nb-results {
+    display: inline-flex;
+  }
 }
 
 .results-item {
@@ -183,12 +161,6 @@
   display: none;
 }
 
-blockquote.annotations {
-  margin-top: 5px;
-  padding-left: 1rem;
-  border-left: 5px solid #00acc1;
-}
-
 footer {
   &.page-footer {
     margin-top: 10px;
@@ -201,38 +173,9 @@ footer {
 }
 
 @media screen and (min-width: 993px) {
-  .results {
-    margin-bottom: 0;
-  }
-
-  .nb-results {
-    margin-bottom: 0;
-    gap: 0;
-  }
-
-  .mass-action-button {
-    height: 24px;
-    line-height: 24px;
-    padding: 0 0.5rem;
-  }
-
-  .mass-action-group {
-    gap: 10px;
-  }
-
-  .mass-action-tags {
-    margin-top: 0;
-    margin-left: 7px;
-    flex-wrap: initial;
-  }
-
   .mass-action {
     display: flex;
-    margin-top: 10px;
     align-items: center;
-
-    .mass-action-tags-input.mass-action-tags-input {
-      height: 21px;
-    }
+    gap: 30px;
   }
 }