From 48a6948abc16a786d394a8fdfcfc211aceafe5ea Mon Sep 17 00:00:00 2001
From: Yassine Guedidi <yassine@guedidi.com>
Date: Sun, 31 Dec 2023 18:40:02 +0100
Subject: [PATCH] Move Import form type to Core

---
 src/Wallabag/CoreBundle/Controller/Import/BrowserController.php | 2 +-
 .../CoreBundle/Controller/Import/DeliciousController.php        | 2 +-
 src/Wallabag/CoreBundle/Controller/Import/HtmlController.php    | 2 +-
 .../CoreBundle/Controller/Import/InstapaperController.php       | 2 +-
 .../CoreBundle/Controller/Import/PinboardController.php         | 2 +-
 .../CoreBundle/Controller/Import/ReadabilityController.php      | 2 +-
 .../CoreBundle/Controller/Import/WallabagController.php         | 2 +-
 .../{ImportBundle => CoreBundle}/Form/Type/UploadImportType.php | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename src/Wallabag/{ImportBundle => CoreBundle}/Form/Type/UploadImportType.php (95%)

diff --git a/src/Wallabag/CoreBundle/Controller/Import/BrowserController.php b/src/Wallabag/CoreBundle/Controller/Import/BrowserController.php
index 74b3131f0..c89df2e11 100644
--- a/src/Wallabag/CoreBundle/Controller/Import/BrowserController.php
+++ b/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\Form\Type\UploadImportType;
 use Wallabag\CoreBundle\Import\ImportInterface;
-use Wallabag\ImportBundle\Form\Type\UploadImportType;
 
 abstract class BrowserController extends AbstractController
 {
diff --git a/src/Wallabag/CoreBundle/Controller/Import/DeliciousController.php b/src/Wallabag/CoreBundle/Controller/Import/DeliciousController.php
index b4ae46ec7..9b11d1fea 100644
--- a/src/Wallabag/CoreBundle/Controller/Import/DeliciousController.php
+++ b/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\Form\Type\UploadImportType;
 use Wallabag\CoreBundle\Import\DeliciousImport;
-use Wallabag\ImportBundle\Form\Type\UploadImportType;
 use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
 
 class DeliciousController extends AbstractController
diff --git a/src/Wallabag/CoreBundle/Controller/Import/HtmlController.php b/src/Wallabag/CoreBundle/Controller/Import/HtmlController.php
index 5a0548afe..e6f0af226 100644
--- a/src/Wallabag/CoreBundle/Controller/Import/HtmlController.php
+++ b/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\Form\Type\UploadImportType;
 use Wallabag\CoreBundle\Import\ImportInterface;
-use Wallabag\ImportBundle\Form\Type\UploadImportType;
 
 abstract class HtmlController extends AbstractController
 {
diff --git a/src/Wallabag/CoreBundle/Controller/Import/InstapaperController.php b/src/Wallabag/CoreBundle/Controller/Import/InstapaperController.php
index 04631e93f..13ef18084 100644
--- a/src/Wallabag/CoreBundle/Controller/Import/InstapaperController.php
+++ b/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\Form\Type\UploadImportType;
 use Wallabag\CoreBundle\Import\InstapaperImport;
-use Wallabag\ImportBundle\Form\Type\UploadImportType;
 use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
 
 class InstapaperController extends AbstractController
diff --git a/src/Wallabag/CoreBundle/Controller/Import/PinboardController.php b/src/Wallabag/CoreBundle/Controller/Import/PinboardController.php
index 252e7410a..5d101604d 100644
--- a/src/Wallabag/CoreBundle/Controller/Import/PinboardController.php
+++ b/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\Form\Type\UploadImportType;
 use Wallabag\CoreBundle\Import\PinboardImport;
-use Wallabag\ImportBundle\Form\Type\UploadImportType;
 use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
 
 class PinboardController extends AbstractController
diff --git a/src/Wallabag/CoreBundle/Controller/Import/ReadabilityController.php b/src/Wallabag/CoreBundle/Controller/Import/ReadabilityController.php
index 8e26ff315..5fc3138eb 100644
--- a/src/Wallabag/CoreBundle/Controller/Import/ReadabilityController.php
+++ b/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\Form\Type\UploadImportType;
 use Wallabag\CoreBundle\Import\ReadabilityImport;
-use Wallabag\ImportBundle\Form\Type\UploadImportType;
 use Wallabag\ImportBundle\Redis\Producer as RedisProducer;
 
 class ReadabilityController extends AbstractController
diff --git a/src/Wallabag/CoreBundle/Controller/Import/WallabagController.php b/src/Wallabag/CoreBundle/Controller/Import/WallabagController.php
index 440df2005..bdc830ba7 100644
--- a/src/Wallabag/CoreBundle/Controller/Import/WallabagController.php
+++ b/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\Form\Type\UploadImportType;
 use Wallabag\CoreBundle\Import\ImportInterface;
-use Wallabag\ImportBundle\Form\Type\UploadImportType;
 
 /**
  * Define Wallabag import for v1 and v2, since there are very similar.
diff --git a/src/Wallabag/ImportBundle/Form/Type/UploadImportType.php b/src/Wallabag/CoreBundle/Form/Type/UploadImportType.php
similarity index 95%
rename from src/Wallabag/ImportBundle/Form/Type/UploadImportType.php
rename to src/Wallabag/CoreBundle/Form/Type/UploadImportType.php
index c50ef8c91..db32544ef 100644
--- a/src/Wallabag/ImportBundle/Form/Type/UploadImportType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/UploadImportType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\ImportBundle\Form\Type;
+namespace Wallabag\CoreBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;