changed trait method names

rollun-lc · Jan 25, 2023 · ac7e573 · ac7e573
1 parent e0e10ef
commit ac7e573
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/src/Domain/Traits/ProblemTrait.php b/src/Domain/Traits/ProblemTrait.php
@@ -17,20 +17,24 @@ trait ProblemTrait
      * @param ArrayObjectItemInterface $problem
      * @return void
      */
-    public function addProblem(mixed $problem)
+    public function addProblemItem(mixed $problem)
     {
         if ($this->problems === null) {
             $this->problems = new ArrayObject(true);
         }
 
-        $this->problems->addItem(new ArrayObjectItem($problem));
+        if (!$problem instanceof ArrayObjectItem) {
+            $problem = new ArrayObjectItem($problem);
+        }
+
+        $this->problems->addItem($problem);
     }
 
     /**
      * @param $problem
      * @return bool
      */
-    public function hasProblem($problem): bool
+    public function hasProblemItem($problem): bool
     {
         if (isset($this->problems)) {
             return $this->problems->hasItem($problem);

diff --git a/src/Domain/Traits/TagTrait.php b/src/Domain/Traits/TagTrait.php
@@ -13,7 +13,7 @@ trait TagTrait
     /**
      * @var ArrayObject|null
      */
-    protected $tags;
+    protected ?ArrayObject $tags = null;
 
     protected function enclose(string $tag)
     {
@@ -26,21 +26,25 @@ protected function enclose(string $tag)
      * @param string $tag
      * @return void
      */
-    public function addTag(string $tag): void
+    public function addTagItem(ArrayObjectItem|string $tag): void
     {
         $tag = $this->enclose($tag);
         if ($this->tags === null) {
             $this->tags = new ArrayObject(true);
         }
+
+        if (is_string($tag)) {
+            $tag = new ArrayObjectItem($tag);
+        }
 
-        $this->tags->addItem(new ArrayObjectItem($tag));
+        $this->tags->addItem($tag);
     }
 
     /**
      * @param $tag
      * @return bool
      */
-    public function hasTag($tag): bool
+    public function hasTagItem($tag): bool
     {
         $tag = $this->enclose($tag);
         if (isset($this->tags)) {
@@ -50,7 +54,7 @@ public function hasTag($tag): bool
         return false;
     }
 
-    public function deleteTag(string $tag)
+    public function deleteTagItem(string $tag)
     {
         $tag = $this->enclose($tag);
         if ($this->tags !== null) {

diff --git a/test/unit/Domain/Traits/TagTraitTest.php b/test/unit/Domain/Traits/TagTraitTest.php
@@ -13,7 +13,7 @@ public function testAddTag()
             use TagTrait;
         };
 
-        $instance->addTag('hello');
+        $instance->addTagItem('hello');
 
         $property = new \ReflectionProperty($instance, 'tags');
         $property->setAccessible(true);
@@ -33,17 +33,17 @@ public function testHasTag()
             use TagTrait;
         };
 
-        $instance->addTag('#hello#');
+        $instance->addTagItem('#hello#');
 
-        $result = $instance->hasTag('hello');
+        $result = $instance->hasTagItem('hello');
 
         $this->assertTrue($result);
 
-        $result = $instance->hasTag('#hello#');
+        $result = $instance->hasTagItem('#hello#');
 
         $this->assertTrue($result);
 
-        $result = $instance->hasTag('world');
+        $result = $instance->hasTagItem('world');
 
         $this->assertFalse($result);
     }
@@ -54,9 +54,9 @@ public function testDeleteTag()
             use TagTrait;
         };
 
-        $instance->addTag('#hello#');
+        $instance->addTagItem('#hello#');
 
-        $instance->deleteTag('hello');
+        $instance->deleteTagItem('hello');
 
         $property = new \ReflectionProperty($instance, 'tags');
         $property->setAccessible(true);