Merge pull request #156 from AndreyBrazhnyk/lumen-support

Lumen support

src/Console/Commands/OptimizeCommand.php

@@ -15,6 +15,7 @@
 
 use Illuminate\Console\Command;
 use Algolia\ScoutExtended\Algolia;
+use Illuminate\Console\Application;
 use Algolia\ScoutExtended\Settings\Compiler;
 use Algolia\ScoutExtended\Settings\LocalFactory;
 use Algolia\ScoutExtended\Helpers\SearchableFinder;
@@ -60,7 +61,7 @@ public function handle(
                 $compiler->compile($settings, $path);
                 $this->output->success('Settings file created at: '.$path);
                 $this->output->note('Please review the settings file and synchronize it with Algolia using: "'.
-                    ARTISAN_BINARY.' scout:sync"');
+                    Application::artisanBinary().' scout:sync"');
             }
         }
     }

src/Engines/AlgoliaEngine.php

@@ -87,7 +87,7 @@ public function map(Builder $builder, $results, $searchable)
             return $searchable->newCollection();
         }
 
-        return resolve(ModelsResolver::class)->from($builder, $searchable, $results);
+        return app(ModelsResolver::class)->from($builder, $searchable, $results);
     }
 
     /**

src/Helpers/SearchableFinder.php

@@ -18,7 +18,6 @@
 use Laravel\Scout\Searchable;
 use Illuminate\Console\Command;
 use Symfony\Component\Finder\Finder;
-use Illuminate\Foundation\Application;
 use Symfony\Component\Console\Exception\InvalidArgumentException;
 
 /**
@@ -32,18 +31,17 @@ final class SearchableFinder
     private static $declaredClasses;
 
     /**
-     * @var \Illuminate\Foundation\Application
+     * @var \Illuminate\Contracts\Foundation\Application
      */
     private $app;
 
     /**
      * SearchableModelsFinder constructor.
      *
-     * @param \Illuminate\Foundation\Application $app
-     *
+     * @param \Illuminate\Contracts\Foundation\Application $app
      * @return void
      */
-    public function __construct(Application $app)
+    public function __construct($app)
     {
         $this->app = $app;
     }

src/Repositories/LocalSettingsRepository.php

@@ -74,7 +74,7 @@ public function getPath(SearchIndex $index): string
         $settingsPath = config('scout.algolia.settings_path');
 
         if ($settingsPath === null) {
-            return config_path($fileName);
+            return app('path.config').DIRECTORY_SEPARATOR.$fileName;
         }
 
         if (! $this->files->exists($settingsPath)) {

src/ScoutExtendedServiceProvider.php

@@ -20,6 +20,7 @@
 use Algolia\AlgoliaSearch\AnalyticsClient;
 use Algolia\ScoutExtended\Engines\AlgoliaEngine;
 use Algolia\ScoutExtended\Managers\EngineManager;
+use Algolia\ScoutExtended\Helpers\SearchableFinder;
 use Algolia\ScoutExtended\Console\Commands\SyncCommand;
 use Algolia\ScoutExtended\Console\Commands\FlushCommand;
 use Algolia\ScoutExtended\Searchable\AggregatorObserver;
@@ -89,6 +90,10 @@ private function registerBinds(): void
 
         $this->app->singleton(AggregatorObserver::class, AggregatorObserver::class);
         $this->app->bind(\Laravel\Scout\Builder::class, Builder::class);
+
+        $this->app->bind(SearchableFinder::class, function () {
+            return new SearchableFinder($this->app);
+        });
     }
 
     /**

src/Searchable/Aggregator.php

@@ -57,7 +57,7 @@ public static function bootSearchable(): void
     {
         ($self = new static)->registerSearchableMacros();
 
-        $observer = tap(resolve(AggregatorObserver::class))->setAggregator(static::class, $models = $self->getModels());
+        $observer = tap(app(AggregatorObserver::class))->setAggregator(static::class, $models = $self->getModels());
 
         foreach ($models as $model) {
             $model::observe($observer);