Dev

.gitignore

@@ -1,6 +1,3 @@
+/build
 /vendor
-composer.phar
-composer.lock
-.DS_Store
-.idea
-atlassian-ide-plugin.xml
+composer.lock

.travis.yml

@@ -1,12 +1,27 @@
 language: php
 
-php: 
-  - 5.3
-  - 5.4
-  - 5.5
+php:
+  - 5.6
+  - 7.0
+
+addons:
+  apt:
+    sources:
+      - elasticsearch-5.0
+    packages:
+      - elasticsearch
+
+services:
+  - elasticsearch
 
 before_script:
-  - curl -s http://getcomposer.org/installer | php
-  - php composer.phar install --dev
+  - travis_retry composer self-update
+  - travis_retry composer update --prefer-dist --no-interaction
+
+script:
+  - mkdir -p build/logs
+  - vendor/bin/phpcs
+  - vendor/bin/phpunit
 
-script: phpunit
+after_script:
+  - vendor/bin/coveralls -v

CONTRIBUTING.md

@@ -0,0 +1,17 @@
+# Contributing
+
+Before you contribute code to laravel-elasticsearch, please make sure it conforms PHPCS coding standard and unit tests
+still pass.
+
+## How to
+Fork, then clone the repo:
+
+    git clone [email protected]:your-username/laravel-elasticsearch.git
+
+Make sure the tests pass:
+
+    composer test
+
+Make your change. Add tests for your change. Make the tests pass
+
+Push to your fork and [submit a pull request][pr].

LICENCE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Shift 31 Consulting
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

README.md

@@ -1,60 +1,66 @@
-Elasticsearch for Laravel
-=========================
-This is a Laravel (4+) Service Provider for the official Elasticsearch low-level client:
-http://www.elasticsearch.org/guide/en/elasticsearch/client/php-api/current/index.html
+Laravel Elasticsearch Service Provider  (4.5.1)
+================================================
+[![Latest Stable Version](https://poser.pugx.org/shift31/laravel-elasticsearch/v/stable)](https://packagist.org/packages/shift31/laravel-elasticsearch)
+[![Total Downloads](https://poser.pugx.org/shift31/laravel-elasticsearch/downloads)](https://packagist.org/packages/shift31/laravel-elasticsearch)
+[![Build Status](https://travis-ci.org/shift31/laravel-elasticsearch.svg?branch=4.5)](https://travis-ci.org/shift31/laravel-elasticsearch)
+[![Coverage Status](https://coveralls.io/repos/github/shift31/laravel-elasticsearch/badge.svg?branch=4.5)](https://coveralls.io/github/shift31/laravel-elasticsearch?branch=master)
+[![License](https://poser.pugx.org/shift31/laravel-elasticsearch/license)](https://packagist.org/packages/shift31/laravel-elasticsearch)
 
+This is a Laravel (4.2) Service Provider for the [official Elasticsearch low-level client](http://www.elasticsearch.org/guide/en/elasticsearch/client/php-api/5.0/index.html).
 
 Version Matrix
---------------
-Since there are breaking changes in Elasticsearch 1.0, your version of Elasticsearch must match the version of this library, which matches the version of the Elasticsearch low-level client.
-If you are using a version older than 1.0, you must install the `0.4` laravel-elasticsearch branch.  Otherwise, use the `1.0` branch.
-
-The master branch will always track the latest version.
-
-| Elasticsearch Version | laravel-elasticsearch branch |
-| --------------------- | ---------------------------- |
-| >= 1.0                | 1.0, 2.0                     |
-| <= 0.90.*             | 0.4                          |
-
-**Support for v1.1.x of the Elasticsearch client has been added in v1.1 of laravel-elasticsearch.**  We'll try to be consistent with this convention going forward.
+------------------
+Since there are breaking changes in Elasticsearch versions, your version of Elasticsearch must match the version of this 
+library, which matches the version of the Elasticsearch low-level client. 
+
+|Shift31/laravel-elasticsearch| Elasticsearch | Laravel |
+| :---: | :---: | :---: |
+| 0.4| <= 0.90.* | 4.2 |
+| 1.0, 2.0| \>= 1.0 | 4.x, 5.x |
+|4.0| <= 0.90.* | 4.2|
+|4.1| \>= 1.0 <= 2.0 | 4.2|
+|4.2| \>= 2.0 <= 5.0| 4.2|
+|4.5| \>= 5.0| 4.2|
+|5.0| <= 0.90.* | 5.x|
+|5.1| \>= 1.0 <= 2.0 | 5.x|
+|5.2| \>= 2.0 <= 5.0| 5.x|
+|5.5| \>= 5.0| 5.x|
+
+Attention: Until we launch new versions please keep using old stable versions (which are created as a branch) and don't use dev-master branch!
 
 Usage
 -----
-1. Run `composer require shift31/laravel-elasticsearch:~2.0`
+1. Run `composer require shift31/laravel-elasticsearch:~4.5.0`
 
-2. Create app/config/elasticsearch.php, modifying the following contents accordingly:
+2. Publish config file
+
+Laravel artisan command 
+```
+$ php artisan config:publish shift31/laravel-elasticsearch 
+```
+You can always read config parameters with:
 ```php
-<?php
-
-return array(
-    'hosts' => array(
-                    'your.elasticsearch.server:9200'
-                    ),
-    'logPath' => 'path/to/your/elasticsearch/log',
-);
+\Config::get('shift31::elasticsearch');
 ```
+Note: The keys of this array should be named according the parameters supported by [Elasticsearch\ClientBuilder](https://github.com/elastic/elasticsearch-php/blob/5.0/src/Elasticsearch/ClientBuilder.php#L119).
 
-The keys of this array should be named according the parameters supported by Elasticsearch\Client.
-
-3. In the `'providers'` array in app/config/app.php, if you are using Laravel 4.x, add `'Shift31\LaravelElasticsearch\LaravelElasticsearchServiceProvider'`. 
-
- **If you are using Laravel 5.x**, add `'Shift31\LaravelElasticsearch\ElasticsearchServiceProvider'`. The ServiceProvider will enable the 'Es' facade for you.
+3. In the `'providers'` array in app/config/app.php, add `'Shift31\LaravelElasticsearch\ElasticsearchServiceProvider'`. 
 
 4. Use the `Es` facade to access any method from the `Elasticsearch\Client` class, for example:
 ```php
 $searchParams['index'] = 'your_index';
 $searchParams['size'] = 50;
 $searchParams['body']['query']['query_string']['query'] = 'foofield:barstring';
-
 $result = Es::search($searchParams);
 ```
 
-**A friendly reminder:**  If you use the facade in a namespaced class (i.e. in a Laravel 5.x controller), you must add `use Es;` at the top of your file (after `<?php` of course), or add a backslash in front of any static calls (ex: `\Es::search(...)`).
-
 Default Configuration
 ---------------------
-If you return an empty array in the config file:
+If you return an empty array in the config file, Service provider [merges default config with custom config variables](src/Shift31/LaravelElasticsearch/ElasticsearchServiceProvider.php).
+For custom config file question please see [this](https://www.elastic.co/guide/en/elasticsearch/client/php-api/5.0/_configuration.html#_building_the_client_from_a_configuration_hash) elastic search configuration page.
 
-`'hosts'` defaults to localhost:9200
+[Default config file](src/config/elasticsearch.php) which is publishing by artisan command.
 
-`'logPath'` defaults to `storage_path() . '/logs/elasticsearch.log'`
+Contributing
+---------------------
+Please see [CONTRIBUTING.md](CONTRIBUTING.md).

composer.json

@@ -1,28 +1,49 @@
 {
-    "name": "shift31/laravel-elasticsearch",
-    "description": "A Laravel Service Provider for the Elasticsearch API client",
-    "authors": [
-        {
-            "name": "Shift 31 Consulting",
-            "email": "[email protected]"
-        }
-    ],
-    "require": {
-        "php": ">=5.4.0",
-        "illuminate/support": "~4|~5",
-        "elasticsearch/elasticsearch": "~2.0"
-    },
-    "autoload": {
-        "classmap": [
-            "src/migrations"
-        ],
-        "psr-0": {
-            "Shift31\\LaravelElasticsearch": "src/"
-        }
+  "name": "shift31/laravel-elasticsearch",
+  "description": "A Laravel Service Provider for the Elasticsearch API client",
+  "authors": [
+    {
+      "name": "Shift 31 Consulting",
+      "email": "[email protected]"
+    }
+  ],
+  "require": {
+    "php": ">=7.2",
+    "illuminate/support": "^6.0|^7.0|^8.0",
+    "elasticsearch/elasticsearch": "~5.0"
+  },
+  "require-dev": {
+    "squizlabs/php_codesniffer": "^2.8",
+    "satooshi/php-coveralls": "^1.0",
+    "orchestra/testbench": "^4.0|^5.0|^6.0"
+  },
+  "autoload": {
+    "psr-0": {
+      "Shift31\\LaravelElasticsearch": "src/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Shift31\\LaravelElasticsearch\\Tests\\": "tests/"
+    }
+  },
+  "extra": {
+    "branch-alias": {
+      "dev-master": "4.5.x-dev"
     },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "require-dev": {
-        "laravel/framework": "^5.2"
+    "laravel": {
+      "providers": [
+        "Shift31\\LaravelElasticsearch\\ElasticsearchServiceProvider"
+      ],
+      "aliases": {
+        "Es": "Shift31\\LaravelElasticsearch\\Facades\\Es"
+      }
     }
-}
+  },
+  "scripts": {
+    "test": [
+      "vendor/bin/phpcs",
+      "vendor/bin/phpunit"
+    ]
+  }
+}

phpcs.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<ruleset>
+    <rule ref="PSR2"/>
+    <file>./src</file>
+</ruleset>

phpunit.xml

@@ -8,11 +8,21 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
->
+         syntaxCheck="false">
     <testsuites>
-        <testsuite name="Package Test Suite">
-            <directory suffix=".php">./tests/</directory>
+        <testsuite name="unit">
+            <directory suffix=".php">./tests/Unit</directory>
+        </testsuite>
+        <testsuite name="integration">
+            <directory suffix=".php">./tests/Integration</directory>
         </testsuite>
     </testsuites>
+    <filter>
+        <whitelist>
+            <directory suffix=".php">./src/Shift31/LaravelElasticsearch</directory>
+        </whitelist>
+    </filter>
+    <logging>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+    </logging>
 </phpunit>