Make sure Tag::applyRule() returns true if at least one tag is added

Pierstoval · Pierstoval · commit 06ff3e3de281 · 2019-12-21T21:41:00.000+01:00
diff --git a/src/Entity/Operation.php b/src/Entity/Operation.php
@@ -143,20 +143,25 @@ public function getTags(): Collection
      */
     public function applyRule(TagRule $rule): bool
     {
+        $addedTags = false;
+
         $matches = $rule->isRegex()
             ? \preg_match($rule->getMatchingPattern(), $this->details)
             : false !== \strpos($this->details, $rule->getMatchingPattern())
         ;
 
         if ($matches) {
             foreach ($rule->getTags() as $tag) {
-                $this->addTag($tag);
+                if (!$this->tags->contains($tag)) {
+                    $this->addTag($tag);
+                    $addedTags = true;
+                }
             }
 
-            return true;
+            return $addedTags;
         }
 
-        return false;
+        return $addedTags;
     }
 
     private function addTag(Tag $tag): void

Original file line number	Diff line number	Diff line change
`@@ -143,20 +143,25 @@ public function getTags(): Collection`
`143`	`143`	`*/`
`144`	`144`	`public function applyRule(TagRule $rule): bool`
`145`	`145`	`{`
	`146`	`+ $addedTags = false;`
	`147`	`+`
`146`	`148`	`$matches = $rule->isRegex()`
`147`	`149`	`? \preg_match($rule->getMatchingPattern(), $this->details)`
`148`	`150`	`: false !== \strpos($this->details, $rule->getMatchingPattern())`
`149`	`151`	`;`
`150`	`152`
`151`	`153`	`if ($matches) {`
`152`	`154`	`foreach ($rule->getTags() as $tag) {`
`153`		`- $this->addTag($tag);`
	`155`	`+ if (!$this->tags->contains($tag)) {`
	`156`	`+ $this->addTag($tag);`
	`157`	`+ $addedTags = true;`
	`158`	`+ }`
`154`	`159`	`}`
`155`	`160`
`156`		`- return true;`
	`161`	`+ return $addedTags;`
`157`	`162`	`}`
`158`	`163`
`159`		`- return false;`
	`164`	`+ return $addedTags;`
`160`	`165`	`}`
`161`	`166`
`162`	`167`	`private function addTag(Tag $tag): void`