remove predis so it is added only if redis is used and laravel uuid in favor of Str::uuid()

joselfonseca · joselfonseca · commit a32ecc2efe5a · 2018-03-23T17:15:50.000-05:00
diff --git a/app/Support/UuidScopeTrait.php b/app/Support/UuidScopeTrait.php
@@ -2,7 +2,7 @@
 
 namespace App\Support;
 
-use Uuid;
+use Illuminate\Support\Str;
 
 /**
  * Class UuidScopeTrait.
@@ -28,7 +28,7 @@ protected static function bootUuidScopeTrait()
     {
         static::creating(function ($model) {
             if (empty($model->uuid)) {
-                $model->uuid = Uuid::generate()->string;
+                $model->uuid = (string) Str::uuid();
             }
         });
     }
diff --git a/composer.json b/composer.json
@@ -19,9 +19,7 @@
         "laravel/framework": "5.6.*",
         "laravel/passport": "^5.0",
         "laravel/tinker": "~1.0",
-        "predis/predis": "^1.1",
-        "spatie/laravel-permission": "^2.6",
-        "webpatser/laravel-uuid": "^2.0"
+        "spatie/laravel-permission": "^2.6"
     },
     "require-dev": {
         "filp/whoops": "~2.0",
diff --git a/composer.lock b/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace App\Support;`
`4`	`4`
`5`		`-use Uuid;`
	`5`	`+use Illuminate\Support\Str;`
`6`	`6`
`7`	`7`	`/**`
`8`	`8`	`* Class UuidScopeTrait.`
`@@ -28,7 +28,7 @@ protected static function bootUuidScopeTrait()`
`28`	`28`	`{`
`29`	`29`	`static::creating(function ($model) {`
`30`	`30`	`if (empty($model->uuid)) {`
`31`		`- $model->uuid = Uuid::generate()->string;`
	`31`	`+ $model->uuid = (string) Str::uuid();`
`32`	`32`	`}`
`33`	`33`	`});`
`34`	`34`	`}`