From 8e03bd8d705f51bba5231be43e8a43f1a7d548f0 Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Sat, 3 Jan 2015 19:08:28 +0300
Subject: [PATCH] NestedSetsBehavior::ancestors renamed to
 NestedSetsBehavior::parents, NestedSetsBehavior::parent removed

---
 NestedSetsBehavior.php                        | 23 +------------------
 tests/NestedSetsBehaviorTest.php              | 20 +++++-----------
 ... => multiple-roots-tree-after-parents.xml} |  0
 ...r-ancestors.xml => tree-after-parents.xml} |  0
 4 files changed, 7 insertions(+), 36 deletions(-)
 rename tests/datasets/{multiple-roots-tree-after-ancestors.xml => multiple-roots-tree-after-parents.xml} (100%)
 rename tests/datasets/{tree-after-ancestors.xml => tree-after-parents.xml} (100%)

diff --git a/NestedSetsBehavior.php b/NestedSetsBehavior.php
index dc62eb0..3c6fa39 100644
--- a/NestedSetsBehavior.php
+++ b/NestedSetsBehavior.php
@@ -238,7 +238,7 @@ class NestedSetsBehavior extends Behavior
      * @param integer $depth the depth
      * @return \yii\db\ActiveQuery
      */
-    public function ancestors($depth = null)
+    public function parents($depth = null)
     {
         $query = $this->owner->find();
 
@@ -259,27 +259,6 @@ class NestedSetsBehavior extends Behavior
         return $query->andWhere($condition)->addOrderBy([$this->leftAttribute => SORT_ASC]);
     }
 
-    /**
-     * Gets the parent of the node.
-     * @return \yii\db\ActiveQuery
-     */
-    public function parent()
-    {
-        $query = $this->owner->find();
-
-        $condition = [
-            'and',
-            ['<', $this->leftAttribute, $this->owner->getAttribute($this->leftAttribute)],
-            ['>', $this->rightAttribute, $this->owner->getAttribute($this->rightAttribute)],
-        ];
-
-        if ($this->treeAttribute !== false) {
-            $condition[] = [$this->treeAttribute => $this->owner->getAttribute($this->treeAttribute)];
-        }
-
-        return $query->andWhere($condition)->addOrderBy([$this->rightAttribute => SORT_ASC]);
-    }
-
     /**
      * Gets the previous sibling of the node.
      * @return \yii\db\ActiveQuery
diff --git a/tests/NestedSetsBehaviorTest.php b/tests/NestedSetsBehaviorTest.php
index ccdb493..3354f6a 100644
--- a/tests/NestedSetsBehaviorTest.php
+++ b/tests/NestedSetsBehaviorTest.php
@@ -872,37 +872,29 @@ class NestedSetsBehaviorTest extends DatabaseTestCase
     }
 
     /**
-     * @covers \creocoder\nestedsets\NestedSetsBehavior::ancestors
+     * @covers \creocoder\nestedsets\NestedSetsBehavior::parents
      */
-    public function testAncestors()
+    public function testParents()
     {
         $dataSet = $this->createFlatXMLDataSet(__DIR__ . '/datasets/tree.xml');
         $this->getDatabaseTester()->setDataSet($dataSet);
         $this->getDatabaseTester()->onSetUp();
         $node = Tree::findOne(11);
-        $models = $node->ancestors()->all();
+        $models = $node->parents()->all();
         $dataSet = new ArrayDataSet(['tree' => ArrayHelper::toArray($models)]);
-        $expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/datasets/tree-after-ancestors.xml');
+        $expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/datasets/tree-after-parents.xml');
         $this->assertDataSetsEqual($expectedDataSet, $dataSet);
 
         $dataSet = $this->createFlatXMLDataSet(__DIR__ . '/datasets/multiple-roots-tree.xml');
         $this->getDatabaseTester()->setDataSet($dataSet);
         $this->getDatabaseTester()->onSetUp();
         $node = MultipleRootsTree::findOne(33);
-        $models = $node->ancestors()->all();
+        $models = $node->parents()->all();
         $dataSet = new ArrayDataSet(['multiple_roots_tree' => ArrayHelper::toArray($models)]);
-        $expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/datasets/multiple-roots-tree-after-ancestors.xml');
+        $expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/datasets/multiple-roots-tree-after-parents.xml');
         $this->assertDataSetsEqual($expectedDataSet, $dataSet);
     }
 
-    /**
-     * @covers \creocoder\nestedsets\NestedSetsBehavior::parent
-     */
-    public function testParent()
-    {
-        $this->markTestSkipped();
-    }
-
     /**
      * @covers \creocoder\nestedsets\NestedSetsBehavior::prev
      */
diff --git a/tests/datasets/multiple-roots-tree-after-ancestors.xml b/tests/datasets/multiple-roots-tree-after-parents.xml
similarity index 100%
rename from tests/datasets/multiple-roots-tree-after-ancestors.xml
rename to tests/datasets/multiple-roots-tree-after-parents.xml
diff --git a/tests/datasets/tree-after-ancestors.xml b/tests/datasets/tree-after-parents.xml
similarity index 100%
rename from tests/datasets/tree-after-ancestors.xml
rename to tests/datasets/tree-after-parents.xml