From 23301b7eaca8f42b1c82bcbd9231f07c0b6edec5 Mon Sep 17 00:00:00 2001 From: Yassine Guedidi Date: Mon, 25 Dec 2023 19:17:46 +0100 Subject: [PATCH] Move Annotation repository to Core --- src/Wallabag/CoreBundle/Controller/AnnotationController.php | 2 +- src/Wallabag/CoreBundle/Controller/ConfigController.php | 2 +- src/Wallabag/CoreBundle/Entity/Annotation.php | 2 +- .../Repository/AnnotationRepository.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename src/Wallabag/{AnnotationBundle => CoreBundle}/Repository/AnnotationRepository.php (98%) diff --git a/src/Wallabag/CoreBundle/Controller/AnnotationController.php b/src/Wallabag/CoreBundle/Controller/AnnotationController.php index ad31446b7..d19d2d9d4 100644 --- a/src/Wallabag/CoreBundle/Controller/AnnotationController.php +++ b/src/Wallabag/CoreBundle/Controller/AnnotationController.php @@ -12,9 +12,9 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\Routing\Annotation\Route; use Wallabag\AnnotationBundle\Form\EditAnnotationType; use Wallabag\AnnotationBundle\Form\NewAnnotationType; -use Wallabag\AnnotationBundle\Repository\AnnotationRepository; use Wallabag\CoreBundle\Entity\Annotation; use Wallabag\CoreBundle\Entity\Entry; +use Wallabag\CoreBundle\Repository\AnnotationRepository; use Wallabag\UserBundle\Entity\User; class AnnotationController extends AbstractFOSRestController diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index 9d9605df5..bfd3ffdc1 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php @@ -20,7 +20,6 @@ use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; use Symfony\Component\Validator\Constraints\Locale as LocaleConstraint; use Symfony\Component\Validator\Validator\ValidatorInterface; -use Wallabag\AnnotationBundle\Repository\AnnotationRepository; use Wallabag\CoreBundle\Entity\Config as ConfigEntity; use Wallabag\CoreBundle\Entity\IgnoreOriginUserRule; use Wallabag\CoreBundle\Entity\RuleInterface; @@ -34,6 +33,7 @@ use Wallabag\CoreBundle\Form\Type\TaggingRuleImportType; use Wallabag\CoreBundle\Form\Type\TaggingRuleType; use Wallabag\CoreBundle\Form\Type\UserInformationType; use Wallabag\CoreBundle\Helper\Redirect; +use Wallabag\CoreBundle\Repository\AnnotationRepository; use Wallabag\CoreBundle\Repository\ConfigRepository; use Wallabag\CoreBundle\Repository\EntryRepository; use Wallabag\CoreBundle\Repository\IgnoreOriginUserRuleRepository; diff --git a/src/Wallabag/CoreBundle/Entity/Annotation.php b/src/Wallabag/CoreBundle/Entity/Annotation.php index 6b1a903c7..a83a659ee 100644 --- a/src/Wallabag/CoreBundle/Entity/Annotation.php +++ b/src/Wallabag/CoreBundle/Entity/Annotation.php @@ -16,7 +16,7 @@ use Wallabag\UserBundle\Entity\User; * Annotation. * * @ORM\Table(name="annotation") - * @ORM\Entity(repositoryClass="Wallabag\AnnotationBundle\Repository\AnnotationRepository") + * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\AnnotationRepository") * @ORM\HasLifecycleCallbacks() * @ExclusionPolicy("none") */ diff --git a/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php b/src/Wallabag/CoreBundle/Repository/AnnotationRepository.php similarity index 98% rename from src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php rename to src/Wallabag/CoreBundle/Repository/AnnotationRepository.php index a95900723..acd48fea4 100644 --- a/src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php +++ b/src/Wallabag/CoreBundle/Repository/AnnotationRepository.php @@ -1,6 +1,6 @@