Add preliminar support for laravel 12.x

.editorconfig

@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.yml]
+indent_size = 2

.github/workflows/tests.yml

@@ -0,0 +1,75 @@
+name: Tests
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  tests:
+    runs-on: ubuntu-20.04
+
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [7.3, 7.4, 8.0, 8.1, 8.2, 8.3]
+        laravel: [8.0, 9.0, 10.0, 11.0, 12.0]
+        exclude:
+          - php: 7.3
+            laravel: 9.0
+          - php: 7.3
+            laravel: 10.0
+          - php: 7.3
+            laravel: 11.0
+          - php: 7.3
+            laravel: 12.0
+          - php: 7.4
+            laravel: 9.0
+          - php: 7.4
+            laravel: 10.0
+          - php: 7.4
+            laravel: 11.0
+          - php: 7.4
+            laravel: 12.0
+          - php: 8.0
+            laravel: 10.0
+          - php: 8.0
+            laravel: 11.0
+          - php: 8.0
+            laravel: 12.0
+          - php: 8.1
+            laravel: 11.0
+          - php: 8.1
+            laravel: 12.0
+          - php: 8.2
+            laravel: 8.0
+
+    name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      # Docs: https://github.com/shivammathur/setup-php
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: curl, libxml, mbstring, sqlite3
+          ini-values: error_reporting=E_ALL
+          tools: composer:v2
+          coverage: none
+
+      - name: Setup problem matchers for PHP/PHPUnit
+        run: |
+          echo "::add-matcher::${{ runner.tool_cache }}/php.json"
+          echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
+
+      - name: Install dependencies
+        run: |
+          composer require "illuminate/contracts=^${{ matrix.laravel }}" --no-update
+          composer update --prefer-dist --no-interaction --no-progress
+
+      - name: Execute test suite
+        run: vendor/bin/phpunit

.gitignore

@@ -1,2 +1,6 @@
 /vendor
 composer.lock
+.vscode
+.phpunit.result.cache
+.php_cs.cache
+.phpunit.cache

bootstrap.php

@@ -1,38 +1,61 @@
 <?php
 
-/**
- * Register composer auto  loader
- */
+/*
+|--------------------------------------------------------------------------
+| Register The Auto Loader
+|--------------------------------------------------------------------------
+|
+| Composer provides a convenient, automatically generated class loader
+| for our library. We just need to utilize it!
+|
+*/
+
 require __DIR__.'/vendor/autoload.php';
 
-/**
- * Initialize Capsule
- */
-$capsule = new Illuminate\Database\Capsule\Manager;
+/*
+|--------------------------------------------------------------------------
+| Initialize the Eloquent database manager
+|--------------------------------------------------------------------------
+|
+| Eloquent can run as a stand-alone library (outside of Laravel applications)
+| with all its functionality intact. We just need to bootstrap it correctly.
+|
+*/
 
-$capsule->addConnection(require(__DIR__.'/tests/config/database.php'));
+use Illuminate\Container\Container;
+use Illuminate\Database\Capsule\Manager as Capsule;
+use Illuminate\Events\Dispatcher;
 
-$capsule->setEventDispatcher(new Illuminate\Events\Dispatcher(new Illuminate\Container\Container));
+$capsule = new Capsule;
 
-$capsule->bootEloquent();
+$capsule->addConnection(require(__DIR__.'/tests/config/database.php'));
+
+$capsule->setEventDispatcher(new Dispatcher(new Container));
 
 $capsule->setAsGlobal();
 
-/**
- * Autoload required libraries
- */
-$__autoload_paths = array('models', 'migrators', 'seeders');
-
-foreach($__autoload_paths as $path) {
-  foreach(glob(__DIR__ . "/tests/$path/*.php") as $dep) {
-    require_once $dep;
-  }
-}
-
-/**
- * Require test helpers
- */
-require __DIR__ . '/tests/suite/support.php';
-require __DIR__ . '/tests/suite/BaumTestCase.php';
-require __DIR__ . '/tests/suite/CategoryTestCase.php';
-require __DIR__ . '/tests/suite/ClusterTestCase.php';
+$capsule->bootEloquent();
+
+/*
+|--------------------------------------------------------------------------
+| Initialize the Collection extensions
+|--------------------------------------------------------------------------
+|
+| This would normally be under a service provider on a laravel application but
+| for testing we just initialize the mixin here.
+|
+*/
+
+\Illuminate\Database\Eloquent\Collection::mixin(new \Baum\Mixins\Collection);
+
+/*
+|--------------------------------------------------------------------------
+| Initialize the schema blueprint extensions
+|--------------------------------------------------------------------------
+|
+| This would normally be under a service provider on a laravel application but
+| for testing we just initialize the mixin here.
+|
+*/
+
+\Illuminate\Database\Schema\Blueprint::mixin(new \Baum\Mixins\Blueprint);

composer.json

@@ -2,31 +2,53 @@
   "name": "baum/baum",
   "type": "library",
   "description": "Baum is an implementation of the Nested Set pattern for Eloquent models.",
-  "keywords": ["nested set", "laravel", "laravel 4", "laravel 5", "eloquent", "database"],
+  "keywords": ["nested set", "laravel", "eloquent", "database", "tree", "hierarchy"],
   "license": "MIT",
   "authors": [
     {
       "name": "Estanislau Trepat",
       "email": "estanis@etrepat.com",
-      "homepage": "http://etrepat.com"
+      "homepage": "https://etrepat.com"
     }
   ],
   "require": {
-    "php": ">=5.4.0",
-    "illuminate/console": "5.*",
-    "illuminate/database": "5.*",
-    "illuminate/events": "5.*",
-    "illuminate/filesystem": "5.*",
-    "illuminate/support": "5.*"
+    "php": "^7.3|^8.0|^8.1|^8.2",
+    "illuminate/contracts": "^8.0|^9.0|^10.0|^11.0|^12.0",
+    "illuminate/database": "^8.0|^9.0|^10.0|^11.0|^12.0",
+    "illuminate/events": "^8.0|^9.0|^10.0|^11.0|^12.0",
+    "illuminate/support": "^8.0|^9.0|^10.0|^11.0|^12.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "~4.0",
-    "mockery/mockery": "~0.9",
-    "d11wtq/boris": "~1.0.10"
+    "mockery/mockery": "^1.4",
+    "phpunit/phpunit": "^8.5.19|^9.5.8|^11.0.1|^11.5.3",
+    "psy/psysh": "@stable",
+    "squizlabs/php_codesniffer": "*",
+    "illuminate/console": "^8.0|^9.0|^10.0|^11.0|^12.0",
+    "illuminate/filesystem": "^8.0|^9.0|^10.0|^11.0|^12.0"
   },
   "autoload": {
-    "psr-0": {
-      "Baum": "src/"
+    "psr-4": {
+      "Baum\\": "src/"
     }
-  }
+  },
+  "autoload-dev": {
+      "files": [
+        "tests/suite/Support/helpers.php"
+      ],
+      "psr-4": {
+          "Baum\\Tests\\": "tests/suite/"
+      }
+  },
+  "extra": {
+    "laravel": {
+        "providers": [
+          "Baum\\BaumServiceProvider"
+        ]
+    }
+  },
+  "config": {
+    "sort-packages": true
+  },
+  "minimum-stability": "dev",
+  "prefer-stable": true
 }

console

@@ -0,0 +1,21 @@
+#!/usr/bin/env php
+<?php
+/**
+ * Baum, an implementation of the [Nested Set](http://en.wikipedia.org/wiki/Nested_set_model)
+ * pattern for Laravel's Eloquent ORM.
+ *
+ * @package Baum
+ * @author  Estanislau Trepat <estanis@etrepat.com>
+ */
+
+ require __DIR__ . '/bootstrap.php';
+
+class Test extends Illuminate\Database\Eloquent\Model {
+    use Baum\NestedSet\Node;
+
+    protected $tableName = 'forest';
+}
+
+with(new \Baum\Tests\Support\Migrators\CategoryMigrator)->up();
+
+exit($status = Baum\Playground\Console::start());

phpcs.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<ruleset name="PHP_CodeSniffer">
+    <description>The coding standard for Baum.</description>
+
+    <!-- Include the whole PSR2 standard -->
+    <rule ref="PSR2" />
+
+    <!-- Include some other sniffs -->
+    <rule ref="Generic.Arrays.ArrayIndent" />
+    <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
+</ruleset>

phpunit.xml

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="bootstrap.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.2/phpunit.xsd"
+    backupGlobals="false"
+    beStrictAboutTestsThatDoNotTestAnything="false"
+    bootstrap="./bootstrap.php"
+    colors="true"
+    failOnRisky="true"
+    failOnWarning="true"
+    processIsolation="false"
+    stopOnError="false"
+    stopOnFailure="false"
+    cacheDirectory=".phpunit.cache"
+    backupStaticProperties="false">
   <testsuites>
     <testsuite name="Baum Test Suite">
-      <file>tests/suite/QueryBuilderExtensionTest.php</file>
-      <file>tests/suite/NodeModelExtensionsTest.php</file>
-      <directory>tests/suite/Category</directory>
-      <directory>tests/suite/Cluster</directory>
+      <directory suffix="Test.php">./tests/suite</directory>
     </testsuite>
   </testsuites>
 </phpunit>