fixed issue arangodb#182: Set hidden attributes is not working properly

Jan Steemann · Jan Steemann · commit acaf40170cc8 · 2015-07-23T12:08:19.000+02:00
diff --git a/lib/triagens/ArangoDb/Document.php b/lib/triagens/ArangoDb/Document.php
@@ -239,8 +239,8 @@ public function filterHiddenAttributes($attributes)
 
         if (is_array($hiddenAttributes)) {
             foreach ($hiddenAttributes as $hiddenAttributeName) {
-                if (!in_array($hiddenAttributeName, $attributes)) {
-                    unset ($attributes[$hiddenAttributeName]);
+                if (isset($attributes[$hiddenAttributeName])) {
+                    unset($attributes[$hiddenAttributeName]);
                 }
             }
         }
diff --git a/tests/DocumentExtendedTest.php b/tests/DocumentExtendedTest.php
@@ -746,6 +746,87 @@ public function testGetAll()
         $this->assertArrayHasKey('_id', $result);
         $this->assertArrayHasKey('_rev', $result);
     }
+    
+    /**
+     * test to set some attributes and get all attributes of the document through getAll()
+     * Also testing to optionally get internal attributes _id and _rev
+     */
+    public function testHiddenAttributesGetAll()
+    {
+        $documentHandler = $this->documentHandler;
+
+        $document = Document::createFromArray(
+                            array(
+                                 '_key'     => 'test1',
+                                 'isActive' => true,
+                                 'password' => 'secret',
+                                 'name'     => 'foo'
+                                 )
+        );
+        $documentHandler->add($this->collection->getId(), $document);
+        
+        $document = Document::createFromArray(
+                            array(
+                                 '_key'     => 'test2',
+                                 'isActive' => false,
+                                 'password' => 'secret',
+                                 'name'     => 'bar'
+                                 )
+        );
+        $documentHandler->add($this->collection->getId(), $document);
+
+
+        $document = $documentHandler->getById($this->collection->getId(), "test1");
+        $document->setHiddenAttributes(array('password'));
+        $result = $document->getAll();
+
+        $this->assertTrue($result['isActive']);
+        $this->assertEquals('foo', $result['name']);
+        $this->assertArrayNotHasKey('password', $result);
+        
+        // test with even more hidden attributes
+        $document = $documentHandler->getById($this->collection->getId(), "test1");
+        $document->setHiddenAttributes(array('isActive', 'password', 'foobar'));
+        $result = $document->getAll();
+
+        $this->assertArrayNotHasKey('isActive', $result);
+        $this->assertEquals('foo', $result['name']);
+        $this->assertArrayNotHasKey('password', $result);
+    
+        // fetch again, without hidden fields now
+        $document = $documentHandler->getById($this->collection->getId(), "test1");
+        $result = $document->getAll();
+
+        $this->assertTrue($result['isActive']);
+        $this->assertEquals('foo', $result['name']);
+        $this->assertEquals('secret', $result['password']);
+        
+            
+        $document = $documentHandler->getById($this->collection->getId(), "test2");
+        $document->setHiddenAttributes(array('password'));
+        $result = $document->getAll();
+
+        $this->assertFalse($result['isActive']);
+        $this->assertEquals('bar', $result['name']);
+        $this->assertArrayNotHasKey('password', $result);
+        
+        // test with even more hidden attributes
+        $document = $documentHandler->getById($this->collection->getId(), "test2");
+        $document->setHiddenAttributes(array('isActive', 'password', 'foobar'));
+        $result = $document->getAll();
+
+        $this->assertArrayNotHasKey('isActive', $result);
+        $this->assertEquals('bar', $result['name']);
+        $this->assertArrayNotHasKey('password', $result);
+        
+        // fetch again, without hidden fields now
+        $document = $documentHandler->getById($this->collection->getId(), "test2");
+        $result = $document->getAll();
+
+        $this->assertFalse($result['isActive']);
+        $this->assertEquals('bar', $result['name']);
+        $this->assertEquals('secret', $result['password']);
+    }
 
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -239,8 +239,8 @@ public function filterHiddenAttributes($attributes)`
`239`	`239`
`240`	`240`	`if (is_array($hiddenAttributes)) {`
`241`	`241`	`foreach ($hiddenAttributes as $hiddenAttributeName) {`
`242`		`- if (!in_array($hiddenAttributeName, $attributes)) {`
`243`		`- unset ($attributes[$hiddenAttributeName]);`
	`242`	`+ if (isset($attributes[$hiddenAttributeName])) {`
	`243`	`+ unset($attributes[$hiddenAttributeName]);`
`244`	`244`	`}`
`245`	`245`	`}`
`246`	`246`	`}`