Merge remote-tracking branch 'upstream/master' into fix/annotaion_input

zendframework · Aug 29, 2013 · b991bc1 · b991bc1
commit b991bc1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/test/Node/OfflineTest.php b/test/Node/OfflineTest.php
@@ -387,9 +387,9 @@ public function testGetChangedData()
     public function testDeleteUnusedAttribute()
     {
         $node = $this->createTestNode();
-        $node->deleteAttribute('nonexistant');
+        $node->deleteAttribute('nonexistent');
         $changedData = $node->getChangedData();
-        $this->assertArrayNotHasKey('nonexistant', $changedData);
+        $this->assertArrayNotHasKey('nonexistent', $changedData);
     }
 
     public function testRenameNodeString()

diff --git a/test/Node/OnlineTest.php b/test/Node/OnlineTest.php
@@ -261,7 +261,7 @@ public function testGetParent()
     /**
      * @expectedException Zend\Ldap\Exception\ExceptionInterface
      */
-    public function testGetNonexistantParent()
+    public function testGetNonexistentParent()
     {
         $node  = $this->getLDAP()->getNode(TESTS_ZEND_LDAP_WRITEABLE_SUBTREE);
         $pnode = $node->getParent();