From 87ed6695046b0087dc770f1263a8995c09c77183 Mon Sep 17 00:00:00 2001
From: Yassine Guedidi <yassine@guedidi.com>
Date: Sat, 30 Dec 2023 23:41:01 +0100
Subject: [PATCH] Move User form types to Core

---
 src/Wallabag/ApiBundle/Controller/UserRestController.php    | 2 +-
 src/Wallabag/CoreBundle/Controller/UserController.php       | 6 +++---
 .../Form => CoreBundle/Form/Type}/NewUserType.php           | 2 +-
 .../Form => CoreBundle/Form/Type}/SearchUserType.php        | 2 +-
 .../{UserBundle/Form => CoreBundle/Form/Type}/UserType.php  | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename src/Wallabag/{UserBundle/Form => CoreBundle/Form/Type}/NewUserType.php (98%)
 rename src/Wallabag/{UserBundle/Form => CoreBundle/Form/Type}/SearchUserType.php (94%)
 rename src/Wallabag/{UserBundle/Form => CoreBundle/Form/Type}/UserType.php (97%)

diff --git a/src/Wallabag/ApiBundle/Controller/UserRestController.php b/src/Wallabag/ApiBundle/Controller/UserRestController.php
index fa156368a..a1c3e29d1 100644
--- a/src/Wallabag/ApiBundle/Controller/UserRestController.php
+++ b/src/Wallabag/ApiBundle/Controller/UserRestController.php
@@ -17,7 +17,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Annotation\Route;
 use Wallabag\ApiBundle\Entity\Client;
 use Wallabag\CoreBundle\Entity\User;
-use Wallabag\UserBundle\Form\NewUserType;
+use Wallabag\CoreBundle\Form\Type\NewUserType;
 
 class UserRestController extends WallabagRestController
 {
diff --git a/src/Wallabag/CoreBundle/Controller/UserController.php b/src/Wallabag/CoreBundle/Controller/UserController.php
index c31dbc9a4..525a6431c 100644
--- a/src/Wallabag/CoreBundle/Controller/UserController.php
+++ b/src/Wallabag/CoreBundle/Controller/UserController.php
@@ -18,10 +18,10 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Contracts\Translation\TranslatorInterface;
 use Wallabag\CoreBundle\Entity\User;
+use Wallabag\CoreBundle\Form\Type\NewUserType;
+use Wallabag\CoreBundle\Form\Type\SearchUserType;
+use Wallabag\CoreBundle\Form\Type\UserType;
 use Wallabag\CoreBundle\Repository\UserRepository;
-use Wallabag\UserBundle\Form\NewUserType;
-use Wallabag\UserBundle\Form\SearchUserType;
-use Wallabag\UserBundle\Form\UserType;
 
 /**
  * User controller.
diff --git a/src/Wallabag/UserBundle/Form/NewUserType.php b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php
similarity index 98%
rename from src/Wallabag/UserBundle/Form/NewUserType.php
rename to src/Wallabag/CoreBundle/Form/Type/NewUserType.php
index 66d718c0f..acdb60cc2 100644
--- a/src/Wallabag/UserBundle/Form/NewUserType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/NewUserType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\UserBundle\Form;
+namespace Wallabag\CoreBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\EmailType;
diff --git a/src/Wallabag/UserBundle/Form/SearchUserType.php b/src/Wallabag/CoreBundle/Form/Type/SearchUserType.php
similarity index 94%
rename from src/Wallabag/UserBundle/Form/SearchUserType.php
rename to src/Wallabag/CoreBundle/Form/Type/SearchUserType.php
index 9ce46ee17..fe14df56c 100644
--- a/src/Wallabag/UserBundle/Form/SearchUserType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/SearchUserType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\UserBundle\Form;
+namespace Wallabag\CoreBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
diff --git a/src/Wallabag/UserBundle/Form/UserType.php b/src/Wallabag/CoreBundle/Form/Type/UserType.php
similarity index 97%
rename from src/Wallabag/UserBundle/Form/UserType.php
rename to src/Wallabag/CoreBundle/Form/Type/UserType.php
index 62f2a6363..196307fe2 100644
--- a/src/Wallabag/UserBundle/Form/UserType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/UserType.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Wallabag\UserBundle\Form;
+namespace Wallabag\CoreBundle\Form\Type;
 
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;