update to laravel 6.x

oiuv · Mar 6, 2022 · 2bfad53 · 2bfad53
1 parent c11fcff
commit 2bfad53
Show file tree

Hide file tree

Showing 8 changed files with 1,784 additions and 1,340 deletions.
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
@@ -20,6 +20,7 @@ class Kernel extends HttpKernel
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
         \App\Http\Middleware\TrustProxies::class,
+        \Fruitcake\Cors\HandleCors::class,
     ];
 
     /**

diff --git a/app/Services/EsEngine.php b/app/Services/EsEngine.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Database\Eloquent\Collection;
 use Laravel\Scout\Builder;
-use ScoutEngines\Elasticsearch\ElasticsearchEngine;
+use Tamayo\LaravelScoutElastic\Engines\ElasticsearchEngine;
 
 /**
  * Class EsEngine.
@@ -34,7 +34,7 @@ public function search(Builder $builder)
     protected function performSearch(Builder $builder, array $options = [])
     {
         $params = [
-            'index' => $this->index,
+            'index' => config('scout.elasticsearch.index'),
             'type' => $builder->model->searchableAs(),
             'body' => [
                 'query' => [

diff --git a/composer.json b/composer.json
@@ -3,32 +3,35 @@
     "description": "A Laravel application.",
     "type": "project",
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.3",
         "beyondcode/laravel-self-diagnosis": "^1.0",
+        "elasticsearch/elasticsearch": "^6.80",
         "erusev/parsedown-extra": "^0.7.1",
         "fideloper/proxy": "^4.0",
+        "fruitcake/laravel-cors": "^2.2",
         "guzzlehttp/guzzle": "^6.3",
-        "laravel/framework": "5.8.*",
+        "laravel/framework": "^6.0",
+        "laravel/helpers": "^1.5",
         "laravel/passport": "^7.2",
-        "laravel/scout": "^7.1",
+        "laravel/scout": "^8.0",
         "laravel/tinker": "^1.0",
-        "laravolt/avatar": "^2.0",
+        "laravolt/avatar": "^4.0",
         "lcobucci/jwt": "3.3",
-        "mews/purifier": "^2.1",
+        "mews/purifier": "^3.3",
         "overtrue/easy-sms": "^1.0",
         "overtrue/laravel-emoji": "^1.0",
         "overtrue/laravel-filesystem-qiniu": "^1.0",
         "overtrue/laravel-follow": "^1.0",
         "overtrue/laravel-lang": "^3.0",
-        "overtrue/laravel-mail-aliyun": "^1.0",
+        "overtrue/laravel-mail-aliyun": "^1.0.3",
         "overtrue/laravel-socialite": "^2.0",
-        "overtrue/laravel-uploader": "^1.0",
+        "overtrue/laravel-uploader": "^1.2",
         "predis/predis": "^1.1",
         "sentry/sentry-laravel": "^1.0.1",
         "spatie/laravel-activitylog": "^3.2",
-        "tamayo/laravel-scout-elastic": "^5.0",
-        "tucker-eric/eloquentfilter": "^1.3",
-        "vinkla/hashids": "^5.0"
+        "tamayo/laravel-scout-elastic": "^8.0",
+        "tucker-eric/eloquentfilter": "^3.0",
+        "vinkla/hashids": "^7.0"
     },
     "require-dev": {
         "filp/whoops": "^2.0",