Improve untag all query count and add phpdoc for properties

Author: Tofandel

src/IlluminateTag.php

@@ -25,6 +25,10 @@
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
+/** @property string $name */
+/** @property string $namespace */
+/** @property string $slug */
+/** @property int $count */
 class IlluminateTag extends Model
 {
     /**

src/TaggableTrait.php

@@ -20,10 +20,12 @@
 
 namespace Cartalyst\Tags;
 
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 
+/** @property Collection<IlluminateTag> $tags */
 trait TaggableTrait
 {
     /**
@@ -172,10 +174,19 @@ public function tag($tags): bool
      */
     public function untag($tags = null): bool
     {
-        $tags = $tags ?: $this->tags->pluck('name')->all();
-
-        foreach ($this->prepareTags($tags) as $tag) {
-            $this->removeTag($tag);
+        if (empty($tags)) {
+            $tags = $this->tags;
+            if (!empty($tags)) {
+                $this->tags()->detach();
+                foreach ($tags as $tag) {
+                    $tag->update(['count' => $tag->count - 1]);
+                }
+                $this->tags = new Collection();
+            }
+        } else {
+            foreach ($this->prepareTags($tags) as $tag) {
+                $this->removeTag($tag);
+            }
         }
 
         return true;
@@ -214,6 +225,7 @@ public function setTags($tags, string $type = 'name'): bool
      */
     public function addTag(string $name): void
     {
+        /** @var IlluminateTag $tag */
         $tag = $this->createTagsModel()->firstOrCreate([
             'slug'      => $this->generateTagSlug($name),
             'namespace' => $this->getEntityClassName(),
@@ -242,6 +254,7 @@ public function removeTag(string $name): void
 
         $namespace = $this->getEntityClassName();
 
+        /** @var IlluminateTag $tag */
         $tag = $this->tags()
             ->whereNamespace($namespace)
             ->where(function ($query) use ($name, $slug) {

tests/TaggableTraitTest.php

@@ -88,7 +88,7 @@ public function it_can_remove_all_tags()
         $queryCount = $this->withQueryCount(fn () => $post->untag());
 
         $this->assertCount(0, $post->tags);
-        $this->assertLessThanOrEqual(9, $queryCount);
+        $this->assertLessThanOrEqual(4, $queryCount);
     }
 
     #[Test]