Skip to content

add Laravel 6 compatibility #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
igor-kamil wants to merge 2 commits into
base: l5
Choose a base branch
from
Open

add Laravel 6 compatibility #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3134b55
l6 compatiiblity
igor-kamil May 2, 2020
cc2a043
fix getElasticClient()
igor-kamil May 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
],
"require": {
"php": ">=5.4.0",
"illuminate/support": "5.*",
"illuminate/database": "5.*",
"elasticsearch/elasticsearch": "~1.0"
"illuminate/support": "6.*",
"illuminate/database": "6.*",
"elasticsearch/elasticsearch": "7.2"
},
"autoload": {
"psr-0": {
Expand Down
4 changes: 3 additions & 1 deletion src/Fadion/Bouncy/BouncyTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php namespace Fadion\Bouncy;

use Illuminate\Support\Facades\Config;
use Elasticsearch\ClientBuilder as ClientBuilder;
use Elasticsearch\Client as ElasticSearch;
use Elasticsearch\Common\Exceptions\Missing404Exception;
use Elasticsearch\Common\Exceptions\Conflict409Exception;
Expand Down Expand Up @@ -591,7 +592,8 @@ protected function basicElasticParams($withId = false)
*/
protected function getElasticClient()
{
return new ElasticSearch(Config::get('elasticsearch'));
return \Elasticsearch\ClientBuilder::create()->setHosts(config('elasticsearch.hosts'))->build();

}

}