Skip to content

Commit 743c884

Browse files
Fix Elastic[S]earch case and add missing "use"
See elastic/elasticsearch#4634 about the official case of Elasticsearch versus ElasticSearch.
1 parent 62f63df commit 743c884

File tree

7 files changed

+14
-8
lines changed

7 files changed

+14
-8
lines changed

changes.txt

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
CHANGES
22

3+
2014-04-27
4+
- Fix missing use in TermsStats->setOrder()
5+
- Replace all instances of ElasticSearch with Elasticsearch
6+
37
2014-04-24
48
- Fixing the Bool filter with Bool filter children bug #594
59

lib/Elastica/Exception/Connection/HttpException.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function getErrorMessage($error)
6363
$error = "Couldn't resolve host";
6464
break;
6565
case CURLE_COULDNT_CONNECT:
66-
$error = "Couldn't connect to host, ElasticSearch down?";
66+
$error = "Couldn't connect to host, Elasticsearch down?";
6767
break;
6868
case 28:
6969
$error = "Operation timed out";

lib/Elastica/Facet/AbstractFacet.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public function setFilter(AbstractFilter $filter)
8080
/**
8181
* Sets the flag to either run the facet globally or bound to the
8282
* current search query. When not set, it defaults to the
83-
* ElasticSearch default value.
83+
* Elasticsearch default value.
8484
*
8585
* @param bool $global Flag to either run the facet globally.
8686
* @return \Elastica\Facet\AbstractFacet

lib/Elastica/Facet/Terms.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class Terms extends AbstractFacet
1818
{
1919
/**
2020
* Holds the types of ordering which are allowed
21-
* by ElasticSearch.
21+
* by Elasticsearch.
2222
*
2323
* @var array
2424
*/
@@ -75,7 +75,7 @@ public function setAllTerms($allTerms)
7575
}
7676

7777
/**
78-
* Sets the ordering type for this facet. ElasticSearch
78+
* Sets the ordering type for this facet. Elasticsearch
7979
* internal default is count.
8080
*
8181
* @param string $type The order type to set use for sorting of the terms.

lib/Elastica/Facet/TermsStats.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace Elastica\Facet;
44

5+
use Elastica\Exception\InvalidException;
6+
57
/**
68
* Implements the statistical facet on a per term basis.
79
*
@@ -15,7 +17,7 @@ class TermsStats extends AbstractFacet
1517

1618
/**
1719
* Holds the types of ordering which are allowed
18-
* by ElasticSearch.
20+
* by Elasticsearch.
1921
*
2022
* @var array
2123
*/
@@ -46,7 +48,7 @@ public function setValueScript( $valueScript )
4648
}
4749

4850
/**
49-
* Sets the ordering type for this facet. ElasticSearch
51+
* Sets the ordering type for this facet. Elasticsearch
5052
* internal default is count.
5153
*
5254
* @param string $type The order type to set use for sorting of the terms.

lib/Elastica/Query/Builder.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ public function explain($value = true)
285285
* In the simple case, a facet can return facet counts for various facet
286286
* values for a specific field.
287287
*
288-
* ElasticSearch supports more advanced facet implementations, such as
288+
* Elasticsearch supports more advanced facet implementations, such as
289289
* statistical or date histogram facets.
290290
*
291291
* @return \Elastica\Query\Builder

test/lib/Elastica/Test/Query/MultiMatchTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public function testFuzzy()
7777

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

0 commit comments

Comments
 (0)