Move Import importers to Core

src/Wallabag/CoreBundle/Command/Import/ImportCommand.php

@@ -14,18 +14,18 @@ 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\CoreBundle\Import\ChromeImport;
+use Wallabag\CoreBundle\Import\DeliciousImport;
+use Wallabag\CoreBundle\Import\ElcuratorImport;
+use Wallabag\CoreBundle\Import\FirefoxImport;
+use Wallabag\CoreBundle\Import\InstapaperImport;
+use Wallabag\CoreBundle\Import\PinboardImport;
+use Wallabag\CoreBundle\Import\PocketHtmlImport;
+use Wallabag\CoreBundle\Import\ReadabilityImport;
+use Wallabag\CoreBundle\Import\ShaarliImport;
+use Wallabag\CoreBundle\Import\WallabagV1Import;
+use Wallabag\CoreBundle\Import\WallabagV2Import;
 use Wallabag\CoreBundle\Repository\UserRepository;
-use Wallabag\ImportBundle\Import\ChromeImport;
-use Wallabag\ImportBundle\Import\DeliciousImport;
-use Wallabag\ImportBundle\Import\ElcuratorImport;
-use Wallabag\ImportBundle\Import\FirefoxImport;
-use Wallabag\ImportBundle\Import\InstapaperImport;
-use Wallabag\ImportBundle\Import\PinboardImport;
-use Wallabag\ImportBundle\Import\PocketHtmlImport;
-use Wallabag\ImportBundle\Import\ReadabilityImport;
-use Wallabag\ImportBundle\Import\ShaarliImport;
-use Wallabag\ImportBundle\Import\WallabagV1Import;
-use Wallabag\ImportBundle\Import\WallabagV2Import;
 
 class ImportCommand extends Command
 {

src/Wallabag/CoreBundle/Consumer/AbstractConsumer.php

@@ -9,8 +9,8 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Wallabag\CoreBundle\Entity\Entry;
 use Wallabag\CoreBundle\Entity\Tag;
 use Wallabag\CoreBundle\Event\EntrySavedEvent;
+use Wallabag\CoreBundle\Import\AbstractImport;
 use Wallabag\CoreBundle\Repository\UserRepository;
-use Wallabag\ImportBundle\Import\AbstractImport;
 
 abstract class AbstractConsumer
 {

src/Wallabag/CoreBundle/Controller/Import/BrowserController.php

@@ -7,8 +7,8 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Wallabag\CoreBundle\Controller\AbstractController;
+use Wallabag\CoreBundle\Import\ImportInterface;
 use Wallabag\ImportBundle\Form\Type\UploadImportType;
-use Wallabag\ImportBundle\Import\ImportInterface;
 
 abstract class BrowserController extends AbstractController
 {

src/Wallabag/CoreBundle/Controller/Import/ChromeController.php

@@ -7,7 +7,7 @@ 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\ImportBundle\Import\ChromeImport;
+use Wallabag\CoreBundle\Import\ChromeImport;
 use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
 
 class ChromeController extends BrowserController

src/Wallabag/CoreBundle/Controller/Import/DeliciousController.php

@@ -8,8 +8,8 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Wallabag\CoreBundle\Controller\AbstractController;
+use Wallabag\CoreBundle\Import\DeliciousImport;
 use Wallabag\ImportBundle\Form\Type\UploadImportType;
-use Wallabag\ImportBundle\Import\DeliciousImport;
 use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
 
 class DeliciousController extends AbstractController

src/Wallabag/CoreBundle/Controller/Import/ElcuratorController.php

@@ -7,7 +7,7 @@ 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\ImportBundle\Import\ElcuratorImport;
+use Wallabag\CoreBundle\Import\ElcuratorImport;
 use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
 
 class ElcuratorController extends WallabagController

src/Wallabag/CoreBundle/Controller/Import/FirefoxController.php

@@ -7,7 +7,7 @@ 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\ImportBundle\Import\FirefoxImport;
+use Wallabag\CoreBundle\Import\FirefoxImport;
 use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
 
 class FirefoxController extends BrowserController

src/Wallabag/CoreBundle/Controller/Import/HtmlController.php

@@ -7,8 +7,8 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Wallabag\CoreBundle\Controller\AbstractController;
+use Wallabag\CoreBundle\Import\ImportInterface;
 use Wallabag\ImportBundle\Form\Type\UploadImportType;
-use Wallabag\ImportBundle\Import\ImportInterface;
 
 abstract class HtmlController extends AbstractController
 {

src/Wallabag/CoreBundle/Controller/Import/ImportController.php

@@ -8,7 +8,7 @@ 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\ImportBundle\Import\ImportChain;
+use Wallabag\CoreBundle\Import\ImportChain;
 
 class ImportController extends AbstractController
 {

src/Wallabag/CoreBundle/Controller/Import/InstapaperController.php

@@ -8,8 +8,8 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Wallabag\CoreBundle\Controller\AbstractController;
+use Wallabag\CoreBundle\Import\InstapaperImport;
 use Wallabag\ImportBundle\Form\Type\UploadImportType;
-use Wallabag\ImportBundle\Import\InstapaperImport;
 use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
 
 class InstapaperController extends AbstractController

src/Wallabag/CoreBundle/Controller/Import/PinboardController.php

@@ -8,8 +8,8 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Wallabag\CoreBundle\Controller\AbstractController;
+use Wallabag\CoreBundle\Import\PinboardImport;
 use Wallabag\ImportBundle\Form\Type\UploadImportType;
-use Wallabag\ImportBundle\Import\PinboardImport;
 use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
 
 class PinboardController extends AbstractController

src/Wallabag/CoreBundle/Controller/Import/PocketController.php

@@ -11,7 +11,7 @@ use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Wallabag\CoreBundle\Controller\AbstractController;
-use Wallabag\ImportBundle\Import\PocketImport;
+use Wallabag\CoreBundle\Import\PocketImport;
 use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
 
 class PocketController extends AbstractController

src/Wallabag/CoreBundle/Controller/Import/PocketHtmlController.php

@@ -7,7 +7,7 @@ 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\ImportBundle\Import\PocketHtmlImport;
+use Wallabag\CoreBundle\Import\PocketHtmlImport;
 use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
 
 class PocketHtmlController extends HtmlController

src/Wallabag/CoreBundle/Controller/Import/ReadabilityController.php

@@ -8,8 +8,8 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Wallabag\CoreBundle\Controller\AbstractController;
+use Wallabag\CoreBundle\Import\ReadabilityImport;
 use Wallabag\ImportBundle\Form\Type\UploadImportType;
-use Wallabag\ImportBundle\Import\ReadabilityImport;
 use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
 
 class ReadabilityController extends AbstractController

src/Wallabag/CoreBundle/Controller/Import/ShaarliController.php

@@ -7,7 +7,7 @@ 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\ImportBundle\Import\ShaarliImport;
+use Wallabag\CoreBundle\Import\ShaarliImport;
 use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
 
 class ShaarliController extends HtmlController

src/Wallabag/CoreBundle/Controller/Import/WallabagController.php

@@ -7,8 +7,8 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Wallabag\CoreBundle\Controller\AbstractController;
+use Wallabag\CoreBundle\Import\ImportInterface;
 use Wallabag\ImportBundle\Form\Type\UploadImportType;
-use Wallabag\ImportBundle\Import\ImportInterface;
 
 /**
  * Define Wallabag import for v1 and v2, since there are very similar.

src/Wallabag/CoreBundle/Controller/Import/WallabagV1Controller.php

@@ -7,7 +7,7 @@ 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\ImportBundle\Import\WallabagV1Import;
+use Wallabag\CoreBundle\Import\WallabagV1Import;
 use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
 
 class WallabagV1Controller extends WallabagController

src/Wallabag/CoreBundle/Controller/Import/WallabagV2Controller.php

@@ -7,7 +7,7 @@ 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\ImportBundle\Import\WallabagV2Import;
+use Wallabag\CoreBundle\Import\WallabagV2Import;
 use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
 
 class WallabagV2Controller extends WallabagController

src/Wallabag/CoreBundle/Import/AbstractImport.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Import;
+namespace Wallabag\CoreBundle\Import;
 
 use Doctrine\ORM\EntityManagerInterface;
 use OldSound\RabbitMqBundle\RabbitMq\ProducerInterface;

src/Wallabag/CoreBundle/Import/BrowserImport.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Import;
+namespace Wallabag\CoreBundle\Import;
 
 use Wallabag\CoreBundle\Entity\Entry;
 use Wallabag\CoreBundle\Event\EntrySavedEvent;

src/Wallabag/CoreBundle/Import/ChromeImport.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Import;
+namespace Wallabag\CoreBundle\Import;
 
 class ChromeImport extends BrowserImport
 {

src/Wallabag/CoreBundle/Import/DeliciousImport.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Import;
+namespace Wallabag\CoreBundle\Import;
 
 use Wallabag\CoreBundle\Entity\Entry;
 

src/Wallabag/CoreBundle/Import/ElcuratorImport.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Import;
+namespace Wallabag\CoreBundle\Import;
 
 class ElcuratorImport extends WallabagImport
 {

src/Wallabag/CoreBundle/Import/FirefoxImport.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Import;
+namespace Wallabag\CoreBundle\Import;
 
 class FirefoxImport extends BrowserImport
 {

src/Wallabag/CoreBundle/Import/HtmlImport.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Import;
+namespace Wallabag\CoreBundle\Import;
 
 use Wallabag\CoreBundle\Entity\Entry;
 use Wallabag\CoreBundle\Event\EntrySavedEvent;

src/Wallabag/CoreBundle/Import/ImportChain.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Import;
+namespace Wallabag\CoreBundle\Import;
 
 class ImportChain
 {

src/Wallabag/CoreBundle/Import/ImportCompilerPass.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Import;
+namespace Wallabag\CoreBundle\Import;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;

src/Wallabag/CoreBundle/Import/ImportInterface.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Import;
+namespace Wallabag\CoreBundle\Import;
 
 use Psr\Log\LoggerAwareInterface;
 

src/Wallabag/CoreBundle/Import/InstapaperImport.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Import;
+namespace Wallabag\CoreBundle\Import;
 
 use Wallabag\CoreBundle\Entity\Entry;
 

src/Wallabag/CoreBundle/Import/PinboardImport.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Import;
+namespace Wallabag\CoreBundle\Import;
 
 use Wallabag\CoreBundle\Entity\Entry;
 

src/Wallabag/CoreBundle/Import/PocketHtmlImport.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Import;
+namespace Wallabag\CoreBundle\Import;
 
 class PocketHtmlImport extends HtmlImport
 {

src/Wallabag/CoreBundle/Import/PocketImport.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Import;
+namespace Wallabag\CoreBundle\Import;
 
 use Http\Client\Common\HttpMethodsClient;
 use Http\Client\Common\Plugin\ErrorPlugin;

src/Wallabag/CoreBundle/Import/ReadabilityImport.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Import;
+namespace Wallabag\CoreBundle\Import;
 
 use Wallabag\CoreBundle\Entity\Entry;
 

src/Wallabag/CoreBundle/Import/ShaarliImport.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Import;
+namespace Wallabag\CoreBundle\Import;
 
 class ShaarliImport extends HtmlImport
 {

src/Wallabag/CoreBundle/Import/WallabagImport.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Import;
+namespace Wallabag\CoreBundle\Import;
 
 use Wallabag\CoreBundle\Entity\Entry;
 

src/Wallabag/CoreBundle/Import/WallabagV1Import.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Import;
+namespace Wallabag\CoreBundle\Import;
 
 use Doctrine\ORM\EntityManagerInterface;
 use Psr\Log\LoggerInterface;

src/Wallabag/CoreBundle/Import/WallabagV2Import.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Import;
+namespace Wallabag\CoreBundle\Import;
 
 class WallabagV2Import extends WallabagImport
 {

src/Wallabag/ImportBundle/WallabagImportBundle.php

@@ -4,7 +4,7 @@ namespace Wallabag\ImportBundle;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
-use Wallabag\ImportBundle\Import\ImportCompilerPass;
+use Wallabag\CoreBundle\Import\ImportCompilerPass;
 
 class WallabagImportBundle extends Bundle
 {