Merge pull request #4 from lazychaser/v4

Update from master repo

Author: DominiqueFERET

CHANGELOG.markdown

@@ -1,3 +1,9 @@
+### 4.3.4
+*   Support Laravel 5.8
+
+### 4.3.3
+*   Support Laravel 5.7
+
 ### 4.3.2
 *   Support Laravel 5.6
 *   Added `nestedSet` and `dropNestedSet` blueprint macros
@@ -108,4 +114,4 @@
 ### 1.1.0
 
 *   `Collection::toDictionary` is now obsolete. Use `Collection::groupBy`.
-*   Laravel 4.2 is required
+*   Laravel 4.2 is required

README.markdown

@@ -6,6 +6,7 @@
 
 This is a Laravel 4-5 package for working with trees in relational databases.
 
+*   **Laravel 5.7, 5.8** is supported since v5
 *   **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

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "kalnoy/nestedset",
-    "description": "Nested Set Model for Laravel 4-5",
+    "description": "Nested Set Model for Laravel 5.7 and up",
     "keywords": ["laravel", "nested sets", "nsm", "database", "hierarchy"],
     "license": "MIT",
 
@@ -12,10 +12,10 @@
     ],
 
     "require": {
-        "php": ">=5.5.9",
-        "illuminate/support": "5.2 - 5.6",
-        "illuminate/database": "5.2 - 5.6",
-        "illuminate/events": "5.2 - 5.6"
+        "php": ">=7.1.3",
+        "illuminate/support": "~5.7.0|~5.8.0",
+        "illuminate/database": "~5.7.0|~5.8.0",
+        "illuminate/events": "~5.7.0|~5.8.0"
     },
 
     "autoload": {
@@ -25,15 +25,15 @@
     },
 
     "require-dev": {
-        "phpunit/phpunit": "4.8.*"
+        "phpunit/phpunit": "7.*"
     },
 
     "minimum-stability": "dev",
     "prefer-stable": true,
 
     "extra": {
         "branch-alias": {
-            "dev-master": "v4.2.x-dev"
+            "dev-master": "v5.0.x-dev"
         },
 
         "laravel": {

phpunit.xml

@@ -7,8 +7,6 @@
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="true"
-         syntaxCheck="false"
 >
     <testsuites>
         <testsuite name="Package Test Suite">

src/AncestorsRelation.php

@@ -15,7 +15,8 @@ public function addConstraints()
     {
         if ( ! static::$constraints) return;
 
-        $this->query->whereAncestorOf($this->parent)->defaultOrder();
+        $this->query->whereAncestorOf($this->parent)
+            ->applyNestedSetScope();
     }
 
     /**

src/BaseRelation.php

@@ -154,6 +154,11 @@ public function getResults()
      */
     public function addEagerConstraints(array $models)
     {
+        // The first model in the array is always the parent, so add the scope constraints based on that model.
+        // @link https://github.com/laravel/framework/pull/25240
+        // @link https://github.com/lazychaser/laravel-nestedset/issues/351
+        optional($models[0])->applyNestedSetScope($this->query);
+
         $this->query->whereNested(function (Builder $inner) use ($models) {
             // We will use this query in order to apply constraints to the
             // base query builder

src/DescendantsRelation.php

@@ -17,7 +17,8 @@ public function addConstraints()
     {
         if ( ! static::$constraints) return;
 
-        $this->query->whereDescendantOf($this->parent);
+        $this->query->whereDescendantOf($this->parent)
+        ->applyNestedSetScope();
     }
 
     /**

src/NodeTrait.php

@@ -248,7 +248,7 @@ public function children()
      */
     public function descendants()
     {
-        return new DescendantsRelation($this->newScopedQuery(), $this);
+        return new DescendantsRelation($this->newQuery(), $this);
     }
 
     /**
@@ -337,7 +337,7 @@ public function prevNodes()
      */
     public function ancestors()
     {
-        return new AncestorsRelation($this->newScopedQuery(), $this);
+        return new AncestorsRelation($this->newQuery(), $this);
     }
 
     /**

src/QueryBuilder.php

@@ -110,8 +110,9 @@ public function whereAncestorOf($id, $andSelf = false, $boolean = 'and')
 
         $this->query->whereNested(function ($inner) use ($value, $andSelf, $id, $keyName) {
             list($lft, $rgt) = $this->wrappedColumns();
+            $wrappedTable = $this->query->getGrammar()->wrapTable($this->model->getTable());
 
-            $inner->whereRaw("{$value} between {$lft} and {$rgt}");
+            $inner->whereRaw("{$value} between {$wrappedTable}.{$lft} and {$wrappedTable}.{$rgt}");
 
             if ( ! $andSelf) {
                 $inner->where($keyName, '<>', $id);
@@ -182,7 +183,7 @@ public function ancestorsAndSelf($id, array $columns = [ '*' ])
      */
     public function whereNodeBetween($values, $boolean = 'and', $not = false)
     {
-        $this->query->whereBetween($this->model->getLftName(), $values, $boolean, $not);
+        $this->query->whereBetween($this->model->getTable() . '.' . $this->model->getLftName(), $values, $boolean, $not);
 
         return $this;
     }

tests/NodeTest.php

@@ -3,7 +3,7 @@
 use Illuminate\Database\Capsule\Manager as Capsule;
 use Kalnoy\Nestedset\NestedSet;
 
-class NodeTest extends PHPUnit_Framework_TestCase
+class NodeTest extends PHPUnit\Framework\TestCase
 {
     public static function setUpBeforeClass()
     {
@@ -870,7 +870,9 @@ public function testFlatTree()
         $this->assertEquals('galaxy', $tree[3]->name);
     }
 
-    public function testSeveralNodesModelWork()
+    // Commented, cause there is no assertion here and otherwise the test is marked as risky in PHPUnit 7.
+    // What's the purpose of this method? @todo: remove/update?
+    /*public function testSeveralNodesModelWork()
     {
         $category = new Category;
 
@@ -883,7 +885,7 @@ public function testSeveralNodesModelWork()
         $duplicate->name = 'test';
 
         $duplicate->saveAsRoot();
-    }
+    }*/
 
     public function testWhereIsLeaf()
     {