mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-26 19:11:07 +00:00
Code Issues Projects Releases Wiki Activity

Move Annotation repository to Core

Browse source
This commit is contained in:
Yassine Guedidi 2023-12-25 19:17:46 +01:00
parent 2190174754
commit 23301b7eac
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Wallabag/CoreBundle/Controller/AnnotationController.php
View file

@ -12,9 +12,9 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Annotation\Route;
use Wallabag\AnnotationBundle\Form\EditAnnotationType; use Wallabag\AnnotationBundle\Form\EditAnnotationType;
use Wallabag\AnnotationBundle\Form\NewAnnotationType; use Wallabag\AnnotationBundle\Form\NewAnnotationType;
use Wallabag\AnnotationBundle\Repository\AnnotationRepository;
use Wallabag\CoreBundle\Entity\Annotation; use Wallabag\CoreBundle\Entity\Annotation;
use Wallabag\CoreBundle\Entity\Entry; use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Repository\AnnotationRepository;
use Wallabag\UserBundle\Entity\User; use Wallabag\UserBundle\Entity\User;
class AnnotationController extends AbstractFOSRestController class AnnotationController extends AbstractFOSRestController

2
src/Wallabag/CoreBundle/Controller/ConfigController.php
View file

@ -20,7 +20,6 @@ use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Symfony\Component\Validator\Constraints\Locale as LocaleConstraint; use Symfony\Component\Validator\Constraints\Locale as LocaleConstraint;
use Symfony\Component\Validator\Validator\ValidatorInterface; use Symfony\Component\Validator\Validator\ValidatorInterface;
use Wallabag\AnnotationBundle\Repository\AnnotationRepository;
use Wallabag\CoreBundle\Entity\Config as ConfigEntity; use Wallabag\CoreBundle\Entity\Config as ConfigEntity;
use Wallabag\CoreBundle\Entity\IgnoreOriginUserRule; use Wallabag\CoreBundle\Entity\IgnoreOriginUserRule;
use Wallabag\CoreBundle\Entity\RuleInterface; 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\TaggingRuleType;
use Wallabag\CoreBundle\Form\Type\UserInformationType; use Wallabag\CoreBundle\Form\Type\UserInformationType;
use Wallabag\CoreBundle\Helper\Redirect; use Wallabag\CoreBundle\Helper\Redirect;
use Wallabag\CoreBundle\Repository\AnnotationRepository;
use Wallabag\CoreBundle\Repository\ConfigRepository; use Wallabag\CoreBundle\Repository\ConfigRepository;
use Wallabag\CoreBundle\Repository\EntryRepository; use Wallabag\CoreBundle\Repository\EntryRepository;
use Wallabag\CoreBundle\Repository\IgnoreOriginUserRuleRepository; use Wallabag\CoreBundle\Repository\IgnoreOriginUserRuleRepository;

2
src/Wallabag/CoreBundle/Entity/Annotation.php
View file

@ -16,7 +16,7 @@ use Wallabag\UserBundle\Entity\User;
* Annotation. * Annotation.
* *
* @ORM\Table(name="annotation") * @ORM\Table(name="annotation")
* @ORM\Entity(repositoryClass="Wallabag\AnnotationBundle\Repository\AnnotationRepository") * @ORM\Entity(repositoryClass="Wallabag\CoreBundle\Repository\AnnotationRepository")
* @ORM\HasLifecycleCallbacks() * @ORM\HasLifecycleCallbacks()
* @ExclusionPolicy("none") * @ExclusionPolicy("none")
*/ */

2
src/Wallabag/AnnotationBundle/Repository/AnnotationRepository.php → src/Wallabag/CoreBundle/Repository/AnnotationRepository.php
View file

@ -1,6 +1,6 @@
<?php <?php
namespace Wallabag\AnnotationBundle\Repository; namespace Wallabag\CoreBundle\Repository;
use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
use Doctrine\ORM\QueryBuilder; use Doctrine\ORM\QueryBuilder;