Date filters type reset to text avoiding datepicker showing twice

Fix jrQrcode

.babelrc

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

.editorconfig

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

.eslintrc.json

@@ -1,6 +1,9 @@
 {
     "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,7 +20,7 @@ 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 `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.
+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.
 
 ### Using your own PHP server
 
@@ -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:
+To run the tests locally run `make test`.
 
-- when testing using Docker: `docker-compose run --rm php make test`
-- otherwise: `make test`
+To run the PHP formatter run `make fix-cs`.
 
-To run the PHP formatter:
+To run the PHPStan static analysis run `make phpstan`.
 
-- when testing using Docker: `docker-compose run --rm php bin/php-cs-fixer fix`
-- otherwise: `php bin/php-cs-fixer fix`
+To run the JS linter run `make lint-js`.
+
+To run the SCSS linter run `make lint-scss`.

.github/dependabot.yml

@@ -7,10 +7,17 @@ updates:
     time: "04:00"
     timezone: Europe/Paris
   open-pull-requests-limit: 10
+  groups:
+    babel-dependencies:
+      patterns:
+        - "*babel*"
+    fontsource-dependencies:
+      patterns:
+        - "*fontsource*"
   ignore:
-  - dependency-name: materialize-css
+  - dependency-name: @materializecss/materialize
     versions:
-    - "> 0.98.2"
+    - "> 1.2.2"
 - package-ecosystem: composer
   directory: "/"
   schedule:
@@ -18,14 +25,28 @@ updates:
     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
-  - tcitworld
+  - yguedidi
   - Kdecherf
   ignore:
   - dependency-name: lcobucci/jwt
     versions:
     - ">= 4.2.0"
+  # until we add support for Symfony 5+
+  - dependency-name: symfony/*
+    versions:
+    - ">= 5.0.0"
 - package-ecosystem: github-actions
   directory: "/"
   schedule:

.github/workflows/assets.yml

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

@@ -13,7 +13,7 @@ permissions:
 jobs:
   coding-standards:
     name: "CS Fixer, PHPStan & TwigCS"
-    runs-on: ubuntu-latest
+    runs-on: "ubuntu-20.04"
 
     steps:
       - name: "Checkout"
@@ -30,25 +30,61 @@ jobs:
         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"
-        uses: "ramsey/composer-install@v2"
+        id: composer-install
+        uses: "ramsey/composer-install@v3"
         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

@@ -8,13 +8,15 @@ on:
       - "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
@@ -33,6 +35,8 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
+          - "8.4"
         database:
           - "sqlite"
           - "mysql"
@@ -53,6 +57,12 @@ 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: |
@@ -68,22 +78,25 @@ jobs:
           pg_isready -d wallabag_test -h localhost -p 5432 -U wallabag
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           composer-options: "--optimize-autoloader --prefer-dist"
 
-      - name: "Prepare database"
-        run: "make prepare DB=${{ matrix.database }}"
+      - name: "Install dependencies with Yarn"
+        run: yarn install
 
-      - name: "Prepare fixtures"
-        run: "make fixtures"
+      - 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/simple-phpunit -v"
+        run: "php bin/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
@@ -119,6 +132,12 @@ 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
@@ -139,15 +158,84 @@ jobs:
           pg_isready -d wallabag_test -h localhost -p 5432 -U wallabag
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           composer-options: "--optimize-autoloader --prefer-dist"
 
-      - name: "Prepare database"
-        run: "make prepare DB=${{ matrix.database }}"
+      - name: "Install dependencies with Yarn"
+        run: yarn install
 
-      - name: "Prepare fixtures"
-        run: "make fixtures"
+      - 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/simple-phpunit -v"
+        run: "php bin/phpunit -v"
+
+  phpunit-without-rmq-redis:
+    name: "PHP ${{ matrix.php }} using ${{ matrix.database }} without Rabbit & Redis"
+    runs-on: "ubuntu-20.04"
+
+    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"

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

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

.github/workflows/translations.yml

@@ -13,7 +13,7 @@ permissions:
 jobs:
   translations:
     name: "Translations"
-    runs-on: ubuntu-latest
+    runs-on: "ubuntu-20.04"
 
     strategy:
       matrix:
@@ -36,7 +36,7 @@ jobs:
           COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: "Install dependencies with Composer"
-        uses: "ramsey/composer-install@v2"
+        uses: "ramsey/composer-install@v3"
         with:
           composer-options: "--optimize-autoloader --prefer-dist"
 

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

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

.php-cs-fixer.dist.php

@@ -1,13 +1,14 @@
 <?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,
@@ -21,21 +22,34 @@ 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,
+        // We override next rule because of current @Symfony ruleSet
+        // 'parameters' element is breaking PHP 7.4
+        // https://cs.symfony.com/doc/rules/control_structure/trailing_comma_in_multiline.html
+        // TODO: remove this configuration after dropping support of PHP 7.4
+        'trailing_comma_in_multiline' => [
+            'elements' => [
+                'arrays',
+                'array_destructuring',
+                'match',
+            ],
+        ],
         'concat_space' => [
-            'spacing' => 'one'
+            'spacing' => 'one',
         ],
     ])
     ->setFinder(
@@ -44,7 +58,7 @@ return $config
                 'node_modules',
                 'vendor',
                 'var',
-                'web'
+                'web',
             ])
             ->in(__DIR__)
     )

CHANGELOG.md

@@ -1,65 +1,8 @@
 # Changelog
 
-## [2.6.14](https://github.com/wallabag/wallabag/tree/2.6.14)
-[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.13...2.6.14)
+## Upcoming changes
 
-### Improvements
-
-* Add annotations filter to entries API endpoint by @skn in https://github.com/wallabag/wallabag/pull/8346
-
-### Fixes
-
-* Fix reading time computation for short entries by @andreadecorte in https://github.com/wallabag/wallabag/pull/8332
-* Fix `urls` parameter when sending many urls to be stored using the API by @j0k3r in https://github.com/wallabag/wallabag/pull/8488
-* Fix docker base image by @yguedidi in https://github.com/wallabag/wallabag/pull/8440
-
-### Technical stuff
-
-* Change version in wallabag.yml by @nicosomb in https://github.com/wallabag/wallabag/pull/8251
-* Fix deprecation by @j0k3r in https://github.com/wallabag/wallabag/pull/8267
-* Update dependencies by @yguedidi in https://github.com/wallabag/wallabag/pull/8435
-* Bump deps (mostly for siteconfig) by @j0k3r in https://github.com/wallabag/wallabag/pull/8489
-
-## [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
-* Backport Pocket and Shaarli HTML imports from master by @nicosomb in 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
-
-### 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
-
-## [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
-* Update dependencies by @yguedidi in 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
-* Fix title tag filter by @nicosomb in 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
-* Fix entries counter for annotated entries in the menu by @j0k3r in https://github.com/wallabag/wallabag/pull/7999
-
-### Technical stuff
-
-* Prepare 2.6.11 release by @yguedidi in https://github.com/wallabag/wallabag/pull/8133
+* `wallassets/` folder renamed to `build/`
 
 ## [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)

GNUmakefile

@@ -11,12 +11,21 @@ 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)
 
@@ -28,25 +37,26 @@ 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)
 
-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
+test: ## Launch wallabag testsuite
+	@$(PHP_NO_XDEBUG) -dmemory_limit=-1 bin/phpunit -v
 
-fixtures: ## Load fixtures into database
-	php bin/console doctrine:fixtures:load --no-interaction --env=test
+fix-cs: ## Run PHP-CS-Fixer
+	@$(PHP_NO_XDEBUG) bin/php-cs-fixer fix
 
-test: prepare fixtures ## Launch wallabag testsuite
-	XDEBUG_MODE=off php -dmemory_limit=-1 bin/simple-phpunit -v
+phpstan: ## Run PHPStan
+	@$(PHP_NO_XDEBUG) bin/phpstan analyse
+
+lint-js: ## Run ESLint
+	@$(YARN) lint:js
+
+lint-scss: ## Run Stylelint
+	@$(YARN) lint:scss
 
 release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`).
 ifndef VERSION
@@ -57,6 +67,6 @@ endif
 deploy: ## Deploy wallabag
 	@bundle exec cap staging deploy
 
-.PHONY: help clean prepare install fixtures update build test release deploy run dev
+.PHONY: help install update build test release deploy run dev fix-cs phpstan
 
 .DEFAULT_GOAL := install

README.md

@@ -55,6 +55,10 @@ 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_core.version`)
+    - `app/config/wallabag.yml` (`wallabag.version`)
     - `CHANGELOG.md`
 - Create a PR named "Prepare $LAST_WALLABAG_RELEASE release".
 - Wait for test to be ok, merge it.
@@ -19,7 +19,7 @@ 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_core.version`)
+- Put the next patch version suffixed with `-dev` in `app/config/wallabag.yml` (`wallabag.version`)
 - Drink a :beer:!
 
 ### Target PHP version

app/AppKernel.php

@@ -3,6 +3,7 @@
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel;
+use Wallabag\Import\ImportCompilerPass;
 
 class AppKernel extends Kernel
 {
@@ -21,7 +22,7 @@ class AppKernel extends Kernel
             new Nelmio\ApiDocBundle\NelmioApiDocBundle(),
             new Nelmio\CorsBundle\NelmioCorsBundle(),
             new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle(),
-            new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(),
+            new Spiriit\Bundle\FormFilterBundle\SpiriitFormFilterBundle(),
             new FOS\OAuthServerBundle\FOSOAuthServerBundle(),
             new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
             new Scheb\TwoFactorBundle\SchebTwoFactorBundle(),
@@ -30,18 +31,10 @@ class AppKernel extends Kernel
             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(),
+            new Symfony\WebpackEncoreBundle\WebpackEncoreBundle(),
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
@@ -76,26 +69,47 @@ class AppKernel extends Kernel
     {
         $loader->load($this->getProjectDir() . '/app/config/config_' . $this->getEnvironment() . '.yml');
 
-        $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) {
+            $this->processDatabaseParameters($container);
+        });
+    }
+
+    protected function build(ContainerBuilder $container)
+    {
+        $container->addCompilerPass(new ImportCompilerPass());
+    }
+
+    private function processDatabaseParameters(ContainerBuilder $container)
+    {
+        switch ($container->getParameter('database_driver')) {
+            case 'pdo_mysql':
+                $scheme = 'mysql';
+                break;
+            case 'pdo_pgsql':
+                $scheme = 'pgsql';
+                break;
+            case 'pdo_sqlite':
+                $scheme = 'sqlite';
+                break;
+            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'));
     }
 }

app/DoctrineMigrations/Version20160812120952.php

@@ -1,51 +0,0 @@
-<?php
-
-namespace Application\Migrations;
-
-use Doctrine\DBAL\Platforms\SqlitePlatform;
-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 ($this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
-            // 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 ($this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
-            $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/Resources/static/themes/_global/img/icons/Diaspora-asterisk.svg

@@ -1,261 +0,0 @@
-<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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
-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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

@@ -1,119 +0,0 @@
-/* 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

@@ -1,4 +0,0 @@
-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/shortcuts/main.js

@@ -1,15 +0,0 @@
-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

@@ -1,36 +0,0 @@
-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

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

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

@@ -1,18 +0,0 @@
-@import "variables";
-
-/* Style */
-@import "article";
-@import "cards";
-@import "entries";
-@import "filters";
-@import "layout";
-@import "nav";
-@import "sidenav";
-@import "various";
-@import "dark_theme";
-
-/* Tools */
-@import "fonts";
-@import "icons";
-@import "print";
-@import "media_queries";

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

@@ -1,36 +0,0 @@
-import $ from 'jquery';
-
-function initFilters() {
-  // no display if filters not available
-  if ($('div').is('#filters')) {
-    $('#button_filters').show();
-    $('.js-filters-action').sideNav({ edge: 'right' });
-    $('#clear_form_filters').on('click', () => {
-      $('#filters input').val('');
-      $('#filters :checked').removeAttr('checked');
-
-      return false;
-    });
-  }
-}
-
-function initExport() {
-  // no display if export not available
-  if ($('div').is('#export')) {
-    $('#button_export').show();
-    $('.js-export-action').sideNav({ edge: 'right' });
-  }
-}
-
-function initRandom() {
-  // no display if export (ie: entries) not available
-  if ($('div').is('#export')) {
-    $('#button_random').show();
-  }
-}
-
-export {
-  initExport,
-  initFilters,
-  initRandom,
-};

app/config/config.yml

@@ -5,9 +5,8 @@ imports:
     - { resource: wallabag.yml }
 
 parameters:
-    # Allows to use the live reload feature for changes in assets
-    use_webpack_dev_server: false
     craue_config.cache_adapter.class: Craue\ConfigBundle\CacheAdapter\SymfonyCacheComponentAdapter
+    env(DATABASE_URL): '%database_scheme%://%database_user%:%database_password%@%database_host%:%database_port%/%database_name%?unix_socket=%database_socket%&charset=%database_charset%'
 
 framework:
     #esi:             ~
@@ -30,42 +29,58 @@ framework:
         handler_id: session.handler.native_file
         save_path: "%kernel.project_dir%/var/sessions/%kernel.environment%"
         cookie_secure: auto
-        cookie_samesite: lax
     fragments: ~
     http_method_override: true
-    assets: ~
+    assets:
+        base_url: '%domain_name%'
+        json_manifest_path: '%kernel.project_dir%/web/build/manifest.json'
     mailer:
         dsn: "%mailer_dsn%"
+    http_client:
+        scoped_clients:
+            download_images.client:
+                scope: '.*'
+            pocket.client:
+                scope: '.*'
+                headers:
+                    Content-Type: 'application/json'
+                    X-Accept: 'application/json'
+            request_html_function.client:
+                scope: '.*'
+            browser.client:
+                scope: '.*'
+                verify_host: false
+                verify_peer: false
 
 # Twig Configuration
 twig:
+    default_path: '%kernel.project_dir%/templates'
     debug: "%kernel.debug%"
     strict_variables: "%kernel.debug%"
     form_themes:
-        - "@LexikFormFilter/Form/form_div_layout.html.twig"
+        - "@SpiriitFormFilter/Form/form_div_layout.html.twig"
     globals:
         registration_enabled: '%fosuser_registration%'
 
 # Doctrine Configuration
 doctrine:
     dbal:
-        driver: "%database_driver%"
-        host: "%database_host%"
-        port: "%database_port%"
-        dbname: "%database_name%"
-        user: "%database_user%"
-        password: "%database_password%"
-        charset: "%database_charset%"
-        path: "%database_path%"
-        unix_socket: "%database_socket%"
+        url: '%env(resolve:DATABASE_URL)%'
         types:
-            json_array: Wallabag\CoreBundle\Doctrine\JsonArrayType
+            json_array: Wallabag\Doctrine\JsonArrayType
 
     orm:
         auto_generate_proxy_classes: "%kernel.debug%"
         entity_managers:
             default:
                 auto_mapping: true
+                mappings:
+                    Wallabag:
+                        type: annotation
+                        is_bundle: false
+                        dir: '%kernel.project_dir%/src/Entity'
+                        prefix: 'Wallabag\Entity'
+                        alias: Wallabag
 
 stof_doctrine_extensions:
     default_locale: "%locale%"
@@ -77,13 +92,15 @@ stof_doctrine_extensions:
 
 doctrine_migrations:
     migrations_paths:
-        'Application\Migrations': "%kernel.project_dir%/app/DoctrineMigrations"
+        'Application\Migrations': '%kernel.project_dir%/migrations'
     storage:
         table_storage:
             table_name: 'migration_versions'
             version_column_name: 'version'
             version_column_length: 192
             executed_at_column_name: 'executed_at'
+    services:
+        Doctrine\Migrations\Version\MigrationFactory: Wallabag\Doctrine\MigrationFactoryDecorator
 
 fos_rest:
     param_fetcher_listener: true
@@ -97,8 +114,6 @@ fos_rest:
                 - 'application/pdf'
             epub:
                 - 'application/epub+zip'
-            mobi:
-                - 'application/x-mobipocket-ebook'
         view_response_listener: 'force'
         formats:
             xml: true
@@ -107,18 +122,20 @@ fos_rest:
             csv: true
             pdf: true
             epub: true
-            mobi: true
         failed_validation: HTTP_BAD_REQUEST
     routing_loader: false
     format_listener:
         enabled: true
         rules:
-            - { path: "^/api/entries/([0-9]+)/export.(.*)", priorities: ['epub', 'mobi', 'pdf', 'txt', 'csv'], fallback_format: json, prefer_extension: false }
+            - { path: "^/api/entries/([0-9]+)/export.(.*)", priorities: ['epub', 'pdf', 'txt', 'csv'], fallback_format: json, prefer_extension: false }
             - { path: "^/api", priorities: ['json', 'xml'], fallback_format: json, prefer_extension: false }
             - { path: "^/annotations", priorities: ['json', 'xml'], fallback_format: json, prefer_extension: false }
             # for an unknown reason, EACH REQUEST goes to FOS\RestBundle\EventListener\FormatListener
             # so we need to add custom rule for custom api export but also for all other routes of the application...
             - { path: '^/', priorities: ['text/html', '*/*'], fallback_format: html, prefer_extension: false }
+    exception:
+        messages:
+            Symfony\Component\HttpKernel\Exception\BadRequestHttpException: true
 
 nelmio_api_doc:
     areas:
@@ -171,7 +188,7 @@ nelmio_cors:
 fos_user:
     db_driver: orm
     firewall_name: secured_area
-    user_class: Wallabag\UserBundle\Entity\User
+    user_class: Wallabag\Entity\User
     registration:
         confirmation:
             enabled: "%fosuser_confirmation%"
@@ -179,14 +196,14 @@ fos_user:
         address: "%from_email%"
         sender_name: wallabag
     service:
-        mailer: Wallabag\UserBundle\Mailer\UserMailer
+        mailer: Wallabag\Mailer\UserMailer
 
 fos_oauth_server:
     db_driver:           orm
-    client_class:        Wallabag\ApiBundle\Entity\Client
-    access_token_class:  Wallabag\ApiBundle\Entity\AccessToken
-    refresh_token_class: Wallabag\ApiBundle\Entity\RefreshToken
-    auth_code_class:     Wallabag\ApiBundle\Entity\AuthCode
+    client_class:        Wallabag\Entity\Api\Client
+    access_token_class:  Wallabag\Entity\Api\AccessToken
+    refresh_token_class: Wallabag\Entity\Api\RefreshToken
+    auth_code_class:     Wallabag\Entity\Api\AuthCode
     service:
         user_provider: fos_user.user_provider.username_email
         options:
@@ -205,16 +222,16 @@ scheb_two_factor:
     google:
         enabled: true
         issuer: "%server_name%"
-        template: "@WallabagUser/Authentication/form.html.twig"
+        template: "Authentication/form.html.twig"
 
     email:
         enabled: true
         sender_email: "%twofactor_sender%"
         digits: 6
-        template: "@WallabagUser/Authentication/form.html.twig"
-        mailer: Wallabag\UserBundle\Mailer\AuthCodeMailer
+        template: "Authentication/form.html.twig"
+        mailer: Wallabag\Mailer\AuthCodeMailer
 
-kphoen_rulerz:
+rulerz:
     targets:
         doctrine: true
 
@@ -293,11 +310,6 @@ old_sound_rabbit_mq:
             exchange_options:
                 name: 'wallabag.import.pocket_html'
                 type: topic
-        import_pocket_csv:
-            connection: default
-            exchange_options:
-                name: 'wallabag.import.pocket_csv'
-                type: topic
     consumers:
         import_pocket:
             connection: default
@@ -306,7 +318,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.pocket'
-            callback: wallabag_import.consumer.amqp.pocket
+            callback: wallabag.consumer.amqp.pocket
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_readability:
             connection: default
@@ -315,7 +327,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.readability'
-            callback: wallabag_import.consumer.amqp.readability
+            callback: wallabag.consumer.amqp.readability
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_instapaper:
             connection: default
@@ -324,7 +336,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.instapaper'
-            callback: wallabag_import.consumer.amqp.instapaper
+            callback: wallabag.consumer.amqp.instapaper
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_pinboard:
             connection: default
@@ -333,7 +345,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.pinboard'
-            callback: wallabag_import.consumer.amqp.pinboard
+            callback: wallabag.consumer.amqp.pinboard
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_delicious:
             connection: default
@@ -342,7 +354,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.delicious'
-            callback: wallabag_import.consumer.amqp.delicious
+            callback: wallabag.consumer.amqp.delicious
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_wallabag_v1:
             connection: default
@@ -351,7 +363,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.wallabag_v1'
-            callback: wallabag_import.consumer.amqp.wallabag_v1
+            callback: wallabag.consumer.amqp.wallabag_v1
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_wallabag_v2:
             connection: default
@@ -360,7 +372,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.wallabag_v2'
-            callback: wallabag_import.consumer.amqp.wallabag_v2
+            callback: wallabag.consumer.amqp.wallabag_v2
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_elcurator:
             connection: default
@@ -369,7 +381,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.elcurator'
-            callback: wallabag_import.consumer.amqp.elcurator
+            callback: wallabag.consumer.amqp.elcurator
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_omnivore:
             connection: default
@@ -378,7 +390,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.omnivore'
-            callback: wallabag_import.consumer.amqp.omnivore
+            callback: wallabag.consumer.amqp.omnivore
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_firefox:
             connection: default
@@ -387,7 +399,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.firefox'
-            callback: wallabag_import.consumer.amqp.firefox
+            callback: wallabag.consumer.amqp.firefox
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_chrome:
             connection: default
@@ -396,7 +408,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.chrome'
-            callback: wallabag_import.consumer.amqp.chrome
+            callback: wallabag.consumer.amqp.chrome
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_shaarli:
             connection: default
@@ -405,7 +417,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.shaarli'
-            callback: wallabag_import.consumer.amqp.shaarli
+            callback: wallabag.consumer.amqp.shaarli
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_pocket_html:
             connection: default
@@ -414,16 +426,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.pocket_html'
-            callback: wallabag_import.consumer.amqp.pocket_html
-            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
-        import_pocket_csv:
-            connection: default
-            exchange_options:
-                name: 'wallabag.import.pocket_csv'
-                type: topic
-            queue_options:
-                name: 'wallabag.import.pocket_csv'
-            callback: wallabag_import.consumer.amqp.pocket_csv
+            callback: wallabag.consumer.amqp.pocket_html
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
 
 fos_js_routing:
@@ -452,28 +455,15 @@ sensio_framework_extra:
    router:
         annotations: false
 
-httplug:
-    clients:
-        wallabag_core:
-            factory: Wallabag\CoreBundle\Helper\HttpClientFactory
-            config:
-                defaults:
-                    timeout: 10
-            plugins: ['httplug.plugin.logger']
-        wallabag_core.entry.download_images:
-            factory: 'httplug.factory.auto'
-            plugins: ['httplug.plugin.logger']
-        wallabag_import.pocket.client:
-            factory: 'httplug.factory.auto'
-            plugins:
-                - 'httplug.plugin.logger'
-                - header_defaults:
-                      headers:
-                          'content-type': 'application/json'
-                          'X-Accept': 'application/json'
-    discovery:
-        client: false
-
 # define custom entity so we can override length attribute to fix utf8mb4 issue
 craue_config:
-    entity_name: Wallabag\CoreBundle\Entity\InternalSetting
+    entity_name: Wallabag\Entity\InternalSetting
+
+when@dev:
+    maker:
+        root_namespace: 'Wallabag'
+
+webpack_encore:
+    output_path: '%kernel.project_dir%/web/build'
+    script_attributes:
+        defer: true

app/config/config_prod.yml

@@ -1,10 +1,6 @@
 imports:
     - { resource: config.yml }
 
-framework:
-    assets:
-        # json_manifest_path: '%kernel.project_dir%/web/bundles/wallabagcore/manifest.json'
-
 #doctrine:
 #    orm:
 #        metadata_cache_driver: apc

app/config/config_test.yml

@@ -3,6 +3,10 @@ imports:
     - { resource: parameters_test.yml }
     - { resource: services_test.yml }
 
+parameters:
+    fosuser_registration: true
+    wallabag_dbname_suffix: '_test'
+
 framework:
     test: ~
     session:
@@ -20,14 +24,8 @@ web_profiler:
 
 doctrine:
     dbal:
-        driver: "%test_database_driver%"
-        host: "%test_database_host%"
-        port: "%test_database_port%"
-        dbname: "%test_database_name%"
-        user: "%test_database_user%"
-        password: "%test_database_password%"
-        charset: "%test_database_charset%"
-        path: "%env(TEST_DATABASE_PATH)%"
+        dbname_suffix: '%wallabag_dbname_suffix%' # for MySQL and PostgreSQL
+        use_savepoints: true
 
     orm:
         metadata_cache_driver:
@@ -36,3 +34,8 @@ doctrine:
         query_cache_driver:
             type: service
             id: filesystem_cache
+
+dama_doctrine_test:
+    enable_static_connection: true
+    enable_static_meta_data_cache: true
+    enable_static_query_cache: true

app/config/parameters.yml.dist

@@ -1,7 +1,7 @@
 # This file is a "template" of what your parameters.yml file should look like
 parameters:
     # Uncomment these settings or manually update your parameters.yml
-    # to use docker-compose
+    # to use Docker Compose
     #
     # database_driver: %env.database_driver%
     # database_host: %env.database_host%
@@ -37,7 +37,7 @@ parameters:
     twofactor_sender: no-reply@wallabag.org
 
     # fosuser stuff
-    fosuser_registration: true
+    fosuser_registration: false
     fosuser_confirmation: true
 
     # how long the access token should live in seconds for the API

app/config/parameters_addons.yml

@@ -5,5 +5,5 @@ parameters:
         opera: https://addons.opera.com/en/extensions/details/wallabagger/?display=en
         f_droid: https://f-droid.org/app/fr.gaulupeau.apps.InThePoche
         google_play: https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche
-        ios: https://itunes.apple.com/app/wallabag-2/id1170800946?mt=8
+        ios: https://apps.apple.com/app/wallabag-2/id1170800946?mt=8
         windows: https://www.microsoft.com/store/apps/wallabag/9nblggh11646

app/config/parameters_test.yml

@@ -1,10 +1,2 @@
 parameters:
-    test_database_driver: pdo_sqlite
-    test_database_host: 127.0.0.1
-    test_database_port: null
-    test_database_name: null
-    test_database_user: null
-    test_database_password: null
-    test_database_path: "%env(TEST_DATABASE_PATH)%"
-    env(TEST_DATABASE_PATH): "%kernel.project_dir%/data/db/wallabag_test.sqlite"
-    test_database_charset: utf8
+    database_path: "%kernel.project_dir%/data/db/wallabag%wallabag_dbname_suffix%.sqlite"

app/config/routing.yml

@@ -1,35 +1,20 @@
-wallabag_annotation:
-    resource: "@WallabagAnnotationBundle/Controller/"
-    type: annotation
-    prefix: /
-
-wallabag_import:
-    resource: "@WallabagImportBundle/Controller/"
-    type: annotation
-    prefix: /import
-
-wallabag_user:
-    resource: "@WallabagUserBundle/Controller/"
-    type: annotation
-    prefix: /users
-
-wallabag_api:
-    resource: "@WallabagApiBundle/Controller/"
-    type: annotation
-    prefix: /
-
 app:
-    resource: "@WallabagCoreBundle/Controller/"
+    resource: ../../src/Controller/
     type: annotation
 
 doc-api:
-    resource: "@NelmioApiDocBundle/Resources/config/routing/swaggerui.xml"
+    resource: "@NelmioApiDocBundle/config/routing/swaggerui.xml"
     prefix: /api/doc
 
+doc-api-json:
+    path: /api/doc.json
+    methods: GET
+    defaults: { _controller: nelmio_api_doc.controller.swagger }
+
 homepage:
     path: "/{page}"
     defaults:
-        _controller: 'Wallabag\CoreBundle\Controller\EntryController::showUnreadAction'
+        _controller: 'Wallabag\Controller\EntryController::showUnreadAction'
         page : 1
     requirements:
         page: \d+

app/config/routing_dev.yml

@@ -7,7 +7,7 @@ _profiler:
     prefix: /_profiler
 
 _errors:
-    resource: '@TwigBundle/Resources/config/routing/errors.xml'
+    resource: '@FrameworkBundle/Resources/config/routing/errors.xml'
     prefix: /_error
 
 _main:

app/config/security.yml

@@ -9,7 +9,7 @@ security:
     providers:
         administrators:
             entity:
-                class: 'Wallabag\UserBundle\Entity\User'
+                class: 'Wallabag\Entity\User'
                 property: username
         fos_userbundle:
             id: fos_user.user_provider.username_email
@@ -76,6 +76,4 @@ security:
         - { path: ^/settings, roles: ROLE_SUPER_ADMIN }
         - { path: ^/annotations, roles: ROLE_USER }
         - { path: ^/2fa, role: IS_AUTHENTICATED_2FA_IN_PROGRESS }
-        - { path: ^/users, roles: ROLE_SUPER_ADMIN }
-        - { path: ^/ignore-origin-instance-rules, roles: ROLE_SUPER_ADMIN }
         - { path: ^/, roles: ROLE_USER }

app/config/services.yml

@@ -4,7 +4,7 @@ imports:
     - { resource: parameters_addons.yml }
 
 parameters:
-    lexik_form_filter.get_filter.doctrine_orm.class: Wallabag\CoreBundle\Event\Subscriber\CustomDoctrineORMSubscriber
+    spiriit_form_filter.get_filter.doctrine_orm.class: Wallabag\Event\Subscriber\CustomDoctrineORMSubscriber
 
 services:
     _defaults:
@@ -17,12 +17,11 @@ services:
             $defaultLocale: '%kernel.default_locale%'
             $wallabagUrl: '%domain_name%'
             $tablePrefix: "%database_table_prefix%"
-            $encryptionKeyPath: "%wallabag_core.site_credentials.encryption_key_path%"
-            $fetchingErrorMessageTitle: "%wallabag_core.fetching_error_message_title%"
-            $fetchingErrorMessage: '%wallabag_core.fetching_error_message%'
-            $languages: '%wallabag_core.languages%'
-            $lifeTime: '%wallabag_core.cache_lifetime%'
-            $cookieFile: "%kernel.cache_dir%/cookiejar.json"
+            $encryptionKeyPath: "%wallabag.site_credentials.encryption_key_path%"
+            $fetchingErrorMessageTitle: "%wallabag.fetching_error_message_title%"
+            $fetchingErrorMessage: '%wallabag.fetching_error_message%'
+            $languages: '%wallabag.languages%'
+            $lifeTime: '%wallabag.cache_lifetime%'
             $logoPath: 'web/img/appicon/apple-touch-icon-152.png'
             $registrationEnabled: '%fosuser_registration%'
             $restrictedAccess: '@=service(''craue_config'').get(''restricted_access'')'
@@ -30,119 +29,87 @@ services:
             $senderName: "%scheb_two_factor.email.sender_name%"
             $storeArticleHeaders: '@=service(''craue_config'').get(''store_article_headers'')'
             $supportUrl: '@=service(''craue_config'').get(''wallabag_support_url'')'
+            $fonts: '%wallabag.fonts%'
+            $defaultIgnoreOriginInstanceRules: '%wallabag.default_ignore_origin_instance_rules%'
 
-    Wallabag\AnnotationBundle\:
-        resource: '../../src/Wallabag/AnnotationBundle/*'
-        exclude: '../../src/Wallabag/AnnotationBundle/{Controller,Entity,DataFixtures}'
-
-    Wallabag\ApiBundle\:
-        resource: '../../src/Wallabag/ApiBundle/*'
-        exclude: '../../src/Wallabag/ApiBundle/{Controller,Entity}'
-
-    Wallabag\CoreBundle\:
-        resource: '../../src/Wallabag/CoreBundle/*'
-        exclude: ['../../src/Wallabag/CoreBundle/{Controller,Entity,DataFixtures}', '../../src/Wallabag/CoreBundle/Event/*Event.php']
+    Wallabag\:
+        resource: '../../src/*'
+        exclude: ['../../src/{Consumer,Controller,Entity,DataFixtures,Redis}', '../../src/Event/*Event.php']
 
     # controllers are imported separately to make sure services can be injected
     # as action arguments even if you don't extend any base controller class
-    Wallabag\AnnotationBundle\Controller\:
-        resource: '../../src/Wallabag/AnnotationBundle/Controller/'
-        tags: ['controller.service_arguments']
-
-    Wallabag\ApiBundle\Controller\:
-        resource: '../../src/Wallabag/ApiBundle/Controller/'
-        tags: ['controller.service_arguments']
-
-    Wallabag\CoreBundle\Controller\:
-        resource: '../../src/Wallabag/CoreBundle/Controller/'
-        tags: ['controller.service_arguments']
-
-    Wallabag\ImportBundle\Controller\:
-        resource: '../../src/Wallabag/ImportBundle/Controller/'
-        tags: ['controller.service_arguments']
-
-    Wallabag\UserBundle\Controller\:
-        resource: '../../src/Wallabag/UserBundle/Controller/'
+    Wallabag\Controller\:
+        resource: '../../src/Controller/'
         tags: ['controller.service_arguments']
 
     # inject alias service into controllers
-    Wallabag\ImportBundle\Controller\ChromeController:
+    Wallabag\Controller\Import\ChromeController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_chrome_producer'
-            $redisProducer: '@wallabag_import.producer.redis.chrome'
+            $redisProducer: '@wallabag.producer.redis.chrome'
 
-    Wallabag\ImportBundle\Controller\DeliciousController:
+    Wallabag\Controller\Import\DeliciousController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_delicious_producer'
-            $redisProducer: '@wallabag_import.producer.redis.delicious'
+            $redisProducer: '@wallabag.producer.redis.delicious'
 
-    Wallabag\ImportBundle\Controller\ElcuratorController:
+    Wallabag\Controller\Import\ElcuratorController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_elcurator_producer'
-            $redisProducer: '@wallabag_import.producer.redis.elcurator'
+            $redisProducer: '@wallabag.producer.redis.elcurator'
 
-    Wallabag\ImportBundle\Controller\OmnivoreController:
+    Wallabag\Controller\Import\OmnivoreController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_omnivore_producer'
-            $redisProducer: '@wallabag_import.producer.redis.omnivore'
+            $redisProducer: '@wallabag.producer.redis.omnivore'
 
-    Wallabag\ImportBundle\Controller\FirefoxController:
+    Wallabag\Controller\Import\FirefoxController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_firefox_producer'
-            $redisProducer: '@wallabag_import.producer.redis.firefox'
+            $redisProducer: '@wallabag.producer.redis.firefox'
 
-    Wallabag\ImportBundle\Controller\InstapaperController:
+    Wallabag\Controller\Import\InstapaperController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_instapaper_producer'
-            $redisProducer: '@wallabag_import.producer.redis.instapaper'
+            $redisProducer: '@wallabag.producer.redis.instapaper'
 
-    Wallabag\ImportBundle\Controller\PinboardController:
+    Wallabag\Controller\Import\PinboardController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_pinboard_producer'
-            $redisProducer: '@wallabag_import.producer.redis.pinboard'
+            $redisProducer: '@wallabag.producer.redis.pinboard'
 
-    Wallabag\ImportBundle\Controller\PocketController:
+    Wallabag\Controller\Import\PocketController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_pocket_producer'
-            $redisProducer: '@wallabag_import.producer.redis.pocket'
+            $redisProducer: '@wallabag.producer.redis.pocket'
 
-    Wallabag\ImportBundle\Controller\ReadabilityController:
+    Wallabag\Controller\Import\ReadabilityController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_readability_producer'
-            $redisProducer: '@wallabag_import.producer.redis.readability'
+            $redisProducer: '@wallabag.producer.redis.readability'
 
-    Wallabag\ImportBundle\Controller\WallabagV1Controller:
+    Wallabag\Controller\Import\WallabagV1Controller:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_wallabag_v1_producer'
-            $redisProducer: '@wallabag_import.producer.redis.wallabag_v1'
+            $redisProducer: '@wallabag.producer.redis.wallabag_v1'
 
-    Wallabag\ImportBundle\Controller\WallabagV2Controller:
+    Wallabag\Controller\Import\WallabagV2Controller:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_wallabag_v2_producer'
-            $redisProducer: '@wallabag_import.producer.redis.wallabag_v2'
+            $redisProducer: '@wallabag.producer.redis.wallabag_v2'
 
-    Wallabag\ImportBundle\Controller\ShaarliController:
+    Wallabag\Controller\Import\ShaarliController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_shaarli_producer'
-            $redisProducer: '@wallabag_import.producer.redis.shaarli'
+            $redisProducer: '@wallabag.producer.redis.shaarli'
 
-    Wallabag\ImportBundle\Controller\PocketHtmlController:
+    Wallabag\Controller\Import\PocketHtmlController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_pocket_html_producer'
-            $redisProducer: '@wallabag_import.producer.redis.pocket_html'
+            $redisProducer: '@wallabag.producer.redis.pocket_html'
 
-    Wallabag\ImportBundle\Controller\PocketCsvController:
-        arguments:
-            $rabbitMqProducer: '@old_sound_rabbit_mq.import_pocket_csv_producer'
-            $redisProducer: '@wallabag_import.producer.redis.pocket_csv'
-
-    Wallabag\ImportBundle\:
-        resource: '../../src/Wallabag/ImportBundle/*'
-        exclude: '../../src/Wallabag/ImportBundle/{Consumer,Controller,Redis}'
-
-    Wallabag\UserBundle\:
-        resource: '../../src/Wallabag/UserBundle/*'
-        exclude: '../../src/Wallabag/UserBundle/{Controller,Entity,DataFixtures}'
+    Wallabag\Doctrine\MigrationFactoryDecorator:
+        decorates: doctrine.migrations.migrations_factory
 
     Doctrine\DBAL\Connection:
         alias: doctrine.dbal.default_connection
@@ -150,6 +117,9 @@ services:
     Doctrine\ORM\EntityManagerInterface:
         alias: doctrine.orm.entity_manager
 
+    Doctrine\Migrations\Metadata\Storage\TableMetadataStorageConfiguration:
+        alias: doctrine.migrations.storage.table_storage
+
     Doctrine\Persistence\ManagerRegistry:
         alias: doctrine
 
@@ -159,8 +129,8 @@ services:
     JMS\Serializer\SerializerInterface:
         alias: jms_serializer
 
-    Lexik\Bundle\FormFilterBundle\Filter\FilterBuilderUpdaterInterface:
-        alias: lexik_form_filter.query_builder_updater
+    Spiriit\Bundle\FormFilterBundle\Filter\FilterBuilderUpdaterInterface:
+        alias: spiriit_form_filter.query_builder_updater
 
     Scheb\TwoFactorBundle\Security\TwoFactor\Provider\Google\GoogleAuthenticatorInterface:
         alias: scheb_two_factor.security.google_authenticator
@@ -192,7 +162,10 @@ services:
     MatomoTwigExtension\MatomoTwigExtension:
         public: false
 
-    Wallabag\CoreBundle\Event\Listener\UserLocaleListener:
+    ScssPhp\ScssPhp\Compiler:
+        public: false
+
+    Wallabag\Event\Listener\UserLocaleListener:
         tags:
             - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }
 
@@ -204,19 +177,31 @@ services:
             $defaultLifetime: 0
             $directory: '%kernel.cache_dir%'
 
-    Wallabag\CoreBundle\ParamConverter\UsernameFeedTokenConverter:
+    Wallabag\ParamConverter\UsernameFeedTokenConverter:
         tags:
             - { name: request.param_converter, converter: username_feed_token_converter }
 
-    Wallabag\CoreBundle\Event\Subscriber\TablePrefixSubscriber:
+    Wallabag\Event\Subscriber\TablePrefixSubscriber:
         tags:
             - { name: doctrine.event_subscriber }
 
+    Wallabag\Event\Subscriber\SchemaAdapterSubscriber:
+        arguments:
+            $databaseTablePrefix: "%database_table_prefix%"
+        tags:
+            - { name: doctrine.event_subscriber }
+
+    psr18.wallabag.client:
+        class: Symfony\Component\HttpClient\Psr18Client
+        arguments:
+            $client: '@Wallabag\HttpClient\WallabagClient'
+
     Graby\Graby:
         arguments:
             $config:
-                error_message: '%wallabag_core.fetching_error_message%'
-                error_message_title: '%wallabag_core.fetching_error_message_title%'
+                error_message: '%wallabag.fetching_error_message%'
+                error_message_title: '%wallabag.fetching_error_message_title%'
+            $client: '@psr18.wallabag.client'
         calls:
             - [ setLogger, [ "@logger" ] ]
         tags:
@@ -226,44 +211,38 @@ services:
         arguments:
             $config: {}
 
-    wallabag_core.http_client:
-        alias: 'httplug.client.wallabag_core'
-
-    Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder:
+    Wallabag\SiteConfig\GrabySiteConfigBuilder:
         tags:
             - { name: monolog.logger, channel: graby }
 
     # service alias override
-    bd_guzzle_site_authenticator.site_config_builder:
-        alias: Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder
+    Wallabag\SiteConfig\SiteConfigBuilder:
+        alias: Wallabag\SiteConfig\GrabySiteConfigBuilder
 
-    GuzzleHttp\Cookie\CookieJar:
-        alias: 'Wallabag\CoreBundle\Helper\FileCookieJar'
-
-    Wallabag\CoreBundle\Helper\HttpClientFactory:
-        calls:
-            - ["addSubscriber", ["@bd_guzzle_site_authenticator.authenticator_subscriber"]]
+    Symfony\Component\BrowserKit\HttpBrowser:
+        arguments:
+            $client: '@browser.client'
 
     RulerZ\RulerZ:
         alias: rulerz
 
-    Wallabag\CoreBundle\Operator\PHP\Matches:
+    Wallabag\Operator\PHP\Matches:
         tags:
             - { name: rulerz.operator, target: native, operator: matches }
 
-    Wallabag\CoreBundle\Operator\Doctrine\Matches:
+    Wallabag\Operator\Doctrine\Matches:
         tags:
             - { name: rulerz.operator, target: doctrine, operator: matches, inline: true }
 
-    Wallabag\CoreBundle\Operator\PHP\NotMatches:
+    Wallabag\Operator\PHP\NotMatches:
         tags:
             - { name: rulerz.operator, target: native, operator: notmatches }
 
-    Wallabag\CoreBundle\Operator\Doctrine\NotMatches:
+    Wallabag\Operator\Doctrine\NotMatches:
         tags:
             - { name: rulerz.operator, target: doctrine, operator: notmatches, inline: true }
 
-    Wallabag\CoreBundle\Operator\PHP\PatternMatches:
+    Wallabag\Operator\PHP\PatternMatches:
         tags:
             - { name: rulerz.operator, target: native, operator: "~" }
 
@@ -276,67 +255,25 @@ services:
                 path: '%redis_path%'
                 password: '%redis_password%'
 
-    Wallabag\CoreBundle\Event\Subscriber\SQLiteCascadeDeleteSubscriber:
+    Wallabag\Event\Subscriber\SQLiteCascadeDeleteSubscriber:
         tags:
             - { name: doctrine.event_subscriber }
 
-    Wallabag\CoreBundle\Event\Subscriber\DownloadImagesSubscriber:
+    Wallabag\Event\Subscriber\DownloadImagesSubscriber:
         arguments:
             $enabled: '@=service(''craue_config'').get(''download_images_enabled'')'
 
-    Wallabag\CoreBundle\Helper\DownloadImages:
+    Wallabag\Helper\DownloadImages:
         arguments:
             $baseFolder: "%kernel.project_dir%/web/assets/images"
 
-    Wallabag\CoreBundle\Command\CleanDownloadedImagesCommand:
-        tags:
-            - { name: console.command, command: 'wallabag:clean-downloaded-images' }
-
-    Wallabag\CoreBundle\Command\CleanDuplicatesCommand:
-        tags:
-            - { name: console.command, command: 'wallabag:clean-duplicates' }
-
-    Wallabag\CoreBundle\Command\ExportCommand:
-        arguments:
-            $projectDir: '%kernel.project_dir%'
-        tags:
-            - { name: console.command, command: 'wallabag:export' }
-
-    Wallabag\CoreBundle\Command\GenerateUrlHashesCommand:
-        tags:
-            - { name: console.command, command: 'wallabag:generate-hashed-urls' }
-
-    Wallabag\CoreBundle\Command\InstallCommand:
+    Wallabag\Command\InstallCommand:
         arguments:
             $databaseDriver: '%database_driver%'
-            $databaseName: '%database_name%'
-            $defaultSettings: '%wallabag_core.default_internal_settings%'
-            $defaultIgnoreOriginInstanceRules: '%wallabag_core.default_ignore_origin_instance_rules%'
+            $defaultSettings: '%wallabag.default_internal_settings%'
+            $defaultIgnoreOriginInstanceRules: '%wallabag.default_ignore_origin_instance_rules%'
 
-    Wallabag\CoreBundle\Command\ListUserCommand:
-        tags:
-            - { name: console.command, command: 'wallabag:user:list' }
-
-    Wallabag\CoreBundle\Command\ReloadEntryCommand:
-        tags:
-            - { name: console.command, command: 'wallabag:entry:reload' }
-
-    Wallabag\CoreBundle\Command\ShowUserCommand:
-        tags:
-            - { name: console.command, command: 'wallabag:user:show' }
-
-    Wallabag\CoreBundle\Command\TagAllCommand:
-        tags:
-            - { name: console.command, command: 'wallabag:tag:all' }
-
-    Wallabag\ImportBundle\Command\ImportCommand:
-        tags:
-            - { name: console.command, command: 'wallabag:import' }
-
-    wallabag_core.entry.download_images.client:
-        alias: 'httplug.client.wallabag_core.entry.download_images'
-
-    Wallabag\UserBundle\Mailer\UserMailer:
+    Wallabag\Mailer\UserMailer:
         arguments:
             $parameters:
                 template:
@@ -346,80 +283,73 @@ services:
                     confirmation: '%fos_user.registration.confirmation.from_email%'
                     resetting: '%fos_user.resetting.email.from_email%'
 
-    Wallabag\UserBundle\EventListener\CreateConfigListener:
+    Wallabag\Event\Listener\CreateConfigListener:
         arguments:
-            $itemsOnPage: "%wallabag_core.items_on_page%"
-            $feedLimit: "%wallabag_core.feed_limit%"
-            $language: "%wallabag_core.language%"
-            $readingSpeed: "%wallabag_core.reading_speed%"
-            $actionMarkAsRead: "%wallabag_core.action_mark_as_read%"
-            $listMode: "%wallabag_core.list_mode%"
-            $displayThumbnails: "%wallabag_core.display_thumbnails%"
+            $itemsOnPage: "%wallabag.items_on_page%"
+            $feedLimit: "%wallabag.feed_limit%"
+            $language: "%wallabag.language%"
+            $readingSpeed: "%wallabag.reading_speed%"
+            $actionMarkAsRead: "%wallabag.action_mark_as_read%"
+            $listMode: "%wallabag.list_mode%"
+            $displayThumbnails: "%wallabag.display_thumbnails%"
 
-    Wallabag\UserBundle\EventListener\AuthenticationFailureListener:
+    Wallabag\Event\Listener\AuthenticationFailureListener:
         tags:
             - { name: kernel.event_listener, event: security.authentication.failure, method: onAuthenticationFailure }
 
-    wallabag_import.pocket.client:
-        alias: 'httplug.client.wallabag_import.pocket.client'
-
-    Wallabag\ImportBundle\Import\PocketImport:
+    Wallabag\Import\PocketImport:
         calls:
-            - [ setClient, [ "@wallabag_import.pocket.client" ] ]
+            - [ setClient, [ '@Symfony\Contracts\HttpClient\HttpClientInterface $pocketClient' ] ]
         tags:
-            -  { name: wallabag_import.import, alias: pocket }
+            -  { name: wallabag.import, alias: pocket }
 
-    Wallabag\ImportBundle\Import\WallabagV1Import:
+    Wallabag\Import\WallabagV1Import:
         tags:
-            -  { name: wallabag_import.import, alias: wallabag_v1 }
+            -  { name: wallabag.import, alias: wallabag_v1 }
 
-    Wallabag\ImportBundle\Import\WallabagV2Import:
+    Wallabag\Import\WallabagV2Import:
         tags:
-            -  { name: wallabag_import.import, alias: wallabag_v2 }
+            -  { name: wallabag.import, alias: wallabag_v2 }
 
-    Wallabag\ImportBundle\Import\ElcuratorImport:
+    Wallabag\Import\ElcuratorImport:
         tags:
-            -  { name: wallabag_import.import, alias: elcurator }
+            -  { name: wallabag.import, alias: elcurator }
 
-    Wallabag\ImportBundle\Import\ReadabilityImport:
+    Wallabag\Import\ReadabilityImport:
         tags:
-            -  { name: wallabag_import.import, alias: readability }
+            -  { name: wallabag.import, alias: readability }
 
-    Wallabag\ImportBundle\Import\InstapaperImport:
+    Wallabag\Import\InstapaperImport:
         tags:
-            -  { name: wallabag_import.import, alias: instapaper }
+            -  { name: wallabag.import, alias: instapaper }
 
-    Wallabag\ImportBundle\Import\PinboardImport:
+    Wallabag\Import\PinboardImport:
         tags:
-            -  { name: wallabag_import.import, alias: pinboard }
+            -  { name: wallabag.import, alias: pinboard }
 
-    Wallabag\ImportBundle\Import\DeliciousImport:
+    Wallabag\Import\DeliciousImport:
         tags:
-            -  { name: wallabag_import.import, alias: delicious }
+            -  { name: wallabag.import, alias: delicious }
 
-    Wallabag\ImportBundle\Import\OmnivoreImport:
+    Wallabag\Import\OmnivoreImport:
         tags:
-            -  { name: wallabag_import.import, alias: omnivore }
+            -  { name: wallabag.import, alias: omnivore }
 
-    Wallabag\ImportBundle\Import\FirefoxImport:
+    Wallabag\Import\FirefoxImport:
         tags:
-            -  { name: wallabag_import.import, alias: firefox }
+            -  { name: wallabag.import, alias: firefox }
 
-    Wallabag\ImportBundle\Import\ChromeImport:
+    Wallabag\Import\ChromeImport:
         tags:
-            -  { name: wallabag_import.import, alias: chrome }
+            -  { name: wallabag.import, alias: chrome }
 
-    Wallabag\ImportBundle\Import\ShaarliImport:
+    Wallabag\Import\ShaarliImport:
         tags:
-            -  { name: wallabag_import.import, alias: shaarli }
+            -  { name: wallabag.import, alias: shaarli }
 
-    Wallabag\ImportBundle\Import\PocketHtmlImport:
+    Wallabag\Import\PocketHtmlImport:
         tags:
-            -  { name: wallabag_import.import, alias: pocket_html }
-
-    Wallabag\ImportBundle\Import\PocketCsvImport:
-        tags:
-            -  { name: wallabag_import.import, alias: pocket_csv }
+            -  { name: wallabag.import, alias: pocket_html }
 
     # to factorize the proximity and bypass translation for prev & next
     pagerfanta.view.default_wallabag:

app/config/services_rabbit.yml

@@ -5,7 +5,7 @@ services:
         autoconfigure: true
         public: true
 
-    Wallabag\ImportBundle\Consumer\RabbitMQConsumerTotalProxy:
+    Wallabag\Consumer\RabbitMQConsumerTotalProxy:
         lazy: true
         arguments:
             $pocketConsumer: '@old_sound_rabbit_mq.import_pocket_consumer'
@@ -18,77 +18,71 @@ services:
             $pinboardConsumer: '@old_sound_rabbit_mq.import_pinboard_consumer'
             $deliciousConsumer: '@old_sound_rabbit_mq.import_delicious_consumer'
             $elcuratorConsumer: '@old_sound_rabbit_mq.import_elcurator_consumer'
-            $omnivoreConsumer: '@old_sound_rabbit_mq.import_omnivore_consumer'
             $shaarliConsumer: '@old_sound_rabbit_mq.import_shaarli_consumer'
             $pocketHtmlConsumer: '@old_sound_rabbit_mq.import_pocket_html_consumer'
-            $pocketCsvConsumer: '@old_sound_rabbit_mq.import_pocket_csv_consumer'
+            $omnivoreConsumer: '@old_sound_rabbit_mq.import_omnivore_consumer'
 
-    wallabag_import.consumer.amqp.pocket:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
+    wallabag.consumer.amqp.pocket:
+        class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\PocketImport'
+            $import: '@Wallabag\Import\PocketImport'
 
-    wallabag_import.consumer.amqp.readability:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
+    wallabag.consumer.amqp.readability:
+        class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\ReadabilityImport'
+            $import: '@Wallabag\Import\ReadabilityImport'
 
-    wallabag_import.consumer.amqp.instapaper:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
+    wallabag.consumer.amqp.instapaper:
+        class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\InstapaperImport'
+            $import: '@Wallabag\Import\InstapaperImport'
 
-    wallabag_import.consumer.amqp.pinboard:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
+    wallabag.consumer.amqp.pinboard:
+        class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\PinboardImport'
+            $import: '@Wallabag\Import\PinboardImport'
 
-    wallabag_import.consumer.amqp.delicious:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
+    wallabag.consumer.amqp.delicious:
+        class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\DeliciousImport'
+            $import: '@Wallabag\Import\DeliciousImport'
 
-    wallabag_import.consumer.amqp.omnivore:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
+    wallabag.consumer.amqp.omnivore:
+        class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\OmnivoreImport'
+            $import: '@Wallabag\Import\OmnivoreImport'
 
-    wallabag_import.consumer.amqp.wallabag_v1:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
+    wallabag.consumer.amqp.wallabag_v1:
+        class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\WallabagV1Import'
+            $import: '@Wallabag\Import\WallabagV1Import'
 
-    wallabag_import.consumer.amqp.wallabag_v2:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
+    wallabag.consumer.amqp.wallabag_v2:
+        class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\WallabagV2Import'
+            $import: '@Wallabag\Import\WallabagV2Import'
 
-    wallabag_import.consumer.amqp.elcurator:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
+    wallabag.consumer.amqp.elcurator:
+        class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\ElcuratorImport'
+            $import: '@Wallabag\Import\ElcuratorImport'
 
-    wallabag_import.consumer.amqp.firefox:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
+    wallabag.consumer.amqp.firefox:
+        class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\FirefoxImport'
+            $import: '@Wallabag\Import\FirefoxImport'
 
-    wallabag_import.consumer.amqp.chrome:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
+    wallabag.consumer.amqp.chrome:
+        class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\ChromeImport'
+            $import: '@Wallabag\Import\ChromeImport'
 
-    wallabag_import.consumer.amqp.shaarli:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
+    wallabag.consumer.amqp.shaarli:
+        class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\ShaarliImport'
+            $import: '@Wallabag\Import\ShaarliImport'
 
-    wallabag_import.consumer.amqp.pocket_html:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
+    wallabag.consumer.amqp.pocket_html:
+        class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\PocketHtmlImport'
-
-    wallabag_import.consumer.amqp.pocket_csv:
-        class: Wallabag\ImportBundle\Consumer\AMQPEntryConsumer
-        arguments:
-            $import: '@Wallabag\ImportBundle\Import\PocketCsvImport'
+            $import: '@Wallabag\Import\PocketHtmlImport'

app/config/services_redis.yml

@@ -6,225 +6,209 @@ services:
         public: true
 
     # readability
-    wallabag_import.queue.redis.readability:
+    wallabag.queue.redis.readability:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.readability"
 
-    wallabag_import.producer.redis.readability:
-        class: Wallabag\ImportBundle\Redis\Producer
+    wallabag.producer.redis.readability:
+        class: Wallabag\Redis\Producer
         arguments:
-            - "@wallabag_import.queue.redis.readability"
+            - "@wallabag.queue.redis.readability"
 
-    wallabag_import.consumer.redis.readability:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+    wallabag.consumer.redis.readability:
+        class: Wallabag\Consumer\RedisEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\ReadabilityImport'
+            $import: '@Wallabag\Import\ReadabilityImport'
 
     # instapaper
-    wallabag_import.queue.redis.instapaper:
+    wallabag.queue.redis.instapaper:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.instapaper"
 
-    wallabag_import.producer.redis.instapaper:
-        class: Wallabag\ImportBundle\Redis\Producer
+    wallabag.producer.redis.instapaper:
+        class: Wallabag\Redis\Producer
         arguments:
-            - "@wallabag_import.queue.redis.instapaper"
+            - "@wallabag.queue.redis.instapaper"
 
-    wallabag_import.consumer.redis.instapaper:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+    wallabag.consumer.redis.instapaper:
+        class: Wallabag\Consumer\RedisEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\InstapaperImport'
+            $import: '@Wallabag\Import\InstapaperImport'
 
     # pinboard
-    wallabag_import.queue.redis.pinboard:
+    wallabag.queue.redis.pinboard:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.pinboard"
 
-    wallabag_import.producer.redis.pinboard:
-        class: Wallabag\ImportBundle\Redis\Producer
+    wallabag.producer.redis.pinboard:
+        class: Wallabag\Redis\Producer
         arguments:
-            - "@wallabag_import.queue.redis.pinboard"
+            - "@wallabag.queue.redis.pinboard"
 
-    wallabag_import.consumer.redis.pinboard:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+    wallabag.consumer.redis.pinboard:
+        class: Wallabag\Consumer\RedisEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\PinboardImport'
+            $import: '@Wallabag\Import\PinboardImport'
 
     # delicious
-    wallabag_import.queue.redis.delicious:
+    wallabag.queue.redis.delicious:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.delicious"
 
-    wallabag_import.producer.redis.delicious:
-        class: Wallabag\ImportBundle\Redis\Producer
+    wallabag.producer.redis.delicious:
+        class: Wallabag\Redis\Producer
         arguments:
-            - "@wallabag_import.queue.redis.delicious"
+            - "@wallabag.queue.redis.delicious"
 
-    wallabag_import.consumer.redis.delicious:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+    wallabag.consumer.redis.delicious:
+        class: Wallabag\Consumer\RedisEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\DeliciousImport'
+            $import: '@Wallabag\Import\DeliciousImport'
 
     # Omnivore
-    wallabag_import.queue.redis.omnivore:
+    wallabag.queue.redis.omnivore:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.omnivore"
 
-    wallabag_import.producer.redis.omnivore:
-        class: Wallabag\ImportBundle\Redis\Producer
+    wallabag.producer.redis.omnivore:
+        class: Wallabag\Redis\Producer
         arguments:
-            - "@wallabag_import.queue.redis.omnivore"
+            - "@wallabag.queue.redis.omnivore"
 
-    wallabag_import.consumer.redis.omnivore:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+    wallabag.consumer.redis.omnivore:
+        class: Wallabag\Consumer\RedisEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\OmnivoreImport'
+            $import: '@Wallabag\Import\OmnivoreImport'
 
     # pocket
-    wallabag_import.queue.redis.pocket:
+    wallabag.queue.redis.pocket:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.pocket"
 
-    wallabag_import.producer.redis.pocket:
-        class: Wallabag\ImportBundle\Redis\Producer
+    wallabag.producer.redis.pocket:
+        class: Wallabag\Redis\Producer
         arguments:
-            - "@wallabag_import.queue.redis.pocket"
+            - "@wallabag.queue.redis.pocket"
 
-    wallabag_import.consumer.redis.pocket:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+    wallabag.consumer.redis.pocket:
+        class: Wallabag\Consumer\RedisEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\PocketImport'
+            $import: '@Wallabag\Import\PocketImport'
 
     # wallabag v1
-    wallabag_import.queue.redis.wallabag_v1:
+    wallabag.queue.redis.wallabag_v1:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.wallabag_v1"
 
-    wallabag_import.producer.redis.wallabag_v1:
-        class: Wallabag\ImportBundle\Redis\Producer
+    wallabag.producer.redis.wallabag_v1:
+        class: Wallabag\Redis\Producer
         arguments:
-            - "@wallabag_import.queue.redis.wallabag_v1"
+            - "@wallabag.queue.redis.wallabag_v1"
 
-    wallabag_import.consumer.redis.wallabag_v1:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+    wallabag.consumer.redis.wallabag_v1:
+        class: Wallabag\Consumer\RedisEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\WallabagV1Import'
+            $import: '@Wallabag\Import\WallabagV1Import'
 
     # wallabag v2
-    wallabag_import.queue.redis.wallabag_v2:
+    wallabag.queue.redis.wallabag_v2:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.wallabag_v2"
 
-    wallabag_import.producer.redis.wallabag_v2:
-        class: Wallabag\ImportBundle\Redis\Producer
+    wallabag.producer.redis.wallabag_v2:
+        class: Wallabag\Redis\Producer
         arguments:
-            - "@wallabag_import.queue.redis.wallabag_v2"
+            - "@wallabag.queue.redis.wallabag_v2"
 
-    wallabag_import.consumer.redis.wallabag_v2:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+    wallabag.consumer.redis.wallabag_v2:
+        class: Wallabag\Consumer\RedisEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\WallabagV2Import'
+            $import: '@Wallabag\Import\WallabagV2Import'
 
     # elcurator
-    wallabag_import.queue.redis.elcurator:
+    wallabag.queue.redis.elcurator:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.elcurator"
 
-    wallabag_import.producer.redis.elcurator:
-        class: Wallabag\ImportBundle\Redis\Producer
+    wallabag.producer.redis.elcurator:
+        class: Wallabag\Redis\Producer
         arguments:
-            - "@wallabag_import.queue.redis.elcurator"
+            - "@wallabag.queue.redis.elcurator"
 
-    wallabag_import.consumer.redis.elcurator:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+    wallabag.consumer.redis.elcurator:
+        class: Wallabag\Consumer\RedisEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\ElcuratorImport'
+            $import: '@Wallabag\Import\ElcuratorImport'
 
     # firefox
-    wallabag_import.queue.redis.firefox:
+    wallabag.queue.redis.firefox:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.firefox"
 
-    wallabag_import.producer.redis.firefox:
-        class: Wallabag\ImportBundle\Redis\Producer
+    wallabag.producer.redis.firefox:
+        class: Wallabag\Redis\Producer
         arguments:
-            - "@wallabag_import.queue.redis.firefox"
+            - "@wallabag.queue.redis.firefox"
 
-    wallabag_import.consumer.redis.firefox:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+    wallabag.consumer.redis.firefox:
+        class: Wallabag\Consumer\RedisEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\FirefoxImport'
+            $import: '@Wallabag\Import\FirefoxImport'
 
     # chrome
-    wallabag_import.queue.redis.chrome:
+    wallabag.queue.redis.chrome:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.chrome"
 
-    wallabag_import.producer.redis.chrome:
-        class: Wallabag\ImportBundle\Redis\Producer
+    wallabag.producer.redis.chrome:
+        class: Wallabag\Redis\Producer
         arguments:
-            - "@wallabag_import.queue.redis.chrome"
+            - "@wallabag.queue.redis.chrome"
 
-    wallabag_import.consumer.redis.chrome:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+    wallabag.consumer.redis.chrome:
+        class: Wallabag\Consumer\RedisEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\ChromeImport'
+            $import: '@Wallabag\Import\ChromeImport'
 
     # shaarli
-    wallabag_import.queue.redis.shaarli:
+    wallabag.queue.redis.shaarli:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.shaarli"
 
-    wallabag_import.producer.redis.shaarli:
-        class: Wallabag\ImportBundle\Redis\Producer
+    wallabag.producer.redis.shaarli:
+        class: Wallabag\Redis\Producer
         arguments:
-            - "@wallabag_import.queue.redis.shaarli"
+            - "@wallabag.queue.redis.shaarli"
 
-    wallabag_import.consumer.redis.shaarli:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+    wallabag.consumer.redis.shaarli:
+        class: Wallabag\Consumer\RedisEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\ShaarliImport'
+            $import: '@Wallabag\Import\ShaarliImport'
 
     # pocket html
-    wallabag_import.queue.redis.pocket_html:
+    wallabag.queue.redis.pocket_html:
         class: Simpleue\Queue\RedisQueue
         arguments:
             $queueName: "wallabag.import.pocket_html"
 
-    wallabag_import.producer.redis.pocket_html:
-        class: Wallabag\ImportBundle\Redis\Producer
+    wallabag.producer.redis.pocket_html:
+        class: Wallabag\Redis\Producer
         arguments:
-            - "@wallabag_import.queue.redis.pocket_html"
+            - "@wallabag.queue.redis.pocket_html"
 
-    wallabag_import.consumer.redis.pocket_html:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
+    wallabag.consumer.redis.pocket_html:
+        class: Wallabag\Consumer\RedisEntryConsumer
         arguments:
-            $import: '@Wallabag\ImportBundle\Import\PocketHtmlImport'
-
-    # pocket csv
-    wallabag_import.queue.redis.pocket_csv:
-        class: Simpleue\Queue\RedisQueue
-        arguments:
-            $queueName: "wallabag.import.pocket_csv"
-
-    wallabag_import.producer.redis.pocket_csv:
-        class: Wallabag\ImportBundle\Redis\Producer
-        arguments:
-            - "@wallabag_import.queue.redis.pocket_csv"
-
-    wallabag_import.consumer.redis.pocket_csv:
-        class: Wallabag\ImportBundle\Consumer\RedisEntryConsumer
-        arguments:
-            $import: '@Wallabag\ImportBundle\Import\PocketCsvImport'
+            $import: '@Wallabag\Import\PocketHtmlImport'

app/config/services_test.yml

@@ -1,38 +1,14 @@
 services:
-    # see https://github.com/symfony/symfony/issues/24543
-    fos_user.user_manager.test:
-        alias: fos_user.user_manager
-        public: true
-
-    fos_user.security.login_manager.test:
-        alias: fos_user.security.login_manager
-        public: true
-
-    wallabag_core.entry_repository.test:
-        alias: Wallabag\CoreBundle\Repository\EntryRepository
-        public: true
-
-    wallabag_user.user_repository.test:
-        alias: Wallabag\UserBundle\Repository\UserRepository
-        public: true
-
     filesystem_cache:
         class: Doctrine\Common\Cache\FilesystemCache
         arguments:
             - "%kernel.cache_dir%/doctrine/metadata"
 
     # fixtures
-    Wallabag\UserBundle\DataFixtures\:
-        resource: '../../src/Wallabag/UserBundle/DataFixtures/*'
-        tags: ['doctrine.fixture.orm']
-        autowire: true
-
-    Wallabag\CoreBundle\DataFixtures\:
-        resource: '../../src/Wallabag/CoreBundle/DataFixtures/*'
-        tags: ['doctrine.fixture.orm']
-        autowire: true
-
-    Wallabag\AnnotationBundle\DataFixtures\:
-        resource: '../../src/Wallabag/AnnotationBundle/DataFixtures/*'
+    Wallabag\DataFixtures\:
+        bind:
+            $defaultIgnoreOriginInstanceRules: '%wallabag.default_ignore_origin_instance_rules%'
+            $defaultInternalSettings: '%wallabag.default_internal_settings%'
+        resource: '../../fixtures/*'
         tags: ['doctrine.fixture.orm']
         autowire: true

app/config/tests/parameters_test.mysql.yml

@@ -1,10 +1,2 @@
 parameters:
-    test_database_driver: pdo_mysql
-    test_database_host: 127.0.0.1
-    test_database_port: 3306
-    test_database_name: wallabag_test
-    test_database_user: root
-    test_database_password: root
-    test_database_path: ~
-    env(TEST_DATABASE_PATH): ~
-    test_database_charset: utf8mb4
+    env(DATABASE_URL): mysql://root:root@127.0.0.1:3306/wallabag?charset=utf8mb4

app/config/tests/parameters_test.pgsql.yml

@@ -1,10 +1,2 @@
 parameters:
-    test_database_driver: pdo_pgsql
-    test_database_host: localhost
-    test_database_port:
-    test_database_name: wallabag_test
-    test_database_user: wallabag
-    test_database_password: wallabagrocks
-    test_database_path: ~
-    env(TEST_DATABASE_PATH): ~
-    test_database_charset: utf8
+    env(DATABASE_URL): postgres://wallabag:wallabagrocks@localhost/wallabag?charset=utf8

app/config/tests/parameters_test.sqlite.yml

@@ -1,12 +1,2 @@
 parameters:
-    test_database_driver: pdo_sqlite
-    test_database_host: localhost
-    test_database_port:
-    test_database_name: ~
-    test_database_user: ~
-    test_database_password: ~
-    # Using an environnement variable in order to avoid the error "attempt to write a readonly database"
-    # when the schema is dropped then recreate
-    test_database_path: "%env(TEST_DATABASE_PATH)%"
-    env(TEST_DATABASE_PATH): "%kernel.project_dir%/data/db/wallabag_test.sqlite"
-    test_database_charset: utf8
+    env(DATABASE_URL): sqlite:///%kernel.project_dir%/data/db/wallabag%wallabag_dbname_suffix%.sqlite?charset=utf8

app/config/wallabag.yml

@@ -1,7 +1,7 @@
-wallabag_core:
-    version: 2.6.14
-    paypal_url: "https://liberapay.com/wallabag/donate"
-    languages:
+parameters:
+    wallabag.version: 2.6.10
+    wallabag.paypal_url: "https://liberapay.com/wallabag/donate"
+    wallabag.languages:
         en: 'English'
         fr: 'Français'
         de: 'Deutsch'
@@ -23,20 +23,21 @@ wallabag_core:
         hr: 'Hrvatski'
         cs: 'Čeština'
         el: 'Ελληνικά'
-    items_on_page: 12
-    language: '%locale%'
-    rss_limit: 50
-    reading_speed: 200
-    cache_lifetime: 10
-    action_mark_as_read: 1
-    list_mode: 0
-    display_thumbnails: 1
-    fetching_error_message_title: 'No title found'
-    fetching_error_message: |
+        gl: 'Galego'
+    wallabag.items_on_page: 12
+    wallabag.language: '%locale%'
+    wallabag.feed_limit: 50
+    wallabag.reading_speed: 200
+    wallabag.cache_lifetime: 10
+    wallabag.action_mark_as_read: 1
+    wallabag.list_mode: 0
+    wallabag.display_thumbnails: 1
+    wallabag.fetching_error_message_title: 'No title found'
+    wallabag.fetching_error_message: |
         wallabag can't retrieve contents for this article. Please <a href="https://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
-    api_limit_mass_actions: 10
-    encryption_key_path: "%kernel.project_dir%/data/site-credentials-secret-key.txt"
-    default_internal_settings:
+    wallabag.api_limit_mass_actions: 10
+    wallabag.site_credentials.encryption_key_path: "%kernel.project_dir%/data/site-credentials-secret-key.txt"
+    wallabag.default_internal_settings:
         -
             name: share_public
             value: 1
@@ -65,6 +66,14 @@ wallabag_core:
             name: shaarli_url
             value: https://myshaarli.com
             section: entry
+        -
+            name: share_linkding
+            value: 1
+            section: entry
+        -
+            name: linkding_url
+            value: https://linkding.example.com
+            section: entry
         -
             name: share_mail
             value: 1
@@ -85,10 +94,6 @@ wallabag_core:
             name: export_epub
             value: 1
             section: export
-        -
-            name: export_mobi
-            value: 0
-            section: export
         -
             name: export_pdf
             value: 1
@@ -109,6 +114,10 @@ wallabag_core:
             name: export_xml
             value: 1
             section: export
+        -
+            name: export_md
+            value: 1
+            section: export
         -
             name: import_with_redis
             value: 0
@@ -129,21 +138,13 @@ wallabag_core:
             name: matomo_site_id
             value: 1
             section: analytics
-        -
-            name: demo_mode_enabled
-            value: 0
-            section: misc
-        -
-            name: demo_mode_username
-            value: wallabag
-            section: misc
         -
             name: download_images_enabled
             value: 0
             section: misc
         -
             name: wallabag_support_url
-            value: https://www.wallabag.org/pages/support.html
+            value: https://github.com/wallabag/wallabag/issues/new/choose
             section: misc
         -
             name: api_user_registration
@@ -158,20 +159,21 @@ wallabag_core:
             value: 0
             section: entry
 
-    default_ignore_origin_instance_rules:
+    wallabag.default_ignore_origin_instance_rules:
         -
             rule: host = "feedproxy.google.com"
         -
             rule: host = "feeds.reuters.com"
         -
             rule: _all ~ "https?://www\.lemonde\.fr/tiny.*"
-
-wallabag_import:
-    allow_mimetypes:
-        - 'application/octet-stream'
-        - 'application/json'
-        - 'text/plain'
-        - 'text/csv'
-        - 'text/html'
-        - 'application/vnd.ms-excel'
-    resource_dir: "%kernel.project_dir%/web/uploads/import"
+    wallabag.fonts:
+        - 'Sans-serif'
+        - 'Serif'
+        - 'Atkinson Hyperlegible'
+        - 'EB Garamond'
+        - 'Lato'
+        - 'Montserrat'
+        - 'OpenDyslexicRegular'
+        - 'Oswald'
+    wallabag.allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv', 'text/html']
+    wallabag.resource_dir: "%kernel.project_dir%/web/uploads/import"

app/config/webpack/common.js

@@ -1,37 +0,0 @@
-const path = require('path');
-const webpack = require('webpack');
-const StyleLintPlugin = require('stylelint-webpack-plugin');
-
-const projectDir = path.resolve(__dirname, '../../../');
-
-module.exports = {
-  entry: {
-    material: path.join(projectDir, './app/Resources/static/themes/material/index.js'),
-    public: path.join(projectDir, './app/Resources/static/themes/_global/share.js'),
-  },
-  output: {
-    filename: '[name].js',
-    path: path.resolve(projectDir, 'web/wallassets'),
-    publicPath: '',
-  },
-  plugins: [
-    new webpack.ProvidePlugin({
-      $: 'jquery',
-      jQuery: 'jquery',
-      'window.$': 'jquery',
-      'window.jQuery': 'jquery',
-    }),
-    new StyleLintPlugin({
-      configFile: 'stylelint.config.js',
-      failOnError: false,
-      quiet: false,
-      context: 'app/Resources/static/themes',
-      files: '**/*.scss',
-    }),
-  ],
-  resolve: {
-    alias: {
-      jquery: path.join(projectDir, 'node_modules/jquery/dist/jquery.js'),
-    },
-  },
-};

app/config/webpack/dev.js

@@ -1,58 +0,0 @@
-const { merge } = require('webpack-merge');
-const ESLintPlugin = require('eslint-webpack-plugin');
-const commonConfig = require('./common');
-
-module.exports = merge(commonConfig, {
-  devtool: 'eval-source-map',
-  output: {
-    filename: '[name].dev.js',
-  },
-  mode: 'development',
-  devServer: {
-    static: {
-      directory: './web',
-    },
-  },
-  plugins: [
-    new ESLintPlugin(),
-  ],
-  module: {
-    rules: [
-      {
-        test: /\.js$/,
-        exclude: /(node_modules)/,
-        use: {
-          loader: 'babel-loader',
-          options: {
-            presets: ['@babel/preset-env'],
-          },
-        },
-      },
-      {
-        test: /\.(s)?css$/,
-        use: [
-          'style-loader',
-          {
-            loader: 'css-loader',
-            options: {
-              importLoaders: 1,
-            },
-          },
-          {
-            loader: 'postcss-loader',
-            options: {
-              postcssOptions: {
-                plugins: ['autoprefixer'],
-              },
-            },
-          },
-          'sass-loader',
-        ],
-      },
-      {
-        test: /\.(jpg|png|gif|svg|ico|eot|ttf|woff|woff2)$/,
-        type: 'asset/inline',
-      },
-    ],
-  },
-});

app/config/webpack/prod.js

@@ -1,101 +0,0 @@
-const webpack = require('webpack');
-const { merge } = require('webpack-merge');
-const ESLintPlugin = require('eslint-webpack-plugin');
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const { WebpackManifestPlugin } = require('webpack-manifest-plugin');
-const TerserPlugin = require('terser-webpack-plugin');
-
-const commonConfig = require('./common');
-
-module.exports = merge(commonConfig, {
-  output: {
-    filename: '[name].js',
-  },
-  mode: 'production',
-  devtool: 'source-map',
-  optimization: {
-    minimize: true,
-    minimizer: [
-      new TerserPlugin({
-        parallel: true,
-        terserOptions: {
-          output: {
-            comments: false,
-          },
-        },
-        extractComments: false,
-      }),
-    ],
-  },
-  plugins: [
-    new ESLintPlugin(),
-    new MiniCssExtractPlugin(),
-    new webpack.DefinePlugin({
-      'process.env': {
-        NODE_ENV: JSON.stringify('production'),
-      },
-    }),
-    new WebpackManifestPlugin({
-      fileName: 'manifest.json',
-      sort: (file1, file2) => file1.path.localeCompare(file2.path),
-    }),
-  ],
-  module: {
-    rules: [
-      {
-        test: /\.js$/,
-        exclude: /(node_modules)/,
-        use: {
-          loader: 'babel-loader',
-          options: {
-            presets: ['@babel/preset-env'],
-          },
-        },
-      },
-      {
-        test: /\.(sa|sc|c)ss$/,
-        use: [
-          MiniCssExtractPlugin.loader,
-          {
-            loader: 'css-loader',
-            options: {
-              importLoaders: 1,
-            },
-          },
-          {
-            loader: 'postcss-loader',
-            options: {
-              postcssOptions: {
-                plugins: ['autoprefixer'],
-              },
-            },
-          },
-          'sass-loader',
-        ],
-      },
-      {
-        test: /\.(jpg|png|gif|svg|ico)$/,
-        include: /node_modules/,
-        type: 'asset/resource',
-        generator: {
-          filename: 'img/[name][ext]',
-        },
-      },
-      {
-        test: /\.(jpg|png|gif|svg|ico)$/,
-        exclude: /node_modules/,
-        type: 'asset/resource',
-        generator: {
-          filename: (content) => content.filename.replace('app/Resources/static/', ''),
-        },
-      },
-      {
-        test: /\.(eot|ttf|woff|woff2)$/,
-        type: 'asset/resource',
-        generator: {
-          filename: 'fonts/[name][ext]',
-        },
-      },
-    ],
-  },
-});

assets/img/icons/linkding.svg

@@ -0,0 +1 @@
+<svg clip-rule="evenodd" fill-rule="evenodd" height="512" stroke-linejoin="round" stroke-miterlimit="1.5" viewBox="0 0 512 512" width="512" xmlns="http://www.w3.org/2000/svg"><circle cx="255.0164" cy="254.9236" fill="#5856e0" r="224.78528" stroke-width="1.18"/><g fill="none" stroke="#fff" stroke-width="31.25"><path d="m1244.39 1293.95v199.64s-.81 67.89 74.9 68.88c75.98.99 74.88-68.88 74.88-68.88v-199.64" transform="matrix(.70710678 .70710678 -.70710678 .70710678 284.139117 -1684.198509)"/><path d="m1244.39 1293.95v199.64s-.81 67.89 74.9 68.88c75.98.99 74.88-68.88 74.88-68.88v-199.64" transform="matrix(-.70957074 -.70463421 .70463421 -.70957074 235.113139 2195.434643)"/></g></svg>

assets/index.js

@@ -1,24 +1,141 @@
 import $ from 'jquery';
 
 /* Materialize imports */
-import 'materialize-css/dist/css/materialize.css';
-import 'materialize-css/dist/js/materialize';
+import '@materializecss/materialize/dist/css/materialize.css';
+import '@materializecss/materialize/dist/js/materialize';
 
-/* Global imports */
-import '../_global/index';
+/* Annotations */
+import annotator from 'annotator';
+
+import ClipboardJS from 'clipboard';
+import 'mathjax/es5/tex-svg';
+
+/* jrQrcode */
+import jrQrcode from 'jr-qrcode';
+
+/* Fonts */
+import 'material-design-icons-iconfont/dist/material-design-icons.css';
+import 'lato-font/css/lato-font.css';
+import 'open-dyslexic/open-dyslexic-regular.css';
+import '@fontsource/atkinson-hyperlegible';
+import '@fontsource/eb-garamond';
+import '@fontsource/montserrat';
+import '@fontsource/oswald';
+
+/* Highlight */
+import './js/highlight';
 
 /* Tools */
-import { initExport, initFilters, initRandom } from './js/tools';
+import {
+  savePercent, retrievePercent, initExport, initFilters, initRandom, initPreviewText,
+} from './js/tools';
 
 /* Import shortcuts */
 import './js/shortcuts/main';
 import './js/shortcuts/entry';
 
 /* Theme style */
-import './css/index.scss';
+import './scss/index.scss';
 
 const mobileMaxWidth = 993;
 
+/* ==========================================================================
+ 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();
+  });
+});
+
 (function darkTheme() {
   const rootEl = document.querySelector('html');
   const themeDom = {
@@ -155,13 +272,14 @@ const articleScroll = () => {
 };
 
 $(document).ready(() => {
-  // sideNav
-  $('.button-collapse').sideNav();
-  $('select').material_select();
-  $('.collapsible').collapsible({
+  // sidenav
+  $('.sidenav').sidenav();
+  $('select').formSelect();
+  $('.collapsible[data-collapsible="accordion"]').collapsible();
+  $('.collapsible[data-collapsible="expandable"]').collapsible({
     accordion: false,
   });
-  $('.datepicker').pickadate({
+  $('.datepicker').datepicker({
     selectMonths: true,
     selectYears: 15,
     formatSubmit: 'yyyy-mm-dd',
@@ -171,12 +289,21 @@ $(document).ready(() => {
   });
 
   $('.dropdown-trigger').dropdown({ hover: false });
+  $('.dropdown-trigger[data-covertrigger="false"][data-constrainwidth="false"]').dropdown({
+    hover: false,
+    coverTrigger: false,
+    constrainWidth: false,
+  });
+
+  $('.tabs').tabs();
+  $('.tooltipped').tooltip();
 
   initFilters();
   initExport();
   initRandom();
   stickyNav();
   articleScroll();
+  initPreviewText();
 
   const toggleNav = (toShow, toFocus) => {
     $('.nav-panel-actions').hide(100);
@@ -188,7 +315,7 @@ $(document).ready(() => {
     $('.nav-panel-add-tag').toggle(100);
     $('.nav-panel-menu').addClass('hidden');
     if (window.innerWidth < mobileMaxWidth) {
-      $('.side-nav').sideNav('hide');
+      $('.sidenav').sidenav('close');
     }
     $('#tag_label').focus();
     return false;
@@ -199,6 +326,29 @@ $(document).ready(() => {
     return false;
   });
 
+  $('#config_fontsize').on('input', () => {
+    const value = $('#config_fontsize').val();
+    const css = `${value}em`;
+    $('#preview-content').css('font-size', css);
+  });
+
+  $('#config_font').on('change', () => {
+    const value = $('#config_font').val();
+    $('#preview-content').css('font-family', value);
+  });
+
+  $('#config_lineHeight').on('input', () => {
+    const value = $('#config_lineHeight').val();
+    const css = `${value}em`;
+    $('#preview-content').css('line-height', css);
+  });
+
+  $('#config_maxWidth').on('input', () => {
+    const value = $('#config_maxWidth').val();
+    const css = `${value}em`;
+    $('#preview-article').css('max-width', css);
+  });
+
   const materialAddForm = $('.nav-panel-add');
   materialAddForm.on('submit', () => {
     materialAddForm.addClass('disabled');
@@ -228,10 +378,16 @@ $(document).ready(() => {
       });
     });
   }
-  $('input[name="tags"][form="form_mass_action"]').on('keydown', (e) => {
+  $('form[name="form_mass_action"] input[name="tags"]').on('keydown', (e) => {
     if (e.key === 'Enter') {
       e.preventDefault();
-      $('button[name="tag"][form="form_mass_action"]').trigger('click');
+      $('form[name="form_mass_action"] button[name="tag"]').trigger('click');
     }
   });
+
+  document.querySelectorAll('img.jr-qrcode').forEach((qrcode) => {
+    const src = jrQrcode.getQrBase64(qrcode.getAttribute('data-url'));
+
+    qrcode.setAttribute('src', src);
+  });
 });

assets/js/shortcuts/entry.js

@@ -5,22 +5,22 @@ $(document).ready(() => {
   if ($('#article').length > 0) {
     /* open original article */
     Mousetrap.bind('o', () => {
-      $('ul.side-nav a.original i')[0].click();
+      $('ul.sidenav a.original i')[0].click();
     });
 
     /* mark as favorite */
     Mousetrap.bind('f', () => {
-      $('ul.side-nav button.favorite i')[0].click();
+      $('ul.sidenav a.favorite i')[0].click();
     });
 
     /* mark as read */
     Mousetrap.bind('a', () => {
-      $('ul.side-nav button.markasread i')[0].click();
+      $('ul.sidenav a.markasread i')[0].click();
     });
 
     /* delete */
     Mousetrap.bind('del', () => {
-      $('ul.side-nav button.delete i')[0].click();
+      $('ul.sidenav a.delete i')[0].click();
     });
   }
 });

assets/js/shortcuts/main.js

@@ -1,6 +1,18 @@
 import Mousetrap from 'mousetrap';
 import $ from 'jquery';
 
+/* 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'); });
+
 function toggleFocus(cardToToogleFocus) {
   if (cardToToogleFocus) {
     $(cardToToogleFocus).toggleClass('z-depth-4');

assets/js/tools.js

@@ -0,0 +1,83 @@
+import $ from 'jquery';
+
+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;
+}
+
+function initFilters() {
+  // no display if filters not available
+  if ($('div').is('#filters')) {
+    $('#button_filters').show();
+    $('#filters.sidenav').sidenav({ edge: 'right' });
+    $('#clear_form_filters').on('click', () => {
+      $('#filters input').val('');
+      $('#filters :checked').removeAttr('checked');
+
+      return false;
+    });
+  }
+}
+
+function initExport() {
+  // no display if export not available
+  if ($('div').is('#export')) {
+    $('#button_export').show();
+    $('#export.sidenav').sidenav({ edge: 'right' });
+  }
+}
+
+function initRandom() {
+  // no display if export (ie: entries) not available
+  if ($('div').is('#export')) {
+    $('#button_random').show();
+  }
+}
+
+function initPreviewText() {
+  // no display if preview_text not available
+  if ($('div').is('#preview-article')) {
+    const defaultFontFamily = $('#config_font').val();
+    const defaultFontSize = $('#config_fontsize').val();
+    const defaultLineHeight = $('#config_lineHeight').val();
+    const defaultMaxWidth = $('#config_maxWidth').val();
+    const previewContent = $('#preview-content');
+
+    previewContent.css('font-family', defaultFontFamily);
+    previewContent.css('font-size', `${defaultFontSize}em`);
+    previewContent.css('line-height', `${defaultLineHeight}em`);
+    $('#preview-article').css('max-width', `${defaultMaxWidth}em`);
+  }
+}
+
+export {
+  savePercent,
+  retrievePercent,
+  initExport,
+  initFilters,
+  initRandom,
+  initPreviewText,
+};

assets/scss/_article.scss

@@ -1,8 +1,10 @@
+@use "variables";
+
 /* ==========================================================================
    Article
    ========================================================================== */
 
-#article {
+#article, #preview-article {
   font-size: 20px;
   margin: 0 auto;
   max-width: 45em;
@@ -54,7 +56,7 @@
     }
 
     a {
-      border-bottom: 1px dotted $blue-accent-color;
+      border-bottom: 1px dotted variables.$blue-accent-color;
       text-decoration: none;
     }
 

assets/scss/_cards.scss

@@ -1,3 +1,5 @@
+@use "variables";
+
 /* ==========================================================================
    Cards
    ========================================================================== */
@@ -73,7 +75,7 @@ main {
 
   .card-entry-labels-hidden li {
     display: inline-block;
-    background-color: $blue-accent-color;
+    background-color: variables.$blue-accent-color;
     margin: 0 5px;
     padding: 5px 12px;
     border-radius: 3px;
@@ -156,7 +158,7 @@ a.original:not(.waves-effect) {
 .card-tag-labels li {
   margin: 10px 10px 10px auto;
   padding: 5px 12px 5px 16px !important;
-  background-color: $blue-accent-color;
+  background-color: variables.$blue-accent-color;
   border-radius: 3px;
   color: #fff;
   cursor: default;
@@ -177,7 +179,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;
@@ -248,7 +249,7 @@ a.original:not(.waves-effect) {
     }
 
     .chip {
-      background-color: $blue-accent-color;
+      background-color: variables.$blue-accent-color;
       padding: 0 7px;
       margin: auto 1px;
       border-radius: 6px;
@@ -269,9 +270,11 @@ 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;
@@ -325,6 +328,12 @@ 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;

assets/scss/_dark_theme.scss

@@ -12,9 +12,9 @@
   .collapsible-header,
   .collection,
   .dropdown-content,
-  .side-nav,
-  .side-nav .collapsible-body,
-  .side-nav.fixed .collapsible-body,
+  .sidenav,
+  .sidenav .collapsible-body,
+  .sidenav.sidenav-fixed .collapsible-body,
   .tabs {
     background-color: #131716;
   }
@@ -59,12 +59,11 @@
   #article article h5,
   #article article h6,
   .dropdown-content li > a,
-  .nav-panels .input-field input:focus,
+  .input-field input,
+  .input-field input:focus,
   .results-item,
-  .side-nav li > a,
-  .side-nav li > a > i.material-icons,
-  .side-nav li button,
-  .side-nav li button > i.material-icons {
+  .sidenav li > a,
+  .sidenav li > a > i.material-icons {
     color: #dfdfdf;
   }
 
@@ -83,15 +82,14 @@
     color: #dfdfdf !important;
   }
 
-  .side-nav li.active {
+  .sidenav li.active {
     background-color: #2f2f2f;
   }
 
   .mass-action-tags .mass-action-tags-input.mass-action-tags-input,
-  .side-nav li:not(.logo) > a:hover,
-  .side-nav li:not(.logo) button:hover,
-  .side-nav .collapsible-header:hover,
-  .side-nav.fixed .collapsible-header:hover {
+  .sidenav li:not(.logo) > a:hover,
+  .sidenav .collapsible-header:hover,
+  .sidenav.sidenav-fixed .collapsible-header:hover {
     background-color: #1d1d1d;
   }
 

assets/scss/_entries.scss

@@ -1,3 +1,5 @@
+@use "variables";
+
 /* ==========================================================================
  * Entries
  * ========================================================================== */
@@ -84,7 +86,7 @@
   }
 
   .mass-action-tags-input.mass-action-tags-input.mass-action-tags-input:focus {
-    border-bottom: 3px solid $blue-accent-color;
+    border-bottom: 3px solid variables.$blue-accent-color;
     box-shadow: none;
   }
 }

assets/scss/_icons.scss

@@ -125,19 +125,24 @@ a.icon-image {
   }
 
   &.diaspora::before {
-    background: url("../../_global/img/icons/diaspora-icon--black.png") no-repeat center/80%;
+    background: url("../img/icons/diaspora-icon--black.png") no-repeat center/80%;
   }
 
   &.unmark::before {
-    background: url("../../_global/img/icons/unmark-icon--black.png") no-repeat center/80%;
+    background: url("../img/icons/unmark-icon--black.png") no-repeat center/80%;
+  }
+
+  &.linkding::before {
+    background: url("../img/icons/linkding.svg") no-repeat center/80%;
+    filter: grayscale(1);
   }
 
   &.shaarli::before {
-    background: url("../../_global/img/icons/shaarli.png") no-repeat center/80%;
+    background: url("../img/icons/shaarli.png") no-repeat center/80%;
   }
 
   &.scuttle::before {
-    background: url("../../_global/img/icons/scuttle.png") no-repeat center/80%;
+    background: url("../img/icons/scuttle.png") no-repeat center/80%;
   }
 }
 

assets/scss/_layout.scss

@@ -1,3 +1,5 @@
+@use "variables";
+
 /* ==========================================================================
    Layout
    ========================================================================== */
@@ -19,7 +21,7 @@ body {
 }
 
 a {
-  color: $blue-accent-color;
+  color: variables.$blue-accent-color;
 }
 
 main,

assets/scss/_nav.scss

@@ -6,38 +6,17 @@ nav {
   line-height: initial;
 }
 
-// adapted from anchor styles from node_modules/materialize-css/sass/components/_navbar.scss
-nav ul button {
-  transition: background-color .3s;
-  font-size: 1rem;
-  color: #fff;
-  display: block;
-  padding: 0 15px;
-  cursor: pointer;
-  background: none;
-  border: 0;
-
-  &:focus {
-    background: none;
-  }
-
-  &:hover {
-    background-color: rgba(0 0 0 / 10%);
-  }
-}
-
 nav {
   input {
     color: #aaa;
   }
 
-  ul button:hover,
   ul a:hover {
     background-color: initial;
   }
 }
 
-.nav-panel-item .button-collapse {
+.nav-panel-item .sidenav-trigger {
   margin-left: 0;
   margin-right: 0.5rem;
   padding-left: 0.5rem;
@@ -55,7 +34,6 @@ nav {
   justify-content: space-between;
   align-items: center;
 
-  button,
   a {
     padding: 10px 15px;
   }
@@ -205,7 +183,7 @@ nav {
     justify-content: end;
   }
 
-  .button-collapse {
+  .sidenav-trigger {
     display: none;
   }
 

assets/scss/_sidenav.scss

@@ -1,8 +1,8 @@
 /* ==========================================================================
-   Side-nav
+   Sidenav
    ========================================================================== */
 
-.side-nav {
+.sidenav {
   width: 240px;
 
   li {
@@ -12,7 +12,6 @@
       background: initial;
     }
 
-    & button > i.material-icons.theme-toggle-icon,
     & > a > i.material-icons.theme-toggle-icon {
       float: none;
       margin-left: 0;
@@ -23,15 +22,14 @@
     margin: 0;
   }
 
-  &.fixed button,
-  &.fixed a {
+  &.sidenav-fixed a {
     font-size: 13px;
     line-height: 44px;
     height: 44px;
   }
 
   .collapsible-header,
-  &.fixed .collapsible-header {
+  &.sidenav-fixed .collapsible-header {
     height: 45px;
     line-height: 44px;
     padding: 0 20px;
@@ -43,38 +41,15 @@
   }
 }
 
-// adapted from anchor styles from node_modules/materialize-css/sass/components/_sideNav.scss
-.side-nav li button {
-  color: rgba(0 0 0 / 87%);
-  display: block;
-  font-size: 14px;
-  font-weight: 500;
-  height: 48px;
-  line-height: 48px;
-  padding: 0 (16px * 2);
-  width: 100%;
-  text-align: left;
-
-  &:hover {
-    background-color: rgba(0 0 0 / 5%);
-  }
-
-  & > i,
-  & > i.material-icons {
-    float: left;
-    height: 48px;
-    line-height: 48px;
-    margin: 0 (16px * 2) 0 0;
-    width: 24px;
-    color: rgba(0 0 0 / 54%);
-  }
-}
-
-.bold > a,
-.bold > button {
+.bold > a {
   font-weight: bold;
 }
 
 .items-number {
   float: right;
 }
+
+.button-filters .sidenav-trigger,
+.button-export .sidenav-trigger {
+  display: block;
+}

assets/scss/_various.scss

@@ -38,18 +38,3 @@ nav .input-field input {
 .tab {
   flex: 1;
 }
-
-.btn-link {
-  background: none;
-  border: 0;
-  padding: 0;
-  color: $blue-accent-color;
-
-  &:focus {
-    background: none;
-  }
-}
-
-.inline-block {
-  display: inline-block;
-}

assets/scss/index.scss

@@ -0,0 +1,19 @@
+@use "material-icons";
+@use "variables";
+
+/* Style */
+@use "article";
+@use "cards";
+@use "entries";
+@use "filters";
+@use "layout";
+@use "nav";
+@use "sidenav";
+@use "various";
+@use "dark_theme";
+
+/* Tools */
+@use "fonts";
+@use "icons";
+@use "print";
+@use "media_queries";

assets/share.js

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

compose.yaml

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
 
     php:
@@ -32,6 +31,8 @@ services:
             # - ./docker/postgres/env
             # Uncomment to enable Xdebug
             # - ./docker/php/xdebug
+            # Uncomment to enable Blackfire
+            # - ./docker/php/blackfire
         ports:
             - 8000:8000
             # Uncomment to permit Xdebug remote session
@@ -48,7 +49,7 @@ services:
     #     env_file:
     #         - ./docker/postgres/env
     #     healthcheck:
-    #         test: ["CMD-SHELL", "pg_isready -q || exit 1"]
+    #         test: ["CMD-SHELL", "pg_isready -U wallabag -q || exit 1"]
     #         interval: 10s
     #         timeout: 3s
     #         retries: 3
@@ -75,6 +76,12 @@ services:
             timeout: 3s
             retries: 3
 
+    # blackfire:
+    #     image: blackfire/blackfire:2
+    #     ports: [ "8307" ]
+    #     env_file:
+    #         - ./docker/php/blackfire
+
 volumes:
     db-data:
         driver: local

composer-dependency-analyser.php

@@ -0,0 +1,73 @@
+<?php
+
+use ShipMonk\ComposerDependencyAnalyser\Config\Configuration;
+use ShipMonk\ComposerDependencyAnalyser\Config\ErrorType;
+
+$config = new Configuration();
+
+$config
+    ->disableComposerAutoloadPathScan()
+    ->disableExtensionsAnalysis()
+    ->enableAnalysisOfUnusedDevDependencies()
+    ->addPathToScan(__DIR__ . '/app', false)
+    ->addPathToScan(__DIR__ . '/migrations', false)
+    ->addPathToScan(__DIR__ . '/src', false)
+    ->addPathToScan(__DIR__ . '/web', false)
+    ->addPathToScan(__DIR__ . '/fixtures', true)
+    ->addPathToScan(__DIR__ . '/tests', true)
+    ->ignoreErrorsOnPackages([
+        'doctrine/common',
+        'egulias/email-validator',
+        'ergebnis/composer-normalize',
+        'friendsofphp/php-cs-fixer',
+        'friendsoftwig/twigcs',
+        'incenteev/composer-parameter-handler',
+        'j0k3r/graby-site-config',
+        'laminas/laminas-code',
+        'lcobucci/jwt',
+        'mgargano/simplehtmldom',
+        'mnapoli/piwik-twig-extension',
+        'ocramius/proxy-manager',
+        'pagerfanta/twig',
+        'php-http/mock-client',
+        'phpstan/extension-installer',
+        'phpstan/phpstan',
+        'phpstan/phpstan-doctrine',
+        'phpstan/phpstan-phpunit',
+        'phpstan/phpstan-symfony',
+        'psr/http-client',
+        'psr/http-factory',
+        'rulerz-php/doctrine-orm',
+        'scheb/2fa-qr-code',
+        'scheb/2fa-trusted-device',
+        'shipmonk/composer-dependency-analyser',
+        'symfony/asset',
+        'symfony/css-selector',
+        'symfony/doctrine-bridge',
+        'symfony/google-mailer',
+        'symfony/intl',
+        'symfony/phpunit-bridge',
+        'symfony/proxy-manager-bridge',
+        'symfony/templating',
+        'symfony/var-dumper',
+        'twig/string-extra',
+    ], [ErrorType::UNUSED_DEPENDENCY])
+    ->ignoreErrorsOnPackages([
+        'monolog/monolog',
+        'symfony/filesystem',
+    ], [ErrorType::PROD_DEPENDENCY_ONLY_IN_DEV])
+    ->ignoreErrorsOnPackages([
+        'dama/doctrine-test-bundle',
+        'doctrine/doctrine-fixtures-bundle',
+        'symfony/debug-bundle',
+        'symfony/maker-bundle',
+        'symfony/web-profiler-bundle',
+        'symfony/web-server-bundle',
+    ], [ErrorType::DEV_DEPENDENCY_IN_PROD])
+;
+
+if (\PHP_VERSION_ID >= 80000) {
+    $config->ignoreErrorsOnPackage('symfony/polyfill-php80', [ErrorType::UNUSED_DEPENDENCY]);
+}
+
+return $config;

composer.json

@@ -48,6 +48,7 @@
         "ext-iconv": "*",
         "ext-intl": "*",
         "ext-json": "*",
+        "ext-libxml": "*",
         "ext-mbstring": "*",
         "ext-pcre": "*",
         "ext-pdo": "*",
@@ -57,123 +58,132 @@
         "ext-tokenizer": "*",
         "ext-xml": "*",
         "babdev/pagerfanta-bundle": "^3.8",
-        "bdunogier/guzzle-site-authenticator": "^1.1.0",
         "craue/config-bundle": "^2.7.0",
         "defuse/php-encryption": "^2.4",
         "doctrine/collections": "^1.8",
         "doctrine/common": "^3.4.3",
         "doctrine/dbal": "^3.8.2",
-        "doctrine/doctrine-bundle": "^2.7.2",
-        "doctrine/doctrine-migrations-bundle": "^3.2.5",
+        "doctrine/doctrine-bundle": "^2.11.3",
+        "doctrine/doctrine-migrations-bundle": "^3.3",
         "doctrine/event-manager": "^1.2",
         "doctrine/migrations": "^3.5.5",
-        "doctrine/orm": "^2.18",
+        "doctrine/orm": "^2.18.1",
         "doctrine/persistence": "^3.2",
         "egulias/email-validator": "^3.2.6",
-        "enshrined/svg-sanitize": "^0.15.4",
+        "enshrined/svg-sanitize": "^0.21",
         "friendsofsymfony/jsrouting-bundle": "^2.8",
         "friendsofsymfony/oauth-server-bundle": "dev-master#dc8ff343363cf794d30eb1a123610d186a43f162",
-        "friendsofsymfony/rest-bundle": "^3.5",
+        "friendsofsymfony/rest-bundle": "^3.6",
         "friendsofsymfony/user-bundle": "^3.2.1",
-        "guzzlehttp/guzzle": "^5.3.4",
         "guzzlehttp/psr7": "^2.6.2",
         "html2text/html2text": "^4.3.1",
-        "incenteev/composer-parameter-handler": "^2.1.5",
+        "incenteev/composer-parameter-handler": "^2.2",
         "j0k3r/graby": "^2.4.5",
-        "j0k3r/php-readability": "^1.2.13",
+        "j0k3r/graby-site-config": "^1.0",
         "javibravo/simpleue": "^2.1",
         "jms/serializer": "^3.29.1",
-        "jms/serializer-bundle": "^5.3.1",
-        "kphoen/rulerz": "^0.21.1",
-        "kphoen/rulerz-bundle": "^0.15",
+        "jms/serializer-bundle": "^5.4",
         "laminas/laminas-code": "^4.7.1",
-        "lcobucci/jwt": "4.1.5",
-        "lexik/form-filter-bundle": "^7.0.3",
+        "lcobucci/jwt": "^4.3",
+        "league/html-to-markdown": "^5.1",
         "mgargano/simplehtmldom": "^1.5",
         "mnapoli/piwik-twig-extension": "^3.0",
-        "nelmio/api-doc-bundle": "^4.11.1",
-        "nelmio/cors-bundle": "^2.3.1",
+        "monolog/monolog": "^2.9",
+        "nelmio/api-doc-bundle": "^4.20.0",
+        "nelmio/cors-bundle": "^2.4",
         "ocramius/proxy-manager": "^2.1.1",
+        "pagerfanta/core": "^3.8",
         "pagerfanta/doctrine-orm-adapter": "^3.8",
         "pagerfanta/twig": "^3.8",
         "php-amqplib/php-amqplib": "^3.6.1",
-        "php-amqplib/rabbitmq-bundle": "^2.14",
-        "php-http/client-common": "^2.7.1",
-        "php-http/discovery": "^1.19.2",
-        "php-http/guzzle5-adapter": "^2.0",
-        "php-http/httplug": "^2.4",
-        "php-http/httplug-bundle": "^1.32",
-        "php-http/message": "^1.16",
-        "php-http/message-factory": "^1.1",
+        "php-amqplib/rabbitmq-bundle": "^2.14.0",
         "pragmarx/recovery": "^0.2.1",
         "predis/predis": "^2.2.2",
-        "psr/http-message": "^1.1",
+        "psr/http-client": "^1.0.3",
+        "psr/http-factory": "^1.0.2",
+        "psr/http-message": "^2.0",
         "psr/log": "^1.1.4",
+        "rulerz-php/doctrine-orm": "dev-master",
         "scheb/2fa-backup-code": "^5.13.2",
         "scheb/2fa-bundle": "^5.13.2",
         "scheb/2fa-email": "^5.13.2",
         "scheb/2fa-google-authenticator": "^5.13.2",
         "scheb/2fa-qr-code": "^5.13.2",
         "scheb/2fa-trusted-device": "^5.13.2",
+        "scssphp/scssphp": "^1.12.1",
         "sensio/framework-extra-bundle": "^6.2.10",
-        "sentry/sentry-symfony": "^4.13.2",
-        "stof/doctrine-extensions-bundle": "^1.7.2",
-        "symfony/asset": "^4.4.46",
-        "symfony/config": "^4.4.44",
-        "symfony/console": "^4.4.49",
-        "symfony/debug": "^4.4.44",
-        "symfony/dependency-injection": "^4.4.49",
-        "symfony/doctrine-bridge": "^4.4.48",
-        "symfony/dom-crawler": "^4.4.45",
-        "symfony/error-handler": "^4.4.44",
-        "symfony/event-dispatcher": "^4.4.44",
-        "symfony/finder": "^4.4.44",
-        "symfony/form": "^4.4.48",
-        "symfony/framework-bundle": "^4.4.51",
-        "symfony/google-mailer": "^4.4.41",
-        "symfony/http-foundation": "^4.4.49",
-        "symfony/http-kernel": "^4.4.51",
-        "symfony/mailer": "^4.4.49",
-        "symfony/mime": "^4.4.47",
-        "symfony/monolog-bundle": "^3.8",
-        "symfony/options-resolver": "^4.4.44",
-        "symfony/proxy-manager-bridge": "^4.4.39",
-        "symfony/routing": "^4.4.44",
-        "symfony/security-bundle": "^4.4.50",
-        "symfony/security-core": "^4.4.48",
-        "symfony/security-http": "^4.4.50",
-        "symfony/templating": "^4.4.44",
-        "symfony/twig-bundle": "^4.4.41",
-        "symfony/validator": "^4.4.48",
+        "sentry/sentry-symfony": "^5.0.1",
+        "spiriitlabs/form-filter-bundle": "^10.0",
+        "stof/doctrine-extensions-bundle": "^1.11.0",
+        "symfony/asset": "^5.4.35",
+        "symfony/browser-kit": "^5.4.35",
+        "symfony/config": "^5.4.35",
+        "symfony/console": "^5.4.35",
+        "symfony/dependency-injection": "^5.4.35",
+        "symfony/doctrine-bridge": "^5.4.35",
+        "symfony/dom-crawler": "^5.4.35",
+        "symfony/error-handler": "^5.4.35",
+        "symfony/event-dispatcher": "^5.4.35",
+        "symfony/event-dispatcher-contracts": "^2.5.2",
+        "symfony/expression-language": "^5.4.35",
+        "symfony/filesystem": "^5.4",
+        "symfony/finder": "^5.4.35",
+        "symfony/form": "^5.4.35",
+        "symfony/framework-bundle": "^5.4.35",
+        "symfony/google-mailer": "^5.4.35",
+        "symfony/http-client": "^5.4.35",
+        "symfony/http-client-contracts": "^2.5",
+        "symfony/http-foundation": "^5.4.35",
+        "symfony/http-kernel": "^5.4.35",
+        "symfony/intl": "^5.4.35",
+        "symfony/mailer": "^5.4.35",
+        "symfony/mime": "^5.4.35",
+        "symfony/monolog-bundle": "^3.10",
+        "symfony/options-resolver": "^5.4.21",
+        "symfony/polyfill-php80": "^1.29",
+        "symfony/proxy-manager-bridge": "^5.4.21",
+        "symfony/routing": "^5.4.35",
+        "symfony/security-bundle": "^5.4.35",
+        "symfony/security-core": "^5.4.35",
+        "symfony/security-http": "^5.4.35",
+        "symfony/templating": "^5.4.35",
+        "symfony/translation-contracts": "^2.5.2",
+        "symfony/twig-bundle": "^5.4.35",
+        "symfony/validator": "^5.4.35",
+        "symfony/webpack-encore-bundle": "^1.17",
         "tecnickcom/tcpdf": "^6.6.5",
-        "twig/extra-bundle": "^3.7",
+        "twig/extra-bundle": "^3.8",
         "twig/string-extra": "^3.8",
         "twig/twig": "^3.8.0",
-        "wallabag/php-mobi": "^1.1.1",
         "wallabag/phpepub": "^4.0.10",
+        "wallabag/rulerz": "dev-master",
+        "wallabag/rulerz-bundle": "dev-master",
         "willdurand/hateoas": "^3.10",
         "willdurand/hateoas-bundle": "^2.6"
     },
     "require-dev": {
-        "dama/doctrine-test-bundle": "^7.1.1",
-        "doctrine/doctrine-fixtures-bundle": "^3.4.5",
-        "ergebnis/composer-normalize": "^2.42",
-        "friendsofphp/php-cs-fixer": "^3.4",
+        "dama/doctrine-test-bundle": "^8.0.2",
+        "doctrine/data-fixtures": "^1.7",
+        "doctrine/doctrine-fixtures-bundle": "^3.5.1",
+        "ergebnis/composer-normalize": "^2.42.0",
+        "friendsofphp/php-cs-fixer": "^3.49",
         "friendsoftwig/twigcs": "^6.1",
         "m6web/redis-mock": "^5.6",
         "php-http/mock-client": "^1.6",
         "phpstan/extension-installer": "^1.3.1",
-        "phpstan/phpstan": "^1.10.58",
+        "phpstan/phpstan": "^1.10.59",
         "phpstan/phpstan-doctrine": "^1.3.62",
-        "phpstan/phpstan-phpunit": "^1.3.15",
+        "phpstan/phpstan-phpunit": "^1.3.16",
         "phpstan/phpstan-symfony": "^1.3.7",
-        "symfony/browser-kit": "^4.4.44",
-        "symfony/css-selector": "^4.4.44",
-        "symfony/debug-bundle": "^4.4.37",
-        "symfony/maker-bundle": "^1.39.1",
-        "symfony/phpunit-bridge": "^6.4.3",
-        "symfony/var-dumper": "^4.4.47",
-        "symfony/web-profiler-bundle": "^4.4.47",
+        "phpunit/phpunit": "^9.6.17",
+        "shipmonk/composer-dependency-analyser": "^1.7",
+        "symfony/css-selector": "^5.4.35",
+        "symfony/debug-bundle": "^5.4.35",
+        "symfony/maker-bundle": "^1.43",
+        "symfony/phpunit-bridge": "^7.0.3",
+        "symfony/process": "^5.4",
+        "symfony/var-dumper": "^5.4.35",
+        "symfony/web-profiler-bundle": "^5.4.35",
         "symfony/web-server-bundle": "^4.4.44"
     },
     "suggest": {
@@ -183,7 +193,7 @@
     "prefer-stable": true,
     "autoload": {
         "psr-4": {
-            "Wallabag\\": "src/Wallabag/"
+            "Wallabag\\": "src/"
         },
         "classmap": [
             "app/AppKernel.php",
@@ -192,8 +202,12 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Tests\\": "tests/"
-        }
+            "Tests\\Wallabag\\": "tests/",
+            "Wallabag\\DataFixtures\\": "fixtures/"
+        },
+        "files": [
+            "tests/functions.php"
+        ]
     },
     "config": {
         "allow-plugins": {
@@ -214,7 +228,7 @@
         "public-dir": "web",
         "symfony": {
             "allow-contrib": true,
-            "require": "4.4.*"
+            "require": "5.4.*"
         }
     },
     "scripts": {

docker/mariadb/env

@@ -1,10 +1,9 @@
 MYSQL_ROOT_PASSWORD=wallaroot
-MYSQL_USER=wallabag
-MYSQL_PASSWORD=wallapass
 MYSQL_DATABASE=wallabag
 DATABASE_DRIVER=pdo_mysql
-DATABASE_HOST=mysql
+DATABASE_HOST=mariadb
 DATABASE_PORT=3306
 DATABASE_NAME=wallabag
-DATABASE_USER=wallabag
-DATABASE_PASSWORD=wallapass
+DATABASE_USER=root
+DATABASE_PASSWORD=wallaroot
+DATABASE_CHARSET=utf8mb4

docker/php/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.1-fpm-bookworm AS rootless
+FROM php:8.1-fpm AS rootless
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG NODE_VERSION=20
@@ -12,8 +12,7 @@ RUN apt-get update \
       openssl \
       software-properties-common
 
-RUN curl 'https://deb.nodesource.com/gpgkey/nodesource.gpg.key' | apt-key add - \
-    && echo "deb https://deb.nodesource.com/node_${NODE_VERSION}.x $(lsb_release -cs) main" > /etc/apt/sources.list.d/nodesource.list
+RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash -
 
 RUN apt-get update && apt-get install -y \
         libmcrypt-dev \
@@ -60,6 +59,21 @@ RUN pecl install redis; \
         xdebug \
     ;
 
+RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
+    && architecture=$(uname -m) \
+    && curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/$architecture/$version \
+    && mkdir -p /tmp/blackfire \
+    && tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
+    && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
+    && printf "extension=blackfire.so\nblackfire.agent_socket=tcp://blackfire:8307\n" > $PHP_INI_DIR/conf.d/blackfire.ini \
+    && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
+
+RUN mkdir -p /tmp/blackfire \
+    && architecture=$(uname -m) \
+    && curl -A "Docker" -L https://blackfire.io/api/v1/releases/cli/linux/$architecture | tar zxp -C /tmp/blackfire \
+    && mv /tmp/blackfire/blackfire /usr/bin/blackfire \
+    && rm -Rf /tmp/blackfire
+
 RUN npm install -g yarn
 
 RUN curl -L -o /usr/local/bin/envsubst https://github.com/a8m/envsubst/releases/download/v1.1.0/envsubst-`uname -s`-`uname -m`; \

docker/php/blackfire.example

@@ -0,0 +1,4 @@
+BLACKFIRE_SERVER_ID=CHANGE_ME
+BLACKFIRE_SERVER_TOKEN=CHANGE_ME
+BLACKFIRE_CLIENT_ID=CHANGE_ME
+BLACKFIRE_CLIENT_TOKEN=CHANGE_ME

docker/php/config/parameters.yml

@@ -1,12 +1,11 @@
 parameters:
     database_driver: ${DATABASE_DRIVER:-pdo_sqlite}
-    database_driver_class: ${DATABASE_DRIVER_CLASS:-~}
     database_host: ${DATABASE_HOST:-127.0.0.1}
     database_port: ${DATABASE_PORT:-~}
     database_name: ${DATABASE_NAME:-symfony}
     database_user: ${DATABASE_USER:-root}
     database_password: ${DATABASE_PASSWORD:-~}
-    database_path: '${DATABASE_PATH:-"%kernel.project_dir%/data/db/wallabag.sqlite"}'
+    database_path: ${DATABASE_PATH:-"%kernel.project_dir%/data/db/wallabag.sqlite"}
     database_table_prefix: ${DATABASE_TABLE_PREFIX:-wallabag_}
     database_socket: null
     database_charset: ${DATABASE_CHARSET:-utf8}
@@ -25,7 +24,7 @@ parameters:
     twofactor_sender: ${TWOFACTOR_SENDER:-no-reply@wallabag.org}
 
     # fosuser stuff
-    fosuser_registration: ${FOSUSER_REGISTRATION:-true}
+    fosuser_registration: ${FOSUSER_REGISTRATION:-false}
     fosuser_confirmation: ${FOSUSER_CONFIRMATION:-true}
 
     fos_oauth_server_access_token_lifetime: 3600
@@ -36,10 +35,10 @@ parameters:
     rss_limit: 50
 
     # RabbitMQ processing
-    rabbitmq_host: localhost
-    rabbitmq_port: 5672
-    rabbitmq_user: guest
-    rabbitmq_password: guest
+    rabbitmq_host: ${RABBITMQ_HOST:-rabbitmq}
+    rabbitmq_port: ${RABBITMQ_PORT:-5672}
+    rabbitmq_user: ${RABBITMQ_USER:-guest}
+    rabbitmq_password: ${RABBITMQ_PASSWORD:-guest}
     rabbitmq_prefetch_count: 10
 
     # Redis processing
@@ -51,5 +50,3 @@ parameters:
 
     # Sentry
     sentry_dsn: ${SENTRY_DSN:-~}
-
-    session_handler: ${SESSION_HANDLER:-session.handler.native_file}

docker/php/env.example

@@ -4,10 +4,9 @@ DATABASE_PORT=~
 DATABASE_NAME=symfony
 DATABASE_USER=root
 DATABASE_PASSWORD=~
-DATABASE_PATH="%kernel.project_dir%/data/db/wallabag.sqlite"
+DATABASE_PATH='"%kernel.project_dir%/data/db/wallabag.sqlite"'
 DOMAIN_NAME=http://localhost:8000
 SECRET=ch4n63m31fy0uc4n
 PHP_SESSION_SAVE_PATH=tcp://redis:6379?database=2
 PHP_SESSION_HANDLER=redis
-SESSION_HANDLER=~
 TRUSTED_PROXIES=0.0.0.0/0

fixtures/AnnotationFixtures.php

@@ -1,22 +1,17 @@
 <?php
 
-namespace Wallabag\AnnotationBundle\DataFixtures;
+namespace Wallabag\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Wallabag\AnnotationBundle\Entity\Annotation;
-use Wallabag\CoreBundle\DataFixtures\EntryFixtures;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\UserBundle\DataFixtures\UserFixtures;
-use Wallabag\UserBundle\Entity\User;
+use Wallabag\Entity\Annotation;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\User;
 
 class AnnotationFixtures extends Fixture implements DependentFixtureInterface
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         $annotation1 = new Annotation($this->getReference('admin-user', User::class));
         $annotation1->setEntry($this->getReference('entry1', Entry::class));
@@ -48,9 +43,6 @@ class AnnotationFixtures extends Fixture implements DependentFixtureInterface
         $manager->flush();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getDependencies()
     {
         return [

fixtures/ConfigFixtures.php

@@ -1,19 +1,15 @@
 <?php
 
-namespace Wallabag\CoreBundle\DataFixtures;
+namespace Wallabag\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Wallabag\CoreBundle\Entity\Config;
-use Wallabag\UserBundle\DataFixtures\UserFixtures;
-use Wallabag\UserBundle\Entity\User;
+use Wallabag\Entity\Config;
+use Wallabag\Entity\User;
 
 class ConfigFixtures extends Fixture implements DependentFixtureInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function load(ObjectManager $manager): void
     {
         $adminConfig = new Config($this->getReference('admin-user', User::class));
@@ -59,9 +55,6 @@ class ConfigFixtures extends Fixture implements DependentFixtureInterface
         $manager->flush();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getDependencies()
     {
         return [

fixtures/EntryFixtures.php

@@ -1,22 +1,20 @@
 <?php
 
-namespace Wallabag\CoreBundle\DataFixtures;
+namespace Wallabag\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Wallabag\CoreBundle\Entity\Entry;
-use Wallabag\CoreBundle\Entity\Tag;
-use Wallabag\UserBundle\DataFixtures\UserFixtures;
-use Wallabag\UserBundle\Entity\User;
+use Wallabag\Entity\Entry;
+use Wallabag\Entity\Tag;
+use Wallabag\Entity\User;
 
 class EntryFixtures extends Fixture implements DependentFixtureInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function load(ObjectManager $manager): void
     {
+        $now = new \DateTime();
+
         $entries = [
             'entry1' => [
                 'user' => 'admin-user',
@@ -72,6 +70,7 @@ class EntryFixtures extends Fixture implements DependentFixtureInterface
                 'content' => 'This is my content /o/',
                 'language' => 'fr',
                 'starred' => true,
+                'starred_at' => $now,
                 'preview' => 'http://0.0.0.0/image.jpg',
             ],
             'entry6' => [
@@ -84,7 +83,20 @@ class EntryFixtures extends Fixture implements DependentFixtureInterface
                 'content' => 'This is my content /o/',
                 'language' => 'de',
                 'archived' => true,
+                'archived_at' => $now,
                 'tags' => ['bar-tag'],
+                'is_not_parsed' => true,
+            ],
+            'entry7' => [
+                'user' => 'admin-user',
+                'url' => 'http://0.0.0.0/entry7',
+                'reading_time' => 12,
+                'domain' => 'redirect.io',
+                'mime' => 'text/html',
+                'title' => 'test title entry7',
+                'http_status' => '302',
+                'content' => 'This is redirect/o/',
+                'language' => 'de',
             ],
         ];
 
@@ -112,14 +124,30 @@ class EntryFixtures extends Fixture implements DependentFixtureInterface
                 $entry->setStarred($item['starred']);
             }
 
+            if (isset($item['starred_at'])) {
+                $entry->setStarredAt($item['starred_at']);
+            }
+
             if (isset($item['archived'])) {
                 $entry->setArchived($item['archived']);
             }
 
+            if (isset($item['archived_at'])) {
+                $entry->setArchivedAt($item['archived_at']);
+            }
+
             if (isset($item['preview'])) {
                 $entry->setPreviewPicture($item['preview']);
             }
 
+            if (isset($item['is_not_parsed'])) {
+                $entry->setNotParsed($item['is_not_parsed']);
+            }
+
+            if (isset($item['http_status'])) {
+                $entry->setHttpStatus($item['http_status']);
+            }
+
             $manager->persist($entry);
             $this->addReference($reference, $entry);
         }
@@ -127,9 +155,6 @@ class EntryFixtures extends Fixture implements DependentFixtureInterface
         $manager->flush();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getDependencies()
     {
         return [

fixtures/IgnoreOriginInstanceRuleFixtures.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace Wallabag\DataFixtures;
+
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Persistence\ObjectManager;
+use Wallabag\Entity\IgnoreOriginInstanceRule;
+
+class IgnoreOriginInstanceRuleFixtures extends Fixture
+{
+    private array $defaultIgnoreOriginInstanceRules;
+
+    public function __construct(array $defaultIgnoreOriginInstanceRules)
+    {
+        $this->defaultIgnoreOriginInstanceRules = $defaultIgnoreOriginInstanceRules;
+    }
+
+    public function load(ObjectManager $manager): void
+    {
+        foreach ($this->defaultIgnoreOriginInstanceRules as $ignoreOriginInstanceRule) {
+            $newIgnoreOriginInstanceRule = new IgnoreOriginInstanceRule();
+            $newIgnoreOriginInstanceRule->setRule($ignoreOriginInstanceRule['rule']);
+            $manager->persist($newIgnoreOriginInstanceRule);
+        }
+
+        $manager->flush();
+    }
+}

fixtures/IgnoreOriginUserRuleFixtures.php

@@ -1,19 +1,15 @@
 <?php
 
-namespace Wallabag\CoreBundle\DataFixtures;
+namespace Wallabag\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Wallabag\CoreBundle\Entity\IgnoreOriginUserRule;
-use Wallabag\UserBundle\DataFixtures\UserFixtures;
-use Wallabag\UserBundle\Entity\User;
+use Wallabag\Entity\IgnoreOriginUserRule;
+use Wallabag\Entity\User;
 
 class IgnoreOriginUserRuleFixtures extends Fixture implements DependentFixtureInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function load(ObjectManager $manager): void
     {
         $rule = new IgnoreOriginUserRule();
@@ -25,9 +21,6 @@ class IgnoreOriginUserRuleFixtures extends Fixture implements DependentFixtureIn
         $manager->flush();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getDependencies()
     {
         return [

fixtures/InternalSettingFixtures.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Wallabag\DataFixtures;
+
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Persistence\ObjectManager;
+use Wallabag\Entity\InternalSetting;
+
+class InternalSettingFixtures extends Fixture
+{
+    private array $defaultInternalSettings;
+
+    public function __construct(array $defaultInternalSettings)
+    {
+        $this->defaultInternalSettings = $defaultInternalSettings;
+    }
+
+    public function load(ObjectManager $manager): void
+    {
+        foreach ($this->defaultInternalSettings as $setting) {
+            $newSetting = new InternalSetting();
+            $newSetting->setName($setting['name']);
+            $newSetting->setValue($setting['value']);
+            $newSetting->setSection($setting['section']);
+            $manager->persist($newSetting);
+        }
+
+        $manager->flush();
+    }
+}

fixtures/SiteCredentialFixtures.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Wallabag\DataFixtures;
+
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Common\DataFixtures\DependentFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+use Wallabag\Entity\SiteCredential;
+use Wallabag\Entity\User;
+use Wallabag\Helper\CryptoProxy;
+
+class SiteCredentialFixtures extends Fixture implements DependentFixtureInterface
+{
+    private CryptoProxy $cryptoProxy;
+
+    public function __construct(CryptoProxy $cryptoProxy)
+    {
+        $this->cryptoProxy = $cryptoProxy;
+    }
+
+    public function load(ObjectManager $manager): void
+    {
+        $credential = new SiteCredential($this->getReference('admin-user', User::class));
+        $credential->setHost('.super.com');
+        $credential->setUsername($this->cryptoProxy->crypt('.super'));
+        $credential->setPassword($this->cryptoProxy->crypt('bar'));
+
+        $manager->persist($credential);
+
+        $credential = new SiteCredential($this->getReference('admin-user', User::class));
+        $credential->setHost('paywall.example.com');
+        $credential->setUsername($this->cryptoProxy->crypt('paywall.example'));
+        $credential->setPassword($this->cryptoProxy->crypt('bar'));
+
+        $manager->persist($credential);
+
+        $manager->flush();
+    }
+
+    public function getDependencies()
+    {
+        return [
+            UserFixtures::class,
+        ];
+    }
+}

fixtures/TagFixtures.php

@@ -1,20 +1,17 @@
 <?php
 
-namespace Wallabag\CoreBundle\DataFixtures;
+namespace Wallabag\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Persistence\ObjectManager;
-use Wallabag\CoreBundle\Entity\Tag;
+use Wallabag\Entity\Tag;
 
 class TagFixtures extends Fixture
 {
-    /**
-     * {@inheritdoc}
-     */
     public function load(ObjectManager $manager): void
     {
         $tags = [
-            'foo-bar-tag' => 'foo bar', //tag used for EntryControllerTest
+            'foo-bar-tag' => 'foo bar', // tag used for EntryControllerTest
             'bar-tag' => 'bar',
             'baz-tag' => 'baz', // tag used for ExportControllerTest
             'foo-tag' => 'foo',

fixtures/TaggingRuleFixtures.php

@@ -1,18 +1,15 @@
 <?php
 
-namespace Wallabag\CoreBundle\DataFixtures;
+namespace Wallabag\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
-use Wallabag\CoreBundle\Entity\Config;
-use Wallabag\CoreBundle\Entity\TaggingRule;
+use Wallabag\Entity\Config;
+use Wallabag\Entity\TaggingRule;
 
 class TaggingRuleFixtures extends Fixture implements DependentFixtureInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public function load(ObjectManager $manager): void
     {
         $tr1 = new TaggingRule();
@@ -61,9 +58,6 @@ class TaggingRuleFixtures extends Fixture implements DependentFixtureInterface
         $manager->flush();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getDependencies()
     {
         return [

fixtures/UserFixtures.php

@@ -1,17 +1,14 @@
 <?php
 
-namespace Wallabag\UserBundle\DataFixtures;
+namespace Wallabag\DataFixtures;
 
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Persistence\ObjectManager;
-use Wallabag\UserBundle\Entity\User;
+use Wallabag\Entity\User;
 
 class UserFixtures extends Fixture
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function load(ObjectManager $manager)
+    public function load(ObjectManager $manager): void
     {
         $userAdmin = new User();
         $userAdmin->setName('Big boss');