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

Cleanup

Browse Source
This commit is contained in:
Jeremy Benoist
2022-11-23 15:51:33 +01:00
parent af6363bbbd
commit b7dba18cb2
41 changed files with 285 additions and 950 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ class ConfigController extends Controller
*/
public function indexAction(Request $request)
{
$em = $this->getDoctrine()->getManager();
$em = $this->get('doctrine')->getManager();
$config = $this->getConfig();
$userManager = $this->container->get(UserManagerInterface::class);
$user = $this->getUser();
@ -125,7 +125,7 @@ class ConfigController extends Controller
$action = $this->generateUrl('config') . '#set5';
if ($request->query->has('tagging-rule')) {
$taggingRule = $this->getDoctrine()
$taggingRule = $this->get('doctrine')
->getRepository(TaggingRule::class)
->find($request->query->get('tagging-rule'));
@ -188,7 +188,7 @@ class ConfigController extends Controller
$action = $this->generateUrl('config') . '#set6';
if ($request->query->has('ignore-origin-user-rule')) {
$ignoreOriginUserRule = $this->getDoctrine()
$ignoreOriginUserRule = $this->get('doctrine')
->getRepository(IgnoreOriginUserRule::class)
->find($request->query->get('ignore-origin-user-rule'));
@ -414,7 +414,7 @@ class ConfigController extends Controller
$config = $this->getConfig();
$config->setFeedToken(Utils::generateToken());
$em = $this->getDoctrine()->getManager();
$em = $this->get('doctrine')->getManager();
$em->persist($config);
$em->flush();
@ -440,7 +440,7 @@ class ConfigController extends Controller
$config = $this->getConfig();
$config->setFeedToken(null);
$em = $this->getDoctrine()->getManager();
$em = $this->get('doctrine')->getManager();
$em->persist($config);
$em->flush();
@ -467,7 +467,7 @@ class ConfigController extends Controller
{
$this->validateRuleAction($rule);
$em = $this->getDoctrine()->getManager();
$em = $this->get('doctrine')->getManager();
$em->remove($rule);
$em->flush();
@ -504,7 +504,7 @@ class ConfigController extends Controller
{
$this->validateRuleAction($rule);
$em = $this->getDoctrine()->getManager();
$em = $this->get('doctrine')->getManager();
$em->remove($rule);
$em->flush();
@ -541,7 +541,7 @@ class ConfigController extends Controller
{
switch ($type) {
case 'annotations':
$this->getDoctrine()
$this->get('doctrine')
->getRepository(Annotation::class)
->removeAllByUserId($this->getUser()->getId());
break;
@ -552,7 +552,7 @@ class ConfigController extends Controller
// SQLite doesn't care about cascading remove, so we need to manually remove associated stuff
// otherwise they won't be removed ...
if ($this->get(ManagerRegistry::class)->getConnection()->getDatabasePlatform() instanceof SqlitePlatform) {
$this->getDoctrine()->getRepository(Annotation::class)->removeAllByUserId($this->getUser()->getId());
$this->get('doctrine')->getRepository(Annotation::class)->removeAllByUserId($this->getUser()->getId());
}
// manually remove tags to avoid orphan tag
@ -622,7 +622,7 @@ class ConfigController extends Controller
$user = $this->getUser();
$user->getConfig()->setListMode(!$user->getConfig()->getListMode());
$em = $this->getDoctrine()->getManager();
$em = $this->get('doctrine')->getManager();
$em->persist($user);
$em->flush();
@ -691,7 +691,7 @@ class ConfigController extends Controller
->removeTags($userId, $tags);
// cleanup orphan tags
$em = $this->getDoctrine()->getManager();
$em = $this->get('doctrine')->getManager();
foreach ($tags as $tag) {
if (0 === \count($tag->getEntries())) {
@ -726,9 +726,9 @@ class ConfigController extends Controller
private function removeAnnotationsForArchivedByUserId($userId)
{
$em = $this->getDoctrine()->getManager();
$em = $this->get('doctrine')->getManager();
$archivedEntriesAnnotations = $this->getDoctrine()
$archivedEntriesAnnotations = $this->get('doctrine')
->getRepository(Annotation::class)
->findAllArchivedEntriesByUser($userId);
@ -757,7 +757,7 @@ class ConfigController extends Controller
*/
private function getConfig()
{
$config = $this->getDoctrine()
$config = $this->get('doctrine')
->getRepository(ConfigEntity::class)
->findOneByUser($this->getUser());

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

@ -40,7 +40,7 @@ class EntryController extends Controller
*/
public function massAction(Request $request)
{
$em = $this->getDoctrine()->getManager();
$em = $this->get('doctrine')->getManager();
$values = $request->request->all();
$tagsToAdd = [];
@ -173,7 +173,7 @@ class EntryController extends Controller
$this->updateEntry($entry);
$em = $this->getDoctrine()->getManager();
$em = $this->get('doctrine')->getManager();
$em->persist($entry);
$em->flush();
@ -201,7 +201,7 @@ class EntryController extends Controller
if (false === $this->checkIfEntryAlreadyExists($entry)) {
$this->updateEntry($entry);
$em = $this->getDoctrine()->getManager();
$em = $this->get('doctrine')->getManager();
$em->persist($entry);
$em->flush();
@ -238,7 +238,7 @@ class EntryController extends Controller
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
$em = $this->getDoctrine()->getManager();
$em = $this->get('doctrine')->getManager();
$em->persist($entry);
$em->flush();
@ -409,7 +409,7 @@ class EntryController extends Controller
return $this->redirect($this->generateUrl('view', ['id' => $entry->getId()]));
}
$em = $this->getDoctrine()->getManager();
$em = $this->get('doctrine')->getManager();
$em->persist($entry);
$em->flush();
@ -431,7 +431,7 @@ class EntryController extends Controller
$this->checkUserAction($entry);
$entry->toggleArchive();
$this->getDoctrine()->getManager()->flush();
$this->get('doctrine')->getManager()->flush();
$message = 'flashes.entry.notice.entry_unarchived';
if ($entry->isArchived()) {
@ -461,7 +461,7 @@ class EntryController extends Controller
$entry->toggleStar();
$entry->updateStar($entry->isStarred());
$this->getDoctrine()->getManager()->flush();
$this->get('doctrine')->getManager()->flush();
$message = 'flashes.entry.notice.entry_unstarred';
if ($entry->isStarred()) {
@ -500,7 +500,7 @@ class EntryController extends Controller
// entry deleted, dispatch event about it!
$this->get(EventDispatcherInterface::class)->dispatch(EntryDeletedEvent::NAME, new EntryDeletedEvent($entry));
$em = $this->getDoctrine()->getManager();
$em = $this->get('doctrine')->getManager();
$em->remove($entry);
$em->flush();
@ -532,7 +532,7 @@ class EntryController extends Controller
if (null === $entry->getUid()) {
$entry->generateUid();
$em = $this->getDoctrine()->getManager();
$em = $this->get('doctrine')->getManager();
$em->persist($entry);
$em->flush();
}
@ -555,7 +555,7 @@ class EntryController extends Controller
$entry->cleanUid();
$em = $this->getDoctrine()->getManager();
$em = $this->get('doctrine')->getManager();
$em->persist($entry);
$em->flush();

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

@ -50,7 +50,7 @@ class IgnoreOriginInstanceRuleController extends Controller
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
$em = $this->getDoctrine()->getManager();
$em = $this->get('doctrine')->getManager();
$em->persist($ignoreOriginInstanceRule);
$em->flush();
@ -82,7 +82,7 @@ class IgnoreOriginInstanceRuleController extends Controller
$editForm->handleRequest($request);
if ($editForm->isSubmitted() && $editForm->isValid()) {
$em = $this->getDoctrine()->getManager();
$em = $this->get('doctrine')->getManager();
$em->persist($ignoreOriginInstanceRule);
$em->flush();
@ -119,7 +119,7 @@ class IgnoreOriginInstanceRuleController extends Controller
$this->get(TranslatorInterface::class)->trans('flashes.ignore_origin_instance_rule.notice.deleted')
);
$em = $this->getDoctrine()->getManager();
$em = $this->get('doctrine')->getManager();
$em->remove($ignoreOriginInstanceRule);
$em->flush();
}

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

@ -60,7 +60,7 @@ class SiteCredentialController extends Controller
$credential->setUsername($this->get(CryptoProxy::class)->crypt($credential->getUsername()));
$credential->setPassword($this->get(CryptoProxy::class)->crypt($credential->getPassword()));
$em = $this->getDoctrine()->getManager();
$em = $this->get('doctrine')->getManager();
$em->persist($credential);
$em->flush();
@ -99,7 +99,7 @@ class SiteCredentialController extends Controller
$siteCredential->setUsername($this->get(CryptoProxy::class)->crypt($siteCredential->getUsername()));
$siteCredential->setPassword($this->get(CryptoProxy::class)->crypt($siteCredential->getPassword()));
$em = $this->getDoctrine()->getManager();
$em = $this->get('doctrine')->getManager();
$em->persist($siteCredential);
$em->flush();
@ -140,7 +140,7 @@ class SiteCredentialController extends Controller
$this->get(TranslatorInterface::class)->trans('flashes.site_credential.notice.deleted', ['%host%' => $siteCredential->getHost()])
);
$em = $this->getDoctrine()->getManager();
$em = $this->get('doctrine')->getManager();
$em->remove($siteCredential);
$em->flush();
}

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

@ -39,7 +39,7 @@ class TagController extends Controller
$form->get('label')->getData()
);
$em = $this->getDoctrine()->getManager();
$em = $this->get('doctrine')->getManager();
$em->persist($entry);
$em->flush();
@ -67,7 +67,7 @@ class TagController extends Controller
public function removeTagFromEntry(Request $request, Entry $entry, Tag $tag)
{
$entry->removeTag($tag);
$em = $this->getDoctrine()->getManager();
$em = $this->get('doctrine')->getManager();
$em->flush();
// remove orphan tag in case no entries are associated to it
@ -188,7 +188,7 @@ class TagController extends Controller
$entry->removeTag($tag);
}
$this->getDoctrine()->getManager()->flush();
$this->get('doctrine')->getManager()->flush();
$this->get(SessionInterface::class)->getFlashBag()->add(
'notice',
@ -212,7 +212,7 @@ class TagController extends Controller
/** @var QueryBuilder $qb */
$qb = $this->get(EntryRepository::class)->getBuilderForSearchByUser($this->getUser()->getId(), $filter, $currentRoute);
$em = $this->getDoctrine()->getManager();
$em = $this->get('doctrine')->getManager();
$entries = $qb->getQuery()->getResult();
@ -246,7 +246,7 @@ class TagController extends Controller
// remove orphan tag in case no entries are associated to it
if (0 === \count($tag->getEntries())) {
$em = $this->getDoctrine()->getManager();
$em = $this->get('doctrine')->getManager();
$em->remove($tag);
$em->flush();
}