From ef310e9abba5fafc1ada7d56735c007941ce6735 Mon Sep 17 00:00:00 2001 From: Sachin Agarwal Date: Thu, 8 Oct 2020 16:07:45 +0530 Subject: [PATCH 01/10] Support for Laravel 8 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index c713c2ba..7efb75cb 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^7.2", + "php": "^7.2|^7.3", "elasticsearch/elasticsearch": ">=7.2", "laravel/scout": "^8.0", "ongr/elasticsearch-dsl": "^7.0" @@ -26,7 +26,7 @@ "fzaninotto/faker": "^1.8", "orchestra/testbench": "^4.0|^5.0", "phpunit/phpunit": "^8.0|^9.0", - "illuminate/support": "^6.0|^7.0", + "illuminate/support": "^6.0|^7.0|^8.0", "nunomaduro/larastan": "~0.5" }, "autoload-dev": { From c41368d743a0853ba81806a4e47554bcd4ea44aa Mon Sep 17 00:00:00 2001 From: Sachin Agarwal Date: Fri, 9 Oct 2020 20:59:08 +0530 Subject: [PATCH 02/10] Added legacy factory library to support older factory structure --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7efb75cb..04067faf 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,8 @@ "php": "^7.2|^7.3", "elasticsearch/elasticsearch": ">=7.2", "laravel/scout": "^8.0", - "ongr/elasticsearch-dsl": "^7.0" + "ongr/elasticsearch-dsl": "^7.0", + "laravel/legacy-factories": "^1.0" }, "require-dev": { "fzaninotto/faker": "^1.8", From 90193211902cf4b7e1fb82adacfe67e2fa9a35b3 Mon Sep 17 00:00:00 2001 From: Sachin Agarwal Date: Fri, 9 Oct 2020 21:04:36 +0530 Subject: [PATCH 03/10] moved laravel legacy factory package to requie-dev --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 04067faf..ae61847b 100644 --- a/composer.json +++ b/composer.json @@ -20,15 +20,15 @@ "php": "^7.2|^7.3", "elasticsearch/elasticsearch": ">=7.2", "laravel/scout": "^8.0", - "ongr/elasticsearch-dsl": "^7.0", - "laravel/legacy-factories": "^1.0" + "ongr/elasticsearch-dsl": "^7.0" }, "require-dev": { "fzaninotto/faker": "^1.8", "orchestra/testbench": "^4.0|^5.0", "phpunit/phpunit": "^8.0|^9.0", "illuminate/support": "^6.0|^7.0|^8.0", - "nunomaduro/larastan": "~0.5" + "nunomaduro/larastan": "~0.5", + "laravel/legacy-factories": "^1.0" }, "autoload-dev": { "psr-4": { From 968fcebeee83c388ccccf7b0f2897d76eee60842 Mon Sep 17 00:00:00 2001 From: Sergey Shlyakhov Date: Sat, 10 Oct 2020 06:54:04 +0200 Subject: [PATCH 04/10] Update larastan --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ae61847b..5d890d64 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "orchestra/testbench": "^4.0|^5.0", "phpunit/phpunit": "^8.0|^9.0", "illuminate/support": "^6.0|^7.0|^8.0", - "nunomaduro/larastan": "~0.5", + "nunomaduro/larastan": "~0.6", "laravel/legacy-factories": "^1.0" }, "autoload-dev": { From 934859606bc0990f7aba40f166f457ddca23a01b Mon Sep 17 00:00:00 2001 From: Sergey Shlyakhov Date: Wed, 14 Oct 2020 15:26:17 +0200 Subject: [PATCH 05/10] Ignore phpstan error https://github.com/nunomaduro/larastan/blob/master/docs/errors-to-ignore.md --- phpstan.neon.dist | 1 + 1 file changed, 1 insertion(+) diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 8422a749..8143f7a6 100644 --- a/phpstan.neon.dist +++ b/phpstan.neon.dist @@ -7,6 +7,7 @@ parameters: reportUnmatchedIgnoredErrors: false checkMissingIterableValueType: false ignoreErrors: + - '#Call to an undefined method Illuminate\\Support\\HigherOrder#' - path: %currentWorkingDirectory%/src/Engines/ElasticSearchEngine.php message: '#Call to an undefined method Illuminate\\Database\\Eloquent\\Model::searchableAs\(\)\.#' From 2f6e74cc4aae57c357f0cef2119c9e3eddd804ab Mon Sep 17 00:00:00 2001 From: Sergey Shlyakhov Date: Wed, 14 Oct 2020 16:08:05 +0200 Subject: [PATCH 06/10] Remove php 7.2 support --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c354ff50..0214168d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ env: - ELASTICSEARCH_BUILD=7.1.1-amd64.deb ELASTICSEARCH_HOST=localhost:9200 DB_DATABASE=scout_database DB_USERNAME=travis DB_PASSWORD="" php: - - 7.2 - 7.3 - nightly From 3b6ca5537b8b2792e7e50b64466fa2855e30c5a4 Mon Sep 17 00:00:00 2001 From: Sergey Shlyakhov Date: Wed, 14 Oct 2020 16:09:45 +0200 Subject: [PATCH 07/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 29a36396..bfef7146 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ Don't forget to :star: the package if you like it. :pray: ## :warning: Requirements -- PHP version >= 7.2.0 +- PHP version >= 7.3 - Laravel Framework version >= 6.0.0 | Elasticsearch version | ElasticsearchDSL version | From 155c3c45bcc685b0288ce492e815fabbe41d279e Mon Sep 17 00:00:00 2001 From: Sergey Shlyakhov Date: Sun, 18 Oct 2020 09:43:14 +0200 Subject: [PATCH 08/10] self_accessor already disabled --- .styleci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.styleci.yml b/.styleci.yml index fa0ae5c3..0285f179 100755 --- a/.styleci.yml +++ b/.styleci.yml @@ -1,3 +1 @@ preset: laravel -disabled: - - self_accessor From 9f526750f4e91811c296653093e194beb92855ea Mon Sep 17 00:00:00 2001 From: Sergey Shlyakhov Date: Sun, 18 Oct 2020 09:45:04 +0200 Subject: [PATCH 09/10] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85e119cb..3fd3f1b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/) ## [Unreleased] +## [4.0.2] - 2020-10-18 +### Added +- Laravel 8 Support + ## [4.0.1] - 2020-03-26 ### Fixed - Prevent unnessasary send `\Laravel\Scout\Jobs\MakeSearchable` to a queue From 5ff3777e29df3d65c376f480d63fa5d09d4acf54 Mon Sep 17 00:00:00 2001 From: Sergey Shlyakhov Date: Sun, 18 Oct 2020 09:46:10 +0200 Subject: [PATCH 10/10] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5d890d64..c5987822 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "matchish/laravel-scout-elasticsearch", "description": "Search among multiple models with ElasticSearch and Laravel Scout", - "version": "4.0.1", + "version": "4.0.2", "keywords": [ "laravel", "scout",