From 10e04d5b68211760f326ba36166b6e17cc9c0242 Mon Sep 17 00:00:00 2001 From: Candas Minareci Date: Mon, 27 Feb 2017 18:43:56 +0200 Subject: [PATCH 1/2] Changes for elastic search 5.x. - ServiceProvider version updated. - composer.json packages updated to use new php versions. - composer.json phpunit version updated. - README version changes added. --- .travis.yml | 5 ++--- README.md | 16 ++++++++-------- composer.json | 8 ++++---- .../ElasticsearchServiceProvider.php | 2 +- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5f023ba..ac72420 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,13 @@ language: php php: - - 5.4 - - 5.5 - 5.6 + - 7.0 addons: apt: sources: - - elasticsearch-2.4 + - elasticsearch-5.0 packages: - elasticsearch diff --git a/README.md b/README.md index ed9c78c..3fd4a91 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -Laravel Elasticsearch Service Provider (4.2.0) +Laravel Elasticsearch Service Provider (4.5.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.2)](https://travis-ci.org/shift31/laravel-elasticsearch) -[![Coverage Status](https://coveralls.io/repos/github/shift31/laravel-elasticsearch/badge.svg?branch=4.2)](https://coveralls.io/github/shift31/laravel-elasticsearch?branch=master) +[![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/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/5.0/index.html). Version Matrix ------------------ @@ -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.2.0` +1. Run `composer require shift31/laravel-elasticsearch:~4.5.0` 2. Publish config file @@ -42,7 +42,7 @@ You can always read config parameters with: ```php \Config::get('shift31::elasticsearch'); ``` -Note: The keys of this array should be named according the parameters supported by [Elasticsearch\Client](https://github.com/elastic/elasticsearch-php/blob/0.4/src/Elasticsearch/Client.php). +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). 3. In the `'providers'` array in app/config/app.php, add `'Shift31\LaravelElasticsearch\ElasticsearchServiceProvider'`. @@ -56,8 +56,8 @@ $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). -For custom config file question please see [this](https://www.elastic.co/guide/en/elasticsearch/client/php-api/2.0/_configuration.html#_building_the_client_from_a_configuration_hash) elastic search configuration page. +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. [Default config file](src/config/elasticsearch.php) which is publishing by artisan command. diff --git a/composer.json b/composer.json index 85dc887..b7e98ca 100644 --- a/composer.json +++ b/composer.json @@ -8,13 +8,13 @@ } ], "require": { - "php": ">=5.4.0 <=7.0.0", + "php": ">=5.6 <=7.1", "laravel/framework": "~4.2.0", - "elasticsearch/elasticsearch": "~2.0" + "elasticsearch/elasticsearch": "~5.0" }, "require-dev": { "squizlabs/php_codesniffer": "^2.8", - "phpunit/phpunit": "^4.8", + "phpunit/phpunit": "^5.7", "mockery/mockery": "^0.9.8", "satooshi/php-coveralls": "^1.0", "orchestra/testbench": "^2.2", @@ -32,7 +32,7 @@ }, "extra": { "branch-alias": { - "dev-master": "4.2.x-dev" + "dev-master": "4.5.x-dev" } }, "scripts": { diff --git a/src/Shift31/LaravelElasticsearch/ElasticsearchServiceProvider.php b/src/Shift31/LaravelElasticsearch/ElasticsearchServiceProvider.php index a0990f2..24730be 100644 --- a/src/Shift31/LaravelElasticsearch/ElasticsearchServiceProvider.php +++ b/src/Shift31/LaravelElasticsearch/ElasticsearchServiceProvider.php @@ -7,7 +7,7 @@ class ElasticsearchServiceProvider extends ServiceProvider { - const VERSION = '4.2.0'; + const VERSION = '4.5.0'; /** * @inheritdoc From 6f867ef7e2841f3522bb62007a6dde54e120ece4 Mon Sep 17 00:00:00 2001 From: Candas Minareci Date: Mon, 27 Feb 2017 22:09:04 +0200 Subject: [PATCH 2/2] Update phpunit.xml file remove black list add white list. --- phpunit.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpunit.xml b/phpunit.xml index 78db987..d840e70 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -18,9 +18,9 @@ - - ./vendor/* - + + ./src/Shift31/LaravelElasticsearch +