Merge pull request #3 from lazychaser/v4

update from lazychaser

Author: DominiqueFERET

CHANGELOG.markdown

@@ -1,3 +1,12 @@
+### 4.3.2
+*   Support Laravel 5.6
+*   Added `nestedSet` and `dropNestedSet` blueprint macros
+
+### 4.3.0
+*   Support Laravel 5.5
+*   Added `fixSubtree` and `rebuildSubtree` methods
+*   Increased performance of tree rebuilding
+
 ### 4.2.7
 
 *   #217: parent_id, lft and rgt are reset when replicating a node

README.markdown

@@ -6,14 +6,14 @@
 
 This is a Laravel 4-5 package for working with trees in relational databases.
 
+*   **Laravel 5.5, 5.6** is supported since v4.3
 *   **Laravel 5.2, 5.3, 5.4** is supported since v4
 *   **Laravel 5.1** is supported in v3
 *   **Laravel 4** is supported in v2
 
 Although this project is completely free for use, I appreciate any support!
 
--   __[Donate via PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5TJUM7FYU5VR2)__
--   My Visa: 4276 0700 1073 4244
+-   __[Donate via PayPal](https://www.paypal.me/lazychaser)__
 
 __Contents:__
 
@@ -214,6 +214,16 @@ Node `bar` has no primary key specified, so it will be created.
 `$delete` shows whether to delete nodes that are already exists but not present
 in `$data`. By default, nodes aren't deleted.
 
+##### Rebuilding a subtree
+
+As of 4.2.8 you can rebuild a subtree:
+
+```php
+Category::rebuildSubtree($root, $data);
+```
+
+This constraints tree rebuilding to descendants of `$root` node.
+
 ### Retrieving nodes
 
 *In some cases we will use an `$id` variable which is an id of the target node.*
@@ -374,6 +384,9 @@ position.
 Various constraints that can be applied to the query builder:
 
 -   __whereIsRoot()__ to get only root nodes;
+-   __hasParent()__ to get non-root nodes;
+-   __whereIsLeaf()__ to get only leaves;
+-   __hasChildren()__ to get non-leave nodes;
 -   __whereIsAfter($id)__ to get every node (not just siblings) that are after a node
     with specified id;
 -   __whereIsBefore($id)__ to get every node that is before a node with specified id.
@@ -561,17 +574,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);
@@ -585,12 +598,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
@@ -615,7 +629,21 @@ composer require kalnoy/nestedset
 
 #### The schema
 
-You can use a method to add needed columns with default names:
+For Laravel 5.5 and above users:
+
+```php
+Schema::create('table', function (Blueprint $table) {
+    ...
+    $table->nestedSet();
+});
+
+// To drop columns
+Schema::table('table', function (Blueprint $table) {
+    $table->dropNestedSet();
+});
+```
+
+For prior Laravel versions:
 
 ```php
 ...

composer.json

@@ -13,9 +13,9 @@
 
     "require": {
         "php": ">=5.5.9",
-        "illuminate/support": "5.0 - 5.5",
-        "illuminate/database": "5.0 - 5.5",
-        "illuminate/events": "5.0 - 5.5"
+        "illuminate/support": "5.2 - 5.6",
+        "illuminate/database": "5.2 - 5.6",
+        "illuminate/events": "5.2 - 5.6"
     },
 
     "autoload": {
@@ -29,10 +29,17 @@
     },
 
     "minimum-stability": "dev",
+    "prefer-stable": true,
 
     "extra": {
         "branch-alias": {
             "dev-master": "v4.2.x-dev"
+        },
+
+        "laravel": {
+            "providers": [
+                "Kalnoy\\Nestedset\\NestedSetServiceProvider"
+            ]
         }
     }
 }

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

src/NestedSetServiceProvider.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Kalnoy\Nestedset;
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\ServiceProvider;
+
+class NestedSetServiceProvider extends ServiceProvider
+{
+    public function register()
+    {
+        Blueprint::macro('nestedSet', function () {
+            NestedSet::columns($this);
+        });
+
+        Blueprint::macro('dropNestedSet', function () {
+            NestedSet::dropColumns($this);
+        });
+    }
+}