Fixed lazychaser#252: nested eagers for ancestors and descendants are now loaded

Author: lazychaser

README.markdown

@@ -572,17 +572,17 @@ protected function getScopeAttributes()
 }
 ```
 
-But now in order to execute some custom query, you need to provide attributes
+But now, in order to execute some custom query, you need to provide attributes
 that are used for scoping:
 
 ```php
 MenuItem::scoped([ 'menu_id' => 5 ])->withDepth()->get(); // OK
 MenuItem::descendantsOf($id)->get(); // WRONG: returns nodes from other scope
-MenuItem::scoped([ 'menu_id' => 5 ])->fixTree();
+MenuItem::scoped([ 'menu_id' => 5 ])->fixTree(); // OK
 ```
 
 When requesting nodes using model instance, scopes applied automatically based
-on the attributes of that model. See examples:
+on the attributes of that model:
 
 ```php
 $node = MenuItem::findOrFail($id);
@@ -596,12 +596,13 @@ To get scoped query builder using instance:
 $node->newScopedQuery();
 ```
 
-Note, that scoping is not required when retrieving model by primary key
-(since the key is unique):
+#### Scoping and eager loading
+
+Always use scoped query when eager loading:
 
 ```php
-$node = MenuItem::findOrFail($id); // OK
-$node = MenuItem::scoped([ 'menu_id' => 5 ])->findOrFail(); // OK, but redundant
+MenuItem::scoped([ 'menu_id' => 5])->with('descendants')->findOrFail($id); // OK
+MenuItem::with('descendants')->findOrFail($id); // WRONG
 ```
 
 Requirements

src/BaseRelation.php

@@ -154,10 +154,6 @@ public function getResults()
      */
     public function addEagerConstraints(array $models)
     {
-        $model = reset($models);
-
-        $this->query = $model->newScopedQuery();
-
         $this->query->whereNested(function (Builder $inner) use ($models) {
             // We will use this query in order to apply constraints to the
             // base query builder

tests/NodeTest.php

@@ -827,8 +827,6 @@ public function testRebuildSubtree()
             [ 'id' => '8' ],
         ]);
 
-        echo PHP_EOL.$fixed.PHP_EOL;
-
         $this->assertTrue($fixed > 0);
         $this->assertTreeNotBroken();
 

tests/ScopedNodeTest.php

@@ -98,6 +98,13 @@ public function testDescendants()
 
         $this->assertEquals(1, $result->count());
         $this->assertEquals(5, $result->first()->getKey());
+
+        $node = MenuItem::scoped([ 'menu_id' => 1 ])->with('descendants')->find(2);
+
+        $result = $node->descendants;
+
+        $this->assertEquals(1, $result->count());
+        $this->assertEquals(5, $result->first()->getKey());
     }
 
     public function testAncestors()
@@ -109,7 +116,7 @@ public function testAncestors()
         $this->assertEquals(1, $result->count());
         $this->assertEquals(2, $result->first()->getKey());
 
-        $node = MenuItem::with('ancestors')->find(5);
+        $node = MenuItem::scoped([ 'menu_id' => 1 ])->with('ancestors')->find(5);
 
         $result = $node->ancestors;