From c23e0c54c32f7ea08a43dfc82f7542d27e3389c0 Mon Sep 17 00:00:00 2001 From: brain82 Date: Fri, 29 Nov 2019 19:10:22 +0000 Subject: [PATCH 1/3] Support for Laravel 6 --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 006d047..ccfbbfc 100644 --- a/composer.json +++ b/composer.json @@ -17,15 +17,15 @@ } ], "require": { - "php": ">=5.4.0", - "illuminate/database": "~4.2|^5", - "illuminate/config": "~4.2|^5", - "nesbot/carbon": "~1.0|~2", + "php": ">=7.0.0", + "illuminate/database": "~6.0", + "illuminate/config": "~6.0", + "nesbot/carbon": "~2", "elasticsearch/elasticsearch": "~6.1" }, "require-dev": { - "phpunit/phpunit": "~4.2|~5.0", - "mockery/mockery": "^0.9.4" + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^8.0" }, "autoload": { "psr-4": { From 26f51705cc8d4c34ab87ff73053b56811be67cda Mon Sep 17 00:00:00 2001 From: brain82 Date: Thu, 13 Feb 2020 21:41:19 +0000 Subject: [PATCH 2/3] Updated to allow for elasticsearch 7.x --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ccfbbfc..e9643e9 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "illuminate/database": "~6.0", "illuminate/config": "~6.0", "nesbot/carbon": "~2", - "elasticsearch/elasticsearch": "~6.1" + "elasticsearch/elasticsearch": "~7.0" }, "require-dev": { "mockery/mockery": "^1.0", From 0ea2d6e1b6746976701e0242c4dcc6d125b3010b Mon Sep 17 00:00:00 2001 From: brain82 Date: Thu, 13 Feb 2020 21:51:38 +0000 Subject: [PATCH 3/3] Support for elasticsearch 7.x --- src/ElasticquentTrait.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ElasticquentTrait.php b/src/ElasticquentTrait.php index de56e32..9b19bef 100644 --- a/src/ElasticquentTrait.php +++ b/src/ElasticquentTrait.php @@ -71,7 +71,8 @@ public function newCollection(array $models = array()) */ public function getTypeName() { - return $this->getTable(); + //return $this->getTable(); + return '_doc'; } /**