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

Bump sentry/sentry-symfony from 4.9.2 to 4.10.0

.env

@@ -1,77 +0,0 @@
-# In all environments, the following files are loaded if they exist,
-# the latter taking precedence over the former:
-#
-#  * .env                contains default values for the environment variables needed by the app
-#  * .env.local          uncommitted file with local overrides
-#  * .env.$APP_ENV       committed environment-specific defaults
-#  * .env.$APP_ENV.local uncommitted environment-specific overrides
-#
-# Real environment variables win over .env files.
-#
-# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
-# https://symfony.com/doc/current/configuration/secrets.html
-#
-# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
-# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
-
-DOMAIN_NAME=https://your-wallabag-instance.wallabag.org
-SERVER_NAME="Your wallabag instance"
-
-# two factor stuff
-TWOFACTOR_AUTH=true
-TWOFACTOR_SENDER=no-reply@wallabag.org
-
-# fosuser stuff
-FOSUSER_REGISTRATION=true
-FOSUSER_CONFIRMATION=true
-
-# how long the access token should live in seconds for the API
-FOS_OAUTH_SERVER_ACCESS_TOKEN_LIFETIME=3600
-# how long the refresh token should life in seconds for the API
-FOS_OAUTH_SERVER_REFRESH_TOKEN_LIFETIME=1209600
-
-FROM_EMAIL=no-reply@wallabag.org
-
-RSS_LIMIT=50
-
-LOCALE=en
-DATABASE_TABLE_PREFIX=wallabag_
-
-# redis stuff
-REDIS_SCHEME=tcp
-REDIS_HOST=localhost
-REDIS_PORT=6379
-REDIS_PATH=null
-REDIS_PASSWORD=null
-
-###> doctrine/doctrine-bundle ###
-# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
-# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
-#
-DATABASE_URL="sqlite:///%kernel.project_dir%/data/db/wallabag.sqlite"
-# DATABASE_URL="mysql://root:@127.0.0.1:3306/wallabag?serverVersion=8&charset=utf8mb4"
-# DATABASE_URL="postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=14&charset=utf8"
-###< doctrine/doctrine-bundle ###
-
-###> nelmio/cors-bundle ###
-CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$'
-###< nelmio/cors-bundle ###
-
-###> php-amqplib/rabbitmq-bundle ###
-RABBITMQ_URL=amqp://guest:guest@localhost:5672
-###< php-amqplib/rabbitmq-bundle ###
-
-###> sentry/sentry-symfony ###
-SENTRY_DSN=
-###< sentry/sentry-symfony ###
-
-###> symfony/framework-bundle ###
-APP_ENV=dev
-APP_SECRET=b6b54475f34a3238dec16508c4903ca0
-#TRUSTED_PROXIES=127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
-#TRUSTED_HOSTS='^(localhost|example\.com)$'
-###< symfony/framework-bundle ###
-
-###> symfony/mailer ###
-MAILER_DSN=smtp://127.0.0.1
-###< symfony/mailer ###

.env.test

@@ -1,7 +0,0 @@
-# define your env variables for the test env here
-KERNEL_CLASS='App\Kernel'
-APP_SECRET='$ecretf0rt3st'
-SYMFONY_DEPRECATIONS_HELPER=999999
-PANTHER_APP_ENV=panther
-PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots
-DATABASE_URL="mysql://root:root@127.0.0.1:3306/wallabag_test?serverVersion=8&charset=utf8mb4"

.env.test.mysql

@@ -1,7 +0,0 @@
-# define your env variables for the test env here
-KERNEL_CLASS='App\Kernel'
-APP_SECRET='$ecretf0rt3st'
-SYMFONY_DEPRECATIONS_HELPER=999999
-PANTHER_APP_ENV=panther
-PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots
-DATABASE_URL="mysql://root:root@127.0.0.1:3306/wallabag_test?serverVersion=8&charset=utf8mb4"

.env.test.pgsql

@@ -1,7 +0,0 @@
-# define your env variables for the test env here
-KERNEL_CLASS='App\Kernel'
-APP_SECRET='$ecretf0rt3st'
-SYMFONY_DEPRECATIONS_HELPER=999999
-PANTHER_APP_ENV=panther
-PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots
-DATABASE_URL="postgresql://wallabag:wallabagrocks@localhost:5432/wallabag_test?serverVersion=14&charset=utf8"

.env.test.sqlite

@@ -1,7 +0,0 @@
-# define your env variables for the test env here
-KERNEL_CLASS='App\Kernel'
-APP_SECRET='$ecretf0rt3st'
-SYMFONY_DEPRECATIONS_HELPER=999999
-PANTHER_APP_ENV=panther
-PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots
-DATABASE_URL="sqlite:///%test_database_path%"

.gitattributes

@@ -3,6 +3,5 @@
 /.github export-ignore
 /.gitignore export-ignore
 /phpstan.neon export-ignore
-/phpstan-baseline.neon export-ignore
 /phpunit.xml.dist export-ignore
 /tests export-ignore

.github/workflows/coding-standards.yml

@@ -48,7 +48,7 @@ jobs:
         run: "php bin/phpstan analyse --no-progress --error-format=checkstyle | cs2pr"
 
       - name: "Run TwigCS"
-        run: "php bin/twigcs --severity=error --display=blocking --reporter checkstyle templates/ | cs2pr"
+        run: "php bin/twigcs --severity=error --display=blocking --reporter checkstyle app/ src/ | cs2pr"
 
       - name: "Run ergebnis/composer-normalize"
         run: "composer normalize --dry-run --no-check-lock"

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

@@ -23,7 +23,7 @@ jobs:
         with:
           coverage: "none"
           php-version: "${{ matrix.php }}"
-          tools: pecl
+          tools: pecl, composer:2.2
           extensions: pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy
           ini-values: "date.timezone=Europe/Paris"
         env:

.gitignore

@@ -1,27 +1,34 @@
-# Cache, log & sessions
+# Cache, logs & sessions
 /var/*
 !/var/cache
 /var/cache/*
 !var/cache/.gitkeep
-!/var/log
-/var/log/*
-!var/log/.gitkeep
+!/var/logs
+/var/logs/*
+!var/logs/.gitkeep
 !/var/sessions
 /var/sessions/*
 !var/sessions/.gitkeep
 /bin/*
 !/bin/console
+.php-cs-fixer.php
+.php-cs-fixer.cache
+.phpunit.result.cache
+phpunit.xml
 
 # Parameters
 /app/config/parameters.yml
 
+# Managed by Composer
+/vendor/
+
 # Assets and user uploads
-public/uploads/
-/public/bundles/*
-!/public/bundles/.gitkeep
-/public/assets/images/*
-!public/assets/images/.gitkeep
-/public/wallassets/*.dev.js
+web/uploads/
+/web/bundles/*
+!/web/bundles/.gitkeep
+/web/assets/images/*
+!web/assets/images/.gitkeep
+/web/wallassets/*.dev.js
 
 # Build
 /app/build
@@ -40,6 +47,9 @@ data/db/wallabag*.sqlite
 # assets stuff
 node_modules/
 bin
+app/Resources/build/
+!/src/Wallabag/CoreBundle/Resources/public
+/src/Wallabag/CoreBundle/Resources/public/*
 
 # Test-generated files
 admin-export.json
@@ -47,24 +57,4 @@ specialexport.json
 /data/site-credentials-secret-key.txt
 
 # Custom CSS file
-public/custom.css
-
-###> friendsofphp/php-cs-fixer ###
-/.php-cs-fixer.php
-/.php-cs-fixer.cache
-###< friendsofphp/php-cs-fixer ###
-
-###> symfony/phpunit-bridge ###
-.phpunit.result.cache
-/phpunit.xml
-###< symfony/phpunit-bridge ###
-
-###> symfony/framework-bundle ###
-/.env.local
-/.env.local.php
-/.env.*.local
-/config/secrets/prod/prod.decrypt.private.php
-/public/bundles/
-/var/
-/vendor/
-###< symfony/framework-bundle ###
+web/custom.css

GNUmakefile

@@ -36,7 +36,7 @@ build: ## Run webpack
 
 prepare: clean ## Prepare database for testsuite
 ifdef DB
-	cp .env.test.$(DB) .env.test
+	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

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

app/.htaccess

@@ -0,0 +1,7 @@
+<IfModule mod_authz_core.c>
+    Require all denied
+</IfModule>
+<IfModule !mod_authz_core.c>
+    Order deny,allow
+    Deny from all
+</IfModule>

app/AppCache.php

@@ -0,0 +1,7 @@
+<?php
+
+use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache;
+
+class AppCache extends HttpCache
+{
+}

app/AppKernel.php

@@ -0,0 +1,106 @@
+<?php
+
+use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\Kernel;
+
+class AppKernel extends Kernel
+{
+    public function registerBundles()
+    {
+        $bundles = [
+            new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
+            new Symfony\Bundle\SecurityBundle\SecurityBundle(),
+            new Symfony\Bundle\TwigBundle\TwigBundle(),
+            new Symfony\Bundle\MonologBundle\MonologBundle(),
+            new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
+            new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
+            new FOS\RestBundle\FOSRestBundle(),
+            new FOS\UserBundle\FOSUserBundle(),
+            new JMS\SerializerBundle\JMSSerializerBundle(),
+            new Nelmio\ApiDocBundle\NelmioApiDocBundle(),
+            new Nelmio\CorsBundle\NelmioCorsBundle(),
+            new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle(),
+            new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(),
+            new FOS\OAuthServerBundle\FOSOAuthServerBundle(),
+            new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
+            new Scheb\TwoFactorBundle\SchebTwoFactorBundle(),
+            new KPhoen\RulerZBundle\KPhoenRulerZBundle(),
+            new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
+            new Craue\ConfigBundle\CraueConfigBundle(),
+            new BabDev\PagerfantaBundle\BabDevPagerfantaBundle(),
+            new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
+            new BD\GuzzleSiteAuthenticatorBundle\BDGuzzleSiteAuthenticatorBundle(),
+            new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),
+            new Http\HttplugBundle\HttplugBundle(),
+            new Sentry\SentryBundle\SentryBundle(),
+            new Twig\Extra\TwigExtraBundle\TwigExtraBundle(),
+
+            // wallabag bundles
+            new Wallabag\CoreBundle\WallabagCoreBundle(),
+            new Wallabag\ApiBundle\WallabagApiBundle(),
+            new Wallabag\UserBundle\WallabagUserBundle(),
+            new Wallabag\ImportBundle\WallabagImportBundle(),
+            new Wallabag\AnnotationBundle\WallabagAnnotationBundle(),
+        ];
+
+        if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
+            $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
+            $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
+            $bundles[] = new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle();
+
+            if ('test' === $this->getEnvironment()) {
+                $bundles[] = new DAMA\DoctrineTestBundle\DAMADoctrineTestBundle();
+            }
+
+            if ('dev' === $this->getEnvironment()) {
+                $bundles[] = new Symfony\Bundle\MakerBundle\MakerBundle();
+                $bundles[] = new Symfony\Bundle\WebServerBundle\WebServerBundle();
+            }
+        }
+
+        return $bundles;
+    }
+
+    public function getRootDir()
+    {
+        return __DIR__;
+    }
+
+    public function getCacheDir()
+    {
+        return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment();
+    }
+
+    public function getLogDir()
+    {
+        return dirname(__DIR__) . '/var/logs';
+    }
+
+    public function registerContainerConfiguration(LoaderInterface $loader)
+    {
+        $loader->load($this->getRootDir() . '/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);
+        });
+    }
+}

app/DoctrineMigrations/Version20160401000000.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Initial database structure.

app/DoctrineMigrations/Version20160410190541.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added foreign keys for account resetting.

app/DoctrineMigrations/Version20160812120952.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added name field on wallabag_oauth2_clients.

app/DoctrineMigrations/Version20160911214952.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added settings for RabbitMQ and Redis imports.

app/DoctrineMigrations/Version20160916201049.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added pocket_consumer_key field on wallabag_config.

app/DoctrineMigrations/Version20161001072726.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Migrations\SkipMigrationException;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added pocket_consumer_key field on wallabag_config.

app/DoctrineMigrations/Version20161022134138.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Converted database to utf8mb4 encoding (for MySQL only).

app/DoctrineMigrations/Version20161024212538.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added user_id column on oauth2_clients to prevent users to delete API clients from other users.

app/DoctrineMigrations/Version20161031132655.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added the internal setting to enable/disable downloading pictures.

app/DoctrineMigrations/Version20161104073720.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added created_at index on entry table.

app/DoctrineMigrations/Version20161106113822.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added action_mark_as_read field on config table.

app/DoctrineMigrations/Version20161117071626.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added the internal setting to share articles to unmark.it.

app/DoctrineMigrations/Version20161118134328.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add http_status in `entry_table`.

app/DoctrineMigrations/Version20161122144743.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add the restricted_access internal setting for articles with paywall.

app/DoctrineMigrations/Version20161122203647.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Methods and properties removed from `FOS\UserBundle\Model\User`.

app/DoctrineMigrations/Version20161128084725.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added list_mode in user config.

app/DoctrineMigrations/Version20161128131503.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Removed locked, credentials_expire_at and expires_at.

app/DoctrineMigrations/Version20161214094402.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Renamed uuid to uid in entry table.

app/DoctrineMigrations/Version20161214094403.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added index on wallabag_entry.uid.

app/DoctrineMigrations/Version20170127093841.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added indexes on wallabag_entry.is_starred and wallabag_entry.is_archived.

app/DoctrineMigrations/Version20170327194233.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add the share_scuttle internal setting.

app/DoctrineMigrations/Version20170405182620.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add published_at and published_by in `entry` table.

app/DoctrineMigrations/Version20170407200919.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Remove isPublic in Entry Table.

app/DoctrineMigrations/Version20170420134133.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Remove download_pictures in craue_config_setting.

app/DoctrineMigrations/Version20170501115751.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add site credential table to store username & password for some website (behind authentication or paywall).

app/DoctrineMigrations/Version20170510082609.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Changed length for username, username_canonical, email and email_canonical fields in wallabag_user table.

app/DoctrineMigrations/Version20170511115400.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added `headers` field in entry table.

app/DoctrineMigrations/Version20170511211659.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Migrations\SkipMigrationException;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Increase the length of the "quote" column of "annotation" table.

app/DoctrineMigrations/Version20170602075214.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add api_user_registration in craue_config_setting.

app/DoctrineMigrations/Version20170606155640.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Remove wallabag_url from craue_config_setting.
@@ -13,7 +13,7 @@ class Version20170606155640 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $this->skipIf(!$schema->hasTable($this->getTable('craue_config_setting')), 'Old migration (table name has changed)');
+        $this->skipIf(!$schema->hasTable($this->getTable('craue_config_setting')), 'Table already renamed');
 
         $apiUserRegistration = $this->container
             ->get('doctrine.orm.default_entity_manager')

app/DoctrineMigrations/Version20170719231144.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Changed tags to lowercase.

app/DoctrineMigrations/Version20170824113337.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add starred_at column and set its value to updated_at for is_starred entries.

app/DoctrineMigrations/Version20171008195606.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Changed reading_time field to prevent null value.

app/DoctrineMigrations/Version20171105202000.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add origin_url column.

app/DoctrineMigrations/Version20171120163128.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add store_article_headers in craue_config_setting.

app/DoctrineMigrations/Version20171125164500.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add shaarli_share_origin_url in craue_config_setting.

app/DoctrineMigrations/Version20180405182455.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add archived_at column and set its value to updated_at for is_archived entries.

app/DoctrineMigrations/Version20181128203230.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Fix varchar field from vendor to work with utf8mb4.

app/DoctrineMigrations/Version20181202073750.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add 2fa OTP stuff.

app/DoctrineMigrations/Version20190117131816.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add updated_at fields to site_credential table.

app/DoctrineMigrations/Version20190129120000.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add missing entries in craue_config_setting.

app/DoctrineMigrations/Version20190401105353.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add hashed_url in entry.

app/DoctrineMigrations/Version20190425115043.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Rename rss_token & rss_limit to feed_token & feed_limit.

app/DoctrineMigrations/Version20190510141130.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Migrations\SkipMigrationException;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Enable cascade delete when deleting a user on:

app/DoctrineMigrations/Version20190511165128.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Convert tab label to utf8mb4_bin (MySQL only).

app/DoctrineMigrations/Version20190601125843.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added `given_url` & `hashed_given_url` field in entry table.

app/DoctrineMigrations/Version20190619093534.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Change reading_time field on SQLite to be integer NOT NULL

app/DoctrineMigrations/Version20190708122957.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Change reading speed value.

app/DoctrineMigrations/Version20190806130304.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Adding more index to kill some slow queries:

app/DoctrineMigrations/Version20190808124957.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Change the internal setting table name.

app/DoctrineMigrations/Version20190826204730.php

@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add tables for the ignore origin rules.
@@ -44,7 +44,7 @@ final class Version20190826204730 extends WallabagMigration
 
     public function postUp(Schema $schema): void
     {
-        foreach ($this->container->getParameter('wallabag.default_ignore_origin_instance_rules') as $entity) {
+        foreach ($this->container->getParameter('wallabag_core.default_ignore_origin_instance_rules') as $entity) {
             $previous_rule = $this->container
                 ->get('doctrine.orm.default_entity_manager')
                 ->getConnection()

app/DoctrineMigrations/Version20200414120227.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Migrations\SkipMigrationException;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Remove baggy theme.

app/DoctrineMigrations/Version20200428072628.php

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

app/DoctrineMigrations/Version20221123132612.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Drop theme fields from config table.

app/DoctrineMigrations/Version20221221092957.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Remove the deprecated (and removed in DBAL v3) `json_array` type.

app/DoctrineMigrations/Version20230613121354.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace DoctrineMigrations;
+namespace Application\Migrations;
 
-use App\Doctrine\WallabagMigration;
 use Doctrine\DBAL\Schema\Schema;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Added a new setting to display or not thumbnails.