X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FHelper%2FRuleBasedTagger.php;h=239d09ae7bd8ff7f13dd8aeb74d12884621476db;hb=e57df5611fe82ce61a71d51c762ee9296f18c3ac;hp=3f9953c0995b8422de0cd78b0e5b39f82a28af8e;hpb=a7f1921f7db312b5def3839393357f443dcbb52c;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php b/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php
index 3f9953c0..239d09ae 100644
--- a/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php
+++ b/src/Wallabag/CoreBundle/Helper/RuleBasedTagger.php
@@ -3,7 +3,6 @@
 namespace Wallabag\CoreBundle\Helper;
 
 use RulerZ\RulerZ;
-
 use Wallabag\CoreBundle\Entity\Entry;
 use Wallabag\CoreBundle\Entity\Tag;
 use Wallabag\CoreBundle\Repository\EntryRepository;
@@ -18,15 +17,15 @@ class RuleBasedTagger
 
     public function __construct(RulerZ $rulerz, TagRepository $tagRepository, EntryRepository $entryRepository)
     {
-        $this->rulerz          = $rulerz;
-        $this->tagRepository   = $tagRepository;
+        $this->rulerz = $rulerz;
+        $this->tagRepository = $tagRepository;
         $this->entryRepository = $entryRepository;
     }
 
     /**
      * Add tags from rules defined by the user.
      *
-     * @param Entry $entry Entry to tag.
+     * @param Entry $entry Entry to tag
      */
     public function tag(Entry $entry)
     {
@@ -38,7 +37,7 @@ class RuleBasedTagger
             }
 
             foreach ($rule->getTags() as $label) {
-                $tag = $this->getTag($entry->getUser(), $label);
+                $tag = $this->getTag($label);
 
                 $entry->addTag($tag);
             }
@@ -50,23 +49,22 @@ class RuleBasedTagger
      *
      * @param User $user
      *
-     * @return array<Entry> A list of modified entries.
+     * @return array<Entry> A list of modified entries
      */
     public function tagAllForUser(User $user)
     {
-        $rules   = $this->getRulesForUser($user);
-        $entries = array();
+        $rules = $this->getRulesForUser($user);
+        $entries = [];
 
         foreach ($rules as $rule) {
-            $qb      = $this->entryRepository->getBuilderForAllByUser($user->getId());
+            $qb = $this->entryRepository->getBuilderForAllByUser($user->getId());
             $entries = $this->rulerz->filter($qb, $rule->getRule());
 
             foreach ($entries as $entry) {
                 foreach ($rule->getTags() as $label) {
-                    $tag = $this->getTag($user, $label);
+                    $tag = $this->getTag($label);
 
                     $entry->addTag($tag);
-                    $entries[] = $entry;
                 }
             }
         }
@@ -75,19 +73,18 @@ class RuleBasedTagger
     }
 
     /**
-     * Fetch a tag for a user.
+     * Fetch a tag.
      *
-     * @param User   $user
-     * @param string $label The tag's label.
+     * @param string $label The tag's label
      *
      * @return Tag
      */
-    private function getTag(User $user, $label)
+    private function getTag($label)
     {
-        $tag = $this->tagRepository->findOneByLabelAndUserId($label, $user->getId());
+        $tag = $this->tagRepository->findOneByLabel($label);
 
         if (!$tag) {
-            $tag = new Tag($user);
+            $tag = new Tag();
             $tag->setLabel($label);
         }