Merge pull request #129 from SachinAgarwal1337/patch-1

Support for Laravel 8
matchish · Oct 19, 2020 · d9f4763 · d9f4763
2 parents dfcc90d + 5ff3777
commit d9f4763
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/.styleci.yml b/.styleci.yml
@@ -1,3 +1 @@
 preset: laravel
-disabled:
-  - self_accessor
diff --git 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
 

diff --git 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

diff --git 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    |

diff --git 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",
@@ -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,8 +26,9 @@
         "fzaninotto/faker": "^1.8",
         "orchestra/testbench": "^4.0|^5.0",
         "phpunit/phpunit": "^8.0|^9.0",
-        "illuminate/support": "^6.0|^7.0",
-        "nunomaduro/larastan": "~0.5"
+        "illuminate/support": "^6.0|^7.0|^8.0",
+        "nunomaduro/larastan": "~0.6",
+        "laravel/legacy-factories": "^1.0"
     },
     "autoload-dev": {
         "psr-4": {

diff --git 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\(\)\.#'
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@