Revert "Merge pull request #138 from clue-labs/remove-attribute"

This reverts commit 9159d94, reversing changes made to 0336a4d.
graphp · Sep 29, 2019 · 35b0014 · 35b0014
1 parent 1eafe38
commit 35b0014
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 86 deletions.
diff --git a/src/Attribute/AttributeAware.php b/src/Attribute/AttributeAware.php
@@ -26,13 +26,6 @@ public function getAttribute($name, $default = null);
      */
     public function setAttribute($name, $value);
 
-    /**
-     * Removes a single attribute with the given $name
-     *
-     * @param string $name
-     */
-    public function removeAttribute($name);
-
     /**
      * get a container for all attributes
      *

diff --git a/src/Attribute/AttributeBag.php b/src/Attribute/AttributeBag.php
@@ -9,7 +9,6 @@ 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
@@ -41,16 +41,6 @@ public function setAttribute($name, $value)
         return $this;
     }
 
-    /**
-     * Removes a single attribute with the given $name
-     *
-     * @param string $name
-     */
-    public function removeAttribute($name)
-    {
-        unset($this->attributes[$name]);
-    }
-
     /**
      * get an array of all attributes
      *

diff --git a/src/Attribute/AttributeBagNamespaced.php b/src/Attribute/AttributeBagNamespaced.php
@@ -68,16 +68,6 @@ public function setAttribute($name, $value)
         $this->bag->setAttribute($this->prefix . $name, $value);
     }
 
-    /**
-     * Removes a single attribute with the given $name
-     *
-     * @param string $name
-     */
-    public function removeAttribute($name)
-    {
-        $this->bag->removeAttribute($this->prefix . $name);
-    }
-
     /**
      * get an array of all attributes
      *

diff --git a/src/Attribute/AttributeBagReference.php b/src/Attribute/AttributeBagReference.php
@@ -55,16 +55,6 @@ public function setAttribute($name, $value)
         return $this;
     }
 
-    /**
-     * Removes a single attribute with the given $name
-     *
-     * @param string $name
-     */
-    public function removeAttribute($name)
-    {
-        unset($this->attributes[$name]);
-    }
-
     /**
      * get an array of all attributes
      *

diff --git a/src/Edge/Base.php b/src/Edge/Base.php
@@ -301,11 +301,6 @@ public function setAttribute($name, $value)
         $this->attributes[$name] = $value;
     }
 
-    public function removeAttribute($name)
-    {
-        unset($this->attributes[$name]);
-    }
-
     public function getAttributeBag()
     {
         return new AttributeBagReference($this->attributes);

diff --git a/src/Graph.php b/src/Graph.php
@@ -457,11 +457,6 @@ public function setAttribute($name, $value)
         $this->attributes[$name] = $value;
     }
 
-    public function removeAttribute($name)
-    {
-        unset($this->attributes[$name]);
-    }
-
     public function getAttributeBag()
     {
         return new AttributeBagReference($this->attributes);

diff --git a/src/Vertex.php b/src/Vertex.php
@@ -399,11 +399,6 @@ public function setAttribute($name, $value)
         $this->attributes[$name] = $value;
     }
 
-    public function removeAttribute($name)
-    {
-        unset($this->attributes[$name]);
-    }
-
     public function getAttributeBag()
     {
         return new AttributeBagReference($this->attributes);

diff --git a/tests/Attribute/AbstractAttributeAwareTest.php b/tests/Attribute/AbstractAttributeAwareTest.php
@@ -31,19 +31,6 @@ public function testAttributeSetGetDefault(AttributeAware $entity)
         $this->assertEquals('default', $entity->getAttribute('unknown', 'default'));
     }
 
-    /**
-     * @depends testAttributeAwareInterface
-     * @param AttributeAware $entity
-     */
-    public function testAttributeSetRemoveGet(AttributeAware $entity)
-    {
-        $entity->setAttribute('test', 'value');
-        $this->assertEquals('value', $entity->getAttribute('test'));
-
-        $entity->removeAttribute('test');
-        $this->assertEquals(null, $entity->getAttribute('test'));
-    }
-
     /**
      * @depends testAttributeAwareInterface
      * @param AttributeAware $entity

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

diff --git a/tests/Attribute/AttributeBagNamespacedTest.php b/tests/Attribute/AttributeBagNamespacedTest.php
@@ -7,13 +7,8 @@
 use Fhaculty\Graph\Attribute\AttributeAware;
 use Fhaculty\Graph\Attribute\AttributeBagContainer;
 
-class AtributeBagNamespacedTest extends AbstractAttributeAwareTest
+class AtributeBagNamespacedTest extends TestCase
 {
-    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
@@ -4,15 +4,8 @@
 
 use Fhaculty\Graph\Attribute\AttributeBagReference;
 
-class AttributeBagReferenceTest extends AbstractAttributeAwareTest
+class AttributeBagReferenceTest extends TestCase
 {
-    protected function createAttributeAware()
-    {
-        $attributes = array();
-
-        return new AttributeBagReference($attributes);
-    }
-
     public function testEmpty()
     {
         $attributes = array();