Laravel 6 & 7 support

Author: therobfonz

.gitignore

@@ -3,3 +3,4 @@ composer.phar
 composer.lock
 .DS_Store
 build
+.phpunit.result.cache

composer.json

@@ -2,19 +2,22 @@
   "name": "trexology/taxonomy",
   "description": "Create and manage a heirarchical taxonomy of terms within different vocabularies",
   "license": "MIT",
-  "keywords": ["taxonomy","laravel"],
+  "keywords": [
+    "taxonomy",
+    "laravel"
+  ],
   "authors": [
     {
       "name": "Trex Lim",
       "email": "trexlim@gmail.com"
     }
   ],
   "require": {
-    "php": ">=5.4",
-    "illuminate/support": "~5.0"
+    "php": "^7.2",
+    "illuminate/support": "^5.0|^6.0|^7.0"
   },
   "require-dev": {
-    "mockery/mockery": "0.9.*",
+    "mockery/mockery": "^1.3.1",
     "codeclimate/php-test-reporter": "dev-master"
   },
   "autoload": {
@@ -32,4 +35,4 @@
       }
     }
   }
-}
+}

src/Models/Term.php

@@ -1,31 +1,37 @@
-<?php namespace Trexology\Taxonomy\Models;
+<?php
 
-class Term extends \Eloquent {
+namespace Trexology\Taxonomy\Models;
 
-  protected $guarded =[
-    'id',
-    'created_at',
-    'updated_at'
-  ];
+class Term extends \Eloquent
+{
+    protected $guarded = [
+        'id',
+        'created_at',
+        'updated_at',
+    ];
 
-	public static $rules = [
-		'name' => 'required'
-  ];
+    public static $rules = [
+        'name' => 'required',
+    ];
 
-  public function termRelation() {
-    return $this->morphMany('Trexology\Taxonomy\Models\TermRelation', 'relationable');
-  }
+    public function termRelation()
+    {
+        return $this->morphMany('Trexology\Taxonomy\Models\TermRelation', 'relationable');
+    }
 
-	public function vocabulary() {
-		return $this->belongsTo('Trexology\Taxonomy\Models\Vocabulary');
-	}
+    public function vocabulary()
+    {
+        return $this->belongsTo('Trexology\Taxonomy\Models\Vocabulary');
+    }
 
-  public function childrens() {
-    return $this->hasMany('Trexology\Taxonomy\Models\Term', 'parent', 'id')
-      ->orderBy('weight', 'ASC');
-  }
+    public function childrens()
+    {
+        return $this->hasMany('Trexology\Taxonomy\Models\Term', 'parent', 'id')
+            ->orderBy('weight', 'ASC');
+    }
 
-  public function parentTerm() {
-    return $this->hasOne('Trexology\Taxonomy\Models\Term', 'id', 'parent');
-  }
+    public function parentTerm()
+    {
+        return $this->hasOne('Trexology\Taxonomy\Models\Term', 'id', 'parent');
+    }
 }

src/Models/TermRelation.php

@@ -1,20 +1,23 @@
-<?php namespace Trexology\Taxonomy\Models;
+<?php
 
-class TermRelation extends \Eloquent {
+namespace Trexology\Taxonomy\Models;
 
-  protected $fillable = [
-    'term_id',
-    'vocabulary_id',
-  ];
+class TermRelation extends \Eloquent
+{
+    protected $fillable = [
+        'term_id',
+        'vocabulary_id',
+    ];
 
-	protected $table = 'term_relations';
+    protected $table = 'term_relations';
 
-  public function relationable() {
-    return $this->morphTo();
-  }
-
-	public function term() {
-		return $this->belongsTo('Trexology\Taxonomy\Models\Term');
-	}
+    public function relationable()
+    {
+        return $this->morphTo();
+    }
 
+    public function term()
+    {
+        return $this->belongsTo('Trexology\Taxonomy\Models\Term');
+    }
 }

src/Models/Vocabulary.php

@@ -1,23 +1,26 @@
-<?php namespace Trexology\Taxonomy\Models;
+<?php
 
-class Vocabulary extends \Eloquent {
+namespace Trexology\Taxonomy\Models;
 
-  protected $fillable = [
-    'name',
-  ];
+class Vocabulary extends \Eloquent
+{
+    protected $fillable = [
+        'name',
+    ];
 
-  protected $table = 'vocabularies';
+    protected $table = 'vocabularies';
 
-  public $rules = [
-    'name' => 'required'
-  ];
+    public $rules = [
+        'name' => 'required',
+    ];
 
-  public function terms() {
-    return $this->HasMany('Trexology\Taxonomy\Models\Term');
-  }
-
-  public function relations() {
-    return $this->HasMany('Trexology\Taxonomy\Models\TermRelation');
-  }
+    public function terms()
+    {
+        return $this->HasMany('Trexology\Taxonomy\Models\Term');
+    }
 
+    public function relations()
+    {
+        return $this->HasMany('Trexology\Taxonomy\Models\TermRelation');
+    }
 }