Skip to content
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.

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

Fix Elastic[S]earch case and add missing "use" #597

Merged
merged 1 commit into from
Apr 27, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions changes.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
CHANGES

2014-04-27
- Fix missing use in TermsStats->setOrder()
- Replace all instances of ElasticSearch with Elasticsearch

2014-04-24
- Fixing the Bool filter with Bool filter children bug #594

Expand Down
2 changes: 1 addition & 1 deletion lib/Elastica/Exception/Connection/HttpException.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public function getErrorMessage($error)
$error = "Couldn't resolve host";
break;
case CURLE_COULDNT_CONNECT:
$error = "Couldn't connect to host, ElasticSearch down?";
$error = "Couldn't connect to host, Elasticsearch down?";
break;
case 28:
$error = "Operation timed out";
Expand Down
2 changes: 1 addition & 1 deletion lib/Elastica/Facet/AbstractFacet.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public function setFilter(AbstractFilter $filter)
/**
* Sets the flag to either run the facet globally or bound to the
* current search query. When not set, it defaults to the
* ElasticSearch default value.
* Elasticsearch default value.
*
* @param bool $global Flag to either run the facet globally.
* @return \Elastica\Facet\AbstractFacet
Expand Down
4 changes: 2 additions & 2 deletions lib/Elastica/Facet/Terms.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Terms extends AbstractFacet
{
/**
* Holds the types of ordering which are allowed
* by ElasticSearch.
* by Elasticsearch.
*
* @var array
*/
Expand Down Expand Up @@ -75,7 +75,7 @@ public function setAllTerms($allTerms)
}

/**
* Sets the ordering type for this facet. ElasticSearch
* Sets the ordering type for this facet. Elasticsearch
* internal default is count.
*
* @param string $type The order type to set use for sorting of the terms.
Expand Down
6 changes: 4 additions & 2 deletions lib/Elastica/Facet/TermsStats.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

namespace Elastica\Facet;

use Elastica\Exception\InvalidException;

/**
* Implements the statistical facet on a per term basis.
*
Expand All @@ -15,7 +17,7 @@ class TermsStats extends AbstractFacet

/**
* Holds the types of ordering which are allowed
* by ElasticSearch.
* by Elasticsearch.
*
* @var array
*/
Expand Down Expand Up @@ -46,7 +48,7 @@ public function setValueScript( $valueScript )
}

/**
* Sets the ordering type for this facet. ElasticSearch
* Sets the ordering type for this facet. Elasticsearch
* internal default is count.
*
* @param string $type The order type to set use for sorting of the terms.
Expand Down
2 changes: 1 addition & 1 deletion lib/Elastica/Query/Builder.php
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ public function explain($value = true)
* In the simple case, a facet can return facet counts for various facet
* values for a specific field.
*
* ElasticSearch supports more advanced facet implementations, such as
* Elasticsearch supports more advanced facet implementations, such as
* statistical or date histogram facets.
*
* @return \Elastica\Query\Builder
Expand Down
2 changes: 1 addition & 1 deletion test/lib/Elastica/Test/Query/MultiMatchTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public function testFuzzy()

public function testFuzzyWithOptions1()
{
// Here ElasticSearch will not accept mispells
// Here Elasticsearch will not accept mispells
// on the first 6 letters.
$this->multiMatch->setQuery('Tritsan'); // Mispell on purpose
$this->multiMatch->setFields(array('full_name', 'name'));
Expand Down