Merge pull request #27 from djoudi/master

Add Laravel 6.0 Support

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 5.6
   - 7.0
   - 7.1
   - 7.2

composer.json

@@ -9,15 +9,15 @@
 		}
 	],
 	"require": {
-		"php": ">=5.5.0",
-		"illuminate/support": "4 - 5"
+		"php": ">=7.0",
+		"illuminate/support": "^5.5|^6.0"
 	},
 	"require-dev": {
-		"phpunit/phpunit": "~4.7",
-		"bkwld/upchuck": "^2.0@dev",
-		"illuminate/database": "4 - 5",
+		"phpunit/phpunit": "~6.0|~8.0",
+		"bkwld/upchuck": "^2.6@dev",
+		"illuminate/database": "^5.5|^6.0",
 		"league/flysystem-vfs": "^1.0",
-		"mockery/mockery": "^0.9.4",
+		"mockery/mockery": "^1.2.3",
 		"satooshi/php-coveralls": "^1.0"
 	},
 	"suggest": {

src/Cloner.php

@@ -2,6 +2,7 @@
 
 // Deps
 use Illuminate\Events\Dispatcher as Events;
+use Illuminate\Support\Arr;
 
 /**
  * Core class that traverses a model's relationships and replicates model
@@ -168,7 +169,7 @@ protected function duplicatePivotedRelation($relation, $relation_name, $clone) {
 
 		// Loop trough current relations and attach to clone
 		$relation->get()->each(function ($foreign) use ($clone, $relation_name) {
-			$pivot_attributes = array_except($foreign->pivot->getAttributes(), [
+			$pivot_attributes = Arr::except($foreign->pivot->getAttributes(), [
 				$foreign->pivot->getRelatedKey(),
 				$foreign->pivot->getForeignKey(),
 				$foreign->pivot->getCreatedAtColumn(),

tests/CloneableTest.php

@@ -3,11 +3,12 @@
 // Deps
 use Bkwld\Cloner\Stubs\Article;
 use Mockery as m;
+use PHPUnit\Framework\TestCase;
 
 /**
  * Test the trait
  */
-class CloneableTest extends PHPUnit_Framework_TestCase {
+class CloneableTest extends TestCase {
 
 	public function testDuplicate() {
 

tests/FunctionalTest.php

@@ -16,8 +16,9 @@
 use League\Flysystem\MountManager;
 use Mockery as m;
 use VirtualFileSystem\FileSystem as Vfs;
+use PHPUnit\Framework\TestCase;
 
-class FunctionalTest extends PHPUnit_Framework_TestCase
+class FunctionalTest extends TestCase 
 {
 
 	private $article;
@@ -81,42 +82,42 @@ protected function setUpDatabase()
 	protected function migrateTables($connection = 'default')
 	{
 		DB::connection($connection)->getSchemaBuilder()->create('articles', function (Blueprint $table) {
-			$table->increments('id');
+			$table->bigIncrements('id');
 			$table->string('title');
 			$table->timestamps();
 		});
 
 		DB::connection($connection)->getSchemaBuilder()->create('authors', function (Blueprint $table) {
-			$table->increments('id');
+			$table->bigIncrements('id');
 			$table->string('name');
 			$table->timestamps();
 		});
 
 		DB::connection($connection)->getSchemaBuilder()->create('article_author', function (Blueprint $table) {
-			$table->increments('id');
-			$table->integer('article_id')->unsigned();
-			$table->integer('author_id')->unsigned();
+			$table->bigIncrements('id');
+			$table->bigInteger('article_id')->unsigned();
+			$table->bigInteger('author_id')->unsigned();
 		});
 
 		DB::connection($connection)->getSchemaBuilder()->create('photos', function (Blueprint $table) {
-			$table->increments('id');
-			$table->integer('article_id')->unsigned();
+			$table->bigIncrements('id');
+			$table->bigInteger('article_id')->unsigned();
 			$table->string('uid');
 			$table->string('image');
 			$table->boolean('source')->nullable();
 			$table->timestamps();
 		});
 
 		DB::connection($connection)->getSchemaBuilder()->create('users', function (Blueprint $table) {
-			$table->increments('id');
+			$table->bigIncrements('id');
 			$table->string('name');
 			$table->timestamps();
 		});
 
 		DB::connection($connection)->getSchemaBuilder()->create('article_user', function (Blueprint $table) {
-			$table->integer('rating')->unsigned();
-			$table->integer('user_id')->unsigned();
-			$table->integer('article_id')->unsigned();
+			$table->bigInteger('rating')->unsigned();
+			$table->bigInteger('user_id')->unsigned();
+			$table->bigInteger('article_id')->unsigned();
 			$table->timestamps();
 		});
 	}

tests/ServiceProviderTest.php

@@ -3,8 +3,10 @@
 // Deps
 use Bkwld\Cloner\ServiceProvider;
 use Mockery as m;
+use PHPUnit\Framework\TestCase;
 
-class ServiceProviderTest extends PHPUnit_Framework_TestCase {
+
+class ServiceProviderTest extends TestCase {
 
 	function testProvides() {
 		$app = m::mock('Illuminate\Foundation\Application');