Merge branch 'master' into issue-103/reimport-command

Author: borealsmith

.travis.yml

@@ -2,14 +2,14 @@ dist: bionic
 language: php
 
 php:
-  - 7.2
   - 7.3
   - 7.4
 
 env:
   matrix:
     - LARAVEL=^6.0
     - LARAVEL=^7.0
+    - LARAVEL=^8.0
 
 matrix:
   fast_finish: true

CHANGELOG.md

@@ -6,6 +6,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [1.10.1](https://github.com/algolia/scout-extended/compare/v1.10.0...v1.10.1) - 2020-09-23
+### Added
+- Support for Laravel 6 & 7 for the latest versions ([#250](https://github.com/algolia/scout-extended/pull/250))
+
+## [1.10.0](https://github.com/algolia/scout-extended/compare/v1.9.0...v1.10.0) - 2020-09-23
+### Added
+- Support to Laravel 8 ([#248](https://github.com/algolia/scout-extended/pull/248))
+
+### Changed
+- Drops support for PHP `7.2`
+
 ## [1.9.0](https://github.com/algolia/scout-extended/compare/v1.8.0...v1.9.0) - 2020-03-03
 ### Added
 - Support to Laravel 7 ([#225](https://github.com/algolia/scout-extended/pull/225))
@@ -16,7 +27,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [1.8.0](https://github.com/algolia/scout-extended/compare/v1.7.0...v1.8.0) - 2019-10-14
 ### Added
 - Support to `_snippetResult` in searchable metadata ([#207](https://github.com/algolia/scout-extended/pull/207))
-
+EngineManager
 ## [1.7.0](https://github.com/algolia/scout-extended/compare/v1.6.0...v1.7.0) - 2019-08-28
 ### Added
 - Support to `laravel/framework:^6.0` ([#198](https://github.com/algolia/scout-extended/pull/198))

composer.json

@@ -14,14 +14,14 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.3",
         "ext-json": "*",
         "algolia/algoliasearch-client-php": "^2.5.1",
-        "illuminate/console": "^6.0|^7.0",
-        "illuminate/contracts": "^6.0|^7.0",
-        "illuminate/database": "^6.0|^7.0",
-        "illuminate/filesystem": "^6.0|^7.0",
-        "illuminate/support": "^6.0|^7.0",
+        "illuminate/console": "^6.0|^7.0|^8.0",
+        "illuminate/contracts": "^6.0|^7.0|^8.0",
+        "illuminate/database": "^6.0|^7.0|^8.0",
+        "illuminate/filesystem": "^6.0|^7.0|^8.0",
+        "illuminate/support": "^6.0|^7.0|^8.0",
         "laravel/scout": "^8.0",
         "riimu/kit-phpencoder": "^2.4"
     },
@@ -31,10 +31,11 @@
     "require-dev": {
         "fzaninotto/faker": "^1.8",
         "mockery/mockery": "^1.1",
-        "nunomaduro/larastan": "^0.5",
-        "orchestra/testbench": "^4.0|^5.0",
+        "nunomaduro/larastan": "^0.6",
+        "orchestra/testbench": "^4.0|^5.0|^6.0",
         "phpstan/phpstan": "^0.12.14",
-        "phpunit/phpunit": "^8.0|^9.0"
+        "phpunit/phpunit": "^8.0|^9.0",
+        "laravel/legacy-factories": "^1.0"
     },
     "autoload-dev": {
         "psr-4": {

phpstan.neon.dist

@@ -6,14 +6,10 @@ parameters:
         - src
     checkMissingIterableValueType: false
     ignoreErrors:
-        - '#Using \$this in static method Algolia\\ScoutExtended\\Searchable\\Aggregator::bootSearchable\(\).#'
-        - '#Method Algolia\\ScoutExtended\\Engines\\AlgoliaEngine::map\(\) should return Illuminate\\Database\\Eloquent\\Collection but returns Illuminate\\Support\\Collection.#'
-        - '#Algolia\\ScoutExtended\\Engines\\AlgoliaEngine::__construct\(\) does not call parent constructor from Laravel\\Scout\\Engines\\AlgoliaEngine.#'
         - '#Illuminate\\Database\\Eloquent\\Model::searchableAs\(\)#'
         - '#Property Laravel\\Scout\\Builder::\$callback \(string\) does not accept Closure\(mixed, mixed, mixed\): mixed.#'
         - '#Algolia\\ScoutExtended\\ScoutExtendedServiceProvider::getModel\(\)#'
         - '#Cannot call static method create\(\) on string\|null#'
-        - '#Cannot call method newCollection\(\) on mixed.#'
-        - '#Casting to string something that#'
         - '#Unsafe usage of new static#'
         - '#Method Algolia\\ScoutExtended\\Console\\Commands\\OptimizeCommand::handle\(\) has no return typehint specified.#'
+        - '#Call to an undefined method Illuminate\\Support\\HigherOrderCollectionProxy::pushSoftDeleteMetadata\(\)#'

src/Helpers/SearchableFinder.php

@@ -94,7 +94,7 @@ private function isSearchableModel($class): bool
     private function getProjectClasses(): array
     {
         if (self::$declaredClasses === null) {
-            $configFiles = Finder::create()->files()->name('*.php')->in($this->app->path());
+            $configFiles = Finder::create()->files()->name('*.php')->in(app('path'));
 
             foreach ($configFiles->files() as $file) {
                 require_once $file;

src/Managers/EngineManager.php

@@ -27,7 +27,7 @@ class EngineManager extends BaseEngineManager
      */
     public function createAlgoliaDriver(): AlgoliaEngine
     {
-        UserAgent::addCustomUserAgent('Laravel Scout Extended', '1.9.0');
+        UserAgent::addCustomUserAgent('Laravel Scout Extended', '1.10.1');
 
         return new AlgoliaEngine(SearchClient::create(config('scout.algolia.id'), config('scout.algolia.secret')));
     }

tests/Features/OptimizeCommandTest.php

@@ -43,6 +43,6 @@ public function testThatRequiresARowOnTheDatabase(): void
 
         Artisan::call('scout:optimize', ['searchable' => User::class]);
 
-        $this->assertFileNotExists(config_path('scout-users.php'));
+        $this->assertFileDoesNotExist(config_path('scout-users.php'));
     }
 }