Merge pull request #34 from candasm/4.0

Update readme file for 4.0 version.
shift31 · Feb 27, 2017 · 1860c34 · 1860c34
2 parents 818c97f + d1b9d01
commit 1860c34
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 31 deletions.
diff --git a/README.md b/README.md
@@ -1,44 +1,32 @@
-Laravel Elasticsearch Service Provider  (v4.0.x)
+Laravel Elasticsearch Service Provider  (4.0.0)
 ================================================
 [![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=master)](https://travis-ci.org/shift31/laravel-elasticsearch)
-[![Coverage Status](https://coveralls.io/repos/github/shift31/laravel-elasticsearch/badge.svg?branch=master)](https://coveralls.io/github/shift31/laravel-elasticsearch?branch=master)
+[![Build Status](https://travis-ci.org/shift31/laravel-elasticsearch.svg?branch=4.0)](https://travis-ci.org/shift31/laravel-elasticsearch)
+[![Coverage Status](https://coveralls.io/repos/github/shift31/laravel-elasticsearch/badge.svg?branch=4.0)](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+) Service Provider for the official Elasticsearch low-level client:
-http://www.elasticsearch.org/guide/en/elasticsearch/client/php-api/current/index.html
-
+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/current/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.
+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. 
 
-Old  
----
-| Elasticsearch Version | laravel-elasticsearch branch |
-| --------------------- | ---------------------------- |
-| >= 1.0                | 1.0, 2.0                     |
-| <= 0.90.*             | 0.4                          |
+|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 versions and don't use dev-master branch!
-
-New (Under development!)
-------------------
-| Elasticsearch Version | Laravel | laravel-elasticsearch branch |
-| --------------------- |---------| ---------------------------- |
-| <= 0.90.*             | 4.2     | 4.0                          |
-|  1.0                  | 4.2     | 4.1                          |
-|  2.0                  | 4.2     | 4.2                          |
-|  5.0                  | 4.2     | 4.5                          |
-| <= 0.90.*             | 5.2     | 5.0                          |
-|  1.0                  | 5.2     | 5.1                          |
-|  2.0                  | 5.2     | 5.2                          |
-|  5.0                  | 5.x     | 5.5                          |
+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
 -----

diff --git a/src/Shift31/LaravelElasticsearch/ElasticsearchServiceProvider.php b/src/Shift31/LaravelElasticsearch/ElasticsearchServiceProvider.php
@@ -7,6 +7,8 @@
 
 class ElasticsearchServiceProvider extends ServiceProvider
 {
+    const VERSION = '4.0.0';
+
     /**
      * @inheritdoc
      */
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,8 @@ @@
     class ElasticsearchServiceProvider extends ServiceProvider
     {
+        const VERSION = '4.0.0';
         /**
          * @inheritdoc
          */
@@ Expand Down @@