Merge pull request #7274 from yguedidi/move-to-bundle-less

Move to bundle-less

.gitignore

@@ -49,8 +49,6 @@ data/db/wallabag*.sqlite
 node_modules/
 bin
 app/Resources/build/
-!/src/Wallabag/CoreBundle/Resources/public
-/src/Wallabag/CoreBundle/Resources/public/*
 package-lock.json
 
 # Test-generated files

RELEASE_PROCESS.md

@@ -9,7 +9,7 @@ During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE` (li
 #### Prepare the release
 
 - Update these files with new information
-    - `app/config/wallabag.yml` (`wallabag_core.version`)
+    - `app/config/wallabag.yml` (`wallabag.version`)
     - `CHANGELOG.md`
 - Create a PR named "Prepare $LAST_WALLABAG_RELEASE release".
 - Wait for test to be ok, merge it.
@@ -19,7 +19,7 @@ During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE` (li
 - [Create the new release on GitHub](https://github.com/wallabag/wallabag/releases/new) by targetting the `master` branch or any appropriate branch (for instance backports).
 - Update [website](https://github.com/wallabag/website) to change MD5 sum and create the release blog post (based on the changelog).
 - Update Dockerfile https://github.com/wallabag/docker (and create a new tag)
-- Put the next patch version suffixed with `-dev` in `app/config/wallabag.yml` (`wallabag_core.version`)
+- Put the next patch version suffixed with `-dev` in `app/config/wallabag.yml` (`wallabag.version`)
 - Drink a :beer:!
 
 ### Target PHP version

app/AppKernel.php

@@ -3,6 +3,7 @@
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel;
+use Wallabag\Import\ImportCompilerPass;
 
 class AppKernel extends Kernel
 {
@@ -34,9 +35,6 @@ class AppKernel extends Kernel
             new Http\HttplugBundle\HttplugBundle(),
             new Sentry\SentryBundle\SentryBundle(),
             new Twig\Extra\TwigExtraBundle\TwigExtraBundle(),
-
-            // wallabag bundles
-            new Wallabag\CoreBundle\WallabagCoreBundle(),
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
@@ -98,6 +96,11 @@ class AppKernel extends Kernel
         });
     }
 
+    protected function build(ContainerBuilder $container)
+    {
+        $container->addCompilerPass(new ImportCompilerPass());
+    }
+
     private function processDatabaseParameters(ContainerBuilder $container)
     {
         switch ($container->getParameter('database_driver')) {

app/DoctrineMigrations/Version20160401000000.php

@@ -6,7 +6,7 @@ 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;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Initial database structure.

app/DoctrineMigrations/Version20160410190541.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Added foreign keys for account resetting.

app/DoctrineMigrations/Version20160812120952.php

@@ -4,7 +4,7 @@ namespace Application\Migrations;
 
 use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Added name field on wallabag_oauth2_clients.

app/DoctrineMigrations/Version20160911214952.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Added settings for RabbitMQ and Redis imports.

app/DoctrineMigrations/Version20160916201049.php

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

app/DoctrineMigrations/Version20161001072726.php

@@ -7,7 +7,7 @@ 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;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Added pocket_consumer_key field on wallabag_config.

app/DoctrineMigrations/Version20161022134138.php

@@ -4,7 +4,7 @@ namespace Application\Migrations;
 
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Converted database to utf8mb4 encoding (for MySQL only).

app/DoctrineMigrations/Version20161024212538.php

@@ -4,7 +4,7 @@ namespace Application\Migrations;
 
 use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Added user_id column on oauth2_clients to prevent users to delete API clients from other users.

app/DoctrineMigrations/Version20161031132655.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Added the internal setting to enable/disable downloading pictures.

app/DoctrineMigrations/Version20161104073720.php

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

app/DoctrineMigrations/Version20161106113822.php

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

app/DoctrineMigrations/Version20161117071626.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Added the internal setting to share articles to unmark.it.

app/DoctrineMigrations/Version20161118134328.php

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

app/DoctrineMigrations/Version20161122144743.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Add the restricted_access internal setting for articles with paywall.

app/DoctrineMigrations/Version20161122203647.php

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

app/DoctrineMigrations/Version20161128084725.php

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

app/DoctrineMigrations/Version20161128131503.php

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

app/DoctrineMigrations/Version20161214094402.php

@@ -6,7 +6,7 @@ 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;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Renamed uuid to uid in entry table.

app/DoctrineMigrations/Version20161214094403.php

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

app/DoctrineMigrations/Version20170127093841.php

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

app/DoctrineMigrations/Version20170327194233.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Add the share_scuttle internal setting.

app/DoctrineMigrations/Version20170405182620.php

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

app/DoctrineMigrations/Version20170407200919.php

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

app/DoctrineMigrations/Version20170420134133.php

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

app/DoctrineMigrations/Version20170501115751.php

@@ -4,7 +4,7 @@ namespace Application\Migrations;
 
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Add site credential table to store username & password for some website (behind authentication or paywall).

app/DoctrineMigrations/Version20170510082609.php

@@ -4,7 +4,7 @@ namespace Application\Migrations;
 
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Changed length for username, username_canonical, email and email_canonical fields in wallabag_user table.

app/DoctrineMigrations/Version20170511115400.php

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

app/DoctrineMigrations/Version20170511211659.php

@@ -7,7 +7,7 @@ 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;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Increase the length of the "quote" column of "annotation" table.

app/DoctrineMigrations/Version20170602075214.php

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

app/DoctrineMigrations/Version20170606155640.php

@@ -3,7 +3,7 @@
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Remove wallabag_url from craue_config_setting.

app/DoctrineMigrations/Version20170719231144.php

@@ -4,7 +4,7 @@ namespace Application\Migrations;
 
 use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Changed tags to lowercase.

app/DoctrineMigrations/Version20170824113337.php

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

app/DoctrineMigrations/Version20171008195606.php

@@ -6,7 +6,7 @@ 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;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Changed reading_time field to prevent null value.

app/DoctrineMigrations/Version20171105202000.php

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

app/DoctrineMigrations/Version20171120163128.php

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

app/DoctrineMigrations/Version20171125164500.php

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

app/DoctrineMigrations/Version20180405182455.php

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

app/DoctrineMigrations/Version20181128203230.php

@@ -4,7 +4,7 @@ namespace Application\Migrations;
 
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Fix varchar field from vendor to work with utf8mb4.

app/DoctrineMigrations/Version20181202073750.php

@@ -6,7 +6,7 @@ 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;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Add 2fa OTP stuff.

app/DoctrineMigrations/Version20190117131816.php

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

app/DoctrineMigrations/Version20190129120000.php

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

app/DoctrineMigrations/Version20190401105353.php

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

app/DoctrineMigrations/Version20190425115043.php

@@ -6,7 +6,7 @@ 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;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Rename rss_token & rss_limit to feed_token & feed_limit.

app/DoctrineMigrations/Version20190510141130.php

@@ -7,7 +7,7 @@ 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;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Enable cascade delete when deleting a user on:

app/DoctrineMigrations/Version20190511165128.php

@@ -6,7 +6,7 @@ namespace Application\Migrations;
 
 use Doctrine\DBAL\Platforms\MySQLPlatform;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Convert tab label to utf8mb4_bin (MySQL only).

app/DoctrineMigrations/Version20190601125843.php

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

app/DoctrineMigrations/Version20190619093534.php

@@ -4,7 +4,7 @@ namespace Application\Migrations;
 
 use Doctrine\DBAL\Platforms\SqlitePlatform;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Change reading_time field on SQLite to be integer NOT NULL

app/DoctrineMigrations/Version20190708122957.php

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

app/DoctrineMigrations/Version20190806130304.php

@@ -6,7 +6,7 @@ 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;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Adding more index to kill some slow queries:

app/DoctrineMigrations/Version20190808124957.php

@@ -6,7 +6,7 @@ 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;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Change the internal setting table name.

app/DoctrineMigrations/Version20190826204730.php

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

app/DoctrineMigrations/Version20200414120227.php

@@ -4,7 +4,7 @@ namespace Application\Migrations;
 
 use Doctrine\DBAL\Migrations\SkipMigrationException;
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Remove baggy theme.

app/DoctrineMigrations/Version20200428072628.php

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

app/DoctrineMigrations/Version20221123132612.php

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

app/DoctrineMigrations/Version20221221092957.php

@@ -6,7 +6,7 @@ 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;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Remove the deprecated (and removed in DBAL v3) `json_array` type.

app/DoctrineMigrations/Version20230613121354.php

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

app/DoctrineMigrations/Version20230728085538.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Remove demonstration mode settings.

app/DoctrineMigrations/Version20230728091417.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Remove mobi export.

app/DoctrineMigrations/Version20230728093912.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Add is_not_parsed field to entry table.
@@ -37,7 +37,7 @@ final class Version20230728093912 extends WallabagMigration
             'UPDATE ' . $this->getTable('entry') . ' SET is_not_parsed = :isNotParsed WHERE content LIKE :content',
             [
                 'isNotParsed' => true,
-                'content' => str_replace("\n", '', addslashes($this->container->getParameter('wallabag_core.fetching_error_message'))) . '%',
+                'content' => str_replace("\n", '', addslashes($this->container->getParameter('wallabag.fetching_error_message'))) . '%',
             ]
         );
     }

app/DoctrineMigrations/Version20230729093853.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace Application\Migrations;
 
 use Doctrine\DBAL\Schema\Schema;
-use Wallabag\CoreBundle\Doctrine\WallabagMigration;
+use Wallabag\Doctrine\WallabagMigration;
 
 /**
  * Add custom_css column to config table.

app/config/config.yml

@@ -61,13 +61,20 @@ doctrine:
     dbal:
         url: '%env(resolve:DATABASE_URL)%'
         types:
-            json_array: Wallabag\CoreBundle\Doctrine\JsonArrayType
+            json_array: Wallabag\Doctrine\JsonArrayType
 
     orm:
         auto_generate_proxy_classes: "%kernel.debug%"
         entity_managers:
             default:
                 auto_mapping: true
+                mappings:
+                    Wallabag:
+                        type: annotation
+                        is_bundle: false
+                        dir: '%kernel.project_dir%/src/Entity'
+                        prefix: 'Wallabag\Entity'
+                        alias: Wallabag
 
 stof_doctrine_extensions:
     default_locale: "%locale%"
@@ -170,7 +177,7 @@ nelmio_cors:
 fos_user:
     db_driver: orm
     firewall_name: secured_area
-    user_class: Wallabag\CoreBundle\Entity\User
+    user_class: Wallabag\Entity\User
     registration:
         confirmation:
             enabled: "%fosuser_confirmation%"
@@ -178,14 +185,14 @@ fos_user:
         address: "%from_email%"
         sender_name: wallabag
     service:
-        mailer: Wallabag\CoreBundle\Mailer\UserMailer
+        mailer: Wallabag\Mailer\UserMailer
 
 fos_oauth_server:
     db_driver:           orm
-    client_class:        Wallabag\CoreBundle\Entity\Api\Client
+    client_class:        Wallabag\Entity\Api\Client
-    access_token_class:  Wallabag\CoreBundle\Entity\Api\AccessToken
+    access_token_class:  Wallabag\Entity\Api\AccessToken
-    refresh_token_class: Wallabag\CoreBundle\Entity\Api\RefreshToken
+    refresh_token_class: Wallabag\Entity\Api\RefreshToken
-    auth_code_class:     Wallabag\CoreBundle\Entity\Api\AuthCode
+    auth_code_class:     Wallabag\Entity\Api\AuthCode
     service:
         user_provider: fos_user.user_provider.username_email
         options:
@@ -211,7 +218,7 @@ scheb_two_factor:
         sender_email: "%twofactor_sender%"
         digits: 6
         template: "Authentication/form.html.twig"
-        mailer: Wallabag\CoreBundle\Mailer\AuthCodeMailer
+        mailer: Wallabag\Mailer\AuthCodeMailer
 
 rulerz:
     targets:
@@ -295,7 +302,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.pocket'
-            callback: wallabag_core.consumer.amqp.pocket
+            callback: wallabag.consumer.amqp.pocket
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_readability:
             connection: default
@@ -304,7 +311,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.readability'
-            callback: wallabag_core.consumer.amqp.readability
+            callback: wallabag.consumer.amqp.readability
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_instapaper:
             connection: default
@@ -313,7 +320,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.instapaper'
-            callback: wallabag_core.consumer.amqp.instapaper
+            callback: wallabag.consumer.amqp.instapaper
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_pinboard:
             connection: default
@@ -322,7 +329,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.pinboard'
-            callback: wallabag_core.consumer.amqp.pinboard
+            callback: wallabag.consumer.amqp.pinboard
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_delicious:
             connection: default
@@ -331,7 +338,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.delicious'
-            callback: wallabag_core.consumer.amqp.delicious
+            callback: wallabag.consumer.amqp.delicious
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_wallabag_v1:
             connection: default
@@ -340,7 +347,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.wallabag_v1'
-            callback: wallabag_core.consumer.amqp.wallabag_v1
+            callback: wallabag.consumer.amqp.wallabag_v1
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_wallabag_v2:
             connection: default
@@ -349,7 +356,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.wallabag_v2'
-            callback: wallabag_core.consumer.amqp.wallabag_v2
+            callback: wallabag.consumer.amqp.wallabag_v2
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_elcurator:
             connection: default
@@ -358,7 +365,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.elcurator'
-            callback: wallabag_core.consumer.amqp.elcurator
+            callback: wallabag.consumer.amqp.elcurator
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_firefox:
             connection: default
@@ -367,7 +374,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.firefox'
-            callback: wallabag_core.consumer.amqp.firefox
+            callback: wallabag.consumer.amqp.firefox
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_chrome:
             connection: default
@@ -376,7 +383,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.chrome'
-            callback: wallabag_core.consumer.amqp.chrome
+            callback: wallabag.consumer.amqp.chrome
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_shaarli:
             connection: default
@@ -385,7 +392,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.shaarli'
-            callback: wallabag_core.consumer.amqp.shaarli
+            callback: wallabag.consumer.amqp.shaarli
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
         import_pocket_html:
             connection: default
@@ -394,7 +401,7 @@ old_sound_rabbit_mq:
                 type: topic
             queue_options:
                 name: 'wallabag.import.pocket_html'
-            callback: wallabag_core.consumer.amqp.pocket_html
+            callback: wallabag.consumer.amqp.pocket_html
             qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
 
 fos_js_routing:
@@ -425,8 +432,8 @@ sensio_framework_extra:
 
 httplug:
     clients:
-        wallabag_core:
+        wallabag:
-            factory: Wallabag\CoreBundle\Helper\HttpClientFactory
+            factory: Wallabag\Helper\HttpClientFactory
             config:
                 defaults:
                     timeout: 10
@@ -436,7 +443,7 @@ httplug:
 
 # define custom entity so we can override length attribute to fix utf8mb4 issue
 craue_config:
-    entity_name: Wallabag\CoreBundle\Entity\InternalSetting
+    entity_name: Wallabag\Entity\InternalSetting
 
 when@dev:
     maker:

app/config/routing.yml

@@ -1,5 +1,5 @@
 app:
-    resource: "@WallabagCoreBundle/Controller/"
+    resource: ../../src/Controller/
     type: annotation
 
 doc-api:
@@ -9,7 +9,7 @@ doc-api:
 homepage:
     path: "/{page}"
     defaults:
-        _controller: 'Wallabag\CoreBundle\Controller\EntryController::showUnreadAction'
+        _controller: 'Wallabag\Controller\EntryController::showUnreadAction'
         page : 1
     requirements:
         page: \d+

app/config/security.yml

@@ -9,7 +9,7 @@ security:
     providers:
         administrators:
             entity:
-                class: 'Wallabag\CoreBundle\Entity\User'
+                class: 'Wallabag\Entity\User'
                 property: username
         fos_userbundle:
             id: fos_user.user_provider.username_email

app/config/services.yml

@@ -4,7 +4,7 @@ imports:
     - { resource: parameters_addons.yml }
 
 parameters:
-    spiriit_form_filter.get_filter.doctrine_orm.class: Wallabag\CoreBundle\Event\Subscriber\CustomDoctrineORMSubscriber
+    spiriit_form_filter.get_filter.doctrine_orm.class: Wallabag\Event\Subscriber\CustomDoctrineORMSubscriber
 
 services:
     _defaults:
@@ -17,11 +17,11 @@ services:
             $defaultLocale: '%kernel.default_locale%'
             $wallabagUrl: '%domain_name%'
             $tablePrefix: "%database_table_prefix%"
-            $encryptionKeyPath: "%wallabag_core.site_credentials.encryption_key_path%"
+            $encryptionKeyPath: "%wallabag.site_credentials.encryption_key_path%"
-            $fetchingErrorMessageTitle: "%wallabag_core.fetching_error_message_title%"
+            $fetchingErrorMessageTitle: "%wallabag.fetching_error_message_title%"
-            $fetchingErrorMessage: '%wallabag_core.fetching_error_message%'
+            $fetchingErrorMessage: '%wallabag.fetching_error_message%'
-            $languages: '%wallabag_core.languages%'
+            $languages: '%wallabag.languages%'
-            $lifeTime: '%wallabag_core.cache_lifetime%'
+            $lifeTime: '%wallabag.cache_lifetime%'
             $cookieFile: "%kernel.cache_dir%/cookiejar.json"
             $logoPath: 'web/img/appicon/apple-touch-icon-152.png'
             $registrationEnabled: '%fosuser_registration%'
@@ -30,78 +30,78 @@ services:
             $senderName: "%scheb_two_factor.email.sender_name%"
             $storeArticleHeaders: '@=service(''craue_config'').get(''store_article_headers'')'
             $supportUrl: '@=service(''craue_config'').get(''wallabag_support_url'')'
-            $fonts: '%wallabag_core.fonts%'
+            $fonts: '%wallabag.fonts%'
 
-    Wallabag\CoreBundle\:
+    Wallabag\:
-        resource: '../../src/Wallabag/CoreBundle/*'
+        resource: '../../src/*'
-        exclude: ['../../src/Wallabag/CoreBundle/{Consumer,Controller,Entity,ExpressionLanguage,DataFixtures,Redis}', '../../src/Wallabag/CoreBundle/Event/*Event.php']
+        exclude: ['../../src/{Consumer,Controller,Entity,ExpressionLanguage,DataFixtures,Redis}', '../../src/Event/*Event.php']
 
     # controllers are imported separately to make sure services can be injected
     # as action arguments even if you don't extend any base controller class
-    Wallabag\CoreBundle\Controller\:
+    Wallabag\Controller\:
-        resource: '../../src/Wallabag/CoreBundle/Controller/'
+        resource: '../../src/Controller/'
         tags: ['controller.service_arguments']
 
     # inject alias service into controllers
-    Wallabag\CoreBundle\Controller\Import\ChromeController:
+    Wallabag\Controller\Import\ChromeController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_chrome_producer'
-            $redisProducer: '@wallabag_core.producer.redis.chrome'
+            $redisProducer: '@wallabag.producer.redis.chrome'
 
-    Wallabag\CoreBundle\Controller\Import\DeliciousController:
+    Wallabag\Controller\Import\DeliciousController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_delicious_producer'
-            $redisProducer: '@wallabag_core.producer.redis.delicious'
+            $redisProducer: '@wallabag.producer.redis.delicious'
 
-    Wallabag\CoreBundle\Controller\Import\ElcuratorController:
+    Wallabag\Controller\Import\ElcuratorController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_elcurator_producer'
-            $redisProducer: '@wallabag_core.producer.redis.elcurator'
+            $redisProducer: '@wallabag.producer.redis.elcurator'
 
-    Wallabag\CoreBundle\Controller\Import\FirefoxController:
+    Wallabag\Controller\Import\FirefoxController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_firefox_producer'
-            $redisProducer: '@wallabag_core.producer.redis.firefox'
+            $redisProducer: '@wallabag.producer.redis.firefox'
 
-    Wallabag\CoreBundle\Controller\Import\InstapaperController:
+    Wallabag\Controller\Import\InstapaperController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_instapaper_producer'
-            $redisProducer: '@wallabag_core.producer.redis.instapaper'
+            $redisProducer: '@wallabag.producer.redis.instapaper'
 
-    Wallabag\CoreBundle\Controller\Import\PinboardController:
+    Wallabag\Controller\Import\PinboardController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_pinboard_producer'
-            $redisProducer: '@wallabag_core.producer.redis.pinboard'
+            $redisProducer: '@wallabag.producer.redis.pinboard'
 
-    Wallabag\CoreBundle\Controller\Import\PocketController:
+    Wallabag\Controller\Import\PocketController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_pocket_producer'
-            $redisProducer: '@wallabag_core.producer.redis.pocket'
+            $redisProducer: '@wallabag.producer.redis.pocket'
 
-    Wallabag\CoreBundle\Controller\Import\ReadabilityController:
+    Wallabag\Controller\Import\ReadabilityController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_readability_producer'
-            $redisProducer: '@wallabag_core.producer.redis.readability'
+            $redisProducer: '@wallabag.producer.redis.readability'
 
-    Wallabag\CoreBundle\Controller\Import\WallabagV1Controller:
+    Wallabag\Controller\Import\WallabagV1Controller:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_wallabag_v1_producer'
-            $redisProducer: '@wallabag_core.producer.redis.wallabag_v1'
+            $redisProducer: '@wallabag.producer.redis.wallabag_v1'
 
-    Wallabag\CoreBundle\Controller\Import\WallabagV2Controller:
+    Wallabag\Controller\Import\WallabagV2Controller:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_wallabag_v2_producer'
-            $redisProducer: '@wallabag_core.producer.redis.wallabag_v2'
+            $redisProducer: '@wallabag.producer.redis.wallabag_v2'
 
-    Wallabag\CoreBundle\Controller\Import\ShaarliController:
+    Wallabag\Controller\Import\ShaarliController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_shaarli_producer'
-            $redisProducer: '@wallabag_core.producer.redis.shaarli'
+            $redisProducer: '@wallabag.producer.redis.shaarli'
 
-    Wallabag\CoreBundle\Controller\Import\PocketHtmlController:
+    Wallabag\Controller\Import\PocketHtmlController:
         arguments:
             $rabbitMqProducer: '@old_sound_rabbit_mq.import_pocket_html_producer'
-            $redisProducer: '@wallabag_core.producer.redis.pocket_html'
+            $redisProducer: '@wallabag.producer.redis.pocket_html'
 
     Doctrine\DBAL\Connection:
         alias: doctrine.dbal.default_connection
@@ -154,7 +154,7 @@ services:
     ScssPhp\ScssPhp\Compiler:
         public: false
 
-    Wallabag\CoreBundle\Event\Listener\UserLocaleListener:
+    Wallabag\Event\Listener\UserLocaleListener:
         tags:
             - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }
 
@@ -166,19 +166,19 @@ services:
             $defaultLifetime: 0
             $directory: '%kernel.cache_dir%'
 
-    Wallabag\CoreBundle\ParamConverter\UsernameFeedTokenConverter:
+    Wallabag\ParamConverter\UsernameFeedTokenConverter:
         tags:
             - { name: request.param_converter, converter: username_feed_token_converter }
 
-    Wallabag\CoreBundle\Event\Subscriber\TablePrefixSubscriber:
+    Wallabag\Event\Subscriber\TablePrefixSubscriber:
         tags:
             - { name: doctrine.event_subscriber }
 
     Graby\Graby:
         arguments:
             $config:
-                error_message: '%wallabag_core.fetching_error_message%'
+                error_message: '%wallabag.fetching_error_message%'
-                error_message_title: '%wallabag_core.fetching_error_message_title%'
+                error_message_title: '%wallabag.fetching_error_message_title%'
         calls:
             - [ setLogger, [ "@logger" ] ]
         tags:
@@ -188,45 +188,45 @@ services:
         arguments:
             $config: {}
 
-    wallabag_core.http_client:
+    wallabag.http_client:
-        alias: 'httplug.client.wallabag_core'
+        alias: 'httplug.client.wallabag'
 
-    Wallabag\CoreBundle\SiteConfig\GrabySiteConfigBuilder:
+    Wallabag\SiteConfig\GrabySiteConfigBuilder:
         tags:
             - { name: monolog.logger, channel: graby }
 
     # service alias override
-    Wallabag\CoreBundle\SiteConfig\SiteConfigBuilder:
+    Wallabag\SiteConfig\SiteConfigBuilder:
-        alias: Wallabag\CoreBundle\SiteConfig\GrabySiteConfigBuilder
+        alias: Wallabag\SiteConfig\GrabySiteConfigBuilder
 
     GuzzleHttp\Cookie\CookieJar:
-        alias: 'Wallabag\CoreBundle\Helper\FileCookieJar'
+        alias: 'Wallabag\Helper\FileCookieJar'
 
-    Wallabag\CoreBundle\Helper\HttpClientFactory:
+    Wallabag\Helper\HttpClientFactory:
         calls:
-            - ['addSubscriber', ['@Wallabag\CoreBundle\Guzzle\AuthenticatorSubscriber']]
+            - ['addSubscriber', ['@Wallabag\Guzzle\AuthenticatorSubscriber']]
-            - ['addSubscriber', ['@Wallabag\CoreBundle\Guzzle\FixupMondeDiplomatiqueUriSubscriber']]
+            - ['addSubscriber', ['@Wallabag\Guzzle\FixupMondeDiplomatiqueUriSubscriber']]
 
     RulerZ\RulerZ:
         alias: rulerz
 
-    Wallabag\CoreBundle\Operator\PHP\Matches:
+    Wallabag\Operator\PHP\Matches:
         tags:
             - { name: rulerz.operator, target: native, operator: matches }
 
-    Wallabag\CoreBundle\Operator\Doctrine\Matches:
+    Wallabag\Operator\Doctrine\Matches:
         tags:
             - { name: rulerz.operator, target: doctrine, operator: matches, inline: true }
 
-    Wallabag\CoreBundle\Operator\PHP\NotMatches:
+    Wallabag\Operator\PHP\NotMatches:
         tags:
             - { name: rulerz.operator, target: native, operator: notmatches }
 
-    Wallabag\CoreBundle\Operator\Doctrine\NotMatches:
+    Wallabag\Operator\Doctrine\NotMatches:
         tags:
             - { name: rulerz.operator, target: doctrine, operator: notmatches, inline: true }
 
-    Wallabag\CoreBundle\Operator\PHP\PatternMatches:
+    Wallabag\Operator\PHP\PatternMatches:
         tags:
             - { name: rulerz.operator, target: native, operator: "~" }
 
@@ -239,26 +239,26 @@ services:
                 path: '%redis_path%'
                 password: '%redis_password%'
 
-    Wallabag\CoreBundle\Event\Subscriber\SQLiteCascadeDeleteSubscriber:
+    Wallabag\Event\Subscriber\SQLiteCascadeDeleteSubscriber:
         tags:
             - { name: doctrine.event_subscriber }
 
-    Wallabag\CoreBundle\Event\Subscriber\DownloadImagesSubscriber:
+    Wallabag\Event\Subscriber\DownloadImagesSubscriber:
         arguments:
             $enabled: '@=service(''craue_config'').get(''download_images_enabled'')'
 
-    Wallabag\CoreBundle\Helper\DownloadImages:
+    Wallabag\Helper\DownloadImages:
         arguments:
             $baseFolder: "%kernel.project_dir%/web/assets/images"
 
-    Wallabag\CoreBundle\Command\InstallCommand:
+    Wallabag\Command\InstallCommand:
         arguments:
             $databaseDriver: '%database_driver%'
             $databaseName: '%database_name%'
-            $defaultSettings: '%wallabag_core.default_internal_settings%'
+            $defaultSettings: '%wallabag.default_internal_settings%'
-            $defaultIgnoreOriginInstanceRules: '%wallabag_core.default_ignore_origin_instance_rules%'
+            $defaultIgnoreOriginInstanceRules: '%wallabag.default_ignore_origin_instance_rules%'
 
-    Wallabag\CoreBundle\Mailer\UserMailer:
+    Wallabag\Mailer\UserMailer:
         arguments:
             $parameters:
                 template:
@@ -268,69 +268,69 @@ services:
                     confirmation: '%fos_user.registration.confirmation.from_email%'
                     resetting: '%fos_user.resetting.email.from_email%'
 
-    Wallabag\CoreBundle\Event\Listener\CreateConfigListener:
+    Wallabag\Event\Listener\CreateConfigListener:
         arguments:
-            $itemsOnPage: "%wallabag_core.items_on_page%"
+            $itemsOnPage: "%wallabag.items_on_page%"
-            $feedLimit: "%wallabag_core.feed_limit%"
+            $feedLimit: "%wallabag.feed_limit%"
-            $language: "%wallabag_core.language%"
+            $language: "%wallabag.language%"
-            $readingSpeed: "%wallabag_core.reading_speed%"
+            $readingSpeed: "%wallabag.reading_speed%"
-            $actionMarkAsRead: "%wallabag_core.action_mark_as_read%"
+            $actionMarkAsRead: "%wallabag.action_mark_as_read%"
-            $listMode: "%wallabag_core.list_mode%"
+            $listMode: "%wallabag.list_mode%"
-            $displayThumbnails: "%wallabag_core.display_thumbnails%"
+            $displayThumbnails: "%wallabag.display_thumbnails%"
 
-    Wallabag\CoreBundle\Event\Listener\AuthenticationFailureListener:
+    Wallabag\Event\Listener\AuthenticationFailureListener:
         tags:
             - { name: kernel.event_listener, event: security.authentication.failure, method: onAuthenticationFailure }
 
-    Wallabag\CoreBundle\Import\PocketImport:
+    Wallabag\Import\PocketImport:
         calls:
             - [ setClient, [ '@Symfony\Contracts\HttpClient\HttpClientInterface $pocketClient' ] ]
         tags:
-            -  { name: wallabag_core.import, alias: pocket }
+            -  { name: wallabag.import, alias: pocket }
 
-    Wallabag\CoreBundle\Import\WallabagV1Import:
+    Wallabag\Import\WallabagV1Import:
         tags:
-            -  { name: wallabag_core.import, alias: wallabag_v1 }
+            -  { name: wallabag.import, alias: wallabag_v1 }
 
-    Wallabag\CoreBundle\Import\WallabagV2Import:
+    Wallabag\Import\WallabagV2Import:
         tags:
-            -  { name: wallabag_core.import, alias: wallabag_v2 }
+            -  { name: wallabag.import, alias: wallabag_v2 }
 
-    Wallabag\CoreBundle\Import\ElcuratorImport:
+    Wallabag\Import\ElcuratorImport:
         tags:
-            -  { name: wallabag_core.import, alias: elcurator }
+            -  { name: wallabag.import, alias: elcurator }
 
-    Wallabag\CoreBundle\Import\ReadabilityImport:
+    Wallabag\Import\ReadabilityImport:
         tags:
-            -  { name: wallabag_core.import, alias: readability }
+            -  { name: wallabag.import, alias: readability }
 
-    Wallabag\CoreBundle\Import\InstapaperImport:
+    Wallabag\Import\InstapaperImport:
         tags:
-            -  { name: wallabag_core.import, alias: instapaper }
+            -  { name: wallabag.import, alias: instapaper }
 
-    Wallabag\CoreBundle\Import\PinboardImport:
+    Wallabag\Import\PinboardImport:
         tags:
-            -  { name: wallabag_core.import, alias: pinboard }
+            -  { name: wallabag.import, alias: pinboard }
 
-    Wallabag\CoreBundle\Import\DeliciousImport:
+    Wallabag\Import\DeliciousImport:
         tags:
-            -  { name: wallabag_core.import, alias: delicious }
+            -  { name: wallabag.import, alias: delicious }
 
-    Wallabag\CoreBundle\Import\FirefoxImport:
+    Wallabag\Import\FirefoxImport:
         tags:
-            -  { name: wallabag_core.import, alias: firefox }
+            -  { name: wallabag.import, alias: firefox }
 
-    Wallabag\CoreBundle\Import\ChromeImport:
+    Wallabag\Import\ChromeImport:
         tags:
-            -  { name: wallabag_core.import, alias: chrome }
+            -  { name: wallabag.import, alias: chrome }
 
-    Wallabag\CoreBundle\Import\ShaarliImport:
+    Wallabag\Import\ShaarliImport:
         tags:
-            -  { name: wallabag_core.import, alias: shaarli }
+            -  { name: wallabag.import, alias: shaarli }
 
-    Wallabag\CoreBundle\Import\PocketHtmlImport:
+    Wallabag\Import\PocketHtmlImport:
         tags:
-            -  { name: wallabag_core.import, alias: pocket_html }
+            -  { name: wallabag.import, alias: pocket_html }
 
     # to factorize the proximity and bypass translation for prev & next
     pagerfanta.view.default_wallabag:

app/config/services_rabbit.yml

@@ -5,7 +5,7 @@ services:
         autoconfigure: true
         public: true
 
-    Wallabag\CoreBundle\Consumer\RabbitMQConsumerTotalProxy:
+    Wallabag\Consumer\RabbitMQConsumerTotalProxy:
         arguments:
             $pocketConsumer: '@old_sound_rabbit_mq.import_pocket_consumer'
             $readabilityConsumer: '@old_sound_rabbit_mq.import_readability_consumer'
@@ -20,62 +20,62 @@ services:
             $shaarliConsumer: '@old_sound_rabbit_mq.import_shaarli_consumer'
             $pocketHtmlConsumer: '@old_sound_rabbit_mq.import_pocket_html_consumer'
 
-    wallabag_core.consumer.amqp.pocket:
+    wallabag.consumer.amqp.pocket:
-        class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
+        class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\CoreBundle\Import\PocketImport'
+            $import: '@Wallabag\Import\PocketImport'
 
-    wallabag_core.consumer.amqp.readability:
+    wallabag.consumer.amqp.readability:
-        class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
+        class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\CoreBundle\Import\ReadabilityImport'
+            $import: '@Wallabag\Import\ReadabilityImport'
 
-    wallabag_core.consumer.amqp.instapaper:
+    wallabag.consumer.amqp.instapaper:
-        class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
+        class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\CoreBundle\Import\InstapaperImport'
+            $import: '@Wallabag\Import\InstapaperImport'
 
-    wallabag_core.consumer.amqp.pinboard:
+    wallabag.consumer.amqp.pinboard:
-        class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
+        class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\CoreBundle\Import\PinboardImport'
+            $import: '@Wallabag\Import\PinboardImport'
 
-    wallabag_core.consumer.amqp.delicious:
+    wallabag.consumer.amqp.delicious:
-        class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
+        class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\CoreBundle\Import\DeliciousImport'
+            $import: '@Wallabag\Import\DeliciousImport'
 
-    wallabag_core.consumer.amqp.wallabag_v1:
+    wallabag.consumer.amqp.wallabag_v1:
-        class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
+        class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\CoreBundle\Import\WallabagV1Import'
+            $import: '@Wallabag\Import\WallabagV1Import'
 
-    wallabag_core.consumer.amqp.wallabag_v2:
+    wallabag.consumer.amqp.wallabag_v2:
-        class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
+        class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\CoreBundle\Import\WallabagV2Import'
+            $import: '@Wallabag\Import\WallabagV2Import'
 
-    wallabag_core.consumer.amqp.elcurator:
+    wallabag.consumer.amqp.elcurator:
-        class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
+        class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\CoreBundle\Import\ElcuratorImport'
+            $import: '@Wallabag\Import\ElcuratorImport'
 
-    wallabag_core.consumer.amqp.firefox:
+    wallabag.consumer.amqp.firefox:
-        class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
+        class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\CoreBundle\Import\FirefoxImport'
+            $import: '@Wallabag\Import\FirefoxImport'
 
-    wallabag_core.consumer.amqp.chrome:
+    wallabag.consumer.amqp.chrome:
-        class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
+        class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\CoreBundle\Import\ChromeImport'
+            $import: '@Wallabag\Import\ChromeImport'
 
-    wallabag_core.consumer.amqp.shaarli:
+    wallabag.consumer.amqp.shaarli:
-        class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
+        class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\CoreBundle\Import\ShaarliImport'
+            $import: '@Wallabag\Import\ShaarliImport'
 
-    wallabag_core.consumer.amqp.pocket_html:
+    wallabag.consumer.amqp.pocket_html:
-        class: Wallabag\CoreBundle\Consumer\AMQPEntryConsumer
+        class: Wallabag\Consumer\AMQPEntryConsumer
         arguments:
-            $import: '@Wallabag\CoreBundle\Import\PocketHtmlImport'
+            $import: '@Wallabag\Import\PocketHtmlImport'

app/config/services_redis.yml

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

app/config/services_test.yml

@@ -8,12 +8,12 @@ services:
         alias: fos_user.security.login_manager
         public: true
 
-    wallabag_core.entry_repository.test:
+    wallabag.entry_repository.test:
-        alias: Wallabag\CoreBundle\Repository\EntryRepository
+        alias: Wallabag\Repository\EntryRepository
         public: true
 
     wallabag_user.user_repository.test:
-        alias: Wallabag\CoreBundle\Repository\UserRepository
+        alias: Wallabag\Repository\UserRepository
         public: true
 
     filesystem_cache:
@@ -22,7 +22,7 @@ services:
             - "%kernel.cache_dir%/doctrine/metadata"
 
     # fixtures
-    Wallabag\CoreBundle\DataFixtures\:
+    Wallabag\DataFixtures\:
-        resource: '../../src/Wallabag/CoreBundle/DataFixtures/*'
+        resource: '../../src/DataFixtures/*'
         tags: ['doctrine.fixture.orm']
         autowire: true

app/config/wallabag.yml

@@ -1,7 +1,7 @@
-wallabag_core:
+parameters:
-    version: 2.6.8
+    wallabag.version: 2.6.8
-    paypal_url: "https://liberapay.com/wallabag/donate"
+    wallabag.paypal_url: "https://liberapay.com/wallabag/donate"
-    languages:
+    wallabag.languages:
         en: 'English'
         fr: 'Français'
         de: 'Deutsch'
@@ -23,20 +23,20 @@ wallabag_core:
         hr: 'Hrvatski'
         cs: 'Čeština'
         el: 'Ελληνικά'
-    items_on_page: 12
+    wallabag.items_on_page: 12
-    language: '%locale%'
+    wallabag.language: '%locale%'
-    rss_limit: 50
+    wallabag.feed_limit: 50
-    reading_speed: 200
+    wallabag.reading_speed: 200
-    cache_lifetime: 10
+    wallabag.cache_lifetime: 10
-    action_mark_as_read: 1
+    wallabag.action_mark_as_read: 1
-    list_mode: 0
+    wallabag.list_mode: 0
-    display_thumbnails: 1
+    wallabag.display_thumbnails: 1
-    fetching_error_message_title: 'No title found'
+    wallabag.fetching_error_message_title: 'No title found'
-    fetching_error_message: |
+    wallabag.fetching_error_message: |
         wallabag can't retrieve contents for this article. Please <a href="https://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
-    api_limit_mass_actions: 10
+    wallabag.api_limit_mass_actions: 10
-    encryption_key_path: "%kernel.project_dir%/data/site-credentials-secret-key.txt"
+    wallabag.site_credentials.encryption_key_path: "%kernel.project_dir%/data/site-credentials-secret-key.txt"
-    default_internal_settings:
+    wallabag.default_internal_settings:
         -
             name: share_public
             value: 1
@@ -146,14 +146,14 @@ wallabag_core:
             value: 0
             section: entry
 
-    default_ignore_origin_instance_rules:
+    wallabag.default_ignore_origin_instance_rules:
         -
             rule: host = "feedproxy.google.com"
         -
             rule: host = "feeds.reuters.com"
         -
             rule: _all ~ "https?://www\.lemonde\.fr/tiny.*"
-    fonts:
+    wallabag.fonts:
         - 'Sans-serif'
         - 'Serif'
         - 'Atkinson Hyperlegible'
@@ -162,5 +162,5 @@ wallabag_core:
         - 'Montserrat'
         - 'OpenDyslexicRegular'
         - 'Oswald'
-    allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv', 'text/html']
+    wallabag.allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv', 'text/html']
-    resource_dir: "%kernel.project_dir%/web/uploads/import"
+    wallabag.resource_dir: "%kernel.project_dir%/web/uploads/import"

composer.json

@@ -191,7 +191,7 @@
     "prefer-stable": true,
     "autoload": {
         "psr-4": {
-            "Wallabag\\": "src/Wallabag/"
+            "Wallabag\\": "src/"
         },
         "classmap": [
             "app/AppKernel.php",
@@ -200,7 +200,7 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Tests\\": "tests/"
+            "Tests\\Wallabag\\": "tests/"
         },
         "files": [
             "tests/functions.php"

phpstan-baseline.neon

@@ -1,76 +1,76 @@
 parameters:
 	ignoreErrors:
 		-
-			message: "#^Method Wallabag\\\\CoreBundle\\\\Controller\\\\AnnotationController\\:\\:postAnnotationAction\\(\\) should return Symfony\\\\Component\\\\HttpFoundation\\\\JsonResponse but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\<mixed\\>\\.$#"
+			message: "#^Method Wallabag\\\\Controller\\\\AnnotationController\\:\\:postAnnotationAction\\(\\) should return Symfony\\\\Component\\\\HttpFoundation\\\\JsonResponse but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\<mixed\\>\\.$#"
 			count: 1
-			path: src/Wallabag/CoreBundle/Controller/AnnotationController.php
+			path: src/Controller/AnnotationController.php
 
 		-
-			message: "#^Method Wallabag\\\\CoreBundle\\\\Controller\\\\AnnotationController\\:\\:putAnnotationAction\\(\\) should return Symfony\\\\Component\\\\HttpFoundation\\\\JsonResponse but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\<null\\>\\.$#"
+			message: "#^Method Wallabag\\\\Controller\\\\AnnotationController\\:\\:putAnnotationAction\\(\\) should return Symfony\\\\Component\\\\HttpFoundation\\\\JsonResponse but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\<null\\>\\.$#"
 			count: 1
-			path: src/Wallabag/CoreBundle/Controller/AnnotationController.php
+			path: src/Controller/AnnotationController.php
 
 		-
-			message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Entity\\\\RuleInterface\\:\\:getConfig\\(\\)\\.$#"
+			message: "#^Call to an undefined method Wallabag\\\\Entity\\\\RuleInterface\\:\\:getConfig\\(\\)\\.$#"
 			count: 1
-			path: src/Wallabag/CoreBundle/Controller/ConfigController.php
+			path: src/Controller/ConfigController.php
 
 		-
 			message: "#^Method FOS\\\\UserBundle\\\\Model\\\\UserManagerInterface\\:\\:updateUser\\(\\) invoked with 2 parameters, 1 required\\.$#"
 			count: 6
-			path: src/Wallabag/CoreBundle/Controller/ConfigController.php
+			path: src/Controller/ConfigController.php
 
 		-
-			message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#"
+			message: "#^Call to an undefined method Wallabag\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#"
 			count: 1
-			path: src/Wallabag/CoreBundle/Controller/Import/BrowserController.php
+			path: src/Controller/Import/BrowserController.php
 
 		-
-			message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#"
+			message: "#^Call to an undefined method Wallabag\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#"
 			count: 1
-			path: src/Wallabag/CoreBundle/Controller/Import/BrowserController.php
+			path: src/Controller/Import/BrowserController.php
 
 		-
-			message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#"
+			message: "#^Call to an undefined method Wallabag\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#"
 			count: 1
-			path: src/Wallabag/CoreBundle/Controller/Import/HtmlController.php
+			path: src/Controller/Import/HtmlController.php
 
 		-
-			message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#"
+			message: "#^Call to an undefined method Wallabag\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#"
 			count: 1
-			path: src/Wallabag/CoreBundle/Controller/Import/HtmlController.php
+			path: src/Controller/Import/HtmlController.php
 
 		-
-			message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#"
+			message: "#^Call to an undefined method Wallabag\\\\Import\\\\ImportInterface\\:\\:setFilepath\\(\\)\\.$#"
 			count: 1
-			path: src/Wallabag/CoreBundle/Controller/Import/WallabagController.php
+			path: src/Controller/Import/WallabagController.php
 
 		-
-			message: "#^Call to an undefined method Wallabag\\\\CoreBundle\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#"
+			message: "#^Call to an undefined method Wallabag\\\\Import\\\\ImportInterface\\:\\:setUser\\(\\)\\.$#"
 			count: 1
-			path: src/Wallabag/CoreBundle/Controller/Import/WallabagController.php
+			path: src/Controller/Import/WallabagController.php
 
 		-
 			message: "#^Call to an undefined method Spiriit\\\\Bundle\\\\FormFilterBundle\\\\Filter\\\\Query\\\\QueryInterface\\:\\:getExpressionBuilder\\(\\)\\.$#"
 			count: 1
-			path: src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php
+			path: src/Event/Subscriber/CustomDoctrineORMSubscriber.php
 
 		-
 			message: "#^Call to an undefined method Spiriit\\\\Bundle\\\\FormFilterBundle\\\\Filter\\\\Query\\\\QueryInterface\\:\\:getExpr\\(\\)\\.$#"
 			count: 10
-			path: src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
+			path: src/Form/Type/EntryFilterType.php
 
 		-
 			message: "#^Call to an undefined method Scheb\\\\TwoFactorBundle\\\\Model\\\\Email\\\\TwoFactorInterface\\:\\:getName\\(\\)\\.$#"
 			count: 2
-			path: src/Wallabag/CoreBundle/Mailer/AuthCodeMailer.php
+			path: src/Mailer/AuthCodeMailer.php
 
 		-
-			message: "#^PHPDoc type Symfony\\\\Component\\\\Mailer\\\\MailerInterface of property Wallabag\\\\CoreBundle\\\\Mailer\\\\UserMailer\\:\\:\\$mailer is not covariant with PHPDoc type Swift_Mailer of overridden property FOS\\\\UserBundle\\\\Mailer\\\\TwigSwiftMailer\\:\\:\\$mailer\\.$#"
+			message: "#^PHPDoc type Symfony\\\\Component\\\\Mailer\\\\MailerInterface of property Wallabag\\\\Mailer\\\\UserMailer\\:\\:\\$mailer is not covariant with PHPDoc type Swift_Mailer of overridden property FOS\\\\UserBundle\\\\Mailer\\\\TwigSwiftMailer\\:\\:\\$mailer\\.$#"
 			count: 1
-			path: src/Wallabag/CoreBundle/Mailer/UserMailer.php
+			path: src/Mailer/UserMailer.php
 
 		-
 			message: "#^Call to an undefined method DOMNode\\:\\:getAttribute\\(\\)\\.$#"
 			count: 1
-			path: tests/Wallabag/CoreBundle/Controller/FeedControllerTest.php
+			path: tests/Controller/FeedControllerTest.php

src/Command/CleanDownloadedImagesCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Command;
+namespace Wallabag\Command;
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -8,8 +8,8 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Finder\Finder;
-use Wallabag\CoreBundle\Helper\DownloadImages;
+use Wallabag\Helper\DownloadImages;
-use Wallabag\CoreBundle\Repository\EntryRepository;
+use Wallabag\Repository\EntryRepository;
 
 class CleanDownloadedImagesCommand extends Command
 {

src/Command/CleanDuplicatesCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Command;
+namespace Wallabag\Command;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\NoResultException;
@@ -9,10 +9,10 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\Entity\Entry;
-use Wallabag\CoreBundle\Entity\User;
+use Wallabag\Entity\User;
-use Wallabag\CoreBundle\Repository\EntryRepository;
+use Wallabag\Repository\EntryRepository;
-use Wallabag\CoreBundle\Repository\UserRepository;
+use Wallabag\Repository\UserRepository;
 
 class CleanDuplicatesCommand extends Command
 {

src/Command/ExportCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Command;
+namespace Wallabag\Command;
 
 use Doctrine\ORM\NoResultException;
 use Symfony\Component\Console\Command\Command;
@@ -8,9 +8,9 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Wallabag\CoreBundle\Helper\EntriesExport;
+use Wallabag\Helper\EntriesExport;
-use Wallabag\CoreBundle\Repository\EntryRepository;
+use Wallabag\Repository\EntryRepository;
-use Wallabag\CoreBundle\Repository\UserRepository;
+use Wallabag\Repository\UserRepository;
 
 class ExportCommand extends Command
 {

src/Command/GenerateUrlHashesCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Command;
+namespace Wallabag\Command;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\NoResultException;
@@ -8,10 +8,10 @@ use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Wallabag\CoreBundle\Entity\User;
+use Wallabag\Entity\User;
-use Wallabag\CoreBundle\Helper\UrlHasher;
+use Wallabag\Helper\UrlHasher;
-use Wallabag\CoreBundle\Repository\EntryRepository;
+use Wallabag\Repository\EntryRepository;
-use Wallabag\CoreBundle\Repository\UserRepository;
+use Wallabag\Repository\UserRepository;
 
 class GenerateUrlHashesCommand extends Command
 {

src/Command/Import/ImportCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Command\Import;
+namespace Wallabag\Command\Import;
 
 use Doctrine\DBAL\Driver\Middleware;
 use Doctrine\DBAL\Logging\Middleware as LoggingMiddleware;
@@ -13,19 +13,19 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
-use Wallabag\CoreBundle\Entity\User;
+use Wallabag\Entity\User;
-use Wallabag\CoreBundle\Import\ChromeImport;
+use Wallabag\Import\ChromeImport;
-use Wallabag\CoreBundle\Import\DeliciousImport;
+use Wallabag\Import\DeliciousImport;
-use Wallabag\CoreBundle\Import\ElcuratorImport;
+use Wallabag\Import\ElcuratorImport;
-use Wallabag\CoreBundle\Import\FirefoxImport;
+use Wallabag\Import\FirefoxImport;
-use Wallabag\CoreBundle\Import\InstapaperImport;
+use Wallabag\Import\InstapaperImport;
-use Wallabag\CoreBundle\Import\PinboardImport;
+use Wallabag\Import\PinboardImport;
-use Wallabag\CoreBundle\Import\PocketHtmlImport;
+use Wallabag\Import\PocketHtmlImport;
-use Wallabag\CoreBundle\Import\ReadabilityImport;
+use Wallabag\Import\ReadabilityImport;
-use Wallabag\CoreBundle\Import\ShaarliImport;
+use Wallabag\Import\ShaarliImport;
-use Wallabag\CoreBundle\Import\WallabagV1Import;
+use Wallabag\Import\WallabagV1Import;
-use Wallabag\CoreBundle\Import\WallabagV2Import;
+use Wallabag\Import\WallabagV2Import;
-use Wallabag\CoreBundle\Repository\UserRepository;
+use Wallabag\Repository\UserRepository;
 
 class ImportCommand extends Command
 {

src/Command/Import/RedisWorkerCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Command\Import;
+namespace Wallabag\Command\Import;
 
 use Simpleue\Worker\QueueWorker;
 use Symfony\Component\Config\Definition\Exception\Exception;
@@ -40,13 +40,13 @@ class RedisWorkerCommand extends Command
 
         $serviceName = $input->getArgument('serviceName');
 
-        if (!$this->container->has('wallabag_core.queue.redis.' . $serviceName) || !$this->container->has('wallabag_core.consumer.redis.' . $serviceName)) {
+        if (!$this->container->has('wallabag.queue.redis.' . $serviceName) || !$this->container->has('wallabag.consumer.redis.' . $serviceName)) {
             throw new Exception(sprintf('No queue or consumer found for service name: "%s"', $input->getArgument('serviceName')));
         }
 
         $worker = new QueueWorker(
-            $this->container->get('wallabag_core.queue.redis.' . $serviceName),
+            $this->container->get('wallabag.queue.redis.' . $serviceName),
-            $this->container->get('wallabag_core.consumer.redis.' . $serviceName),
+            $this->container->get('wallabag.consumer.redis.' . $serviceName),
             (int) $input->getOption('maxIterations')
         );
 

src/Command/InstallCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Command;
+namespace Wallabag\Command;
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Exception\DriverException;
@@ -20,9 +20,9 @@ use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Question\Question;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Wallabag\CoreBundle\Entity\IgnoreOriginInstanceRule;
+use Wallabag\Entity\IgnoreOriginInstanceRule;
-use Wallabag\CoreBundle\Entity\InternalSetting;
+use Wallabag\Entity\InternalSetting;
-use Wallabag\CoreBundle\Entity\User;
+use Wallabag\Entity\User;
 
 class InstallCommand extends Command
 {
@@ -299,8 +299,8 @@ class InstallCommand extends Command
         $this->io->section('Step 4 of 4: Config setup.');
 
         // cleanup before insert new stuff
-        $this->entityManager->createQuery('DELETE FROM Wallabag\CoreBundle\Entity\InternalSetting')->execute();
+        $this->entityManager->createQuery('DELETE FROM Wallabag\Entity\InternalSetting')->execute();
-        $this->entityManager->createQuery('DELETE FROM Wallabag\CoreBundle\Entity\IgnoreOriginInstanceRule')->execute();
+        $this->entityManager->createQuery('DELETE FROM Wallabag\Entity\IgnoreOriginInstanceRule')->execute();
 
         foreach ($this->defaultSettings as $setting) {
             $newSetting = new InternalSetting();

src/Command/ListUserCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Command;
+namespace Wallabag\Command;
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -8,7 +8,7 @@ use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Wallabag\CoreBundle\Repository\UserRepository;
+use Wallabag\Repository\UserRepository;
 
 class ListUserCommand extends Command
 {

src/Command/ReloadEntryCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Command;
+namespace Wallabag\Command;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\NoResultException;
@@ -11,10 +11,10 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Wallabag\CoreBundle\Event\EntrySavedEvent;
+use Wallabag\Event\EntrySavedEvent;
-use Wallabag\CoreBundle\Helper\ContentProxy;
+use Wallabag\Helper\ContentProxy;
-use Wallabag\CoreBundle\Repository\EntryRepository;
+use Wallabag\Repository\EntryRepository;
-use Wallabag\CoreBundle\Repository\UserRepository;
+use Wallabag\Repository\UserRepository;
 
 class ReloadEntryCommand extends Command
 {

src/Command/ShowUserCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Command;
+namespace Wallabag\Command;
 
 use Doctrine\ORM\NoResultException;
 use Symfony\Component\Console\Command\Command;
@@ -8,8 +8,8 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Wallabag\CoreBundle\Entity\User;
+use Wallabag\Entity\User;
-use Wallabag\CoreBundle\Repository\UserRepository;
+use Wallabag\Repository\UserRepository;
 
 class ShowUserCommand extends Command
 {

src/Command/TagAllCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Command;
+namespace Wallabag\Command;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\NoResultException;
@@ -9,9 +9,9 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Wallabag\CoreBundle\Entity\User;
+use Wallabag\Entity\User;
-use Wallabag\CoreBundle\Helper\RuleBasedTagger;
+use Wallabag\Helper\RuleBasedTagger;
-use Wallabag\CoreBundle\Repository\UserRepository;
+use Wallabag\Repository\UserRepository;
 
 class TagAllCommand extends Command
 {

src/Command/UpdatePicturesPathCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Command;
+namespace Wallabag\Command;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Console\Command\Command;
@@ -8,7 +8,7 @@ use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Wallabag\CoreBundle\Repository\EntryRepository;
+use Wallabag\Repository\EntryRepository;
 
 class UpdatePicturesPathCommand extends Command
 {

src/Consumer/AMQPEntryConsumer.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Consumer;
+namespace Wallabag\Consumer;
 
 use OldSound\RabbitMqBundle\RabbitMq\ConsumerInterface;
 use PhpAmqpLib\Message\AMQPMessage;

src/Consumer/AbstractConsumer.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace Wallabag\CoreBundle\Consumer;
+namespace Wallabag\Consumer;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\Entity\Entry;
-use Wallabag\CoreBundle\Entity\Tag;
+use Wallabag\Entity\Tag;
-use Wallabag\CoreBundle\Event\EntrySavedEvent;
+use Wallabag\Event\EntrySavedEvent;
-use Wallabag\CoreBundle\Import\AbstractImport;
+use Wallabag\Import\AbstractImport;
-use Wallabag\CoreBundle\Repository\UserRepository;
+use Wallabag\Repository\UserRepository;
 
 abstract class AbstractConsumer
 {

src/Consumer/RabbitMQConsumerTotalProxy.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Consumer;
+namespace Wallabag\Consumer;
 
 use OldSound\RabbitMqBundle\RabbitMq\Consumer;
 

src/Consumer/RedisEntryConsumer.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Consumer;
+namespace Wallabag\Consumer;
 
 use Simpleue\Job\Job;
 

src/Controller/AbstractController.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller;
+namespace Wallabag\Controller;
 
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController as BaseAbstractController;
-use Wallabag\CoreBundle\Entity\User;
+use Wallabag\Entity\User;
 
 abstract class AbstractController extends BaseAbstractController
 {

src/Controller/AnnotationController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller;
+namespace Wallabag\Controller;
 
 use Doctrine\ORM\EntityManagerInterface;
 use FOS\RestBundle\Controller\AbstractFOSRestController;
@@ -10,12 +10,12 @@ use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\Routing\Annotation\Route;
-use Wallabag\CoreBundle\Entity\Annotation;
+use Wallabag\Entity\Annotation;
-use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\Entity\Entry;
-use Wallabag\CoreBundle\Entity\User;
+use Wallabag\Entity\User;
-use Wallabag\CoreBundle\Form\Type\EditAnnotationType;
+use Wallabag\Form\Type\EditAnnotationType;
-use Wallabag\CoreBundle\Form\Type\NewAnnotationType;
+use Wallabag\Form\Type\NewAnnotationType;
-use Wallabag\CoreBundle\Repository\AnnotationRepository;
+use Wallabag\Repository\AnnotationRepository;
 
 class AnnotationController extends AbstractFOSRestController
 {

src/Controller/Api/AnnotationRestController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Api;
+namespace Wallabag\Controller\Api;
 
 use Nelmio\ApiDocBundle\Annotation\Operation;
 use OpenApi\Annotations as OA;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
-use Wallabag\CoreBundle\Entity\Annotation;
+use Wallabag\Entity\Annotation;
-use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\Entity\Entry;
 
 class AnnotationRestController extends WallabagRestController
 {
@@ -42,7 +42,7 @@ class AnnotationRestController extends WallabagRestController
     {
         $this->validateAuthentication();
 
-        return $this->forward('Wallabag\CoreBundle\Controller\AnnotationController::getAnnotationsAction', [
+        return $this->forward('Wallabag\Controller\AnnotationController::getAnnotationsAction', [
             'entry' => $entry,
         ]);
     }
@@ -108,7 +108,7 @@ class AnnotationRestController extends WallabagRestController
     {
         $this->validateAuthentication();
 
-        return $this->forward('Wallabag\CoreBundle\Controller\AnnotationController::postAnnotationAction', [
+        return $this->forward('Wallabag\Controller\AnnotationController::postAnnotationAction', [
             'request' => $request,
             'entry' => $entry,
         ]);
@@ -144,7 +144,7 @@ class AnnotationRestController extends WallabagRestController
     {
         $this->validateAuthentication();
 
-        return $this->forward('Wallabag\CoreBundle\Controller\AnnotationController::putAnnotationAction', [
+        return $this->forward('Wallabag\Controller\AnnotationController::putAnnotationAction', [
             'annotation' => $annotation,
             'request' => $request,
         ]);
@@ -180,7 +180,7 @@ class AnnotationRestController extends WallabagRestController
     {
         $this->validateAuthentication();
 
-        return $this->forward('Wallabag\CoreBundle\Controller\AnnotationController::deleteAnnotationAction', [
+        return $this->forward('Wallabag\Controller\AnnotationController::deleteAnnotationAction', [
             'annotation' => $annotation,
         ]);
     }

src/Controller/Api/ConfigRestController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Api;
+namespace Wallabag\Controller\Api;
 
 use JMS\Serializer\SerializationContext;
 use JMS\Serializer\SerializerInterface;

src/Controller/Api/DeveloperController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Api;
+namespace Wallabag\Controller\Api;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -8,10 +8,10 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Controller\AbstractController;
+use Wallabag\Controller\AbstractController;
-use Wallabag\CoreBundle\Entity\Api\Client;
+use Wallabag\Entity\Api\Client;
-use Wallabag\CoreBundle\Form\Type\Api\ClientType;
+use Wallabag\Form\Type\Api\ClientType;
-use Wallabag\CoreBundle\Repository\Api\ClientRepository;
+use Wallabag\Repository\Api\ClientRepository;
 
 class DeveloperController extends AbstractController
 {

src/Controller/Api/EntryRestController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Api;
+namespace Wallabag\Controller\Api;
 
 use Hateoas\Configuration\Route as HateoasRoute;
 use Hateoas\Representation\Factory\PagerfantaFactory;
@@ -15,16 +15,16 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\Routing\Annotation\Route;
-use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\Entity\Entry;
-use Wallabag\CoreBundle\Entity\Tag;
+use Wallabag\Entity\Tag;
-use Wallabag\CoreBundle\Event\EntryDeletedEvent;
+use Wallabag\Event\EntryDeletedEvent;
-use Wallabag\CoreBundle\Event\EntrySavedEvent;
+use Wallabag\Event\EntrySavedEvent;
-use Wallabag\CoreBundle\Helper\ContentProxy;
+use Wallabag\Helper\ContentProxy;
-use Wallabag\CoreBundle\Helper\EntriesExport;
+use Wallabag\Helper\EntriesExport;
-use Wallabag\CoreBundle\Helper\TagsAssigner;
+use Wallabag\Helper\TagsAssigner;
-use Wallabag\CoreBundle\Helper\UrlHasher;
+use Wallabag\Helper\UrlHasher;
-use Wallabag\CoreBundle\Repository\EntryRepository;
+use Wallabag\Repository\EntryRepository;
-use Wallabag\CoreBundle\Repository\TagRepository;
+use Wallabag\Repository\TagRepository;
 
 class EntryRestController extends WallabagRestController
 {
@@ -525,7 +525,7 @@ class EntryRestController extends WallabagRestController
 
         $urls = json_decode($request->query->get('urls', []));
 
-        $limit = $this->getParameter('wallabag_core.api_limit_mass_actions');
+        $limit = $this->getParameter('wallabag.api_limit_mass_actions');
 
         if (\count($urls) > $limit) {
             throw new HttpException(400, 'API limit reached');
@@ -1044,7 +1044,7 @@ class EntryRestController extends WallabagRestController
         }
 
         // if refreshing entry failed, don't save it
-        if ($this->getParameter('wallabag_core.fetching_error_message') === $entry->getContent()) {
+        if ($this->getParameter('wallabag.fetching_error_message') === $entry->getContent()) {
             return new JsonResponse([], 304);
         }
 

src/Controller/Api/SearchRestController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Api;
+namespace Wallabag\Controller\Api;
 
 use Hateoas\Configuration\Route as HateoasRoute;
 use Hateoas\Representation\Factory\PagerfantaFactory;
@@ -11,7 +11,7 @@ use Pagerfanta\Pagerfanta;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
-use Wallabag\CoreBundle\Repository\EntryRepository;
+use Wallabag\Repository\EntryRepository;
 
 class SearchRestController extends WallabagRestController
 {

src/Controller/Api/TagRestController.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Api;
+namespace Wallabag\Controller\Api;
 
 use Nelmio\ApiDocBundle\Annotation\Operation;
 use OpenApi\Annotations as OA;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
-use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\Entity\Entry;
-use Wallabag\CoreBundle\Entity\Tag;
+use Wallabag\Entity\Tag;
-use Wallabag\CoreBundle\Repository\EntryRepository;
+use Wallabag\Repository\EntryRepository;
-use Wallabag\CoreBundle\Repository\TagRepository;
+use Wallabag\Repository\TagRepository;
 
 class TagRestController extends WallabagRestController
 {

src/Controller/Api/TaggingRuleRestController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Api;
+namespace Wallabag\Controller\Api;
 
 use JMS\Serializer\SerializationContext;
 use JMS\Serializer\SerializerBuilder;

src/Controller/Api/UserRestController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Api;
+namespace Wallabag\Controller\Api;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
@@ -15,9 +15,9 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
-use Wallabag\CoreBundle\Entity\Api\Client;
+use Wallabag\Entity\Api\Client;
-use Wallabag\CoreBundle\Entity\User;
+use Wallabag\Entity\User;
-use Wallabag\CoreBundle\Form\Type\NewUserType;
+use Wallabag\Form\Type\NewUserType;
 
 class UserRestController extends WallabagRestController
 {

src/Controller/Api/WallabagRestController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Api;
+namespace Wallabag\Controller\Api;
 
 use Craue\ConfigBundle\Util\Config;
 use Doctrine\ORM\EntityManagerInterface;
@@ -16,8 +16,8 @@ use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInt
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Entity\Api\ApplicationInfo;
+use Wallabag\Entity\Api\ApplicationInfo;
-use Wallabag\CoreBundle\Entity\User;
+use Wallabag\Entity\User;
 
 class WallabagRestController extends AbstractFOSRestController
 {
@@ -61,7 +61,7 @@ class WallabagRestController extends AbstractFOSRestController
      */
     public function getVersionAction()
     {
-        $version = $this->getParameter('wallabag_core.version');
+        $version = $this->getParameter('wallabag.version');
         $json = $this->serializer->serialize($version, 'json');
 
         return (new JsonResponse())->setJson($json);
@@ -85,7 +85,7 @@ class WallabagRestController extends AbstractFOSRestController
     public function getInfoAction(Config $craueConfig)
     {
         $info = new ApplicationInfo(
-            $this->getParameter('wallabag_core.version'),
+            $this->getParameter('wallabag.version'),
             $this->getParameter('fosuser_registration') && $craueConfig->get('api_user_registration'),
         );