-
Notifications
You must be signed in to change notification settings - Fork 729
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This constant was introduced for compatibility with PHP 5.3. This is now not needed anymore as PHP 5.3 compatibility was removed * Remove JSON_ELASTICSEARCH constant as not needed anymore * Run linter
- Loading branch information
Showing
16 changed files
with
44 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,6 @@ | ||
<?php | ||
|
||
namespace Elastica\Aggregation; | ||
|
||
use Elastica\Exception\InvalidException; | ||
|
||
/** | ||
* Class GeoCentroid. | ||
* | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -47,7 +47,6 @@ class FunctionScore extends AbstractQuery | |
const MULTI_VALUE_MODE_AVG = 'avg'; | ||
const MULTI_VALUE_MODE_SUM = 'sum'; | ||
|
||
|
||
protected $_functions = []; | ||
|
||
/** | ||
|
@@ -134,14 +133,14 @@ public function addScriptScoreFunction(AbstractScript $script, $filter = null, $ | |
/** | ||
* Add a decay function to the query. | ||
* | ||
* @param string $function see DECAY_* constants for valid options | ||
* @param string $field the document field on which to perform the decay function | ||
* @param string $origin the origin value for this decay function | ||
* @param string $scale a scale to define the rate of decay for this function | ||
* @param string $offset If defined, this function will only be computed for documents with a distance from the origin greater than this value | ||
* @param float $decay optionally defines how documents are scored at the distance given by the $scale parameter | ||
* @param float $weight optional factor by which to multiply the score at the value provided by the $scale parameter | ||
* @param AbstractQuery $filter a filter associated with this function | ||
* @param string $function see DECAY_* constants for valid options | ||
* @param string $field the document field on which to perform the decay function | ||
* @param string $origin the origin value for this decay function | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
ruflin
Author
Owner
|
||
* @param string $scale a scale to define the rate of decay for this function | ||
* @param string $offset If defined, this function will only be computed for documents with a distance from the origin greater than this value | ||
* @param float $decay optionally defines how documents are scored at the distance given by the $scale parameter | ||
* @param float $weight optional factor by which to multiply the score at the value provided by the $scale parameter | ||
* @param AbstractQuery $filter a filter associated with this function | ||
* @param string $multiValueMode see MULTI_VALUE_MODE_* constants for valid options | ||
* | ||
* @return $this | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hi @ruflin , this origin typehint seems incorrect as it can be an array, right ?
Edit: just saw the
functionScoreTest
, so concatenating lat and long is the preferred way?