pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #5748 from yguedidi/use-fqcn-as-service-name

Browse Source
This commit is contained in:
Jérémy Benoist
2022-08-25 07:37:06 +02:00
committed by GitHub
parent eda214c35d 538fd258fe
commit 009697f844
59 changed files with 367 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Wallabag/CoreBundle/Command/CleanDownloadedImagesCommand.php
View File

@ -8,6 +8,8 @@ use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
use Symfony\Component\Finder\Finder;
use Wallabag\CoreBundle\Helper\DownloadImages;
use Wallabag\CoreBundle\Repository\EntryRepository;
class CleanDownloadedImagesCommand extends ContainerAwareCommand
{
@ -34,7 +36,7 @@ class CleanDownloadedImagesCommand extends ContainerAwareCommand
$io->text('Dry run mode <info>enabled</info> (no images will be removed)');
}
$downloadImages = $this->getContainer()->get('wallabag_core.entry.download_images');
$downloadImages = $this->getContainer()->get(DownloadImages::class);
$baseFolder = $downloadImages->getBaseFolder();
$io->text('Retrieve existing images');
@ -56,7 +58,7 @@ class CleanDownloadedImagesCommand extends ContainerAwareCommand
$io->text('Retrieve valid folders attached to a user');
$entries = $this->getContainer()->get('wallabag_core.entry_repository')->findAllEntriesIdByUserId();
$entries = $this->getContainer()->get(EntryRepository::class)->findAllEntriesIdByUserId();
// retrieve _valid_ folders from existing entries
$validPaths = [];

8
src/Wallabag/CoreBundle/Command/CleanDuplicatesCommand.php
View File

@ -9,7 +9,9 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Repository\EntryRepository;
use Wallabag\UserBundle\Entity\User;
use Wallabag\UserBundle\Repository\UserRepository;
class CleanDuplicatesCommand extends ContainerAwareCommand
{
@ -49,7 +51,7 @@ class CleanDuplicatesCommand extends ContainerAwareCommand
$this->io->success('Finished cleaning.');
} else {
$users = $this->getContainer()->get('wallabag_user.user_repository')->findAll();
$users = $this->getContainer()->get(UserRepository::class)->findAll();
$this->io->text(sprintf('Cleaning through <info>%d</info> user accounts', \count($users)));
@ -66,7 +68,7 @@ class CleanDuplicatesCommand extends ContainerAwareCommand
private function cleanDuplicates(User $user)
{
$em = $this->getContainer()->get('doctrine.orm.entity_manager');
$repo = $this->getContainer()->get('wallabag_core.entry_repository');
$repo = $this->getContainer()->get(EntryRepository::class);
$entries = $repo->findAllEntriesIdAndUrlByUserId($user->getId());
@ -109,6 +111,6 @@ class CleanDuplicatesCommand extends ContainerAwareCommand
*/
private function getUser($username)
{
return $this->getContainer()->get('wallabag_user.user_repository')->findOneByUserName($username);
return $this->getContainer()->get(UserRepository::class)->findOneByUserName($username);
}
}

9
src/Wallabag/CoreBundle/Command/ExportCommand.php
View File

@ -8,6 +8,9 @@ use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
use Wallabag\CoreBundle\Helper\EntriesExport;
use Wallabag\CoreBundle\Repository\EntryRepository;
use Wallabag\UserBundle\Repository\UserRepository;
class ExportCommand extends ContainerAwareCommand
{
@ -35,14 +38,14 @@ class ExportCommand extends ContainerAwareCommand
$io = new SymfonyStyle($input, $output);
try {
$user = $this->getContainer()->get('wallabag_user.user_repository')->findOneByUserName($input->getArgument('username'));
$user = $this->getContainer()->get(UserRepository::class)->findOneByUserName($input->getArgument('username'));
} catch (NoResultException $e) {
$io->error(sprintf('User "%s" not found.', $input->getArgument('username')));
return 1;
}
$entries = $this->getContainer()->get('wallabag_core.entry_repository')
$entries = $this->getContainer()->get(EntryRepository::class)
->getBuilderForAllByUser($user->getId())
->getQuery()
->getResult();
@ -56,7 +59,7 @@ class ExportCommand extends ContainerAwareCommand
}
try {
$data = $this->getContainer()->get('wallabag_core.helper.entries_export')
$data = $this->getContainer()->get(EntriesExport::class)
->setEntries($entries)
->updateTitle('All')
->updateAuthor('All')

5
src/Wallabag/CoreBundle/Command/ListUserCommand.php
View File

@ -8,6 +8,7 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
use Wallabag\UserBundle\Repository\UserRepository;
class ListUserCommand extends ContainerAwareCommand
{
@ -26,13 +27,13 @@ class ListUserCommand extends ContainerAwareCommand
{
$io = new SymfonyStyle($input, $output);
$users = $this->getContainer()->get('wallabag_user.user_repository')
$users = $this->getContainer()->get(UserRepository::class)
->getQueryBuilderForSearch($input->getArgument('search'))
->setMaxResults($input->getOption('limit'))
->getQuery()
->getResult();
$nbUsers = $this->getContainer()->get('wallabag_user.user_repository')
$nbUsers = $this->getContainer()->get(UserRepository::class)
->getSumUsers();
$rows = [];

9
src/Wallabag/CoreBundle/Command/ReloadEntryCommand.php
View File

@ -9,6 +9,9 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
use Wallabag\CoreBundle\Event\EntrySavedEvent;
use Wallabag\CoreBundle\Helper\ContentProxy;
use Wallabag\CoreBundle\Repository\EntryRepository;
use Wallabag\UserBundle\Repository\UserRepository;
class ReloadEntryCommand extends ContainerAwareCommand
{
@ -30,7 +33,7 @@ class ReloadEntryCommand extends ContainerAwareCommand
if ($username = $input->getArgument('username')) {
try {
$userId = $this->getContainer()
->get('wallabag_user.user_repository')
->get(UserRepository::class)
->findOneByUserName($username)
->getId();
} catch (NoResultException $e) {
@ -40,7 +43,7 @@ class ReloadEntryCommand extends ContainerAwareCommand
}
}
$entryRepository = $this->getContainer()->get('wallabag_core.entry_repository');
$entryRepository = $this->getContainer()->get(EntryRepository::class);
$entryIds = $entryRepository->findAllEntriesIdByUserId($userId);
$nbEntries = \count($entryIds);
@ -63,7 +66,7 @@ class ReloadEntryCommand extends ContainerAwareCommand
$progressBar = $io->createProgressBar($nbEntries);
$contentProxy = $this->getContainer()->get('wallabag_core.content_proxy');
$contentProxy = $this->getContainer()->get(ContentProxy::class);
$em = $this->getContainer()->get('doctrine')->getManager();
$dispatcher = $this->getContainer()->get('event_dispatcher');

3
src/Wallabag/CoreBundle/Command/ShowUserCommand.php
View File

@ -9,6 +9,7 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
use Wallabag\UserBundle\Entity\User;
use Wallabag\UserBundle\Repository\UserRepository;
class ShowUserCommand extends ContainerAwareCommand
{
@ -68,6 +69,6 @@ class ShowUserCommand extends ContainerAwareCommand
*/
private function getUser($username)
{
return $this->getContainer()->get('wallabag_user.user_repository')->findOneByUserName($username);
return $this->getContainer()->get(UserRepository::class)->findOneByUserName($username);
}
}

6
src/Wallabag/CoreBundle/Command/TagAllCommand.php
View File

@ -8,6 +8,8 @@ use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
use Wallabag\CoreBundle\Helper\RuleBasedTagger;
use Wallabag\UserBundle\Repository\UserRepository;
class TagAllCommand extends ContainerAwareCommand
{
@ -35,7 +37,7 @@ class TagAllCommand extends ContainerAwareCommand
return 1;
}
$tagger = $this->getContainer()->get('wallabag_core.rule_based_tagger');
$tagger = $this->getContainer()->get(RuleBasedTagger::class);
$io->text(sprintf('Tagging entries for user <info>%s</info>...', $user->getUserName()));
@ -63,7 +65,7 @@ class TagAllCommand extends ContainerAwareCommand
*/
private function getUser($username)
{
return $this->getContainer()->get('wallabag_user.user_repository')->findOneByUserName($username);
return $this->getContainer()->get(UserRepository::class)->findOneByUserName($username);
}
private function getDoctrine()

17
src/Wallabag/CoreBundle/Controller/ConfigController.php
View File

@ -24,7 +24,10 @@ use Wallabag\CoreBundle\Form\Type\IgnoreOriginUserRuleType;
use Wallabag\CoreBundle\Form\Type\TaggingRuleImportType;
use Wallabag\CoreBundle\Form\Type\TaggingRuleType;
use Wallabag\CoreBundle\Form\Type\UserInformationType;
use Wallabag\CoreBundle\Repository\EntryRepository;
use Wallabag\CoreBundle\Repository\TagRepository;
use Wallabag\CoreBundle\Tools\Utils;
use Wallabag\UserBundle\Repository\UserRepository;
class ConfigController extends Controller
{
@ -236,7 +239,7 @@ class ConfigController extends Controller
],
'twofactor_auth' => $this->getParameter('twofactor_auth'),
'wallabag_url' => $this->getParameter('domain_name'),
'enabled_users' => $this->get('wallabag_user.user_repository')->getSumEnabledUsers(),
'enabled_users' => $this->get(UserRepository::class)->getSumEnabledUsers(),
]);
}
@ -561,7 +564,7 @@ class ConfigController extends Controller
// manually remove tags to avoid orphan tag
$this->removeAllTagsByUserId($this->getUser()->getId());
$this->get('wallabag_core.entry_repository')->removeAllByUserId($this->getUser()->getId());
$this->get(EntryRepository::class)->removeAllByUserId($this->getUser()->getId());
break;
case 'archived':
if ($this->get('doctrine')->getConnection()->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\SqlitePlatform) {
@ -571,7 +574,7 @@ class ConfigController extends Controller
// manually remove tags to avoid orphan tag
$this->removeTagsForArchivedByUserId($this->getUser()->getId());
$this->get('wallabag_core.entry_repository')->removeArchivedByUserId($this->getUser()->getId());
$this->get(EntryRepository::class)->removeArchivedByUserId($this->getUser()->getId());
break;
}
@ -594,7 +597,7 @@ class ConfigController extends Controller
*/
public function deleteAccountAction(Request $request)
{
$enabledUsers = $this->get('wallabag_user.user_repository')
$enabledUsers = $this->get(UserRepository::class)
->getSumEnabledUsers();
if ($enabledUsers <= 1) {
@ -690,7 +693,7 @@ class ConfigController extends Controller
return;
}
$this->get('wallabag_core.entry_repository')
$this->get(EntryRepository::class)
->removeTags($userId, $tags);
// cleanup orphan tags
@ -712,7 +715,7 @@ class ConfigController extends Controller
*/
private function removeAllTagsByUserId($userId)
{
$tags = $this->get('wallabag_core.tag_repository')->findAllTags($userId);
$tags = $this->get(TagRepository::class)->findAllTags($userId);
$this->removeAllTagsByStatusAndUserId($tags, $userId);
}
@ -723,7 +726,7 @@ class ConfigController extends Controller
*/
private function removeTagsForArchivedByUserId($userId)
{
$tags = $this->get('wallabag_core.tag_repository')->findForArchivedArticlesByUser($userId);
$tags = $this->get(TagRepository::class)->findForArchivedArticlesByUser($userId);
$this->removeAllTagsByStatusAndUserId($tags, $userId);
}

35
src/Wallabag/CoreBundle/Controller/EntryController.php
View File

@ -18,6 +18,11 @@ use Wallabag\CoreBundle\Form\Type\EditEntryType;
use Wallabag\CoreBundle\Form\Type\EntryFilterType;
use Wallabag\CoreBundle\Form\Type\NewEntryType;
use Wallabag\CoreBundle\Form\Type\SearchEntryType;
use Wallabag\CoreBundle\Helper\ContentProxy;
use Wallabag\CoreBundle\Helper\PreparePagerForEntries;
use Wallabag\CoreBundle\Helper\Redirect;
use Wallabag\CoreBundle\Repository\EntryRepository;
use Wallabag\CoreBundle\Repository\TagRepository;
class EntryController extends Controller
{
@ -55,7 +60,7 @@ class EntryController extends Controller
$label = substr($label, 1);
$remove = true;
}
$tag = $this->get('wallabag_core.tag_repository')->findOneByLabel($label);
$tag = $this->get(TagRepository::class)->findOneByLabel($label);
if ($remove) {
if (null !== $tag) {
$tagsToRemove[] = $tag;
@ -74,7 +79,7 @@ class EntryController extends Controller
if (isset($values['entry-checkbox'])) {
foreach ($values['entry-checkbox'] as $id) {
/** @var Entry * */
$entry = $this->get('wallabag_core.entry_repository')->findById((int) $id)[0];
$entry = $this->get(EntryRepository::class)->findById((int) $id)[0];
$this->checkUserAction($entry);
@ -98,7 +103,7 @@ class EntryController extends Controller
$em->flush();
}
$redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'));
$redirectUrl = $this->get(Redirect::class)->to($request->headers->get('referer'));
return $this->redirect($redirectUrl);
}
@ -269,7 +274,7 @@ class EntryController extends Controller
public function showUnreadAction(Request $request, $page)
{
// load the quickstart if no entry in database
if (1 === (int) $page && 0 === $this->get('wallabag_core.entry_repository')->countAllEntriesByUser($this->getUser()->getId())) {
if (1 === (int) $page && 0 === $this->get(EntryRepository::class)->countAllEntriesByUser($this->getUser()->getId())) {
return $this->redirect($this->generateUrl('quickstart'));
}
@ -344,7 +349,7 @@ class EntryController extends Controller
public function redirectRandomEntryAction($type = 'all')
{
try {
$entry = $this->get('wallabag_core.entry_repository')
$entry = $this->get(EntryRepository::class)
->getRandomEntry($this->getUser()->getId(), $type);
} catch (NoResultException $e) {
$bag = $this->get('session')->getFlashBag();
@ -431,7 +436,7 @@ class EntryController extends Controller
$message
);
$redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'));
$redirectUrl = $this->get(Redirect::class)->to($request->headers->get('referer'));
return $this->redirect($redirectUrl);
}
@ -461,7 +466,7 @@ class EntryController extends Controller
$message
);
$redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'));
$redirectUrl = $this->get(Redirect::class)->to($request->headers->get('referer'));
return $this->redirect($redirectUrl);
}
@ -501,7 +506,7 @@ class EntryController extends Controller
$referer = $request->headers->get('referer');
$to = (1 !== preg_match('#' . $url . '$#i', $referer) ? $referer : null);
$redirectUrl = $this->get('wallabag_core.helper.redirect')->to($to);
$redirectUrl = $this->get(Redirect::class)->to($to);
return $this->redirect($redirectUrl);
}
@ -597,7 +602,7 @@ class EntryController extends Controller
*/
private function showEntries($type, Request $request, $page)
{
$repository = $this->get('wallabag_core.entry_repository');
$repository = $this->get(EntryRepository::class);
$searchTerm = (isset($request->get('search_entry')['term']) ? $request->get('search_entry')['term'] : '');
$currentRoute = (null !== $request->query->get('currentRoute') ? $request->query->get('currentRoute') : '');
@ -647,7 +652,7 @@ class EntryController extends Controller
$pagerAdapter = new DoctrineORMAdapter($qb->getQuery(), true, false);
$entries = $this->get('wallabag_core.helper.prepare_pager_for_entries')->prepare($pagerAdapter);
$entries = $this->get(PreparePagerForEntries::class)->prepare($pagerAdapter);
try {
$entries->setCurrentPage($page);
@ -657,7 +662,7 @@ class EntryController extends Controller
}
}
$nbEntriesUntagged = $this->get('wallabag_core.entry_repository')
$nbEntriesUntagged = $this->get(EntryRepository::class)
->countUntaggedEntriesByUser($this->getUser()->getId());
return $this->render(
@ -683,7 +688,7 @@ class EntryController extends Controller
$message = 'flashes.entry.notice.' . $prefixMessage;
try {
$this->get('wallabag_core.content_proxy')->updateEntry($entry, $entry->getUrl());
$this->get(ContentProxy::class)->updateEntry($entry, $entry->getUrl());
} catch (\Exception $e) {
$this->get('logger')->error('Error while saving an entry', [
'exception' => $e,
@ -694,11 +699,11 @@ class EntryController extends Controller
}
if (empty($entry->getDomainName())) {
$this->get('wallabag_core.content_proxy')->setEntryDomainName($entry);
$this->get(ContentProxy::class)->setEntryDomainName($entry);
}
if (empty($entry->getTitle())) {
$this->get('wallabag_core.content_proxy')->setDefaultEntryTitle($entry);
$this->get(ContentProxy::class)->setDefaultEntryTitle($entry);
}
$this->get('session')->getFlashBag()->add('notice', $message);
@ -721,6 +726,6 @@ class EntryController extends Controller
*/
private function checkIfEntryAlreadyExists(Entry $entry)
{
return $this->get('wallabag_core.entry_repository')->findByUrlAndUserId($entry->getUrl(), $this->getUser()->getId());
return $this->get(EntryRepository::class)->findByUrlAndUserId($entry->getUrl(), $this->getUser()->getId());
}
}

11
src/Wallabag/CoreBundle/Controller/ExportController.php
View File

@ -7,6 +7,9 @@ use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\Routing\Annotation\Route;
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Helper\EntriesExport;
use Wallabag\CoreBundle\Repository\EntryRepository;
use Wallabag\CoreBundle\Repository\TagRepository;
/**
* The try/catch can be removed once all formats will be implemented.
@ -29,7 +32,7 @@ class ExportController extends Controller
public function downloadEntryAction(Entry $entry, $format)
{
try {
return $this->get('wallabag_core.helper.entries_export')
return $this->get(EntriesExport::class)
->setEntries($entry)
->updateTitle('entry')
->updateAuthor('entry')
@ -56,11 +59,11 @@ class ExportController extends Controller
{
$method = ucfirst($category);
$methodBuilder = 'getBuilderFor' . $method . 'ByUser';
$repository = $this->get('wallabag_core.entry_repository');
$repository = $this->get(EntryRepository::class);
$title = $method;
if ('tag_entries' === $category) {
$tag = $this->get('wallabag_core.tag_repository')->findOneBySlug($request->query->get('tag'));
$tag = $this->get(TagRepository::class)->findOneBySlug($request->query->get('tag'));
$entries = $repository->findAllByTagId(
$this->getUser()->getId(),
@ -95,7 +98,7 @@ class ExportController extends Controller
}
try {
return $this->get('wallabag_core.helper.entries_export')
return $this->get(EntriesExport::class)
->setEntries($entries)
->updateTitle($title)
->updateAuthor($method)

8
src/Wallabag/CoreBundle/Controller/FeedController.php
View File

@ -14,6 +14,8 @@ use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
use Symfony\Component\Routing\Annotation\Route;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Wallabag\CoreBundle\Entity\Tag;
use Wallabag\CoreBundle\Helper\PreparePagerForEntries;
use Wallabag\CoreBundle\Repository\EntryRepository;
use Wallabag\UserBundle\Entity\User;
class FeedController extends Controller
@ -113,7 +115,7 @@ class FeedController extends Controller
UrlGeneratorInterface::ABSOLUTE_URL
);
$entriesByTag = $this->get('wallabag_core.entry_repository')->findAllByTagId(
$entriesByTag = $this->get(EntryRepository::class)->findAllByTagId(
$user->getId(),
$tag->getId(),
$sorts[$sort]
@ -121,7 +123,7 @@ class FeedController extends Controller
$pagerAdapter = new ArrayAdapter($entriesByTag);
$entries = $this->get('wallabag_core.helper.prepare_pager_for_entries')->prepare(
$entries = $this->get(PreparePagerForEntries::class)->prepare(
$pagerAdapter,
$user
);
@ -184,7 +186,7 @@ class FeedController extends Controller
*/
private function showEntries($type, User $user, $page = 1)
{
$repository = $this->get('wallabag_core.entry_repository');
$repository = $this->get(EntryRepository::class);
switch ($type) {
case 'starred':

3
src/Wallabag/CoreBundle/Controller/IgnoreOriginInstanceRuleController.php
View File

@ -6,6 +6,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Wallabag\CoreBundle\Entity\IgnoreOriginInstanceRule;
use Wallabag\CoreBundle\Repository\IgnoreOriginInstanceRuleRepository;
/**
* IgnoreOriginInstanceRuleController controller.
@ -21,7 +22,7 @@ class IgnoreOriginInstanceRuleController extends Controller
*/
public function indexAction()
{
$rules = $this->get('wallabag_core.ignore_origin_instance_rule_repository')->findAll();
$rules = $this->get(IgnoreOriginInstanceRuleRepository::class)->findAll();
return $this->render('WallabagCoreBundle:IgnoreOriginInstanceRule:index.html.twig', [
'rules' => $rules,

12
src/Wallabag/CoreBundle/Controller/SiteCredentialController.php
View File

@ -6,6 +6,8 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Annotation\Route;
use Wallabag\CoreBundle\Entity\SiteCredential;
use Wallabag\CoreBundle\Helper\CryptoProxy;
use Wallabag\CoreBundle\Repository\SiteCredentialRepository;
use Wallabag\UserBundle\Entity\User;
/**
@ -24,7 +26,7 @@ class SiteCredentialController extends Controller
{
$this->isSiteCredentialsEnabled();
$credentials = $this->get('wallabag_core.site_credential_repository')->findByUser($this->getUser());
$credentials = $this->get(SiteCredentialRepository::class)->findByUser($this->getUser());
return $this->render('WallabagCoreBundle:SiteCredential:index.html.twig', [
'credentials' => $credentials,
@ -48,8 +50,8 @@ class SiteCredentialController extends Controller
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
$credential->setUsername($this->get('wallabag_core.helper.crypto_proxy')->crypt($credential->getUsername()));
$credential->setPassword($this->get('wallabag_core.helper.crypto_proxy')->crypt($credential->getPassword()));
$credential->setUsername($this->get(CryptoProxy::class)->crypt($credential->getUsername()));
$credential->setPassword($this->get(CryptoProxy::class)->crypt($credential->getPassword()));
$em = $this->getDoctrine()->getManager();
$em->persist($credential);
@ -87,8 +89,8 @@ class SiteCredentialController extends Controller
$editForm->handleRequest($request);
if ($editForm->isSubmitted() && $editForm->isValid()) {
$siteCredential->setUsername($this->get('wallabag_core.helper.crypto_proxy')->crypt($siteCredential->getUsername()));
$siteCredential->setPassword($this->get('wallabag_core.helper.crypto_proxy')->crypt($siteCredential->getPassword()));
$siteCredential->setUsername($this->get(CryptoProxy::class)->crypt($siteCredential->getUsername()));
$siteCredential->setPassword($this->get(CryptoProxy::class)->crypt($siteCredential->getPassword()));
$em = $this->getDoctrine()->getManager();
$em->persist($siteCredential);

35
src/Wallabag/CoreBundle/Controller/TagController.php
View File

@ -13,6 +13,11 @@ use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Entity\Tag;
use Wallabag\CoreBundle\Form\Type\NewTagType;
use Wallabag\CoreBundle\Form\Type\RenameTagType;
use Wallabag\CoreBundle\Helper\PreparePagerForEntries;
use Wallabag\CoreBundle\Helper\Redirect;
use Wallabag\CoreBundle\Helper\TagsAssigner;
use Wallabag\CoreBundle\Repository\EntryRepository;
use Wallabag\CoreBundle\Repository\TagRepository;
class TagController extends Controller
{
@ -27,7 +32,7 @@ class TagController extends Controller
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
$this->get('wallabag_core.tags_assigner')->assignTagsToEntry(
$this->get(TagsAssigner::class)->assignTagsToEntry(
$entry,
$form->get('label')->getData()
);
@ -69,7 +74,7 @@ class TagController extends Controller
$em->flush();
}
$redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'), '', true);
$redirectUrl = $this->get(Redirect::class)->to($request->headers->get('referer'), '', true);
return $this->redirect($redirectUrl);
}
@ -83,9 +88,9 @@ class TagController extends Controller
*/
public function showTagAction()
{
$tags = $this->get('wallabag_core.tag_repository')
$tags = $this->get(TagRepository::class)
->findAllFlatTagsWithNbEntries($this->getUser()->getId());
$nbEntriesUntagged = $this->get('wallabag_core.entry_repository')
$nbEntriesUntagged = $this->get(EntryRepository::class)
->countUntaggedEntriesByUser($this->getUser()->getId());
$renameForms = [];
@ -110,14 +115,14 @@ class TagController extends Controller
*/
public function showEntriesForTagAction(Tag $tag, $page, Request $request)
{
$entriesByTag = $this->get('wallabag_core.entry_repository')->findAllByTagId(
$entriesByTag = $this->get(EntryRepository::class)->findAllByTagId(
$this->getUser()->getId(),
$tag->getId()
);
$pagerAdapter = new ArrayAdapter($entriesByTag);
$entries = $this->get('wallabag_core.helper.prepare_pager_for_entries')->prepare($pagerAdapter);
$entries = $this->get(PreparePagerForEntries::class)->prepare($pagerAdapter);
try {
$entries->setCurrentPage($page);
@ -152,7 +157,7 @@ class TagController extends Controller
$form = $this->createForm(RenameTagType::class, new Tag());
$form->handleRequest($request);
$redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'), '', true);
$redirectUrl = $this->get(Redirect::class)->to($request->headers->get('referer'), '', true);
if ($form->isSubmitted() && $form->isValid()) {
$newTag = new Tag();
@ -162,18 +167,18 @@ class TagController extends Controller
return $this->redirect($redirectUrl);
}
$tagFromRepo = $this->get('wallabag_core.tag_repository')->findOneByLabel($newTag->getLabel());
$tagFromRepo = $this->get(TagRepository::class)->findOneByLabel($newTag->getLabel());
if (null !== $tagFromRepo) {
$newTag = $tagFromRepo;
}
$entries = $this->get('wallabag_core.entry_repository')->findAllByTagId(
$entries = $this->get(EntryRepository::class)->findAllByTagId(
$this->getUser()->getId(),
$tag->getId()
);
foreach ($entries as $entry) {
$this->get('wallabag_core.tags_assigner')->assignTagsToEntry(
$this->get(TagsAssigner::class)->assignTagsToEntry(
$entry,
$newTag->getLabel(),
[$newTag]
@ -204,13 +209,13 @@ class TagController extends Controller
$currentRoute = $request->query->has('currentRoute') ? $request->query->get('currentRoute') : '';
/** @var QueryBuilder $qb */
$qb = $this->get('wallabag_core.entry_repository')->getBuilderForSearchByUser($this->getUser()->getId(), $filter, $currentRoute);
$qb = $this->get(EntryRepository::class)->getBuilderForSearchByUser($this->getUser()->getId(), $filter, $currentRoute);
$em = $this->getDoctrine()->getManager();
$entries = $qb->getQuery()->getResult();
foreach ($entries as $entry) {
$this->get('wallabag_core.tags_assigner')->assignTagsToEntry(
$this->get(TagsAssigner::class)->assignTagsToEntry(
$entry,
$filter
);
@ -220,7 +225,7 @@ class TagController extends Controller
$em->flush();
return $this->redirect($this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'), '', true));
return $this->redirect($this->get(Redirect::class)->to($request->headers->get('referer'), '', true));
}
/**
@ -234,7 +239,7 @@ class TagController extends Controller
public function removeTagAction(Tag $tag, Request $request)
{
foreach ($tag->getEntriesByUserId($this->getUser()->getId()) as $entry) {
$this->get('wallabag_core.entry_repository')->removeTag($this->getUser()->getId(), $tag);
$this->get(EntryRepository::class)->removeTag($this->getUser()->getId(), $tag);
}
// remove orphan tag in case no entries are associated to it
@ -244,7 +249,7 @@ class TagController extends Controller
$em->flush();
}
$redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'), '', true);
$redirectUrl = $this->get(Redirect::class)->to($request->headers->get('referer'), '', true);
return $this->redirect($redirectUrl);
}

9
src/Wallabag/CoreBundle/DataFixtures/SiteCredentialFixtures.php
View File

@ -8,6 +8,7 @@ use Doctrine\Persistence\ObjectManager;
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Wallabag\CoreBundle\Entity\SiteCredential;
use Wallabag\CoreBundle\Helper\CryptoProxy;
use Wallabag\UserBundle\DataFixtures\UserFixtures;
class SiteCredentialFixtures extends Fixture implements DependentFixtureInterface, ContainerAwareInterface
@ -29,15 +30,15 @@ class SiteCredentialFixtures extends Fixture implements DependentFixtureInterfac
{
$credential = new SiteCredential($this->getReference('admin-user'));
$credential->setHost('.super.com');
$credential->setUsername($this->container->get('wallabag_core.helper.crypto_proxy')->crypt('.super'));
$credential->setPassword($this->container->get('wallabag_core.helper.crypto_proxy')->crypt('bar'));
$credential->setUsername($this->container->get(CryptoProxy::class)->crypt('.super'));
$credential->setPassword($this->container->get(CryptoProxy::class)->crypt('bar'));
$manager->persist($credential);
$credential = new SiteCredential($this->getReference('admin-user'));
$credential->setHost('paywall.example.com');
$credential->setUsername($this->container->get('wallabag_core.helper.crypto_proxy')->crypt('paywall.example'));
$credential->setPassword($this->container->get('wallabag_core.helper.crypto_proxy')->crypt('bar'));
$credential->setUsername($this->container->get(CryptoProxy::class)->crypt('paywall.example'));
$credential->setPassword($this->container->get(CryptoProxy::class)->crypt('bar'));
$manager->persist($credential);

2
src/Wallabag/CoreBundle/Operator/Doctrine/Matches.php
View File

@ -10,7 +10,7 @@ namespace Wallabag\CoreBundle\Operator\Doctrine;
*
* This operator will be used to compile tagging rules in DQL, usable
* by Doctrine ORM.
* It's registered in RulerZ using a service (wallabag.operator.doctrine.matches);
* It's registered in RulerZ using a service;
*/
class Matches
{

2
src/Wallabag/CoreBundle/Operator/Doctrine/NotMatches.php
View File

@ -10,7 +10,7 @@ namespace Wallabag\CoreBundle\Operator\Doctrine;
*
* This operator will be used to compile tagging rules in DQL, usable
* by Doctrine ORM.
* It's registered in RulerZ using a service (wallabag.operator.doctrine.notmatches);
* It's registered in RulerZ using a service;
*/
class NotMatches
{

2
src/Wallabag/CoreBundle/Operator/PHP/Matches.php
View File

@ -10,7 +10,7 @@ namespace Wallabag\CoreBundle\Operator\PHP;
*
* This operator will be used to compile tagging rules in PHP, usable
* directly on Entry objects for instance.
* It's registered in RulerZ using a service (wallabag.operator.array.matches);
* It's registered in RulerZ using a service;
*/
class Matches
{

2
src/Wallabag/CoreBundle/Operator/PHP/NotMatches.php
View File

@ -10,7 +10,7 @@ namespace Wallabag\CoreBundle\Operator\PHP;
*
* This operator will be used to compile tagging rules in PHP, usable
* directly on Entry objects for instance.
* It's registered in RulerZ using a service (wallabag.operator.array.notmatches);
* It's registered in RulerZ using a service;
*/
class NotMatches
{

2
src/Wallabag/CoreBundle/Operator/PHP/PatternMatches.php
View File

@ -10,7 +10,7 @@ namespace Wallabag\CoreBundle\Operator\PHP;
*
* This operator will be used to compile ignore origin rules in PHP, usable
* directly on Entry objects for instance.
* It's registered in RulerZ using a service (wallabag.operator.array.pattern_matches);
* It's registered in RulerZ using a service;
*/
class PatternMatches
{

132
src/Wallabag/CoreBundle/Resources/config/services.yml
View File

@ -1,12 +1,12 @@
services:
wallabag_core.helper.detect_active_theme:
Wallabag\CoreBundle\Helper\DetectActiveTheme:
class: Wallabag\CoreBundle\Helper\DetectActiveTheme
arguments:
- "@security.token_storage"
- "%wallabag_core.theme%"
# custom form type
wallabag_core.form.type.config:
Wallabag\CoreBundle\Form\Type\ConfigType:
class: Wallabag\CoreBundle\Form\Type\ConfigType
arguments:
- "%liip_theme.themes%"
@ -14,42 +14,42 @@ services:
tags:
- { name: form.type }
wallabag_core.filter.type.entry:
Wallabag\CoreBundle\Form\Type\EntryFilterType:
class: Wallabag\CoreBundle\Form\Type\EntryFilterType
arguments:
- "@wallabag_core.entry_repository"
- '@Wallabag\CoreBundle\Repository\EntryRepository'
- "@security.token_storage"
tags:
- { name: form.type }
wallabag_core.param_converter.username_feed_token_converter:
Wallabag\CoreBundle\ParamConverter\UsernameFeedTokenConverter:
class: Wallabag\CoreBundle\ParamConverter\UsernameFeedTokenConverter
tags:
- { name: request.param_converter, converter: username_feed_token_converter }
arguments:
- "@doctrine"
wallabag_core.subscriber.table_prefix:
Wallabag\CoreBundle\Event\Subscriber\TablePrefixSubscriber:
class: Wallabag\CoreBundle\Event\Subscriber\TablePrefixSubscriber
arguments:
- "%database_table_prefix%"
tags:
- { name: doctrine.event_subscriber }
wallabag_core.graby:
Graby\Graby:
class: Graby\Graby
arguments:
-
error_message: '%wallabag_core.fetching_error_message%'
error_message_title: '%wallabag_core.fetching_error_message_title%'
- "@wallabag_core.http_client"
- "@wallabag_core.graby.config_builder"
- '@Graby\SiteConfig\ConfigBuilder'
calls:
- [ setLogger, [ "@logger" ] ]
tags:
- { name: monolog.logger, channel: graby }
wallabag_core.graby.config_builder:
Graby\SiteConfig\ConfigBuilder:
class: Graby\SiteConfig\ConfigBuilder
arguments:
- {}
@ -58,94 +58,94 @@ services:
wallabag_core.http_client:
alias: 'httplug.client.wallabag_core'
wallabag_core.guzzle_authenticator.config_builder:
Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder:
class: Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder
arguments:
- "@wallabag_core.graby.config_builder"
- '@Graby\SiteConfig\ConfigBuilder'
- "@security.token_storage"
- "@wallabag_core.site_credential_repository"
- '@Wallabag\CoreBundle\Repository\SiteCredentialRepository'
- '@logger'
tags:
- { name: monolog.logger, channel: graby }
# service alias override
bd_guzzle_site_authenticator.site_config_builder:
alias: wallabag_core.guzzle_authenticator.config_builder
alias: Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder
wallabag_core.http_client_factory:
Wallabag\CoreBundle\Helper\HttpClientFactory:
class: Wallabag\CoreBundle\Helper\HttpClientFactory
arguments:
- "@wallabag_core.guzzle.cookie_jar"
- '@Wallabag\CoreBundle\Helper\FileCookieJar'
- '@=service(''craue_config'').get(''restricted_access'')'
- '@logger'
calls:
- ["addSubscriber", ["@bd_guzzle_site_authenticator.authenticator_subscriber"]]
wallabag_core.guzzle.cookie_jar:
Wallabag\CoreBundle\Helper\FileCookieJar:
class: Wallabag\CoreBundle\Helper\FileCookieJar
arguments:
- "@logger"
- "%kernel.cache_dir%/cookiejar.json"
wallabag_core.content_proxy:
Wallabag\CoreBundle\Helper\ContentProxy:
class: Wallabag\CoreBundle\Helper\ContentProxy
arguments:
- "@wallabag_core.graby"
- "@wallabag_core.rule_based_tagger"
- "@wallabag_core.rule_based_ignore_origin_processor"
- '@Graby\Graby'
- '@Wallabag\CoreBundle\Helper\RuleBasedTagger'
- '@Wallabag\CoreBundle\Helper\RuleBasedIgnoreOriginProcessor'
- "@validator"
- "@logger"
- '%wallabag_core.fetching_error_message%'
- '@=service(''craue_config'').get(''store_article_headers'')'
wallabag_core.tags_assigner:
Wallabag\CoreBundle\Helper\TagsAssigner:
class: Wallabag\CoreBundle\Helper\TagsAssigner
arguments:
- "@wallabag_core.tag_repository"
- '@Wallabag\CoreBundle\Repository\TagRepository'
wallabag_core.rule_based_tagger:
Wallabag\CoreBundle\Helper\RuleBasedTagger:
class: Wallabag\CoreBundle\Helper\RuleBasedTagger
arguments:
- "@rulerz"
- "@wallabag_core.tag_repository"
- "@wallabag_core.entry_repository"
- '@Wallabag\CoreBundle\Repository\TagRepository'
- '@Wallabag\CoreBundle\Repository\EntryRepository'
- "@logger"
wallabag_core.rule_based_ignore_origin_processor:
Wallabag\CoreBundle\Helper\RuleBasedIgnoreOriginProcessor:
class: Wallabag\CoreBundle\Helper\RuleBasedIgnoreOriginProcessor
arguments:
- "@rulerz"
- "@logger"
- "@wallabag_core.ignore_origin_instance_rule_repository"
- '@Wallabag\CoreBundle\Repository\IgnoreOriginInstanceRuleRepository'
# repository as a service
wallabag_core.entry_repository:
Wallabag\CoreBundle\Repository\EntryRepository:
class: Wallabag\CoreBundle\Repository\EntryRepository
factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
arguments:
- WallabagCoreBundle:Entry
wallabag_core.tag_repository:
Wallabag\CoreBundle\Repository\TagRepository:
class: Wallabag\CoreBundle\Repository\TagRepository
factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
arguments:
- WallabagCoreBundle:Tag
wallabag_core.site_credential_repository:
Wallabag\CoreBundle\Repository\SiteCredentialRepository:
class: Wallabag\CoreBundle\Repository\SiteCredentialRepository
factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
arguments:
- WallabagCoreBundle:SiteCredential
calls:
- [ setCrypto, [ "@wallabag_core.helper.crypto_proxy" ] ]
- [ setCrypto, [ '@Wallabag\CoreBundle\Helper\CryptoProxy' ] ]
wallabag_core.ignore_origin_instance_rule_repository:
Wallabag\CoreBundle\Repository\IgnoreOriginInstanceRuleRepository:
class: Wallabag\CoreBundle\Repository\IgnoreOriginInstanceRuleRepository
factory: [ "@doctrine.orm.default_entity_manager", getRepository ]
arguments:
- WallabagCoreBundle:IgnoreOriginInstanceRule
wallabag_core.helper.entries_export:
Wallabag\CoreBundle\Helper\EntriesExport:
class: Wallabag\CoreBundle\Helper\EntriesExport
arguments:
- "@translator"
@ -153,44 +153,44 @@ services:
- web/img/appicon/apple-touch-icon-152.png
- "@security.token_storage"
wallabag.operator.array.matches:
Wallabag\CoreBundle\Operator\PHP\Matches:
class: Wallabag\CoreBundle\Operator\PHP\Matches
tags:
- { name: rulerz.operator, target: native, operator: matches }
wallabag.operator.doctrine.matches:
Wallabag\CoreBundle\Operator\Doctrine\Matches:
class: Wallabag\CoreBundle\Operator\Doctrine\Matches
tags:
- { name: rulerz.operator, target: doctrine, operator: matches, inline: true }
wallabag.operator.array.notmatches:
Wallabag\CoreBundle\Operator\PHP\NotMatches:
class: Wallabag\CoreBundle\Operator\PHP\NotMatches
tags:
- { name: rulerz.operator, target: native, operator: notmatches }
wallabag.operator.doctrine.notmatches:
Wallabag\CoreBundle\Operator\Doctrine\NotMatches:
class: Wallabag\CoreBundle\Operator\Doctrine\NotMatches
tags:
- { name: rulerz.operator, target: doctrine, operator: notmatches, inline: true }
wallabag.operator.array.pattern_matches:
Wallabag\CoreBundle\Operator\PHP\PatternMatches:
class: Wallabag\CoreBundle\Operator\PHP\PatternMatches
tags:
- { name: rulerz.operator, target: native, operator: "~" }
wallabag_core.helper.redirect:
Wallabag\CoreBundle\Helper\Redirect:
class: Wallabag\CoreBundle\Helper\Redirect
arguments:
- "@router"
- "@security.token_storage"
wallabag_core.helper.prepare_pager_for_entries:
Wallabag\CoreBundle\Helper\PreparePagerForEntries:
class: Wallabag\CoreBundle\Helper\PreparePagerForEntries
arguments:
- "@security.token_storage"
- "@router"
wallabag_core.redis.client:
Predis\Client:
class: Predis\Client
arguments:
-
@ -200,31 +200,31 @@ services:
path: '%redis_path%'
password: '%redis_password%'
wallabag_core.exception_controller:
Wallabag\CoreBundle\Controller\ExceptionController:
class: Wallabag\CoreBundle\Controller\ExceptionController
public: true
arguments:
- '@twig'
- '%kernel.debug%'
wallabag_core.subscriber.sqlite_cascade_delete:
Wallabag\CoreBundle\Event\Subscriber\SQLiteCascadeDeleteSubscriber:
class: Wallabag\CoreBundle\Event\Subscriber\SQLiteCascadeDeleteSubscriber
arguments:
- "@doctrine"
tags:
- { name: doctrine.event_subscriber }
wallabag_core.subscriber.download_images:
Wallabag\CoreBundle\Event\Subscriber\DownloadImagesSubscriber:
class: Wallabag\CoreBundle\Event\Subscriber\DownloadImagesSubscriber
arguments:
- "@doctrine.orm.default_entity_manager"
- "@wallabag_core.entry.download_images"
- '@Wallabag\CoreBundle\Helper\DownloadImages'
- '@=service(''craue_config'').get(''download_images_enabled'')'
- "@logger"
tags:
- { name: kernel.event_subscriber }
wallabag_core.entry.download_images:
Wallabag\CoreBundle\Helper\DownloadImages:
class: Wallabag\CoreBundle\Helper\DownloadImages
arguments:
- "@wallabag_core.entry.download_images.client"
@ -235,44 +235,12 @@ services:
wallabag_core.entry.download_images.client:
alias: 'httplug.client.wallabag_core.entry.download_images'
wallabag_core.helper.crypto_proxy:
Wallabag\CoreBundle\Helper\CryptoProxy:
class: Wallabag\CoreBundle\Helper\CryptoProxy
arguments:
- "%wallabag_core.site_credentials.encryption_key_path%"
- "@logger"
wallabag_core.command.clean_downloaded_images:
class: Wallabag\CoreBundle\Command\CleanDownloadedImagesCommand
tags: ['console.command']
wallabag_core.command.clean_duplicates:
class: Wallabag\CoreBundle\Command\CleanDuplicatesCommand
tags: ['console.command']
wallabag_core.command.export:
class: Wallabag\CoreBundle\Command\ExportCommand
tags: ['console.command']
wallabag_core.command.generate_url_hashes:
class: Wallabag\CoreBundle\Command\GenerateUrlHashesCommand
tags: ['console.command']
wallabag_core.command.install:
class: Wallabag\CoreBundle\Command\InstallCommand
tags: ['console.command']
wallabag_core.command.list_user:
class: Wallabag\CoreBundle\Command\ListUserCommand
tags: ['console.command']
wallabag_core.command.reload_entry:
class: Wallabag\CoreBundle\Command\ReloadEntryCommand
tags: ['console.command']
wallabag_core.command.show_user:
class: Wallabag\CoreBundle\Command\ShowUserCommand
tags: ['console.command']
wallabag_core.command.tag_all:
class: Wallabag\CoreBundle\Command\TagAllCommand
tags: ['console.command']
Wallabag\CoreBundle\Command\:
resource: ../../Command/*
autoconfigure: true