Lumen support + Lumen/Laravel 5.7 support

.travis.yml

@@ -19,6 +19,8 @@ matrix:
       env: ILLUMINATE_VERSION=5.5.*
     - php: 7.1
       env: ILLUMINATE_VERSION=5.6.*
+    - php: 7.1
+      env: ILLUMINATE_VERSION=5.7.*
 
 before_install:
   - if [[ $TRAVIS_PHP_VERSION != 7.1 && $TRAVIS_PHP_VERSION != hhvm ]] ; then phpenv config-rm xdebug.ini; fi

composer.json

@@ -15,12 +15,12 @@
     "php": ">=7.0",
     "elasticsearch/elasticsearch": "~5.3.0",
     "ongr/elasticsearch-dsl": "5.*",
-    "illuminate/container": "5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
-    "illuminate/contracts": "5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
-    "illuminate/console": "5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
-    "illuminate/pagination": "5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
-    "illuminate/support": "5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
-    "illuminate/database": "5.2.*|5.3.*|5.4.*|5.5.*|5.6.*"
+    "illuminate/container": "5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*",
+    "illuminate/contracts": "5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*",
+    "illuminate/console": "5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*",
+    "illuminate/pagination": "5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*",
+    "illuminate/support": "5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*",
+    "illuminate/database": "5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*"
   },
   "require-dev": {
     "phpunit/phpunit": "~4.0",

src/DSL/SearchBuilder.php

@@ -500,7 +500,7 @@ public function geoShape($field, $type, array $coordinates = [], array $attribut
     {
         $query = new GeoShapeQuery();
 
-        $query->addShape($field, $type, $coordinates, $attributes);
+        $query->addShape($field, $type, $coordinates, GeoShapeQuery::INTERSECTS, $attributes);
 
         $this->append($query);
 
@@ -869,6 +869,6 @@ public function append($query)
      */
     protected function getCurrentPage($current)
     {
-        return $current ?: (int) \Request::get('page', 1);
+        return $current ?: (int) app('request')->get('page', 1);
     }
 }

src/MappingServiceProvider.php

@@ -149,6 +149,10 @@ protected function registerMakeCommand()
      */
     protected function registerAlias()
     {
-        AliasLoader::getInstance()->alias('Map', Map::class);
+        if (class_exists('Illuminate\Foundation\AliasLoader')) {
+            AliasLoader::getInstance()->alias('Map', Map::class);
+        } elseif (!class_exists('Map')) {
+            class_alias(Map::class, 'Map');
+        }
     }
 }

src/Mappings/Mapping.php

@@ -12,7 +12,7 @@ abstract class Mapping
     /**
      * Eloquent instance.
      *
-     * @var Model
+     * @var Model|Searchable
      */
     protected $model;
 

src/PlasticManager.php

@@ -2,12 +2,10 @@
 
 namespace Sleimanx2\Plastic;
 
-use Illuminate\Foundation\Application;
-
 class PlasticManager
 {
     /**
-     * @var Application
+     * @var \Illuminate\Foundation\Application|\Laravel\Lumen\Application
      */
     private $app;
 
@@ -19,9 +17,9 @@ class PlasticManager
     /**
      * PlasticManager constructor.
      *
-     * @param Application $app
+     * @param \Illuminate\Foundation\Application|\Laravel\Lumen\Application $app
      */
-    public function __construct(Application $app)
+    public function __construct($app)
     {
         $this->app = $app;
     }

src/PlasticServiceProvider.php

@@ -18,9 +18,15 @@ class PlasticServiceProvider extends ServiceProvider
      */
     public function boot()
     {
+        if (function_exists('config_path')) {
+            $publishPath = config_path('plastic.php');
+        } else {
+            $publishPath = base_path('config/plastic.php');
+        }
+
         // Publish the configuration path
         $this->publishes([
-            __DIR__.'/Resources/config.php' => config_path('plastic.php'),
+            __DIR__.'/Resources/config.php' => $publishPath,
         ]);
 
         // Create the mapping folder
@@ -74,6 +80,10 @@ protected function registerProviders()
      */
     protected function registerAlias()
     {
-        AliasLoader::getInstance()->alias('Plastic', Plastic::class);
+        if (class_exists('Illuminate\Foundation\AliasLoader')) {
+            AliasLoader::getInstance()->alias('Plastic', Plastic::class);
+        } elseif (!class_exists('Plastic')) {
+            class_alias(Plastic::class, 'Plastic');
+        }
     }
 }

src/Searchable.php

@@ -95,6 +95,8 @@ public function getDocumentIndex()
         if (isset($this->documentIndex) and !empty($this->documentIndex)) {
             return $this->documentIndex;
         }
+
+        return function_exists('config') ? config('plastic.index') : 'plastic';
     }
 
     /**

tests/DSL/SearchBuilderTest.php

@@ -298,6 +298,7 @@ public function it_set_a_geoShape_query()
                             'type'        => 'point',
                             'coordinates' => [3.3, 33.3],
                         ],
+                        'relation' => 'intersects',
                     ],
                 ],
             ],

tests/SearchableTest.php

@@ -34,10 +34,10 @@ public function it_gets_the_elastic_index_from_index_field_if_set()
     /**
      * @test
      */
-    public function it_returns_null_as_elastic_index_if_no_index_field()
+    public function it_return_default_index_if_no_index_field()
     {
         $model = new SearchableModelTest();
-        $this->assertEquals(null, $model->getDocumentIndex());
+        $this->assertEquals('plastic', $model->getDocumentIndex());
     }
 
     /**