Skip to content

Commit

Permalink
Merge 1acaf7d into 1860c34
Browse files Browse the repository at this point in the history
  • Loading branch information
candasm committed Feb 27, 2017
2 parents 1860c34 + 1acaf7d commit 321f6c9
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
Laravel Elasticsearch Service Provider (4.0.0)
Laravel Elasticsearch Service Provider (4.0.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.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.2) 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](https://www.elastic.co/guide/en/elasticsearch/client/php-api/0.4/index.html).

Version Matrix
------------------
Expand Down Expand Up @@ -56,7 +56,7 @@ $result = Es::search($searchParams);

Default Configuration
---------------------
If you return an empty array in the config file, Service provider [merges default config with custom config variables](https://github.com/shift31/laravel-elasticsearch/blob/master/src/Shift31/LaravelElasticsearch/ElasticsearchServiceProvider.php#L27).
If you return an empty array in the config file, Service provider [merges default config with custom config variables](src/Shift31/LaravelElasticsearch/ElasticsearchServiceProvider.php#L29).

[Default config file](src/config/elasticsearch.php) which is publishing by artisan command.

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}
],
"require": {
"php": ">=5.4.0 <=7.0.0",
"php": ">=5.4.0 <=7.0",
"laravel/framework": "~4.2.0",
"elasticsearch/elasticsearch": "~0.4"
},
Expand Down
6 changes: 3 additions & 3 deletions phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
</testsuite>
</testsuites>
<filter>
<blacklist>
<directory>./vendor/*</directory>
</blacklist>
<whitelist>
<directory suffix=".php">./src/Shift31/LaravelElasticsearch</directory>
</whitelist>
</filter>
<logging>
<log type="coverage-clover" target="build/logs/clover.xml"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

class ElasticsearchServiceProvider extends ServiceProvider
{
const VERSION = '4.0.0';
const VERSION = '4.0.1';

/**
* @inheritdoc
Expand Down

0 comments on commit 321f6c9

Please sign in to comment.