Skip to content

Commit c752e9e

Browse files
committed
release version 2.0.4
1 parent 62f5612 commit c752e9e

File tree

6 files changed

+27
-14
lines changed

6 files changed

+27
-14
lines changed

ActiveRecord.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@ public function insert($runValidation = true, $attributes = null, $options = ['o
483483
* @throws StaleObjectException if optimistic locking is enabled and the data being updated is outdated.
484484
* @throws InvalidParamException if no [[version]] is available and optimistic locking is enabled.
485485
* @throws Exception in case update failed.
486-
*/
486+
*/
487487
public function update($runValidation = true, $attributeNames = null, $options = [])
488488
{
489489
if ($runValidation && !$this->validate($attributeNames)) {

BatchQueryResult.php

+2
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,13 @@ class BatchQueryResult extends Object implements \Iterator
7575
* (in ElasticSearch [time units](https://www.elastic.co/guide/en/elasticsearch/reference/current/common-options.html#time-units).
7676
*/
7777
public $scrollWindow = '1m';
78+
7879
/*
7980
* @var string internal ElasticSearch scroll id
8081
*/
8182
private $_lastScrollId = null;
8283

84+
8385
/**
8486
* Destructor.
8587
*/

CHANGELOG.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ Yii Framework 2 elasticsearch extension Change Log
22
==================================================
33

44

5-
2.0.4 under development
6-
-----------------------
5+
2.0.4 March 17, 2016
6+
--------------------
77

88
- Bug #8: Fixed issue with running out of sockets when running a large number of requests by reusing curl handles (cebe)
99
- Bug #13: Fixed wrong API call for getting all types or searching all types, `_all` works only for indexes (cebe)

Command.php

+7-5
Original file line numberDiff line numberDiff line change
@@ -299,14 +299,15 @@ public function typeExists($index, $type)
299299

300300
/**
301301
* Change specific index level settings in real time.
302-
* Note that update analyzers required to [[close()]] the index first and [[open()]] it after the changes are made,
302+
* Note that update analyzers required to [[close()]] the index first and [[open()]] it after the changes are made,
303303
* use [[updateAnalyzers()]] for it.
304-
*
304+
*
305305
* @param string $index
306306
* @param string|array $setting
307307
* @param array $options URL options
308308
* @return mixed
309309
* @see http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/indices-update-settings.html
310+
* @since 2.0.4
310311
*/
311312
public function updateSettings($index, $setting, $options = [])
312313
{
@@ -315,8 +316,8 @@ public function updateSettings($index, $setting, $options = [])
315316
}
316317

317318
/**
318-
* Define new analyzers for the index.
319-
* For example if content analyzer hasn’t been defined on "myindex" yet
319+
* Define new analyzers for the index.
320+
* For example if content analyzer hasn’t been defined on "myindex" yet
320321
* you can use the following commands to add it:
321322
*
322323
* ~~~
@@ -340,12 +341,13 @@ public function updateSettings($index, $setting, $options = [])
340341
* ];
341342
* $elasticQuery->createCommand()->updateAnalyzers('myindex', $setting);
342343
* ~~~
343-
*
344+
*
344345
* @param string $index
345346
* @param string|array $setting
346347
* @param array $options URL options
347348
* @return mixed
348349
* @see https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-update-settings.html#update-settings-analysis
350+
* @since 2.0.4
349351
*/
350352
public function updateAnalyzers($index, $setting, $options = [])
351353
{

Connection.php

+9-3
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,14 @@ class Connection extends Component
3535
*/
3636
public $autodetectCluster = true;
3737
/**
38-
* @var array[] cluster nodes
38+
* @var array The elasticsearch cluster nodes to connect to.
39+
*
3940
* This is populated with the result of a cluster nodes request when [[autodetectCluster]] is true.
41+
*
4042
* Additional special options:
43+
*
4144
* - `auth`: overrides [[auth]] property. For example:
45+
*
4246
* ```php
4347
* [
4448
* 'http_address' => 'inet[/127.0.0.1:9200]',
@@ -55,17 +59,18 @@ class Connection extends Component
5559
* @var string the active node. Key of one of the [[nodes]]. Will be randomly selected on [[open()]].
5660
*/
5761
public $activeNode;
58-
5962
/**
6063
* @var array Authentication data used to connect to the ElasticSearch node.
64+
*
6165
* Array elements:
66+
*
6267
* - `username`: the username for authentication.
6368
* - `password`: the password for authentication.
69+
*
6470
* Array either MUST contain both username and password on not contain any authentication credentials.
6571
* @see http://www.elasticsearch.org/guide/en/elasticsearch/client/php-api/current/_configuration.html#_example_configuring_http_basic_auth
6672
*/
6773
public $auth = [];
68-
6974
/**
7075
* @var float timeout to use for connecting to an elasticsearch node.
7176
* This value will be used to configure the curl `CURLOPT_CONNECTTIMEOUT` option.
@@ -84,6 +89,7 @@ class Connection extends Component
8489
*/
8590
private $_curl;
8691

92+
8793
public function init()
8894
{
8995
foreach ($this->nodes as $node) {

Query.php

+6-3
Original file line numberDiff line numberDiff line change
@@ -156,15 +156,17 @@ class Query extends Component implements QueryInterface
156156
/**
157157
* @var float Exclude documents which have a _score less than the minimum specified in min_score
158158
* @see http://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-min-score.html
159+
* @since 2.0.4
159160
*/
160161
public $minScore;
161162
/**
162163
* @var array list of options that will passed to commands created by this query.
163164
* @see Command::$options
164-
* @since 2.0.4
165+
* @since 2.0.4
165166
*/
166167
public $options = [];
167168

169+
168170
/**
169171
* @inheritdoc
170172
*/
@@ -608,6 +610,7 @@ public function timeout($timeout)
608610
* @param float $minScore Exclude documents which have a `_score` less than the minimum specified minScore
609611
* @return static the query object itself
610612
* @see http://www.elastic.co/guide/en/elasticsearch/reference/current/search-request-min-score.html
613+
* @since 2.0.4
611614
*/
612615
public function minScore($minScore)
613616
{
@@ -621,7 +624,7 @@ public function minScore($minScore)
621624
* @return $this the query object itself
622625
* @throws InvalidParamException if $options is not an array
623626
* @see Command::$options
624-
* @since 2.0.4
627+
* @since 2.0.4
625628
*/
626629
public function options($options)
627630
{
@@ -639,7 +642,7 @@ public function options($options)
639642
* @return $this the query object itself
640643
* @throws InvalidParamException if $options is not an array
641644
* @see options()
642-
* @since 2.0.4
645+
* @since 2.0.4
643646
*/
644647
public function addOptions($options)
645648
{

0 commit comments

Comments
 (0)