test

.github/workflows/continuous-integration.yml

@@ -151,3 +151,58 @@ jobs:
 
       - name: "Run PHPUnit"
         run: "php bin/simple-phpunit -v"
+
+  phpunit_no_database:
+    name: "PHP ${{ matrix.php }} using ${{ matrix.database }} without DB created"
+    runs-on: "ubuntu-20.04"
+    services:
+      rabbitmq:
+        image: rabbitmq:3-alpine
+        ports:
+          - 5672:5672
+      redis:
+        image: redis:6-alpine
+        ports:
+          - 6379:6379
+
+    strategy:
+      fail-fast: true
+      matrix:
+        php:
+          - "8.2"
+        database:
+          - "mysql"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v3"
+        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: "Setup MySQL"
+        if: "${{ matrix.database == 'mysql' }}"
+        run: |
+          sudo systemctl start mysql.service
+
+      - name: "Install dependencies with Composer"
+        uses: "ramsey/composer-install@v2"
+        with:
+          composer-options: "--optimize-autoloader --prefer-dist"
+
+      - name: "Install wallabag"
+        run: "php bin/console wallabag:install --env=test"
+
+      - name: "Prepare fixtures"
+        run: "make fixtures"
+
+      - name: "Run PHPUnit"
+        run: "php bin/simple-phpunit -v"

.gitignore

@@ -15,7 +15,6 @@
 .php-cs-fixer.cache
 .phpunit.result.cache
 phpunit.xml
-docker-compose.override.yml
 
 # Parameters
 /app/config/parameters.yml

CHANGELOG.md

@@ -1,54 +1,5 @@
 # Changelog
 
-## [2.6.5](https://github.com/wallabag/wallabag/tree/2.6.5)
-[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.4...2.6.5)
-
-### Fixes
-* "Fix checkboxes pointer-events disabled" by @Simounet https://github.com/wallabag/wallabag/pull/6874
-* "Fix nav input styles" by @Simounet https://github.com/wallabag/wallabag/pull/6877
-* "Change domain status filters html types" by @Simounet https://github.com/wallabag/wallabag/pull/6888
-
-## [2.6.4](https://github.com/wallabag/wallabag/tree/2.6.4)
-[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.3...2.6.4)
-
-### Fixes
-* Fix API token generation by @nicosomb https://github.com/wallabag/wallabag/pull/6869
-* Fix checkboxes which were broken by @nicosomb https://github.com/wallabag/wallabag/pull/6864
-
-## [2.6.3](https://github.com/wallabag/wallabag/tree/2.6.3)
-[Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.2...2.6.3)
-
-### Security fixes
-* Replace GET way to POST way to reset data user by @nicosomb https://github.com/wallabag/wallabag/commit/78b0b55c40511e1f22d5bbb4897aa10fca68441c
-* Replace GET way to POST way to delete API client by @nicosomb https://github.com/wallabag/wallabag/commit/ffcc5c9062fcc8cd922d7d6d65edbe5efae96806
-
-### Improvement
-* Add confirmation before reload entry by @nicosomb https://github.com/wallabag/wallabag/pull/6778
-* Remove external dependencies on howto page by @viktoriussuwandi https://github.com/wallabag/wallabag/pull/6775
-
-### Fixes
-* Use Session instead of Referrer for Redirection by @Spoons https://github.com/wallabag/wallabag/pull/6119
-* Reduce risk of collision for #content by @kdecherf https://github.com/wallabag/wallabag/pull/6829
-* Update dependencies to fix vulnerabilities by @nicosomb https://github.com/wallabag/wallabag/pull/6783
-* Fix failing randomly test by @nicosomb https://github.com/wallabag/wallabag/pull/6763
-
-### Technical stuff
-* Add check if git is installed by @nicosomb https://github.com/wallabag/wallabag/pull/6788
-* Replace kernel.root_dir by kernel.project_dir by @yguedidi https://github.com/wallabag/wallabag/pull/6809
-* Split symfony/symfony by @yguedidi https://github.com/wallabag/wallabag/pull/6817
-* Make Crawler::extract get an array by @yguedidi https://github.com/wallabag/wallabag/pull/6812
-* Use PSR-17 and PSR-18 by @yguedidi https://github.com/wallabag/wallabag/pull/6816
-* Replace Client by KernelBrowser by @yguedidi https://github.com/wallabag/wallabag/pull/6813
-* Replace Debug component by ErrorHandler component by @yguedidi https://github.com/wallabag/wallabag/pull/6810
-* Make ImportController extends AbstractController by @yguedidi https://github.com/wallabag/wallabag/pull/6808
-* Use Twig instead of templating by @yguedidi https://github.com/wallabag/wallabag/pull/6797
-* Identify platforms by their class by @yguedidi https://github.com/wallabag/wallabag/pull/6799
-* Move from transchoice to trans by @yguedidi https://github.com/wallabag/wallabag/pull/6800
-* Replace GetResponseEvent by RequestEvent by @yguedidi https://github.com/wallabag/wallabag/pull/6811
-* Ensure the kernel is shut down before calling createClient by @yguedidi https://github.com/wallabag/wallabag/pull/6803
-* Ignore docker-compose.override.yml by @yguedidi https://github.com/wallabag/wallabag/pull/6814
-* Add composer normalizer by @nicosomb https://github.com/wallabag/wallabag/pull/6762
-
 ## [2.6.2](https://github.com/wallabag/wallabag/tree/2.6.2)
 [Full Changelog](https://github.com/wallabag/wallabag/compare/2.6.1...2.6.2)
 

app/AppKernel.php

@@ -62,6 +62,11 @@ class AppKernel extends Kernel
         return $bundles;
     }
 
+    public function getRootDir()
+    {
+        return __DIR__;
+    }
+
     public function getCacheDir()
     {
         return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment();
@@ -74,7 +79,7 @@ class AppKernel extends Kernel
 
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $loader->load($this->getProjectDir() . '/app/config/config_' . $this->getEnvironment() . '.yml');
+        $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml');
 
         $loader->load(function ($container) {
             if ($container->getParameter('use_webpack_dev_server')) {

app/DoctrineMigrations/Version20160401000000.php

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

app/DoctrineMigrations/Version20160812120952.php

@@ -2,7 +2,6 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
@@ -16,7 +15,7 @@ class Version20160812120952 extends WallabagMigration
         $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) {
+        if ('sqlite' === $this->connection->getDatabasePlatform()->getName()) {
             // Can't use $clientsTable->addColumn('name', 'blob');
             // because of the error:
             // SQLSTATE[HY000]: General error: 1 Cannot add a NOT NULL column with default value NULL
@@ -36,7 +35,7 @@ class Version20160812120952 extends WallabagMigration
     {
         $clientsTable = $schema->getTable($this->getTable('oauth2_clients'));
 
-        if ($this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
+        if ('sqlite' === $this->connection->getDatabasePlatform()->getName()) {
             $databaseTablePrefix = $this->container->getParameter('database_table_prefix');
             $this->addSql('DROP INDEX IDX_635D765EA76ED395');
             $this->addSql('CREATE TEMPORARY TABLE __temp__' . $databaseTablePrefix . 'oauth2_clients AS SELECT id, random_id, redirect_uris, secret, allowed_grant_types FROM ' . $databaseTablePrefix . 'oauth2_clients');

app/DoctrineMigrations/Version20161001072726.php

@@ -3,9 +3,6 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Migrations\SkipMigrationException;
-use Doctrine\DBAL\Platforms\MySQLPlatform;
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
@@ -16,13 +13,11 @@ class Version20161001072726 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $platform = $this->connection->getDatabasePlatform();
-
-        $this->skipIf($platform instanceof SqlitePlatform, 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
+        $this->skipIf('sqlite' === $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
 
         // remove all FK from entry_tag
-        switch (true) {
-            case $platform instanceof MySQLPlatform:
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'mysql':
                 $query = $this->connection->query("
                     SELECT CONSTRAINT_NAME
                     FROM information_schema.key_column_usage
@@ -34,7 +29,7 @@ class Version20161001072726 extends WallabagMigration
                     $this->addSql('ALTER TABLE ' . $this->getTable('entry_tag') . ' DROP FOREIGN KEY ' . $fk['CONSTRAINT_NAME']);
                 }
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 // http://dba.stackexchange.com/questions/36979/retrieving-all-pk-and-fk
                 $query = $this->connection->query("
                     SELECT conrelid::regclass AS table_from
@@ -58,8 +53,8 @@ class Version20161001072726 extends WallabagMigration
 
         // remove entry FK from annotation
 
-        switch (true) {
-            case $platform instanceof MySQLPlatform:
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'mysql':
                 $query = $this->connection->query("
                     SELECT CONSTRAINT_NAME
                     FROM information_schema.key_column_usage
@@ -73,7 +68,7 @@ class Version20161001072726 extends WallabagMigration
                     $this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' DROP FOREIGN KEY ' . $fk['CONSTRAINT_NAME']);
                 }
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 // http://dba.stackexchange.com/questions/36979/retrieving-all-pk-and-fk
                 $query = $this->connection->query("
                     SELECT conrelid::regclass AS table_from

app/DoctrineMigrations/Version20161022134138.php

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

app/DoctrineMigrations/Version20161024212538.php

@@ -2,7 +2,6 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
@@ -38,7 +37,7 @@ class Version20161024212538 extends WallabagMigration
 
         $clientsTable->dropColumn('user_id', 'integer');
 
-        if (!$this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
+        if ('sqlite' !== $this->connection->getDatabasePlatform()->getName()) {
             $clientsTable->removeForeignKey($this->constraintName);
         }
     }

app/DoctrineMigrations/Version20161214094402.php

@@ -2,9 +2,6 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\MySQLPlatform;
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
@@ -19,20 +16,18 @@ class Version20161214094402 extends WallabagMigration
 
         $this->skipIf($entryTable->hasColumn('uid'), 'It seems that you already played this migration.');
 
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'sqlite':
                 $this->addSql('CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM ' . $this->getTable('entry'));
                 $this->addSql('DROP TABLE ' . $this->getTable('entry'));
                 $this->addSql('CREATE TABLE ' . $this->getTable('entry') . ' (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, uid CLOB DEFAULT NULL COLLATE BINARY, title CLOB DEFAULT NULL COLLATE BINARY, url CLOB DEFAULT NULL COLLATE BINARY, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL COLLATE BINARY, language CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, is_public BOOLEAN DEFAULT "0", PRIMARY KEY(id));');
                 $this->addSql('INSERT INTO ' . $this->getTable('entry') . ' (id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public) SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM __temp__wallabag_entry;');
                 $this->addSql('DROP TABLE __temp__wallabag_entry');
                 break;
-            case $platform instanceof MySQLPlatform:
+            case 'mysql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE uuid uid VARCHAR(23)');
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' RENAME uuid TO uid');
         }
     }
@@ -43,16 +38,14 @@ class Version20161214094402 extends WallabagMigration
 
         $this->skipIf($entryTable->hasColumn('uuid'), 'It seems that you already played this migration.');
 
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'sqlite':
                 throw new SkipMigrationException('Too complex ...');
                 break;
-            case $platform instanceof MySQLPlatform:
+            case 'mysql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE uid uuid VARCHAR(23)');
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' RENAME uid TO uuid');
         }
     }

app/DoctrineMigrations/Version20170501115751.php

@@ -2,7 +2,6 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
@@ -26,7 +25,7 @@ class Version20170501115751 extends WallabagMigration
         $table->setPrimaryKey(['id']);
         $table->addForeignKeyConstraint($this->getTable('user'), ['user_id'], ['id'], [], 'fk_user');
 
-        if ($this->connection->getDatabasePlatform() instanceof PostgreSQLPlatform) {
+        if ('postgresql' === $this->connection->getDatabasePlatform()->getName()) {
             $schema->dropSequence('site_credential_id_seq');
             $schema->createSequence('site_credential_id_seq');
         }

app/DoctrineMigrations/Version20170510082609.php

@@ -2,7 +2,6 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
@@ -20,7 +19,7 @@ class Version20170510082609 extends WallabagMigration
 
     public function up(Schema $schema): void
     {
-        $this->skipIf(!$this->connection->getDatabasePlatform() instanceof MySQLPlatform, 'This migration only apply to MySQL');
+        $this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');
 
         foreach ($this->fields as $field) {
             $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CHANGE ' . $field . ' ' . $field . ' VARCHAR(180) NOT NULL;');
@@ -29,7 +28,7 @@ class Version20170510082609 extends WallabagMigration
 
     public function down(Schema $schema): void
     {
-        $this->skipIf(!$this->connection->getDatabasePlatform() instanceof MySQLPlatform, 'This migration only apply to MySQL');
+        $this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');
 
         foreach ($this->fields as $field) {
             $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CHANGE ' . $field . ' ' . $field . ' VARCHAR(255) NOT NULL;');

app/DoctrineMigrations/Version20170511211659.php

@@ -3,9 +3,6 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Migrations\SkipMigrationException;
-use Doctrine\DBAL\Platforms\MySQLPlatform;
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
@@ -16,10 +13,8 @@ class Version20170511211659 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'sqlite':
                 $annotationTableName = $this->getTable('annotation', true);
                 $userTableName = $this->getTable('user', true);
                 $entryTableName = $this->getTable('entry', true);
@@ -58,10 +53,10 @@ EOD
                 );
                 $this->addSql('DROP TABLE __temp__wallabag_annotation');
                 break;
-            case $platform instanceof MySQLPlatform:
+            case 'mysql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' MODIFY quote TEXT NOT NULL');
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' ALTER COLUMN quote TYPE TEXT');
                 break;
         }
@@ -71,16 +66,14 @@ EOD
     {
         $tableName = $this->getTable('annotation');
 
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'sqlite':
                 throw new SkipMigrationException('Too complex ...');
                 break;
-            case $platform instanceof MySQLPlatform:
+            case 'mysql':
                 $this->addSql('ALTER TABLE ' . $tableName . ' MODIFY quote VARCHAR(255) NOT NULL');
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 $this->addSql('ALTER TABLE ' . $tableName . ' ALTER COLUMN quote TYPE VARCHAR(255)');
                 break;
         }

app/DoctrineMigrations/Version20170719231144.php

@@ -2,7 +2,6 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
@@ -13,7 +12,7 @@ class Version20170719231144 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $this->skipIf($this->connection->getDatabasePlatform() instanceof SqlitePlatform, 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
+        $this->skipIf('sqlite' === $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
 
         // Find tags which need to be merged
         $dupTags = $this->connection->query('

app/DoctrineMigrations/Version20171008195606.php

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

app/DoctrineMigrations/Version20181128203230.php

@@ -2,7 +2,6 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
@@ -13,7 +12,7 @@ class Version20181128203230 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $this->skipIf(!$this->connection->getDatabasePlatform() instanceof MySQLPlatform, 'This migration can only be applied on \'mysql\'.');
+        $this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration can only be applied on \'mysql\'.');
 
         $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_access_tokens') . ' CHANGE `token` `token` varchar(191) NOT NULL');
         $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_access_tokens') . ' CHANGE `scope` `scope` varchar(191)');
@@ -28,7 +27,7 @@ class Version20181128203230 extends WallabagMigration
 
     public function down(Schema $schema): void
     {
-        $this->skipIf(!$this->connection->getDatabasePlatform() instanceof MySQLPlatform, 'This migration can only be applied on \'mysql\'.');
+        $this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration can only be applied on \'mysql\'.');
 
         $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_access_tokens') . ' CHANGE `token` `token` varchar(255) NOT NULL');
         $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_access_tokens') . ' CHANGE `scope` `scope` varchar(255)');

app/DoctrineMigrations/Version20181202073750.php

@@ -2,9 +2,6 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\MySQLPlatform;
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
@@ -15,10 +12,8 @@ final class Version20181202073750 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'sqlite':
                 $this->addSql('DROP INDEX UNIQ_1D63E7E5C05FB297');
                 $this->addSql('DROP INDEX UNIQ_1D63E7E5A0D96FBF');
                 $this->addSql('DROP INDEX UNIQ_1D63E7E592FC23A8');
@@ -33,13 +28,13 @@ final class Version20181202073750 extends WallabagMigration
                 $this->addSql('CREATE UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF ON ' . $this->getTable('user', true) . ' (email_canonical)');
                 $this->addSql('CREATE UNIQUE INDEX UNIQ_1D63E7E592FC23A8 ON ' . $this->getTable('user', true) . ' (username_canonical)');
                 break;
-            case $platform instanceof MySQLPlatform:
+            case 'mysql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' ADD googleAuthenticatorSecret VARCHAR(191) DEFAULT NULL');
                 $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' CHANGE twoFactorAuthentication emailTwoFactor BOOLEAN NOT NULL');
                 $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' DROP trusted');
                 $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' ADD backupCodes LONGTEXT DEFAULT NULL COMMENT \'(DC2Type:json_array)\'');
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' ADD googleAuthenticatorSecret VARCHAR(191) DEFAULT NULL');
                 $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' RENAME COLUMN twofactorauthentication TO emailTwoFactor');
                 $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' DROP trusted');
@@ -50,10 +45,8 @@ final class Version20181202073750 extends WallabagMigration
 
     public function down(Schema $schema): void
     {
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'sqlite':
                 $this->addSql('DROP INDEX UNIQ_1D63E7E592FC23A8');
                 $this->addSql('DROP INDEX UNIQ_1D63E7E5A0D96FBF');
                 $this->addSql('DROP INDEX UNIQ_1D63E7E5C05FB297');
@@ -66,13 +59,13 @@ final class Version20181202073750 extends WallabagMigration
                 $this->addSql('CREATE UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF ON "' . $this->getTable('user', true) . '" (email_canonical)');
                 $this->addSql('CREATE UNIQUE INDEX UNIQ_1D63E7E5C05FB297 ON "' . $this->getTable('user', true) . '" (confirmation_token)');
                 break;
-            case $platform instanceof MySQLPlatform:
+            case 'mysql':
                 $this->addSql('ALTER TABLE `' . $this->getTable('user') . '` DROP googleAuthenticatorSecret');
                 $this->addSql('ALTER TABLE `' . $this->getTable('user') . '` CHANGE emailtwofactor twoFactorAuthentication BOOLEAN NOT NULL');
                 $this->addSql('ALTER TABLE `' . $this->getTable('user') . '` ADD trusted TEXT DEFAULT NULL');
                 $this->addSql('ALTER TABLE `' . $this->getTable('user') . '` DROP backupCodes');
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' DROP googleAuthenticatorSecret');
                 $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' RENAME COLUMN emailTwoFactor TO twofactorauthentication');
                 $this->addSql('ALTER TABLE ' . $this->getTable('user') . ' ADD trusted TEXT DEFAULT NULL');

app/DoctrineMigrations/Version20190425115043.php

@@ -2,9 +2,6 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\MySQLPlatform;
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
@@ -15,10 +12,8 @@ final class Version20190425115043 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'sqlite':
                 $this->addSql('DROP INDEX UNIQ_87E64C53A76ED395');
                 $this->addSql('CREATE TEMPORARY TABLE __temp__' . $this->getTable('config', true) . ' AS SELECT id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key, action_mark_as_read, list_mode FROM ' . $this->getTable('config', true));
                 $this->addSql('DROP TABLE ' . $this->getTable('config', true));
@@ -27,11 +22,11 @@ final class Version20190425115043 extends WallabagMigration
                 $this->addSql('DROP TABLE __temp__' . $this->getTable('config', true));
                 $this->addSql('CREATE UNIQUE INDEX UNIQ_87E64C53A76ED395 ON ' . $this->getTable('config', true) . ' (user_id)');
                 break;
-            case $platform instanceof MySQLPlatform:
+            case 'mysql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('config') . ' CHANGE rss_token feed_token VARCHAR(255) DEFAULT NULL');
                 $this->addSql('ALTER TABLE ' . $this->getTable('config') . ' CHANGE rss_limit feed_limit INT DEFAULT NULL');
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('config') . ' RENAME COLUMN rss_token TO feed_token');
                 $this->addSql('ALTER TABLE ' . $this->getTable('config') . ' RENAME COLUMN rss_limit TO feed_limit');
                 break;
@@ -40,10 +35,8 @@ final class Version20190425115043 extends WallabagMigration
 
     public function down(Schema $schema): void
     {
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'sqlite':
                 $this->addSql('DROP INDEX UNIQ_87E64C53A76ED395');
                 $this->addSql('CREATE TEMPORARY TABLE __temp__' . $this->getTable('config', true) . ' AS SELECT id, user_id, theme, items_per_page, language, feed_token, feed_limit, reading_speed, pocket_consumer_key, action_mark_as_read, list_mode FROM "' . $this->getTable('config', true) . '"');
                 $this->addSql('DROP TABLE "' . $this->getTable('config', true) . '"');
@@ -52,11 +45,11 @@ final class Version20190425115043 extends WallabagMigration
                 $this->addSql('DROP TABLE __temp__' . $this->getTable('config', true));
                 $this->addSql('CREATE UNIQUE INDEX UNIQ_87E64C53A76ED395 ON "' . $this->getTable('config', true) . '" (user_id)');
                 break;
-            case $platform instanceof MySQLPlatform:
+            case 'mysql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('config') . ' CHANGE feed_token rss_token');
                 $this->addSql('ALTER TABLE ' . $this->getTable('config') . ' CHANGE feed_limit rss_limit');
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('config') . ' RENAME COLUMN feed_token TO rss_token');
                 $this->addSql('ALTER TABLE ' . $this->getTable('config') . ' RENAME COLUMN feed_limit TO rss_limit');
                 break;

app/DoctrineMigrations/Version20190510141130.php

@@ -3,9 +3,6 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Migrations\SkipMigrationException;
-use Doctrine\DBAL\Platforms\MySQLPlatform;
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
@@ -20,10 +17,8 @@ final class Version20190510141130 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'sqlite':
                 $this->addSql('DROP INDEX IDX_368A4209A76ED395');
                 $this->addSql('DROP INDEX IDX_368A420919EB6921');
                 $this->addSql('DROP INDEX UNIQ_368A42095F37A13B');
@@ -65,7 +60,7 @@ final class Version20190510141130 extends WallabagMigration
                 $this->addSql('CREATE INDEX IDX_EE52E3FAA76ED395 ON ' . $this->getTable('oauth2_auth_codes', true) . ' (user_id)');
                 $this->addSql('CREATE INDEX IDX_EE52E3FA19EB6921 ON ' . $this->getTable('oauth2_auth_codes', true) . ' (client_id)');
                 break;
-            case $platform instanceof MySQLPlatform:
+            case 'mysql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_access_tokens') . ' DROP FOREIGN KEY FK_368A4209A76ED395');
                 $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_access_tokens') . ' ADD CONSTRAINT FK_368A4209A76ED395 FOREIGN KEY (user_id) REFERENCES ' . $this->getTable('user') . ' (id) ON DELETE CASCADE');
 
@@ -80,7 +75,7 @@ final class Version20190510141130 extends WallabagMigration
                 $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_auth_codes') . ' DROP FOREIGN KEY FK_EE52E3FAA76ED395');
                 $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_auth_codes') . ' ADD CONSTRAINT FK_EE52E3FAA76ED395 FOREIGN KEY (user_id) REFERENCES ' . $this->getTable('user') . ' (id) ON DELETE CASCADE');
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_access_tokens') . ' DROP CONSTRAINT FK_368A4209A76ED395');
                 $this->addSql('ALTER TABLE ' . $this->getTable('oauth2_access_tokens') . ' ADD CONSTRAINT FK_368A4209A76ED395 FOREIGN KEY (user_id) REFERENCES ' . $this->getTable('user') . ' (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
 

app/DoctrineMigrations/Version20190511165128.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
@@ -15,7 +14,7 @@ final class Version20190511165128 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $this->skipIf(!$this->connection->getDatabasePlatform() instanceof MySQLPlatform, 'This migration only apply to MySQL');
+        $this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');
 
         $this->addSql('ALTER TABLE ' . $this->getTable('tag') . ' CHANGE `label` `label` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;');
         $this->addSql('ALTER TABLE ' . $this->getTable('tag') . ' CHANGE `slug` `slug` VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;');
@@ -23,7 +22,7 @@ final class Version20190511165128 extends WallabagMigration
 
     public function down(Schema $schema): void
     {
-        $this->skipIf(!$this->connection->getDatabasePlatform() instanceof MySQLPlatform, 'This migration only apply to MySQL');
+        $this->skipIf('mysql' !== $this->connection->getDatabasePlatform()->getName(), 'This migration only apply to MySQL');
 
         $this->addSql('ALTER TABLE ' . $this->getTable('tag') . ' CHANGE `slug` `slug` VARCHAR(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
         $this->addSql('ALTER TABLE ' . $this->getTable('tag') . ' CHANGE `label` `label` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');

app/DoctrineMigrations/Version20190619093534.php

@@ -2,7 +2,6 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
@@ -15,7 +14,7 @@ final class Version20190619093534 extends WallabagMigration
     public function up(Schema $schema): void
     {
         // this up() migration is auto-generated, please modify it to your needs
-        $this->skipIf(!$this->connection->getDatabasePlatform() instanceof SqlitePlatform, 'Migration can only be executed safely on \'sqlite\'.');
+        $this->skipIf('sqlite' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'sqlite\'.');
 
         $this->addSql('UPDATE ' . $this->getTable('entry', true) . ' SET reading_time = 0 WHERE reading_time IS NULL;');
 
@@ -43,7 +42,7 @@ final class Version20190619093534 extends WallabagMigration
     public function down(Schema $schema): void
     {
         // this down() migration is auto-generated, please modify it to your needs
-        $this->skipIf(!$this->connection->getDatabasePlatform() instanceof SqlitePlatform, 'Migration can only be executed safely on \'sqlite\'.');
+        $this->skipIf('sqlite' !== $this->connection->getDatabasePlatform()->getName(), 'Migration can only be executed safely on \'sqlite\'.');
 
         $this->addSql('DROP INDEX IDX_F4D18282A76ED395');
         $this->addSql('DROP INDEX created_at');

app/DoctrineMigrations/Version20190806130304.php

@@ -2,9 +2,6 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\MySQLPlatform;
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
@@ -21,10 +18,8 @@ final class Version20190806130304 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'sqlite':
                 $this->addSql('DROP INDEX uid');
                 $this->addSql('DROP INDEX created_at');
                 $this->addSql('DROP INDEX hashed_url_user_id');
@@ -49,7 +44,7 @@ final class Version20190806130304 extends WallabagMigration
                 $this->addSql('CREATE INDEX tag_label ON ' . $this->getTable('tag', true) . ' (label)');
                 $this->addSql('CREATE INDEX config_feed_token ON ' . $this->getTable('config', true) . ' (feed_token)');
                 break;
-            case $platform instanceof MySQLPlatform:
+            case 'mysql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' MODIFY language VARCHAR(20) DEFAULT NULL');
                 $this->addSql('CREATE INDEX user_language ON ' . $this->getTable('entry') . ' (language, user_id)');
                 $this->addSql('CREATE INDEX user_archived ON ' . $this->getTable('entry') . ' (user_id, is_archived, archived_at)');
@@ -58,7 +53,7 @@ final class Version20190806130304 extends WallabagMigration
                 $this->addSql('CREATE INDEX tag_label ON ' . $this->getTable('tag') . ' (label (255))');
                 $this->addSql('CREATE INDEX config_feed_token ON ' . $this->getTable('config') . ' (feed_token (255))');
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' ALTER language TYPE VARCHAR(20)');
                 $this->addSql('CREATE INDEX user_language ON ' . $this->getTable('entry') . ' (language, user_id)');
                 $this->addSql('CREATE INDEX user_archived ON ' . $this->getTable('entry') . ' (user_id, is_archived, archived_at)');
@@ -72,10 +67,8 @@ final class Version20190806130304 extends WallabagMigration
 
     public function down(Schema $schema): void
     {
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'sqlite':
                 $this->addSql('DROP INDEX IDX_F4D18282A76ED395');
                 $this->addSql('DROP INDEX created_at');
                 $this->addSql('DROP INDEX uid');
@@ -100,7 +93,7 @@ final class Version20190806130304 extends WallabagMigration
                 $this->addSql('CREATE INDEX hashed_url_user_id ON ' . $this->getTable('entry', true) . ' (user_id, hashed_url)');
                 $this->addSql('CREATE INDEX hashed_given_url_user_id ON ' . $this->getTable('entry', true) . ' (user_id, hashed_given_url)');
                 break;
-            case $platform instanceof MySQLPlatform:
+            case 'mysql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' MODIFY language LONGTEXT DEFAULT NULL');
                 $this->addSql('DROP INDEX user_language ON ' . $this->getTable('entry'));
                 $this->addSql('DROP INDEX user_archived ON ' . $this->getTable('entry'));
@@ -109,7 +102,7 @@ final class Version20190806130304 extends WallabagMigration
                 $this->addSql('DROP INDEX tag_label ON ' . $this->getTable('tag'));
                 $this->addSql('DROP INDEX config_feed_token ON ' . $this->getTable('config'));
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' ALTER language TYPE TEXT');
                 $this->addSql('DROP INDEX user_language ON ' . $this->getTable('entry'));
                 $this->addSql('DROP INDEX user_archived ON ' . $this->getTable('entry'));

app/DoctrineMigrations/Version20190808124957.php

@@ -2,9 +2,6 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\MySQLPlatform;
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
@@ -15,16 +12,14 @@ final class Version20190808124957 extends WallabagMigration
 {
     public function up(Schema $schema): void
     {
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'sqlite':
                 $this->addSql('ALTER TABLE ' . $this->getTable('craue_config_setting', true) . ' RENAME TO ' . $this->getTable('internal_setting', true));
                 break;
-            case $platform instanceof MySQLPlatform:
+            case 'mysql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('craue_config_setting') . ' RENAME ' . $this->getTable('internal_setting'));
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('craue_config_setting') . ' RENAME TO ' . $this->getTable('internal_setting'));
                 break;
         }
@@ -32,16 +27,14 @@ final class Version20190808124957 extends WallabagMigration
 
     public function down(Schema $schema): void
     {
-        $platform = $this->connection->getDatabasePlatform();
-
-        switch (true) {
-            case $platform instanceof SqlitePlatform:
+        switch ($this->connection->getDatabasePlatform()->getName()) {
+            case 'sqlite':
                 $this->addSql('ALTER TABLE ' . $this->getTable('internal_setting', true) . ' RENAME TO ' . $this->getTable('craue_config_setting', true));
                 break;
-            case $platform instanceof MySQLPlatform:
+            case 'mysql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('internal_setting') . ' RENAME ' . $this->getTable('craue_config_setting'));
                 break;
-            case $platform instanceof PostgreSQLPlatform:
+            case 'postgresql':
                 $this->addSql('ALTER TABLE ' . $this->getTable('internal_setting') . ' RENAME TO ' . $this->getTable('craue_config_setting'));
                 break;
         }

app/DoctrineMigrations/Version20190826204730.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
@@ -24,7 +23,7 @@ final class Version20190826204730 extends WallabagMigration
             $userTable->setPrimaryKey(['id']);
             $userTable->addForeignKeyConstraint($this->getTable('config'), ['config_id'], ['id'], [], 'fk_config');
 
-            if ($this->connection->getDatabasePlatform() instanceof PostgreSQLPlatform) {
+            if ('postgresql' === $this->connection->getDatabasePlatform()->getName()) {
                 $schema->dropSequence('ignore_origin_user_rule_id_seq');
                 $schema->createSequence('ignore_origin_user_rule_id_seq');
             }
@@ -36,7 +35,7 @@ final class Version20190826204730 extends WallabagMigration
             $instanceTable->addColumn('rule', 'string', ['length' => 255]);
             $instanceTable->setPrimaryKey(['id']);
 
-            if ($this->connection->getDatabasePlatform() instanceof PostgreSQLPlatform) {
+            if ('postgresql' === $this->connection->getDatabasePlatform()->getName()) {
                 $schema->dropSequence('ignore_origin_instance_rule_id_seq');
                 $schema->createSequence('ignore_origin_instance_rule_id_seq');
             }

app/DoctrineMigrations/Version20221221092957.php

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

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

@@ -3,7 +3,7 @@
    ========================================================================== */
 
 main {
-  div#content {
+  #content {
     padding: 0 0.5rem;
   }
 }

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

@@ -21,7 +21,7 @@
 }
 
 @media screen and (min-width: 993px) {
-  .entry main div#content {
+  .entry #content {
     padding-left: 70px;
   }
 }

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

@@ -70,7 +70,6 @@ nav {
 
   .input-field input {
     display: block;
-    font-size: 1.2rem;
     line-height: inherit;
     height: 3rem;
   }
@@ -80,17 +79,6 @@ nav {
     box-shadow: none;
     color: #444;
   }
-
-  /* materializecss override */
-  .input-field.input-field input {
-    margin-bottom: 0;
-    border-bottom: none;
-  }
-
-  .input-field.input-field input:focus {
-    border-bottom: none;
-    box-shadow: initial;
-  }
 }
 
 .nav-panel-top {

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

@@ -15,12 +15,6 @@ div.settings div.file-field {
   }
 }
 
-/* override materializecss pointer-event disabled on checkboxes */
-[type="checkbox"]:not(:checked),
-[type="checkbox"]:checked {
-  pointer-events: initial;
-}
-
 .input-field label.active {
   font-size: 1rem;
 }

app/config/config.yml

@@ -23,6 +23,8 @@ framework:
     csrf_protection: ~
     validation:
         enable_annotations: true
+    templating:
+        engines: ['twig']
     default_locale: "%locale%"
     trusted_hosts: ~
     session:
@@ -41,6 +43,7 @@ twig:
     strict_variables: "%kernel.debug%"
     form_themes:
         - "@LexikFormFilter/Form/form_div_layout.html.twig"
+    exception_controller: Wallabag\CoreBundle\Controller\ExceptionController:showAction
     globals:
         registration_enabled: '%fosuser_registration%'
 

app/config/services.yml

@@ -12,7 +12,7 @@ services:
         autoconfigure: true
         public: true
         bind:
-            $projectDir: '%kernel.project_dir%'
+            $rootDir: '%kernel.root_dir%'
             $debug: '%kernel.debug%'
             $defaultLocale: '%kernel.default_locale%'
             $wallabagUrl: '%domain_name%'

app/config/wallabag.yml

@@ -1,5 +1,5 @@
 wallabag_core:
-    version: 2.6.5
+    version: 2.6.2
     paypal_url: "https://liberapay.com/wallabag/donate"
     languages:
         en: 'English'

app/config/webpack/common.js

@@ -2,16 +2,16 @@ const path = require('path');
 const webpack = require('webpack');
 const StyleLintPlugin = require('stylelint-webpack-plugin');
 
-const projectDir = path.resolve(__dirname, '../../../');
+const rootDir = 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'),
+    material: path.join(rootDir, './app/Resources/static/themes/material/index.js'),
+    public: path.join(rootDir, './app/Resources/static/themes/_global/share.js'),
   },
   output: {
     filename: '[name].js',
-    path: path.resolve(projectDir, 'web/wallassets'),
+    path: path.resolve(rootDir, 'web/wallassets'),
     publicPath: '',
   },
   plugins: [
@@ -31,7 +31,7 @@ module.exports = {
   ],
   resolve: {
     alias: {
-      jquery: path.join(projectDir, 'node_modules/jquery/dist/jquery.js'),
+      jquery: path.join(rootDir, 'node_modules/jquery/dist/jquery.js'),
     },
   },
 };

bin/console

@@ -3,7 +3,7 @@
 
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\ErrorHandler\Debug;
+use Symfony\Component\Debug\Debug;
 
 // if you don't want to setup permissions the proper way, just uncomment the following PHP line
 // read https://symfony.com/doc/current/setup.html#checking-symfony-application-configuration-and-setup

composer.json

@@ -86,6 +86,7 @@
         "kphoen/rulerz": "^0.21",
         "kphoen/rulerz-bundle": "~0.13",
         "laminas/laminas-code": "^4.7",
+        "laminas/laminas-diactoros": "^2.3",
         "lcobucci/jwt": "~4.1.5",
         "lexik/form-filter-bundle": "^7.0",
         "mgargano/simplehtmldom": "~1.5",
@@ -115,34 +116,13 @@
         "scheb/2fa-qr-code": "^5.13",
         "scheb/2fa-trusted-device": "^5.13",
         "sensio/framework-extra-bundle": "^6.2",
-        "sentry/sentry-symfony": "4.10.0",
+        "sentry/sentry-symfony": "4.9.2",
         "stof/doctrine-extensions-bundle": "^1.2",
-        "symfony/asset": "^4.4",
-        "symfony/config": "^4.4",
-        "symfony/console": "^4.4",
-        "symfony/debug": "^4.4",
-        "symfony/dependency-injection": "^4.4",
-        "symfony/doctrine-bridge": "^4.4",
-        "symfony/dom-crawler": "^4.4",
-        "symfony/error-handler": "^4.4",
-        "symfony/event-dispatcher": "^4.4",
-        "symfony/finder": "^4.4",
-        "symfony/form": "^4.4",
-        "symfony/framework-bundle": "^4.4",
-        "symfony/http-foundation": "^4.4",
-        "symfony/http-kernel": "^4.4",
-        "symfony/mailer": "^4.4",
-        "symfony/mime": "^4.4",
+        "symfony/dom-crawler": "^4.0",
+        "symfony/mailer": "^4.0",
         "symfony/monolog-bundle": "^3.1",
-        "symfony/options-resolver": "^4.4",
         "symfony/proxy-manager-bridge": "^4.4",
-        "symfony/routing": "^4.4",
-        "symfony/security-bundle": "^4.4",
-        "symfony/security-core": "^4.4",
-        "symfony/security-http": "^4.4",
-        "symfony/templating": "^4.4",
-        "symfony/twig-bundle": "^4.4",
-        "symfony/validator": "^4.4",
+        "symfony/symfony": "^4.0",
         "tecnickcom/tcpdf": "^6.3.0",
         "twig/extra-bundle": "^3.4",
         "twig/string-extra": "^3.4",
@@ -165,14 +145,8 @@
         "phpstan/phpstan-doctrine": "^1.3",
         "phpstan/phpstan-phpunit": "^1.1",
         "phpstan/phpstan-symfony": "^1.2",
-        "symfony/browser-kit": "^4.4",
-        "symfony/css-selector": "^4.4",
-        "symfony/debug-bundle": "^4.4",
         "symfony/maker-bundle": "^1.18",
-        "symfony/phpunit-bridge": "~6.0",
-        "symfony/var-dumper": "^4.4",
-        "symfony/web-profiler-bundle": "^4.4",
-        "symfony/web-server-bundle": "^4.4"
+        "symfony/phpunit-bridge": "~6.0"
     },
     "suggest": {
         "ext-imagick": "To keep GIF animation when downloading image is enabled"
@@ -191,7 +165,10 @@
     "autoload-dev": {
         "psr-4": {
             "Tests\\": "tests/"
-        }
+        },
+        "files": [
+            "vendor/symfony/symfony/src/Symfony/Component/VarDumper/Resources/functions/dump.php"
+        ]
     },
     "config": {
         "allow-plugins": {

docker/php/config/parameters.yml

@@ -6,7 +6,7 @@ parameters:
     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.root_dir%/data/db/wallabag.sqlite"}'
     database_table_prefix: ${DATABASE_TABLE_PREFIX:-wallabag_}
     database_socket: null
     database_charset: ${DATABASE_CHARSET:-utf8}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wallabag",
-  "version": "2.6.0",
+  "version": "2.5.0",
   "description": "wallabag is a self hostable application for saving web pages",
   "private": true,
   "directories": {
@@ -17,22 +17,17 @@
     {
       "name": "Nicolas Lœuillet",
       "email": "nicolas@loeuillet.org",
-      "homepage": "https://nicolas.loeuillet.org",
+      "homepage": "http://www.cdetc.fr",
       "role": "Developer"
     },
     {
       "name": "Thomas Citharel",
-      "homepage": "https://tcit.fr",
+      "homepage": "http://tcit.fr",
       "role": "Developer"
     },
     {
       "name": "Jérémy Benoist",
-      "homepage": "https://www.j0k3r.net",
-      "role": "Developer"
-    },
-    {
-      "name": "Kevin Decherf",
-      "homepage": "https://kdecherf.com/",
+      "homepage": "http://www.j0k3r.net",
       "role": "Developer"
     }
   ],
@@ -41,30 +36,30 @@
     "url": "https://github.com/wallabag/wallabag/issues"
   },
   "devDependencies": {
-    "@babel/core": "^7.22.10",
-    "@babel/eslint-parser": "^7.22.10",
-    "@babel/preset-env": "^7.22.10",
-    "autoprefixer": "^10.4.15",
+    "@babel/core": "^7.22.9",
+    "@babel/eslint-parser": "^7.22.9",
+    "@babel/preset-env": "^7.22.9",
+    "autoprefixer": "^10.4.14",
     "babel-loader": "^9.1.3",
     "css-loader": "^6.8.1",
-    "eslint": "^8.47.0",
+    "eslint": "^8.45.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-plugin-import": "^2.28.1",
+    "eslint-plugin-import": "^2.27.5",
     "eslint-webpack-plugin": "^4.0.1",
     "file-loader": "^6.2.0",
     "lato-font": "^3.0.0",
     "mini-css-extract-plugin": "^2.7.6",
     "node-sass": "^9.0.0",
-    "postcss": "^8.4.28",
+    "postcss": "^8.4.27",
     "postcss-loader": "^7.3.3",
-    "postcss-scss": "^4.0.7",
-    "sass": "^1.66.1",
+    "postcss-scss": "^4.0.6",
+    "sass": "^1.64.1",
     "sass-loader": "^13.3.2",
     "style-loader": "^3.3.3",
-    "stylelint": "^15.10.3",
+    "stylelint": "^15.10.2",
     "stylelint-config-standard": "^34.0.0",
     "stylelint-config-standard-scss": "^10.0.0",
-    "stylelint-scss": "^5.1.0",
+    "stylelint-scss": "^5.0.1",
     "stylelint-webpack-plugin": "^4.1.1",
     "terser-webpack-plugin": "^5.3.9",
     "url-loader": "^4.1.1",
@@ -84,7 +79,7 @@
     "jquery.cookie": "^1.4.1",
     "jr-qrcode": "^1.0.7",
     "material-design-icons-iconfont": "^6.7.0",
-    "materialize-css": "^0.100.2",
+    "materialize-css": "^0.98.1",
     "mathjax": "^3.2.2",
     "mousetrap": "^1.6.0",
     "ptsans-npm-webfont": "^0.0.4",

scripts/require.sh

@@ -7,9 +7,3 @@ if [ ! -f composer.phar ]; then
 else
     COMPOSER_COMMAND='./composer.phar'
 fi
-
-# Check for git
-command -v git >/dev/null 2>&1 ||
-{ echo >&2 "git is not installed. We can't install wallabag";
-  exit 1
-}

src/Wallabag/AnnotationBundle/DataFixtures/AnnotationFixtures.php

@@ -7,9 +7,7 @@ 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;
 
 class AnnotationFixtures extends Fixture implements DependentFixtureInterface
 {
@@ -18,8 +16,8 @@ class AnnotationFixtures extends Fixture implements DependentFixtureInterface
      */
     public function load(ObjectManager $manager)
     {
-        $annotation1 = new Annotation($this->getReference('admin-user', User::class));
-        $annotation1->setEntry($this->getReference('entry1', Entry::class));
+        $annotation1 = new Annotation($this->getReference('admin-user'));
+        $annotation1->setEntry($this->getReference('entry1'));
         $annotation1->setText('This is my annotation /o/');
         $annotation1->setQuote('content');
 
@@ -27,8 +25,8 @@ class AnnotationFixtures extends Fixture implements DependentFixtureInterface
 
         $this->addReference('annotation1', $annotation1);
 
-        $annotation2 = new Annotation($this->getReference('admin-user', User::class));
-        $annotation2->setEntry($this->getReference('entry2', Entry::class));
+        $annotation2 = new Annotation($this->getReference('admin-user'));
+        $annotation2->setEntry($this->getReference('entry2'));
         $annotation2->setText('This is my 2nd annotation /o/');
         $annotation2->setQuote('content');
 
@@ -36,8 +34,8 @@ class AnnotationFixtures extends Fixture implements DependentFixtureInterface
 
         $this->addReference('annotation2', $annotation2);
 
-        $annotation3 = new Annotation($this->getReference('bob-user', User::class));
-        $annotation3->setEntry($this->getReference('entry3', Entry::class));
+        $annotation3 = new Annotation($this->getReference('bob-user'));
+        $annotation3->setEntry($this->getReference('entry3'));
         $annotation3->setText('This is my first annotation !');
         $annotation3->setQuote('content');
 

src/Wallabag/ApiBundle/Controller/DeveloperController.php

@@ -69,16 +69,12 @@ class DeveloperController extends AbstractController
     /**
      * Remove a client.
      *
-     * @Route("/developer/client/delete/{id}", requirements={"id" = "\d+"}, name="developer_delete_client", methods={"POST"})
+     * @Route("/developer/client/delete/{id}", requirements={"id" = "\d+"}, name="developer_delete_client")
      *
      * @return RedirectResponse
      */
-    public function deleteClientAction(Request $request, Client $client, EntityManagerInterface $entityManager, TranslatorInterface $translator)
+    public function deleteClientAction(Client $client, EntityManagerInterface $entityManager, TranslatorInterface $translator)
     {
-        if (!$this->isCsrfTokenValid('delete-client', $request->request->get('token'))) {
-            throw $this->createAccessDeniedException('Bad CSRF token.');
-        }
-
         if (null === $this->getUser() || $client->getUser()->getId() !== $this->getUser()->getId()) {
             throw $this->createAccessDeniedException('You can not access this client.');
         }
@@ -103,9 +99,6 @@ class DeveloperController extends AbstractController
      */
     public function howtoFirstAppAction()
     {
-        return $this->render('@WallabagCore/Developer/howto_app.html.twig',
-        [
-            'wallabag_url' => $this->getParameter('domain_name'),
-        ]);
+        return $this->render('@WallabagCore/Developer/howto_app.html.twig');
     }
 }

src/Wallabag/CoreBundle/Command/InstallCommand.php

@@ -4,9 +4,6 @@ namespace Wallabag\CoreBundle\Command;
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Exception\DriverException;
-use Doctrine\DBAL\Platforms\MySQLPlatform;
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
-use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\ORM\EntityManagerInterface;
 use FOS\UserBundle\Event\UserEvent;
 use FOS\UserBundle\FOSUserEvents;
@@ -141,7 +138,7 @@ class InstallCommand extends Command
         $help = '';
 
         // now check if MySQL isn't too old to handle utf8mb4
-        if ($conn->isConnected() && $conn->getDatabasePlatform() instanceof MySQLPlatform) {
+        if ($conn->isConnected() && 'mysql' === $conn->getDatabasePlatform()->getName()) {
             $version = $conn->query('select version()')->fetchOne();
             $minimalVersion = '5.5.4';
 
@@ -153,7 +150,7 @@ class InstallCommand extends Command
         }
 
         // testing if PostgreSQL > 9.1
-        if ($conn->isConnected() && $conn->getDatabasePlatform() instanceof PostgreSQLPlatform) {
+        if ($conn->isConnected() && 'postgresql' === $conn->getDatabasePlatform()->getName()) {
             // return version should be like "PostgreSQL 9.5.4 on x86_64-apple-darwin15.6.0, compiled by Apple LLVM version 8.0.0 (clang-800.0.38), 64-bit"
             $version = $conn->query('SELECT version();')->fetchOne();
 
@@ -375,26 +372,27 @@ class InstallCommand extends Command
     private function isDatabasePresent()
     {
         $connection = $this->entityManager->getConnection();
-        $databaseName = $connection->getDatabase();
 
         try {
-            $schemaManager = $connection->getSchemaManager();
+            $databaseName = $connection->getDatabase();
         } catch (\Exception $exception) {
             // mysql & sqlite
-            if (false !== strpos($exception->getMessage(), sprintf("Unknown database '%s'", $databaseName))) {
+            if (false !== strpos($exception->getMessage(), 'Unknown database')) {
                 return false;
             }
 
             // pgsql
-            if (false !== strpos($exception->getMessage(), sprintf('database "%s" does not exist', $databaseName))) {
+            if (false !== strpos($exception->getMessage(), 'does not exist')) {
                 return false;
             }
 
             throw $exception;
         }
 
+        $schemaManager = $connection->getSchemaManager();
+
         // custom verification for sqlite, since `getListDatabasesSQL` doesn't work for sqlite
-        if ($connection->getDatabasePlatform() instanceof SqlitePlatform) {
+        if ('sqlite' === $schemaManager->getDatabasePlatform()->getName()) {
             $params = $connection->getParams();
 
             if (isset($params['path']) && file_exists($params['path'])) {

src/Wallabag/CoreBundle/Controller/ConfigController.php

@@ -523,16 +523,12 @@ class ConfigController extends AbstractController
     /**
      * Remove all annotations OR tags OR entries for the current user.
      *
-     * @Route("/reset/{type}", requirements={"id" = "annotations|tags|entries"}, name="config_reset", methods={"POST"})
+     * @Route("/reset/{type}", requirements={"id" = "annotations|tags|entries"}, name="config_reset")
      *
      * @return RedirectResponse
      */
-    public function resetAction(Request $request, string $type, AnnotationRepository $annotationRepository, EntryRepository $entryRepository)
+    public function resetAction(string $type, AnnotationRepository $annotationRepository, EntryRepository $entryRepository)
     {
-        if (!$this->isCsrfTokenValid('reset-area', $request->request->get('token'))) {
-            throw $this->createAccessDeniedException('Bad CSRF token.');
-        }
-
         switch ($type) {
             case 'annotations':
                 $annotationRepository->removeAllByUserId($this->getUser()->getId());
@@ -619,7 +615,7 @@ class ConfigController extends AbstractController
         $this->entityManager->persist($user);
         $this->entityManager->flush();
 
-        return $this->redirect($request->getSession()->get('prevUrl'));
+        return $this->redirect($request->headers->get('referer'));
     }
 
     /**

src/Wallabag/CoreBundle/Controller/EntryController.php

@@ -128,7 +128,7 @@ class EntryController extends AbstractController
             $this->entityManager->flush();
         }
 
-        $redirectUrl = $this->redirectHelper->to($request->getSession()->get('prevUrl'));
+        $redirectUrl = $this->redirectHelper->to($request->headers->get('referer'));
 
         return $this->redirect($redirectUrl);
     }
@@ -390,7 +390,6 @@ class EntryController extends AbstractController
     public function viewAction(Entry $entry)
     {
         $this->checkUserAction($entry);
-        $this->get('session')->set('prevUrl', $this->generateUrl('view', ['id' => $entry->getId()]));
 
         return $this->render(
             '@WallabagCore/Entry/entry.html.twig',
@@ -452,7 +451,7 @@ class EntryController extends AbstractController
             $message
         );
 
-        $redirectUrl = $this->redirectHelper->to($request->getSession()->get('prevUrl'));
+        $redirectUrl = $this->redirectHelper->to($request->headers->get('referer'));
 
         return $this->redirect($redirectUrl);
     }
@@ -482,7 +481,7 @@ class EntryController extends AbstractController
             $message
         );
 
-        $redirectUrl = $this->redirectHelper->to($request->getSession()->get('prevUrl'));
+        $redirectUrl = $this->redirectHelper->to($request->headers->get('referer'));
 
         return $this->redirect($redirectUrl);
     }
@@ -518,8 +517,8 @@ class EntryController extends AbstractController
         );
 
         // don't redirect user to the deleted entry (check that the referer doesn't end with the same url)
-        $prev = $request->getSession()->get('prevUrl');
-        $to = (1 !== preg_match('#' . $url . '$#i', $prev) ? $prev : null);
+        $referer = $request->headers->get('referer');
+        $to = (1 !== preg_match('#' . $url . '$#i', $referer) ? $referer : null);
 
         $redirectUrl = $this->redirectHelper->to($to);
 
@@ -617,7 +616,6 @@ class EntryController extends AbstractController
     {
         $searchTerm = (isset($request->get('search_entry')['term']) ? $request->get('search_entry')['term'] : '');
         $currentRoute = (null !== $request->query->get('currentRoute') ? $request->query->get('currentRoute') : '');
-        $request->getSession()->set('prevUrl', $request->getRequestUri());
 
         $formOptions = [];
 

src/Wallabag/CoreBundle/Controller/ExceptionController.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Wallabag\CoreBundle\Controller;
+
+use Symfony\Bundle\TwigBundle\Controller\ExceptionController as BaseExceptionController;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * This controller allow us to customize the error template.
+ * The only modified line from the parent template is for "WallabagCoreBundle".
+ */
+class ExceptionController extends BaseExceptionController
+{
+    protected function findTemplate(Request $request, $format, $code, $showException)
+    {
+        $name = $showException ? 'exception' : 'error';
+        if ($showException && 'html' === $format) {
+            $name = 'exception_full';
+        }
+
+        // For error pages, try to find a template for the specific HTTP status code and format
+        if (!$showException) {
+            $template = sprintf('@WallabagCore/Exception/%s.%s.twig', $name, $format);
+            if ($this->templateExists($template)) {
+                return $template;
+            }
+        }
+
+        // try to find a template for the given format
+        $template = sprintf('@Twig/Exception/%s.%s.twig', $name, $format);
+        if ($this->templateExists($template)) {
+            return $template;
+        }
+
+        // default to a generic HTML exception
+        $request->setRequestFormat('html');
+
+        return sprintf('@Twig/Exception/%s.html.twig', $showException ? 'exception_full' : $name);
+    }
+}

src/Wallabag/CoreBundle/Controller/TagController.php

@@ -104,7 +104,7 @@ class TagController extends AbstractController
             $this->entityManager->flush();
         }
 
-        $redirectUrl = $this->redirectHelper->to($request->getSession()->get('prevUrl'), '', true);
+        $redirectUrl = $this->redirectHelper->to($request->headers->get('referer'), '', true);
 
         return $this->redirect($redirectUrl);
     }
@@ -185,7 +185,7 @@ class TagController extends AbstractController
         $form = $this->createForm(RenameTagType::class, new Tag());
         $form->handleRequest($request);
 
-        $redirectUrl = $this->redirectHelper->to($request->getSession()->get('prevUrl'), '', true);
+        $redirectUrl = $this->redirectHelper->to($request->headers->get('referer'), '', true);
 
         if ($form->isSubmitted() && $form->isValid()) {
             $newTag = new Tag();
@@ -257,7 +257,7 @@ class TagController extends AbstractController
             $this->entityManager->flush();
         }
 
-        return $this->redirect($this->redirectHelper->to($request->getSession()->get('prevUrl'), '', true));
+        return $this->redirect($this->redirectHelper->to($request->headers->get('referer'), '', true));
     }
 
     /**
@@ -279,7 +279,8 @@ class TagController extends AbstractController
             $this->entityManager->remove($tag);
             $this->entityManager->flush();
         }
-        $redirectUrl = $this->redirectHelper->to($request->getSession()->get('prevUrl'), '', true);
+
+        $redirectUrl = $this->redirectHelper->to($request->headers->get('referer'), '', true);
 
         return $this->redirect($redirectUrl);
     }

src/Wallabag/CoreBundle/DataFixtures/ConfigFixtures.php

@@ -7,7 +7,6 @@ use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 use Wallabag\CoreBundle\Entity\Config;
 use Wallabag\UserBundle\DataFixtures\UserFixtures;
-use Wallabag\UserBundle\Entity\User;
 
 class ConfigFixtures extends Fixture implements DependentFixtureInterface
 {
@@ -16,7 +15,7 @@ class ConfigFixtures extends Fixture implements DependentFixtureInterface
      */
     public function load(ObjectManager $manager): void
     {
-        $adminConfig = new Config($this->getReference('admin-user', User::class));
+        $adminConfig = new Config($this->getReference('admin-user'));
 
         $adminConfig->setItemsPerPage(30);
         $adminConfig->setReadingSpeed(200);
@@ -30,7 +29,7 @@ class ConfigFixtures extends Fixture implements DependentFixtureInterface
 
         $this->addReference('admin-config', $adminConfig);
 
-        $bobConfig = new Config($this->getReference('bob-user', User::class));
+        $bobConfig = new Config($this->getReference('bob-user'));
         $bobConfig->setItemsPerPage(10);
         $bobConfig->setReadingSpeed(200);
         $bobConfig->setLanguage('fr');
@@ -43,7 +42,7 @@ class ConfigFixtures extends Fixture implements DependentFixtureInterface
 
         $this->addReference('bob-config', $bobConfig);
 
-        $emptyConfig = new Config($this->getReference('empty-user', User::class));
+        $emptyConfig = new Config($this->getReference('empty-user'));
         $emptyConfig->setItemsPerPage(10);
         $emptyConfig->setReadingSpeed(100);
         $emptyConfig->setLanguage('en');

src/Wallabag/CoreBundle/DataFixtures/EntryFixtures.php

@@ -6,9 +6,7 @@ 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;
 
 class EntryFixtures extends Fixture implements DependentFixtureInterface
 {
@@ -89,7 +87,7 @@ class EntryFixtures extends Fixture implements DependentFixtureInterface
         ];
 
         foreach ($entries as $reference => $item) {
-            $entry = new Entry($this->getReference($item['user'], User::class));
+            $entry = new Entry($this->getReference($item['user']));
             $entry->setUrl($item['url']);
             $entry->setReadingTime($item['reading_time']);
             $entry->setDomainName($item['domain']);
@@ -100,7 +98,7 @@ class EntryFixtures extends Fixture implements DependentFixtureInterface
 
             if (isset($item['tags'])) {
                 foreach ($item['tags'] as $tag) {
-                    $entry->addTag($this->getReference($tag, Tag::class));
+                    $entry->addTag($this->getReference($tag));
                 }
             }
 

src/Wallabag/CoreBundle/DataFixtures/IgnoreOriginUserRuleFixtures.php

@@ -7,7 +7,6 @@ use Doctrine\Common\DataFixtures\DependentFixtureInterface;
 use Doctrine\Persistence\ObjectManager;
 use Wallabag\CoreBundle\Entity\IgnoreOriginUserRule;
 use Wallabag\UserBundle\DataFixtures\UserFixtures;
-use Wallabag\UserBundle\Entity\User;
 
 class IgnoreOriginUserRuleFixtures extends Fixture implements DependentFixtureInterface
 {
@@ -18,7 +17,7 @@ class IgnoreOriginUserRuleFixtures extends Fixture implements DependentFixtureIn
     {
         $rule = new IgnoreOriginUserRule();
         $rule->setRule('host = "example.fr"');
-        $rule->setConfig($this->getReference('admin-user', User::class)->getConfig());
+        $rule->setConfig($this->getReference('admin-user')->getConfig());
 
         $manager->persist($rule);
 

src/Wallabag/CoreBundle/DataFixtures/SiteCredentialFixtures.php

@@ -10,7 +10,6 @@ use Symfony\Component\DependencyInjection\ContainerInterface;
 use Wallabag\CoreBundle\Entity\SiteCredential;
 use Wallabag\CoreBundle\Helper\CryptoProxy;
 use Wallabag\UserBundle\DataFixtures\UserFixtures;
-use Wallabag\UserBundle\Entity\User;
 
 class SiteCredentialFixtures extends Fixture implements DependentFixtureInterface, ContainerAwareInterface
 {
@@ -29,14 +28,14 @@ class SiteCredentialFixtures extends Fixture implements DependentFixtureInterfac
      */
     public function load(ObjectManager $manager): void
     {
-        $credential = new SiteCredential($this->getReference('admin-user', User::class));
+        $credential = new SiteCredential($this->getReference('admin-user'));
         $credential->setHost('.super.com');
         $credential->setUsername($this->container->get(CryptoProxy::class)->crypt('.super'));
         $credential->setPassword($this->container->get(CryptoProxy::class)->crypt('bar'));
 
         $manager->persist($credential);
 
-        $credential = new SiteCredential($this->getReference('admin-user', User::class));
+        $credential = new SiteCredential($this->getReference('admin-user'));
         $credential->setHost('paywall.example.com');
         $credential->setUsername($this->container->get(CryptoProxy::class)->crypt('paywall.example'));
         $credential->setPassword($this->container->get(CryptoProxy::class)->crypt('bar'));

src/Wallabag/CoreBundle/DataFixtures/TaggingRuleFixtures.php

@@ -5,7 +5,6 @@ namespace Wallabag\CoreBundle\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;
 
 class TaggingRuleFixtures extends Fixture implements DependentFixtureInterface
@@ -18,14 +17,14 @@ class TaggingRuleFixtures extends Fixture implements DependentFixtureInterface
         $tr1 = new TaggingRule();
         $tr1->setRule('content matches "spurs"');
         $tr1->setTags(['sport']);
-        $tr1->setConfig($this->getReference('admin-config', Config::class));
+        $tr1->setConfig($this->getReference('admin-config'));
 
         $manager->persist($tr1);
 
         $tr2 = new TaggingRule();
         $tr2->setRule('content matches "basket"');
         $tr2->setTags(['sport']);
-        $tr2->setConfig($this->getReference('admin-config', Config::class));
+        $tr2->setConfig($this->getReference('admin-config'));
 
         $manager->persist($tr2);
 
@@ -33,28 +32,28 @@ class TaggingRuleFixtures extends Fixture implements DependentFixtureInterface
 
         $tr3->setRule('title matches "wallabag"');
         $tr3->setTags(['wallabag']);
-        $tr3->setConfig($this->getReference('admin-config', Config::class));
+        $tr3->setConfig($this->getReference('admin-config'));
 
         $manager->persist($tr3);
 
         $tr4 = new TaggingRule();
         $tr4->setRule('content notmatches "basket"');
         $tr4->setTags(['foot']);
-        $tr4->setConfig($this->getReference('admin-config', Config::class));
+        $tr4->setConfig($this->getReference('admin-config'));
 
         $manager->persist($tr4);
 
         $tr5 = new TaggingRule();
         $tr5->setRule('readingTime <= 5');
         $tr5->setTags(['shortread']);
-        $tr5->setConfig($this->getReference('empty-config', Config::class));
+        $tr5->setConfig($this->getReference('empty-config'));
 
         $manager->persist($tr5);
 
         $tr6 = new TaggingRule();
         $tr6->setRule('readingTime > 5');
         $tr6->setTags(['longread']);
-        $tr6->setConfig($this->getReference('empty-config', Config::class));
+        $tr6->setConfig($this->getReference('empty-config'));
 
         $manager->persist($tr6);
 

src/Wallabag/CoreBundle/Doctrine/WallabagMigration.php

@@ -2,7 +2,6 @@
 
 namespace Wallabag\CoreBundle\Doctrine;
 
-use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
@@ -50,7 +49,7 @@ abstract class WallabagMigration extends AbstractMigration implements ContainerA
         }
 
         // escape table name is handled using " on postgresql
-        if ($this->connection->getDatabasePlatform() instanceof PostgreSQLPlatform) {
+        if ('postgresql' === $this->connection->getDatabasePlatform()->getName()) {
             return '"' . $table . '"';
         }
 

src/Wallabag/CoreBundle/Event/Listener/LocaleListener.php

@@ -3,7 +3,7 @@
 namespace Wallabag\CoreBundle\Event\Listener;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\Event\RequestEvent;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
@@ -18,7 +18,7 @@ class LocaleListener implements EventSubscriberInterface
         $this->defaultLocale = $defaultLocale;
     }
 
-    public function onKernelRequest(RequestEvent $event)
+    public function onKernelRequest(GetResponseEvent $event)
     {
         $request = $event->getRequest();
         if (!$request->hasPreviousSession()) {

src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php

@@ -6,7 +6,6 @@ use Lexik\Bundle\FormFilterBundle\Filter\FilterOperands;
 use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\CheckboxFilterType;
 use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\ChoiceFilterType;
 use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\DateRangeFilterType;
-use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\NumberFilterType;
 use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\NumberRangeFilterType;
 use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\TextFilterType;
 use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface;
@@ -103,13 +102,10 @@ class EntryFilterType extends AbstractType
                     return $filterQuery->createCondition($expression);
                 },
                 'label' => 'entry.filters.domain_label',
-                'attr' => [
-                    'autocapitalize' => 'off',
-                ],
             ])
-            ->add('httpStatus', NumberFilterType::class, [
+            ->add('httpStatus', TextFilterType::class, [
                 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
-                    $value = (int) $values['value'];
+                    $value = $values['value'];
                     if (false === \array_key_exists($value, Response::$statusTexts)) {
                         return false;
                     }
@@ -121,11 +117,6 @@ class EntryFilterType extends AbstractType
                     return $filterQuery->createCondition($expression, $parameters);
                 },
                 'label' => 'entry.filters.http_status_label',
-                'html5' => true,
-                'attr' => [
-                    'min' => 100,
-                    'max' => 527,
-                ],
             ])
             ->add('isArchived', CheckboxFilterType::class, [
                 'label' => 'entry.filters.archived_label',

src/Wallabag/CoreBundle/Helper/DownloadImages.php

@@ -9,11 +9,10 @@ use Http\Client\Common\HttpMethodsClient;
 use Http\Client\Common\Plugin\ErrorPlugin;
 use Http\Client\Common\Plugin\RedirectPlugin;
 use Http\Client\Common\PluginClient;
-use Http\Discovery\Psr17FactoryDiscovery;
-use Psr\Http\Client\ClientInterface;
-use Psr\Http\Message\RequestFactoryInterface;
+use Http\Client\HttpClient;
+use Http\Discovery\MessageFactoryDiscovery;
+use Http\Message\MessageFactory;
 use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\DomCrawler\Crawler;
 use Symfony\Component\Finder\Finder;
@@ -29,9 +28,9 @@ class DownloadImages
     private $mimeTypes;
     private $wallabagUrl;
 
-    public function __construct(ClientInterface $client, $baseFolder, $wallabagUrl, LoggerInterface $logger, RequestFactoryInterface $requestFactory = null, StreamFactoryInterface $streamFactory = null)
+    public function __construct(HttpClient $client, $baseFolder, $wallabagUrl, LoggerInterface $logger, MessageFactory $messageFactory = null)
     {
-        $this->client = new HttpMethodsClient(new PluginClient($client, [new ErrorPlugin(), new RedirectPlugin()]), $requestFactory ?: Psr17FactoryDiscovery::findRequestFactory(), $streamFactory ?: Psr17FactoryDiscovery::findStreamFactory());
+        $this->client = new HttpMethodsClient(new PluginClient($client, [new ErrorPlugin(), new RedirectPlugin()]), $messageFactory ?: MessageFactoryDiscovery::find());
         $this->baseFolder = $baseFolder;
         $this->wallabagUrl = rtrim($wallabagUrl, '/');
         $this->logger = $logger;

src/Wallabag/CoreBundle/Resources/views/Config/index.html.twig

@@ -552,34 +552,18 @@
                         <div class="row">
                             <h5>{{ 'config.reset.title'|trans }}</h5>
                             <p>{{ 'config.reset.description'|trans }}</p>
-                            <p>
-                                <form action="{{ path('config_reset', {type: 'annotations'}) }}" method="post" onsubmit="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" name="reset-annotations">
-                                    <input type="hidden" name="token" value="{{ csrf_token('reset-area') }}" />
-
-                                    <button class="waves-effect waves-light btn red" type="submit">{{ 'config.reset.annotations'|trans }}</button>
-                                </form>
-                            </p>
-                            <p>
-                                <form action="{{ path('config_reset', {type: 'tags'}) }}" method="post" onsubmit="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" name="reset-tags">
-                                    <input type="hidden" name="token" value="{{ csrf_token('reset-area') }}" />
-
-                                    <button class="waves-effect waves-light btn red" type="submit">{{ 'config.reset.tags'|trans }}</button>
-                                </form>
-                            </p>
-                            <p>
-                                <form action="{{ path('config_reset', {type: 'archived'}) }}" method="post" onsubmit="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" name="reset-archived">
-                                    <input type="hidden" name="token" value="{{ csrf_token('reset-area') }}" />
-
-                                    <button class="waves-effect waves-light btn red" type="submit">{{ 'config.reset.archived'|trans }}</button>
-                                </form>
-                            </p>
-                            <p>
-                                <form action="{{ path('config_reset', {type: 'entries'}) }}" method="post" onsubmit="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" name="reset-entries">
-                                    <input type="hidden" name="token" value="{{ csrf_token('reset-area') }}" />
-
-                                    <button class="waves-effect waves-light btn red" type="submit">{{ 'config.reset.entries'|trans }}</button>
-                                </form>
-                            </p>
+                            <a href="{{ path('config_reset', {type: 'annotations'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
+                                {{ 'config.reset.annotations'|trans }}
+                            </a>
+                            <a href="{{ path('config_reset', {type: 'tags'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
+                                {{ 'config.reset.tags'|trans }}
+                            </a>
+                            <a href="{{ path('config_reset', {type: 'archived'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
+                                {{ 'config.reset.archived'|trans }}
+                            </a>
+                            <a href="{{ path('config_reset', {type: 'entries'}) }}" onclick="return confirm('{{ 'config.reset.confirm'|trans|escape('js') }}')" class="waves-effect waves-light btn red">
+                                {{ 'config.reset.entries'|trans }}
+                            </a>
                         </div>
 
                         {% if enabled_users > 1 %}

src/Wallabag/CoreBundle/Resources/views/Developer/howto_app.html.twig

@@ -2,6 +2,11 @@
 
 {% block title %}{{ 'developer.howto.page_title'|trans }}{% endblock %}
 
+{% block css %}
+    {{ parent() }}
+    <link rel="stylesheet" href="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/themes/prism-dark.min.css') }}">
+{% endblock %}
+
 {% block content %}
 <div class="row">
     <div class="col s12">
@@ -13,7 +18,7 @@
                 <p>{{ 'developer.howto.description.paragraph_3'|trans({'%link%': path('developer_create_client')})|raw }}</p>
                 <p>{{ 'developer.howto.description.paragraph_4'|trans }}</p>
                 <p>
-                    <pre><code class="language-bash">http POST {{ wallabag_url }}/oauth/v2/token \
+                    <pre><code class="language-bash">http POST https://app.wallabag.it/oauth/v2/token \
     grant_type=password \
     client_id=12_5um6nz50ceg4088c0840wwc0kgg44g00kk84og044ggkscso0k \
     client_secret=3qd12zpeaxes8cwg8c0404g888co4wo8kc4gcw0occww8cgw4k \
@@ -42,7 +47,7 @@ X-Powered-By: PHP/5.5.9-1ubuntu4.13
                 </p>
                 <p>{{ 'developer.howto.description.paragraph_6'|trans }}</p>
                 <p>
-                    <pre><code class="language-bash">http GET {{ wallabag_url }}/api/entries.json \
+                    <pre><code class="language-bash">http GET https://app.wallabag.it/api/entries.json \
     "Authorization:Bearer ZWFjNjA3ZWMwYWVmYzRkYTBlMmQ3NTllYmVhOGJiZDE0ZTg1NjE4MjczOTVlNzM0ZTRlMWQ0MmRlMmYwNTk5Mw"</code></pre>
                 </p>
                 <p>{{ 'developer.howto.description.paragraph_7'|trans }}</p>
@@ -53,4 +58,6 @@ X-Powered-By: PHP/5.5.9-1ubuntu4.13
         </div>
     </div>
 </div>
+<script src="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/prism.min.js') }}"></script>
+<script src="{{ asset('https://cdnjs.cloudflare.com/ajax/libs/prism/1.4.1/components/prism-bash.min.js') }}"></script>
 {% endblock %}

src/Wallabag/CoreBundle/Resources/views/Developer/index.html.twig

@@ -57,11 +57,9 @@
 
                                     <p>{{ 'developer.remove.warn_message_1'|trans({'%name%': client.name}) }}</p>
                                     <p>{{ 'developer.remove.warn_message_2'|trans({'%name%': client.name}) }}</p>
-                                    <form action="{{ path('developer_delete_client', {id: client.id}) }}" method="post" name="delete-client">
-                                        <input type="hidden" name="token" value="{{ csrf_token('delete-client') }}" />
-
-                                        <button class="waves-effect waves-light btn red" type="submit">{{ 'developer.remove.action'|trans({'%name%': client.name}) }}</button>
-                                    </form>
+                                    <p>
+                                        <a class="waves-effect waves-light red btn" href="{{ path('developer_delete_client', {'id': client.id}) }}">{{ 'developer.remove.action'|trans({'%name%': client.name}) }}</a>
+                                    </p>
                                 </div>
                             </li>
                         {% endfor %}

src/Wallabag/CoreBundle/Resources/views/Entry/entries.html.twig

@@ -28,7 +28,7 @@
     <form name="form_mass_action" action="{{ path('mass_action') }}" method="post">
     <div class="results">
         <div class="nb-results">
-            {{ 'entry.list.number_on_the_page'|trans({'%count%': entries.count}) }}
+            {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
             {% if entries.count > 0 %}
                 <a class="results-item" href="{{ path('switch_view_mode') }}"><i class="material-icons">{% if list_mode == 0 %}view_list{% else %}view_module{% endif %}</i></a>
             {% endif %}

src/Wallabag/CoreBundle/Resources/views/Entry/entry.html.twig

@@ -54,7 +54,7 @@
         </li>
 
         <li class="bold">
-            <a class="waves-effect collapsible-header" onclick="return confirm('{{ 'entry.confirm.reload'|trans|escape('js') }}')" title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" href="{{ path('reload_entry', {'id': entry.id}) }}" id="reload">
+            <a class="waves-effect collapsible-header" title="{{ 'entry.view.left_menu.re_fetch_content'|trans }}" href="{{ path('reload_entry', {'id': entry.id}) }}" id="reload">
                 <i class="material-icons small">refresh</i>
                 <span>{{ 'entry.view.left_menu.re_fetch_content'|trans }}</span>
             </a>
@@ -269,7 +269,7 @@
                     {% if entry.annotations|length %}
                         <li>
                             <i class="material-icons grey-text">comment</i>
-                            {{ 'entry.view.annotations_on_the_entry'|trans({'%count%': entry.annotations|length}) }}
+                            {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations|length) }}
                         </li>
                     {% endif %}
                     {% if entry.originUrl is not empty %}

src/Wallabag/CoreBundle/Resources/views/Tag/tags.html.twig

@@ -4,7 +4,7 @@
 
 {% block content %}
     <div class="results clearfix">
-        {{ 'tag.list.number_on_the_page'|trans({'%count%': tags|length}) }}
+        {{ 'tag.list.number_on_the_page'|transchoice(tags|length) }}
     </div>
 
     <div class="row">

src/Wallabag/CoreBundle/Twig/WallabagExtension.php

@@ -19,16 +19,16 @@ class WallabagExtension extends AbstractExtension implements GlobalsInterface
     private $tagRepository;
     private $lifeTime;
     private $translator;
-    private $projectDir;
+    private $rootDir;
 
-    public function __construct(EntryRepository $entryRepository, TagRepository $tagRepository, TokenStorageInterface $tokenStorage, $lifeTime, TranslatorInterface $translator, string $projectDir)
+    public function __construct(EntryRepository $entryRepository, TagRepository $tagRepository, TokenStorageInterface $tokenStorage, $lifeTime, TranslatorInterface $translator, string $rootDir)
     {
         $this->entryRepository = $entryRepository;
         $this->tagRepository = $tagRepository;
         $this->tokenStorage = $tokenStorage;
         $this->lifeTime = $lifeTime;
         $this->translator = $translator;
-        $this->projectDir = $projectDir;
+        $this->rootDir = $rootDir;
     }
 
     public function getGlobals(): array
@@ -174,7 +174,7 @@ class WallabagExtension extends AbstractExtension implements GlobalsInterface
 
     public function assetFileExists($name)
     {
-        return file_exists(realpath($this->projectDir . '/web/' . $name));
+        return file_exists(realpath($this->rootDir . '/../web/' . $name));
     }
 
     public function themeClass()

src/Wallabag/ImportBundle/Controller/ImportController.php

@@ -4,13 +4,13 @@ namespace Wallabag\ImportBundle\Controller;
 
 use Craue\ConfigBundle\Util\Config;
 use Predis\Client;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Wallabag\ImportBundle\Consumer\RabbitMQConsumerTotalProxy;
 use Wallabag\ImportBundle\Import\ImportChain;
 
-class ImportController extends AbstractController
+class ImportController extends Controller
 {
     private RabbitMQConsumerTotalProxy $rabbitMQConsumerTotalProxy;
 

src/Wallabag/ImportBundle/Import/PocketImport.php

@@ -6,11 +6,10 @@ use Http\Client\Common\HttpMethodsClient;
 use Http\Client\Common\Plugin\ErrorPlugin;
 use Http\Client\Common\PluginClient;
 use Http\Client\Exception\RequestException;
-use Http\Discovery\Psr17FactoryDiscovery;
-use Psr\Http\Client\ClientInterface;
-use Psr\Http\Message\RequestFactoryInterface;
+use Http\Client\HttpClient;
+use Http\Discovery\MessageFactoryDiscovery;
+use Http\Message\MessageFactory;
 use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\StreamFactoryInterface;
 use Wallabag\CoreBundle\Entity\Entry;
 
 class PocketImport extends AbstractImport
@@ -153,9 +152,9 @@ class PocketImport extends AbstractImport
     /**
      * Set the Http client.
      */
-    public function setClient(ClientInterface $client, RequestFactoryInterface $requestFactory = null, StreamFactoryInterface $streamFactory = null)
+    public function setClient(HttpClient $client, MessageFactory $messageFactory = null)
     {
-        $this->client = new HttpMethodsClient(new PluginClient($client, [new ErrorPlugin()]), $requestFactory ?: Psr17FactoryDiscovery::findRequestFactory(), $streamFactory ?: Psr17FactoryDiscovery::findStreamFactory());
+        $this->client = new HttpMethodsClient(new PluginClient($client, [new ErrorPlugin()]), $messageFactory ?: MessageFactoryDiscovery::find());
     }
 
     /**

tests/Wallabag/AnnotationBundle/WallabagAnnotationTestCase.php

@@ -5,7 +5,7 @@ namespace Tests\Wallabag\AnnotationBundle;
 use FOS\UserBundle\Model\UserInterface;
 use FOS\UserBundle\Model\UserManager;
 use FOS\UserBundle\Security\LoginManager;
-use Symfony\Bundle\FrameworkBundle\KernelBrowser;
+use Symfony\Bundle\FrameworkBundle\Client;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\BrowserKit\Cookie;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
@@ -14,7 +14,7 @@ use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInt
 abstract class WallabagAnnotationTestCase extends WebTestCase
 {
     /**
-     * @var KernelBrowser
+     * @var Client
      */
     protected $client = null;
 
@@ -42,7 +42,7 @@ abstract class WallabagAnnotationTestCase extends WebTestCase
     }
 
     /**
-     * @return KernelBrowser
+     * @return Client
      */
     protected function createAuthorizedClient()
     {

tests/Wallabag/ApiBundle/Controller/DeveloperControllerTest.php

@@ -104,16 +104,20 @@ class DeveloperControllerTest extends WallabagCoreTestCase
         $this->assertStringContainsString('no_client', $client->getResponse()->getContent());
 
         $this->logInAs('bob');
-        $client->request('POST', '/developer/client/delete/' . $adminApiClient->getId());
+        $client->request('GET', '/developer/client/delete/' . $adminApiClient->getId());
         $this->assertSame(403, $client->getResponse()->getStatusCode());
 
         // Try to remove the admin's client with the good user
         $this->logInAs('admin');
         $crawler = $client->request('GET', '/developer');
 
-        $form = $crawler->filter('form[name=delete-client]')->form();
+        $link = $crawler
+            ->filter('div[class=collapsible-body] p a')
+            ->eq(0)
+            ->link()
+        ;
 
-        $client->submit($form);
+        $client->click($link);
         $this->assertSame(302, $client->getResponse()->getStatusCode());
 
         $this->assertNull(

tests/Wallabag/ApiBundle/WallabagApiTestCase.php

@@ -6,7 +6,7 @@ use Doctrine\ORM\EntityManagerInterface;
 use FOS\UserBundle\Model\UserInterface;
 use FOS\UserBundle\Model\UserManager;
 use FOS\UserBundle\Security\LoginManager;
-use Symfony\Bundle\FrameworkBundle\KernelBrowser;
+use Symfony\Bundle\FrameworkBundle\Client;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\BrowserKit\Cookie;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
@@ -16,7 +16,7 @@ use Wallabag\UserBundle\Entity\User;
 abstract class WallabagApiTestCase extends WebTestCase
 {
     /**
-     * @var KernelBrowser
+     * @var Client
      */
     protected $client = null;
 
@@ -32,7 +32,7 @@ abstract class WallabagApiTestCase extends WebTestCase
     }
 
     /**
-     * @return KernelBrowser
+     * @return Client
      */
     protected function createAuthorizedClient()
     {

tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php

@@ -929,8 +929,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
 
         $this->assertSame(200, $client->getResponse()->getStatusCode());
 
-        $form = $crawler->filter('form[name=reset-annotations]')->form();
-        $client->submit($form);
+        $crawler = $client->click($crawler->selectLink('config.reset.annotations')->link());
 
         $this->assertSame(302, $client->getResponse()->getStatusCode());
         $this->assertStringContainsString('flashes.config.notice.annotations_reset', $client->getContainer()->get(SessionInterface::class)->getFlashBag()->get('notice')[0]);
@@ -946,8 +945,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
 
         $this->assertSame(200, $client->getResponse()->getStatusCode());
 
-        $form = $crawler->filter('form[name=reset-tags]')->form();
-        $client->submit($form);
+        $crawler = $client->click($crawler->selectLink('config.reset.tags')->link());
 
         $this->assertSame(302, $client->getResponse()->getStatusCode());
         $this->assertStringContainsString('flashes.config.notice.tags_reset', $client->getContainer()->get(SessionInterface::class)->getFlashBag()->get('notice')[0]);
@@ -963,8 +961,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
 
         $this->assertSame(200, $client->getResponse()->getStatusCode());
 
-        $form = $crawler->filter('form[name=reset-entries]')->form();
-        $client->submit($form);
+        $crawler = $client->click($crawler->selectLink('config.reset.entries')->link());
 
         $this->assertSame(302, $client->getResponse()->getStatusCode());
         $this->assertStringContainsString('flashes.config.notice.entries_reset', $client->getContainer()->get(SessionInterface::class)->getFlashBag()->get('notice')[0]);
@@ -1030,8 +1027,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
 
         $this->assertSame(200, $client->getResponse()->getStatusCode());
 
-        $form = $crawler->filter('form[name=reset-archived]')->form();
-        $client->submit($form);
+        $crawler = $client->click($crawler->selectLink('config.reset.archived')->link());
 
         $this->assertSame(302, $client->getResponse()->getStatusCode());
         $this->assertStringContainsString('flashes.config.notice.archived_reset', $client->getContainer()->get(SessionInterface::class)->getFlashBag()->get('notice')[0]);
@@ -1090,8 +1086,7 @@ class ConfigControllerTest extends WallabagCoreTestCase
 
         $this->assertSame(200, $client->getResponse()->getStatusCode());
 
-        $form = $crawler->filter('form[name=reset-entries]')->form();
-        $client->submit($form);
+        $crawler = $client->click($crawler->selectLink('config.reset.entries')->link());
 
         $this->assertSame(302, $client->getResponse()->getStatusCode());
         $this->assertStringContainsString('flashes.config.notice.entries_reset', $client->getContainer()->get(SessionInterface::class)->getFlashBag()->get('notice')[0]);

tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php

@@ -1654,7 +1654,7 @@ class EntryControllerTest extends WallabagCoreTestCase
         // As long as the deletion link of a tag is following
         // a link to the tag view, we take the second one to retrieve
         // the deletion link of the first tag
-        $link = $crawler->filter('body div#article div.tools ul.tags li.chip a')->extract(['href'])[1];
+        $link = $crawler->filter('body div#article div.tools ul.tags li.chip a')->extract('href')[1];
 
         $this->assertSame(sprintf('/remove-tag/%s/%s', $entry->getId(), $tag->getId()), $link);
     }

tests/Wallabag/CoreBundle/Controller/SiteCredentialControllerTest.php

@@ -4,7 +4,7 @@ namespace Tests\Wallabag\CoreBundle\Controller;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
-use Symfony\Bundle\FrameworkBundle\KernelBrowser;
+use Symfony\Bundle\FrameworkBundle\Client;
 use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 use Wallabag\CoreBundle\Entity\SiteCredential;
 
@@ -139,7 +139,7 @@ class SiteCredentialControllerTest extends WallabagCoreTestCase
         $this->assertStringContainsString('flashes.site_credential.notice.deleted', $crawler->filter('body')->extract(['_text'])[0]);
     }
 
-    private function createSiteCredential(KernelBrowser $client)
+    private function createSiteCredential(Client $client)
     {
         $credential = new SiteCredential($this->getLoggedInUser());
         $credential->setHost('google.io');

tests/Wallabag/CoreBundle/Controller/TagControllerTest.php

@@ -124,7 +124,7 @@ class TagControllerTest extends WallabagCoreTestCase
 
         // We make a first request to set an history and test redirection after tag deletion
         $client->request('GET', '/view/' . $entry->getId());
-        $entryUri = $client->getRequest()->getRequestUri();
+        $entryUri = $client->getRequest()->getUri();
         $client->request('GET', '/remove-tag/' . $entry->getId() . '/' . $tag->getId());
 
         $this->assertSame(302, $client->getResponse()->getStatusCode());

tests/Wallabag/CoreBundle/Event/Listener/LocaleListenerTest.php

@@ -7,7 +7,7 @@ use Symfony\Component\EventDispatcher\EventDispatcher;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Session\Session;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
-use Symfony\Component\HttpKernel\Event\RequestEvent;
+use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Wallabag\CoreBundle\Event\Listener\LocaleListener;
@@ -82,6 +82,6 @@ class LocaleListenerTest extends TestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        return new RequestEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST);
+        return new GetResponseEvent($kernel, $request, HttpKernelInterface::MASTER_REQUEST);
     }
 }

tests/Wallabag/CoreBundle/WallabagCoreTestCase.php

@@ -3,8 +3,8 @@
 namespace Tests\Wallabag\CoreBundle;
 
 use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Client;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Symfony\Bundle\FrameworkBundle\KernelBrowser;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 use Symfony\Component\BrowserKit\Cookie;
 use Symfony\Component\Console\Input\ArrayInput;
@@ -16,14 +16,12 @@ use Wallabag\UserBundle\Entity\User;
 abstract class WallabagCoreTestCase extends WebTestCase
 {
     /**
-     * @var KernelBrowser|null
+     * @var Client|null
      */
     private $client = null;
 
     protected function setUp(): void
     {
-        static::ensureKernelShutdown();
-
         parent::setUp();
 
         $this->client = static::createClient();
@@ -31,8 +29,6 @@ abstract class WallabagCoreTestCase extends WebTestCase
 
     public function getNewClient()
     {
-        static::ensureKernelShutdown();
-
         return $this->client = static::createClient();
     }
 
@@ -41,7 +37,7 @@ abstract class WallabagCoreTestCase extends WebTestCase
         return $this->client;
     }
 
-    public function resetDatabase(KernelBrowser $client)
+    public function resetDatabase(Client $client)
     {
         $application = new Application($client->getKernel());
         $application->setAutoExit(false);

tests/Wallabag/UserBundle/Controller/ManageControllerTest.php

@@ -74,7 +74,7 @@ class ManageControllerTest extends WallabagCoreTestCase
         $client = $this->getTestClient();
 
         $crawler = $client->request('GET', '/users/' . $this->getLoggedInUserId() . '/edit');
-        $disabled = $crawler->selectButton('user.form.delete')->extract(['disabled']);
+        $disabled = $crawler->selectButton('user.form.delete')->extract('disabled');
 
         $this->assertSame('disabled', $disabled[0]);
     }

translations/messages.en.yml

@@ -320,7 +320,6 @@ entry:
         delete: Are you sure you want to remove that article?
         delete_tag: Are you sure you want to remove that tag from that article?
         delete_entries: Are you sure you want to remove these articles?
-        reload: Are you sure you want to reload that article?
     metadata:
         reading_time: Estimated reading time
         reading_time_minutes_short: '%readingTime% min'

translations/messages.hr.yml

@@ -551,7 +551,6 @@ entry:
         delete: Stvarno želiš ukloniti taj članak?
         delete_tag: Stvarno želiš ukloniti tu oznaku za taj članak?
         delete_entries: Stvarno želiš ukloniti ove članke?
-        reload: Stvarno želiš ponovo učitati taj članak?
     edit:
         title_label: Naslov
         url_label: Url

translations/messages.pl.yml

@@ -336,7 +336,6 @@ entry:
         delete: Czy jesteś pewien, że chcesz usunąć ten artykuł?
         delete_tag: Czy jesteś pewien, że chcesz usunąć ten tag z tego artykułu?
         delete_entries: Czy na pewno chcesz usunąć te artykuły?
-        reload: Czy na pewno chcesz ponownie załadować ten artykuł?
     metadata:
         reading_time: Szacowany czas czytania
         reading_time_minutes_short: '%readingTime% min'

web/app_dev.php

@@ -1,6 +1,6 @@
 <?php
 
-use Symfony\Component\ErrorHandler\Debug;
+use Symfony\Component\Debug\Debug;
 use Symfony\Component\HttpFoundation\Request;
 
 // If you don't want to setup permissions the proper way, just uncomment the following PHP line