Merge branch 'master' into add-relation-to-whereGeoShape

Author: babenkoivan

.editorconfig

@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.yml]
+indent_size = 2

.gitattributes

@@ -0,0 +1,11 @@
+* text=auto
+
+/docker export-ignore
+/tests export-ignore
+.codecov.yml export-ignore
+.editorconfig export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+.styleci.yml export-ignore
+_config.yml export-ignore
+phpunit.xml export-ignore

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,29 @@
+---
+name: 🐛 Bug report
+about: Report a bug related to scout-elastic-driver. Please ensure you are using the latest version.
+
+---
+
+<!--
+Please fill up this template in order to help us to reproduce,
+investigate and possibly fix your bug report. Issues that doesn't
+follow this template will be closed.
+-->
+
+**Versions**
+
+- scout-elastic-driver: #.#.#
+- laravel/framwork: #.#.#
+- php: #.#.#
+- elasticsearch: #.#.#
+
+**Description**
+
+<!-- Describe the bug you are reporting. Try to do your best here -->
+
+**Steps to reproduce**
+
+<!--
+Describe the steps to reproduce the bug. Remember that if we can't reproduce,
+we will not be able to fix the issue. So this step is also very important.
+-->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: 💡 Feature request
+about: Ask for features.
+
+---
+
+<!--
+Please fill up this template in order to help us to understand
+your feature request.
+-->
+
+**Short Description**
+
+<!-- Describe the feature you are requesting in a few words. Try to do your best here -->
+
+**Use cases**
+
+<!--
+Describe some sittuation that this is helpful.
+-->

.github/ISSUE_TEMPLATE/help_wanted.md

@@ -0,0 +1,21 @@
+---
+name: "🧐 Help question"
+about: 'Questions about usage of this package.'
+
+---
+
+<!--
+Use this template for questions about this package usage, they will receive the `help wanted`
+and `question` tags, and the community can help you here.
+
+Also, if the problem is related to the Elasticsearch itself, eg. index mapping, search rules
+and environment setup, please try to search first on the official elasticsearch docs and on
+Stack Overflow community:
+
+- https://stackoverflow.com/questions/tagged/elasticsearch
+- https://www.elastic.co/guide/en/elasticsearch/reference/current/index.html
+
+If you decide to create your question here, please try do your best to explain your question,
+and if possible provide some code samples. When the question is answered, fell free to close
+the issue yourself.
+-->

.gitignore

@@ -1,3 +1,5 @@
 .idea
 vendor
-!.gitkeep
+!.gitkeep
+composer.lock
+phpunit.xml

.styleci.yml

@@ -0,0 +1 @@
+preset: laravel

.travis.yml

@@ -0,0 +1,13 @@
+sudo: required
+
+services:
+  - docker
+
+before_script:
+  - docker-compose -f docker-compose.yml up --build --force-recreate -d
+  - sh ./travis/connection_check.sh elastic 9200
+  - sh ./travis/connection_check.sh mysql 3306
+  - sh ./travis/dependencies_check.sh
+
+script:
+  - docker-compose -f docker-compose.yml exec php /app/driver/vendor/bin/phpunit -c /app/driver/phpunit.xml.dist

README.md

@@ -1,7 +1,12 @@
 # Scout Elasticsearch Driver
 
+:exclamation: **If you are interested in being a collaborator, please fill in [this form](https://goo.gl/forms/hcB8LPQCyDpNRt9u2).** :exclamation:    
+
+---
+
 [![Packagist](https://img.shields.io/packagist/v/babenkoivan/scout-elasticsearch-driver.svg)](https://packagist.org/packages/babenkoivan/scout-elasticsearch-driver)
 [![Packagist](https://img.shields.io/packagist/dt/babenkoivan/scout-elasticsearch-driver.svg)](https://packagist.org/packages/babenkoivan/scout-elasticsearch-driver)
+[![Build Status](https://travis-ci.com/babenkoivan/scout-elasticsearch-driver.svg?branch=master)](https://travis-ci.com/babenkoivan/scout-elasticsearch-driver)
 [![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg)](https://gitter.im/scout-elasticsearch-driver/Lobby)
 [![Donate](https://img.shields.io/badge/donate-PayPal-blue.svg)](https://www.paypal.me/ivanbabenko)
 
@@ -129,7 +134,7 @@ More about index settings you can find in the [index management section](https:/
 To create an index just run the artisan command:
 
 ```
-php artisan elastic:create-index App\\MyIndexConfigurator
+php artisan elastic:create-index "App\MyIndexConfigurator"
 ```
 
 Note, that every searchable model requires its own index configurator.
@@ -166,11 +171,12 @@ class MyModel extends Model
         //
     ];
 
-    // Here you can specify a mapping for a model fields.
+    // Here you can specify a mapping for model fields
     protected $mapping = [
         'properties' => [
-            'text' => [
+            'title' => [
                 'type' => 'text',
+                // Also you can configure multi-fields, more details you can find here https://www.elastic.co/guide/en/elasticsearch/reference/current/multi-fields.html
                 'fields' => [
                     'raw' => [
                         'type' => 'keyword',
@@ -194,7 +200,7 @@ We'll take a closer look at it in [the search rules section](#search-rules).
 After setting up a mapping in your model you can update an Elasticsearch type mapping:
 
 ```
-php artisan elastic:update-mapping App\\MyModel
+php artisan elastic:update-mapping "App\MyModel"
 ```
 
 ## Usage
@@ -455,13 +461,13 @@ Before you run the command, make sure that your index configurator uses the `Sco
 If it's not, add the trait and run the artisan `elastic:update-index` command using your index configurator class name as an argument:
 
 ```
-php artisan elastic:update-index App\\MyIndexConfigurator
+php artisan elastic:update-index "App\MyIndexConfigurator"
 ```
 
 When you are ready, make changes in the model mapping and run the `elastic:migrate` command using the model class as the first argument and desired index name as the second argument:
 
 ```
-php artisan elastic:migrate App\\MyModel my_index_v2
+php artisan elastic:migrate "App\MyModel" my_index_v2
 ``` 
 
 Note, that if you need just to add new fields in your mapping, use the `elastic:update-mapping` command.

composer.json

@@ -23,7 +23,7 @@
     "require": {
         "php": ">=7.1.3",
         "elasticsearch/elasticsearch": "6.*",
-        "laravel/scout": "6.*"
+        "laravel/scout": "7.*"
     },
     "require-dev": {
         "phpunit/phpunit": "7.*",