Consistent documentation and no return value for removeAttribute()

clue-labs · Oct 2, 2015 · 4c0a334 · 4c0a334
1 parent 9d48cfc
commit 4c0a334
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 38 deletions.
diff --git a/src/Attribute/AttributeAware.php b/src/Attribute/AttributeAware.php
@@ -27,8 +27,9 @@ public function getAttribute($name, $default = null);
     public function setAttribute($name, $value);
 
     /**
-     * @param $name
-     * @return mixed
+     * Removes a single attribute with the given $name
+     *
+     * @param string $name
      */
     public function removeAttribute($name);
 

diff --git a/src/Attribute/AttributeBag.php b/src/Attribute/AttributeBag.php
@@ -9,6 +9,7 @@ interface AttributeBag extends AttributeAware
 {
     // public function getAttribute($name, $default);
     // public function setAttribute($name, $value);
+    // public function removeAttribute();
     // public function getAttributeBag();
 
     /**

diff --git a/src/Attribute/AttributeBagContainer.php b/src/Attribute/AttributeBagContainer.php
@@ -42,18 +42,13 @@ public function setAttribute($name, $value)
     }
 
     /**
-     * remove a single attribute with the given $name
+     * Removes a single attribute with the given $name
      *
-     * @param $name
-     * @return $this
+     * @param string $name
      */
     public function removeAttribute($name)
     {
-        if (isset($this->attributes[$name]) === true) {
-            unset($this->attributes[$name]);
-        }
-
-        return $this;
+        unset($this->attributes[$name]);
     }
 
     /**

diff --git a/src/Attribute/AttributeBagNamespaced.php b/src/Attribute/AttributeBagNamespaced.php
@@ -69,18 +69,13 @@ public function setAttribute($name, $value)
     }
 
     /**
-     * remove a single attribute with the given $name
+     * Removes a single attribute with the given $name
      *
-     * @param $name
-     * @return $this
+     * @param string $name
      */
     public function removeAttribute($name)
     {
-        if (isset($this->attributes[$name]) === true) {
-            unset($this->attributes[$name]);
-        }
-
-        return $this;
+        $this->bag->removeAttribute($this->prefix . $name);
     }
 
     /**

diff --git a/src/Attribute/AttributeBagReference.php b/src/Attribute/AttributeBagReference.php
@@ -56,18 +56,13 @@ public function setAttribute($name, $value)
     }
 
     /**
-     * remove a single attribute with the given $name
+     * Removes a single attribute with the given $name
      *
-     * @param $name
-     * @return $this
+     * @param string $name
      */
     public function removeAttribute($name)
     {
-        if (isset($this->attributes[$name]) === true) {
-            unset($this->attributes[$name]);
-        }
-
-        return $this;
+        unset($this->attributes[$name]);
     }
 
     /**

diff --git a/src/Edge/Base.php b/src/Edge/Base.php
@@ -305,9 +305,7 @@ public function setAttribute($name, $value)
 
     public function removeAttribute($name)
     {
-        if (isset($this->attributes[$name]) === true) {
-            unset($this->attributes[$name]);
-        }
+        unset($this->attributes[$name]);
     }
 
     public function getAttributeBag()

diff --git a/src/Graph.php b/src/Graph.php
@@ -464,9 +464,7 @@ public function setAttribute($name, $value)
 
     public function removeAttribute($name)
     {
-        if (isset($this->attributes[$name]) === true) {
-            unset($this->attributes[$name]);
-        }
+        unset($this->attributes[$name]);
     }
 
     public function getAttributeBag()

diff --git a/src/Vertex.php b/src/Vertex.php
@@ -384,9 +384,7 @@ public function setAttribute($name, $value)
 
     public function removeAttribute($name)
     {
-        if (isset($this->attributes[$name]) === true) {
-            unset($this->attributes[$name]);
-        }
+        unset($this->attributes[$name]);
     }
 
     public function getAttributeBag()

diff --git a/tests/Attribute/AttributeBagContainerTest.php b/tests/Attribute/AttributeBagContainerTest.php
@@ -2,8 +2,13 @@
 
 use Fhaculty\Graph\Attribute\AttributeBagContainer;
 
-class AttributeBagContainerTest extends TestCase
+class AttributeBagContainerTest extends AbstractAttributeAwareTest
 {
+    protected function createAttributeAware()
+    {
+        return new AttributeBagContainer();
+    }
+
     public function testEmpty()
     {
         $bag = new AttributeBagContainer();

diff --git a/tests/Attribute/AttributeBagNamespacedTest.php b/tests/Attribute/AttributeBagNamespacedTest.php
@@ -5,8 +5,13 @@
 use Fhaculty\Graph\Attribute\AttributeAware;
 use Fhaculty\Graph\Attribute\AttributeBagContainer;
 
-class AtributeBagNamespacedTest extends TestCase
+class AtributeBagNamespacedTest extends AbstractAttributeAwareTest
 {
+    protected function createAttributeAware()
+    {
+        return new AttributeBagNamespaced(new AttributeBagContainer(), 'test.');
+    }
+
     public function testBagContainer()
     {
         $container = new AttributeBagContainer();

diff --git a/tests/Attribute/AttributeBagReferenceTest.php b/tests/Attribute/AttributeBagReferenceTest.php
@@ -2,8 +2,15 @@
 
 use Fhaculty\Graph\Attribute\AttributeBagReference;
 
-class AttributeBagReferenceTest extends TestCase
+class AttributeBagReferenceTest extends AbstractAttributeAwareTest
 {
+    protected function createAttributeAware()
+    {
+        $attributes = array();
+
+        return new AttributeBagReference($attributes);
+    }
+
     public function testEmpty()
     {
         $attributes = array();