Laravel 6

.gitignore

@@ -1,2 +1,3 @@
 /vendor
 composer.lock
+/.idea

composer.json

@@ -13,11 +13,11 @@
   ],
   "require": {
     "php": ">=5.4.0",
-    "illuminate/console": "5.*",
-    "illuminate/database": "5.*",
-    "illuminate/events": "5.*",
-    "illuminate/filesystem": "5.*",
-    "illuminate/support": "5.*"
+    "illuminate/console": "5.*||6.*",
+    "illuminate/database": "5.*||6.*",
+    "illuminate/events": "5.*||6.*",
+    "illuminate/filesystem": "5.*||6.*",
+    "illuminate/support": "5.*||6.*"
   },
   "require-dev": {
     "phpunit/phpunit": "~4.0",

src/Baum/Generators/Generator.php

@@ -2,6 +2,7 @@
 namespace Baum\Generators;
 
 use Illuminate\Filesystem\Filesystem;
+use Illuminate\Support\Str;
 
 abstract class Generator {
 
@@ -78,7 +79,7 @@ protected function parseStub($stub, $replacements=array()) {
    * @return string
    */
   protected function classify($input) {
-    return studly_case(str_singular($input));
+    return Str::studly(Str::singular($input));
   }
 
   /**
@@ -88,6 +89,6 @@ protected function classify($input) {
    * @return string
    */
   protected function tableize($input) {
-    return snake_case(str_plural($input));
+    return Str::snake(Str::plural($input));
   }
 }

src/Baum/Move.php

@@ -352,7 +352,11 @@ protected function fireMoveEvent($event, $halt = true) {
     // but we relay the event into the node instance.
     $event = "eloquent.{$event}: ".get_class($this->node);
 
-    $method = $halt ? 'until' : 'fire';
+    if (version_compare(app()->version(), '5.8.0', '>=')) {
+      $method = $halt ? 'until' : 'dispatch';
+    } else {
+      $method = $halt ? 'until' : 'fire';
+    }
 
     return static::$dispatcher->$method($event, $this->node);
   }

src/Baum/SetMapper.php

@@ -2,6 +2,7 @@
 namespace Baum;
 
 use \Closure;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Contracts\ArrayableInterface;
 use Baum\Node;
 
@@ -128,13 +129,13 @@ protected function mapTreeRecursive(array $tree, $parentKey = null, &$affectedKe
   protected function getSearchAttributes($attributes) {
     $searchable = array($this->node->getKeyName());
 
-    return array_only($attributes, $searchable);
+    return Arr::only($attributes, $searchable);
   }
 
   protected function getDataAttributes($attributes) {
     $exceptions = array($this->node->getKeyName(), $this->getChildrenKeyName());
 
-    return array_except($attributes, $exceptions);
+    return Arr::except($attributes, $exceptions);
   }
 
   protected function firstOrNew($attributes) {

tests/suite/support.php

@@ -18,7 +18,7 @@ function hmap(array $nodes, $preserve = null) {
       } else {
         $preserve = is_string($preserve) ? array($preserve) : $preserve;
 
-        $current = array_only($node, $preserve);
+        $current = \Illuminate\Support\Arr::only($node, $preserve);
         if ( array_key_exists('children', $node) ) {
           $children = $node['children'];