Support l5.2 and refactor a bit

Author: lazychaser

README.markdown

@@ -6,7 +6,11 @@
 
 This is a Laravel 4-5 package for working with trees in a database.
 
-__[Support this project](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5TJUM7FYU5VR2)__
+*   Laravel 5.2 is supported since v4
+*   Laravel 5.1 is supported in v3
+*   Laravel 4 is supported in v2
+
+__[Donate](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=5TJUM7FYU5VR2)__
 
 __Contents:__
 

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "kalnoy/nestedset",
-    "description": "Nested Set Model for Laravel 4",
+    "description": "Nested Set Model for Laravel 4-5",
     "keywords": ["laravel", "nested sets", "nsm", "database", "hierarchy"],
     "license": "MIT",
 
@@ -13,9 +13,9 @@
 
     "require": {
         "php": ">=5.5.9",
-        "illuminate/support": "5.1 - 5.2",
-        "illuminate/database": "5.1 - 5.2",
-        "illuminate/events": "5.1 - 5.2"
+        "illuminate/support": "5.2.*",
+        "illuminate/database": "5.2.*",
+        "illuminate/events": "5.2.*"
     },
 
     "autoload": { "psr-4": { "Kalnoy\\Nestedset\\": "src/" } },

src/Node.php

@@ -3,8 +3,10 @@
 namespace Kalnoy\Nestedset;
 
 use Exception;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\SoftDeletingScope;
 use LogicException;
 use Illuminate\Database\Eloquent\Model as Eloquent;
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
@@ -46,24 +48,6 @@ class Node extends Eloquent
      */
     const AFTER = 'after';
 
-    /**
-     * Whether model uses soft delete.
-     *
-     * @var bool
-     *
-     * @since 1.1
-     */
-    static protected $_softDelete;
-
-    /**
-     * Whether the node is being deleted.
-     *
-     * @since 2.0
-     *
-     * @var bool
-     */
-    static protected $deleting;
-
     /**
      * Pending operation.
      *
@@ -97,23 +81,9 @@ protected static function boot()
     {
         parent::boot();
 
-        static::$_softDelete = static::getIsSoftDelete();
-
         static::signOnEvents();
     }
 
-    /**
-     * Get whether model uses soft delete.
-     *
-     * @return bool
-     */
-    protected static function getIsSoftDelete()
-    {
-        $instance = new static;
-
-        return method_exists($instance, 'withTrashed');
-    }
-
     /**
      * Sign on model events.
      */
@@ -132,7 +102,7 @@ protected static function signOnEvents()
             $model->deleteDescendants();
         });
 
-        if (static::$_softDelete) {
+        if (static::usesSoftDelete()) {
             static::restoring(function (Node $model) {
                 static::$deletedAt = $model->{$model->getDeletedAtColumn()};
             });
@@ -146,7 +116,7 @@ protected static function signOnEvents()
     /**
      * {@inheritdoc}
      *
-     * Saves a node in a transaction.
+     * Saves a node in transaction.
      */
     public function save(array $options = array())
     {
@@ -158,7 +128,7 @@ public function save(array $options = array())
     /**
      * {@inheritdoc}
      *
-     * Delete a node in transaction if model is not soft deleting.
+     * Delete a node in transaction.
      */
     public function delete()
     {
@@ -208,6 +178,22 @@ protected function callPendingAction()
         $this->moved = call_user_func_array([ $this, $method ], $parameters);
     }
 
+    /**
+     * @return bool
+     */
+    public static function usesSoftDelete()
+    {
+        static $softDelete;
+
+        if (is_null($softDelete)) {
+            $instance = new static;
+
+            return $softDelete = method_exists($instance, 'withTrashed');
+        }
+
+        return $softDelete;
+    }
+
     /**
      * Make a root node.
      */
@@ -685,24 +671,19 @@ protected function insertNode($position)
      */
     protected function deleteDescendants()
     {
-        if (static::$deleting) return;
-
         $lft = $this->getLft();
         $rgt = $this->getRgt();
 
-        // Make sure that inner nodes are just deleted and don't touch the tree
-        // This makes sense in Laravel 4.2
-        static::$deleting = true;
-
+        /** @var QueryBuilder $query */
         $query = $this->newQuery()->whereNodeBetween([ $lft + 1, $rgt ]);
 
-        if (static::$_softDelete && $this->forceDeleting) {
-            $query->withTrashed()->forceDelete();
-        } else {
-            $query->delete();
+        // Remove soft deleting scope when user forced delete so that descendants
+        // are also deleted physically
+        if ($this->usesSoftDelete() && $this->forceDeleting) {
+            $query->withoutGlobalScope(SoftDeletingScope::class);
         }
 
-        static::$deleting = false;
+        $query->applyScopes()->delete();
 
         if ($this->hardDeleting()) {
             $height = $rgt - $lft + 1;
@@ -726,6 +707,7 @@ protected function restoreDescendants($deletedAt)
         $this->newQuery()
              ->whereNodeBetween([ $this->getLft() + 1, $this->getRgt() ])
              ->where($this->getDeletedAtColumn(), '>=', $deletedAt)
+             ->applyScopes()
              ->restore();
     }
 
@@ -748,7 +730,7 @@ public function newEloquentBuilder($query)
      */
     public function newServiceQuery()
     {
-        return static::$_softDelete ? $this->withTrashed() : $this->newQuery();
+        return $this->usesSoftDelete() ? $this->withTrashed() : $this->newQuery();
     }
 
     /**
@@ -779,9 +761,8 @@ public function newFromBuilder($attributes = array(), $connection = null)
      *
      * @param Node $parent
      */
-    public static function create(array $attributes = array(),
-                                  Node $parent = null
-    ) {
+    public static function create(array $attributes = [], Node $parent = null)
+    {
         $children = array_pull($attributes, 'children');
 
         $instance = new static($attributes);
@@ -1146,7 +1127,7 @@ protected function getArrayableRelations()
      */
     protected function hardDeleting()
     {
-        return ! static::$_softDelete or $this->forceDeleting;
+        return ! $this->usesSoftDelete() || $this->forceDeleting;
     }
 
     /**

tests/NodeTest.php

@@ -99,11 +99,11 @@ public function assertNodeReceivesValidValues($node)
      */
     public function findCategory($name, $withTrashed = false)
     {
-        $q = Category::whereName($name);
+        $q = new Category;
 
-        if ($withTrashed) $q->withTrashed();
+        $q = $withTrashed ? $q->withTrashed() : $q->newQuery();
 
-        return $q->first();
+        return $q->whereName($name)->first();
     }
 
     public function testTreeNotBroken()

tests/models/Category.php

@@ -1,10 +1,10 @@
 <?php
 
-class Category extends Kalnoy\Nestedset\Node {
-
+class Category extends Kalnoy\Nestedset\Node
+{
     use \Illuminate\Database\Eloquent\SoftDeletes;
 
-    protected $fillable = array('name', 'parent_id');
+    protected $fillable = array( 'name', 'parent_id' );
 
     public $timestamps = false;