diff options
author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2017-06-21 14:51:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-21 14:51:46 +0200 |
commit | 8c68acff2abe0573e287ad9ee4589668d1bb7ffa (patch) | |
tree | 0e67b949bde3bf8c441bfa77cbf9aa0a49326f72 /src/Wallabag/CoreBundle/Command | |
parent | 80784b782becfaa297e6d9cbb0584e27739cffc8 (diff) | |
parent | bd40f1af88979cb5257206d178d26819e350a24c (diff) | |
download | wallabag-8c68acff2abe0573e287ad9ee4589668d1bb7ffa.tar.gz wallabag-8c68acff2abe0573e287ad9ee4589668d1bb7ffa.tar.zst wallabag-8c68acff2abe0573e287ad9ee4589668d1bb7ffa.zip |
Merge pull request #3207 from wallabag/tag-rss
Add RSS for tags
Diffstat (limited to 'src/Wallabag/CoreBundle/Command')
4 files changed, 7 insertions, 8 deletions
diff --git a/src/Wallabag/CoreBundle/Command/CleanDuplicatesCommand.php b/src/Wallabag/CoreBundle/Command/CleanDuplicatesCommand.php index 65f35d8e..74da1e5f 100644 --- a/src/Wallabag/CoreBundle/Command/CleanDuplicatesCommand.php +++ b/src/Wallabag/CoreBundle/Command/CleanDuplicatesCommand.php | |||
@@ -46,7 +46,7 @@ class CleanDuplicatesCommand extends ContainerAwareCommand | |||
46 | return 1; | 46 | return 1; |
47 | } | 47 | } |
48 | } else { | 48 | } else { |
49 | $users = $this->getDoctrine()->getRepository('WallabagUserBundle:User')->findAll(); | 49 | $users = $this->getContainer()->get('wallabag_user.user_repository')->findAll(); |
50 | 50 | ||
51 | $output->writeln(sprintf('Cleaning through %d user accounts', count($users))); | 51 | $output->writeln(sprintf('Cleaning through %d user accounts', count($users))); |
52 | 52 | ||
@@ -66,7 +66,7 @@ class CleanDuplicatesCommand extends ContainerAwareCommand | |||
66 | private function cleanDuplicates(User $user) | 66 | private function cleanDuplicates(User $user) |
67 | { | 67 | { |
68 | $em = $this->getContainer()->get('doctrine.orm.entity_manager'); | 68 | $em = $this->getContainer()->get('doctrine.orm.entity_manager'); |
69 | $repo = $this->getDoctrine()->getRepository('WallabagCoreBundle:Entry'); | 69 | $repo = $this->getContainer()->get('wallabag_core.entry_repository'); |
70 | 70 | ||
71 | $entries = $repo->getAllEntriesIdAndUrl($user->getId()); | 71 | $entries = $repo->getAllEntriesIdAndUrl($user->getId()); |
72 | 72 | ||
@@ -109,7 +109,7 @@ class CleanDuplicatesCommand extends ContainerAwareCommand | |||
109 | */ | 109 | */ |
110 | private function getUser($username) | 110 | private function getUser($username) |
111 | { | 111 | { |
112 | return $this->getDoctrine()->getRepository('WallabagUserBundle:User')->findOneByUserName($username); | 112 | return $this->getContainer()->get('wallabag_user.user_repository')->findOneByUserName($username); |
113 | } | 113 | } |
114 | 114 | ||
115 | private function getDoctrine() | 115 | private function getDoctrine() |
diff --git a/src/Wallabag/CoreBundle/Command/ExportCommand.php b/src/Wallabag/CoreBundle/Command/ExportCommand.php index e3d3b399..ebb2b4cf 100644 --- a/src/Wallabag/CoreBundle/Command/ExportCommand.php +++ b/src/Wallabag/CoreBundle/Command/ExportCommand.php | |||
@@ -32,15 +32,14 @@ class ExportCommand extends ContainerAwareCommand | |||
32 | protected function execute(InputInterface $input, OutputInterface $output) | 32 | protected function execute(InputInterface $input, OutputInterface $output) |
33 | { | 33 | { |
34 | try { | 34 | try { |
35 | $user = $this->getDoctrine()->getRepository('WallabagUserBundle:User')->findOneByUserName($input->getArgument('username')); | 35 | $user = $this->getContainer()->get('wallabag_user.user_repository')->findOneByUserName($input->getArgument('username')); |
36 | } catch (NoResultException $e) { | 36 | } catch (NoResultException $e) { |
37 | $output->writeln(sprintf('<error>User "%s" not found.</error>', $input->getArgument('username'))); | 37 | $output->writeln(sprintf('<error>User "%s" not found.</error>', $input->getArgument('username'))); |
38 | 38 | ||
39 | return 1; | 39 | return 1; |
40 | } | 40 | } |
41 | 41 | ||
42 | $entries = $this->getDoctrine() | 42 | $entries = $this->getContainer()->get('wallabag_core.entry_repository') |
43 | ->getRepository('WallabagCoreBundle:Entry') | ||
44 | ->getBuilderForAllByUser($user->getId()) | 43 | ->getBuilderForAllByUser($user->getId()) |
45 | ->getQuery() | 44 | ->getQuery() |
46 | ->getResult(); | 45 | ->getResult(); |
diff --git a/src/Wallabag/CoreBundle/Command/ShowUserCommand.php b/src/Wallabag/CoreBundle/Command/ShowUserCommand.php index 0eeaabc4..eef04988 100644 --- a/src/Wallabag/CoreBundle/Command/ShowUserCommand.php +++ b/src/Wallabag/CoreBundle/Command/ShowUserCommand.php | |||
@@ -67,7 +67,7 @@ class ShowUserCommand extends ContainerAwareCommand | |||
67 | */ | 67 | */ |
68 | private function getUser($username) | 68 | private function getUser($username) |
69 | { | 69 | { |
70 | return $this->getDoctrine()->getRepository('WallabagUserBundle:User')->findOneByUserName($username); | 70 | return $this->getContainer()->get('wallabag_user.user_repository')->findOneByUserName($username); |
71 | } | 71 | } |
72 | 72 | ||
73 | private function getDoctrine() | 73 | private function getDoctrine() |
diff --git a/src/Wallabag/CoreBundle/Command/TagAllCommand.php b/src/Wallabag/CoreBundle/Command/TagAllCommand.php index 3f9bb04d..9843674e 100644 --- a/src/Wallabag/CoreBundle/Command/TagAllCommand.php +++ b/src/Wallabag/CoreBundle/Command/TagAllCommand.php | |||
@@ -59,7 +59,7 @@ class TagAllCommand extends ContainerAwareCommand | |||
59 | */ | 59 | */ |
60 | private function getUser($username) | 60 | private function getUser($username) |
61 | { | 61 | { |
62 | return $this->getDoctrine()->getRepository('WallabagUserBundle:User')->findOneByUserName($username); | 62 | return $this->getContainer()->get('wallabag_user.user_repository')->findOneByUserName($username); |
63 | } | 63 | } |
64 | 64 | ||
65 | private function getDoctrine() | 65 | private function getDoctrine() |