Skip to content

Commit

Permalink
Merge pull request #35 from candasm/version_4.1
Browse files Browse the repository at this point in the history
Update composer file with elastic search 1.0 version support.
  • Loading branch information
candasm authored Feb 27, 2017
2 parents 1860c34 + c33a071 commit 4fbcdbc
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 9 deletions.
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,16 @@ php:
- 5.5
- 5.6

addons:
apt:
sources:
- elasticsearch-1.7
packages:
- elasticsearch

services:
- elasticsearch

before_install:
- curl -O https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-0.90.13.deb && sudo dpkg -i --force-confnew elasticsearch-0.90.13.deb && sudo service elasticsearch restart

before_script:
- travis_retry composer self-update
- travis_retry composer update --prefer-dist --no-interaction
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Laravel Elasticsearch Service Provider (4.0.0)
Laravel Elasticsearch Service Provider (4.1.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=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)
[![Build Status](https://travis-ci.org/shift31/laravel-elasticsearch.svg?branch=4.1)](https://travis-ci.org/shift31/laravel-elasticsearch)
[![Coverage Status](https://coveralls.io/repos/github/shift31/laravel-elasticsearch/badge.svg?branch=4.1)](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):
Expand All @@ -30,7 +30,7 @@ Attention: Until we launch new versions please keep using old stable versions (w

Usage
-----
1. Run `composer require shift31/laravel-elasticsearch:~4.0.0`
1. Run `composer require shift31/laravel-elasticsearch:~4.1.0`

2. Publish config file

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"require": {
"php": ">=5.4.0 <=7.0.0",
"laravel/framework": "~4.2.0",
"elasticsearch/elasticsearch": "~0.4"
"elasticsearch/elasticsearch": "~1.0"
},
"require-dev": {
"squizlabs/php_codesniffer": "^2.8",
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.1.0';

/**
* @inheritdoc
Expand Down

0 comments on commit 4fbcdbc

Please sign in to comment.