Remove the CoreBundle namespace

src/Controller/Import/BrowserController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 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\CoreBundle\Form\Type\UploadImportType;
-use Wallabag\CoreBundle\Import\ImportInterface;
+use Wallabag\Controller\AbstractController;
+use Wallabag\Form\Type\UploadImportType;
+use Wallabag\Import\ImportInterface;
 
 abstract class BrowserController extends AbstractController
 {

src/Controller/Import/ChromeController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Import\ChromeImport;
-use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
+use Wallabag\Import\ChromeImport;
+use Wallabag\Redis\Producer as RedisProducer;
 
 class ChromeController extends BrowserController
 {

src/Controller/Import/DeliciousController.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Controller\AbstractController;
-use Wallabag\CoreBundle\Form\Type\UploadImportType;
-use Wallabag\CoreBundle\Import\DeliciousImport;
-use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
+use Wallabag\Controller\AbstractController;
+use Wallabag\Form\Type\UploadImportType;
+use Wallabag\Import\DeliciousImport;
+use Wallabag\Redis\Producer as RedisProducer;
 
 class DeliciousController extends AbstractController
 {

src/Controller/Import/ElcuratorController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Import\ElcuratorImport;
-use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
+use Wallabag\Import\ElcuratorImport;
+use Wallabag\Redis\Producer as RedisProducer;
 
 class ElcuratorController extends WallabagController
 {

src/Controller/Import/FirefoxController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Import\FirefoxImport;
-use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
+use Wallabag\Import\FirefoxImport;
+use Wallabag\Redis\Producer as RedisProducer;
 
 class FirefoxController extends BrowserController
 {

src/Controller/Import/HtmlController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 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\CoreBundle\Form\Type\UploadImportType;
-use Wallabag\CoreBundle\Import\ImportInterface;
+use Wallabag\Controller\AbstractController;
+use Wallabag\Form\Type\UploadImportType;
+use Wallabag\Import\ImportInterface;
 
 abstract class HtmlController extends AbstractController
 {

src/Controller/Import/ImportController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use Predis\Client;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Wallabag\CoreBundle\Consumer\RabbitMQConsumerTotalProxy;
-use Wallabag\CoreBundle\Controller\AbstractController;
-use Wallabag\CoreBundle\Import\ImportChain;
+use Wallabag\Consumer\RabbitMQConsumerTotalProxy;
+use Wallabag\Controller\AbstractController;
+use Wallabag\Import\ImportChain;
 
 class ImportController extends AbstractController
 {

src/Controller/Import/InstapaperController.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Controller\AbstractController;
-use Wallabag\CoreBundle\Form\Type\UploadImportType;
-use Wallabag\CoreBundle\Import\InstapaperImport;
-use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
+use Wallabag\Controller\AbstractController;
+use Wallabag\Form\Type\UploadImportType;
+use Wallabag\Import\InstapaperImport;
+use Wallabag\Redis\Producer as RedisProducer;
 
 class InstapaperController extends AbstractController
 {

src/Controller/Import/PinboardController.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Controller\AbstractController;
-use Wallabag\CoreBundle\Form\Type\UploadImportType;
-use Wallabag\CoreBundle\Import\PinboardImport;
-use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
+use Wallabag\Controller\AbstractController;
+use Wallabag\Form\Type\UploadImportType;
+use Wallabag\Import\PinboardImport;
+use Wallabag\Redis\Producer as RedisProducer;
 
 class PinboardController extends AbstractController
 {

src/Controller/Import/PocketController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
@@ -10,9 +10,9 @@ use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Controller\AbstractController;
-use Wallabag\CoreBundle\Import\PocketImport;
-use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
+use Wallabag\Controller\AbstractController;
+use Wallabag\Import\PocketImport;
+use Wallabag\Redis\Producer as RedisProducer;
 
 class PocketController extends AbstractController
 {

src/Controller/Import/PocketHtmlController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Import\PocketHtmlImport;
-use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
+use Wallabag\Import\PocketHtmlImport;
+use Wallabag\Redis\Producer as RedisProducer;
 
 class PocketHtmlController extends HtmlController
 {

src/Controller/Import/ReadabilityController.php

@@ -1,16 +1,16 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Controller\AbstractController;
-use Wallabag\CoreBundle\Form\Type\UploadImportType;
-use Wallabag\CoreBundle\Import\ReadabilityImport;
-use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
+use Wallabag\Controller\AbstractController;
+use Wallabag\Form\Type\UploadImportType;
+use Wallabag\Import\ReadabilityImport;
+use Wallabag\Redis\Producer as RedisProducer;
 
 class ReadabilityController extends AbstractController
 {

src/Controller/Import/ShaarliController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Import\ShaarliImport;
-use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
+use Wallabag\Import\ShaarliImport;
+use Wallabag\Redis\Producer as RedisProducer;
 
 class ShaarliController extends HtmlController
 {

src/Controller/Import/WallabagController.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Controller\AbstractController;
-use Wallabag\CoreBundle\Form\Type\UploadImportType;
-use Wallabag\CoreBundle\Import\ImportInterface;
+use Wallabag\Controller\AbstractController;
+use Wallabag\Form\Type\UploadImportType;
+use Wallabag\Import\ImportInterface;
 
 /**
  * Define Wallabag import for v1 and v2, since there are very similar.

src/Controller/Import/WallabagV1Controller.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Import\WallabagV1Import;
-use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
+use Wallabag\Import\WallabagV1Import;
+use Wallabag\Redis\Producer as RedisProducer;
 
 class WallabagV1Controller extends WallabagController
 {

src/Controller/Import/WallabagV2Controller.php

@@ -1,14 +1,14 @@
 <?php
 
-namespace Wallabag\CoreBundle\Controller\Import;
+namespace Wallabag\Controller\Import;
 
 use Craue\ConfigBundle\Util\Config;
 use OldSound\RabbitMqBundle\RabbitMq\Producer as RabbitMqProducer;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Wallabag\CoreBundle\Import\WallabagV2Import;
-use Wallabag\CoreBundle\Redis\Producer as RedisProducer;
+use Wallabag\Import\WallabagV2Import;
+use Wallabag\Redis\Producer as RedisProducer;
 
 class WallabagV2Controller extends WallabagController
 {