From b1009dd72a194ac88fdc5b8c5f05e6566396c9d1 Mon Sep 17 00:00:00 2001
From: Mantas Varatiejus <mantas.varatiejus@nfq.com>
Date: Wed, 9 Dec 2015 11:26:21 +0200
Subject: [PATCH] Coding style fix
---
src/Search.php | 2 +-
tests/Query/Span/SpanFirstQueryTest.php | 10 +++-------
tests/Query/Span/SpanMultiTermQueryTest.php | 2 +-
tests/Query/Span/SpanNearQueryTest.php | 6 ++----
tests/Query/Span/SpanNotQueryTest.php | 10 +++-------
tests/Query/Span/SpanOrQueryTest.php | 6 ++----
6 files changed, 12 insertions(+), 24 deletions(-)
diff --git a/src/Search.php b/src/Search.php
index b8d83d6..828d5f3 100644
--- a/src/Search.php
+++ b/src/Search.php
@@ -307,7 +307,7 @@ class Search
*
* @param AbstractAggregation $aggregation
*
- * @return $this;
+ * @return $this
*/
public function addAggregation(AbstractAggregation $aggregation)
{
diff --git a/tests/Query/Span/SpanFirstQueryTest.php b/tests/Query/Span/SpanFirstQueryTest.php
index 7dbb30a..9af18fb 100644
--- a/tests/Query/Span/SpanFirstQueryTest.php
+++ b/tests/Query/Span/SpanFirstQueryTest.php
@@ -20,7 +20,7 @@ use ONGR\ElasticsearchDSL\Query\Span\SpanQueryInterface;
class SpanFirstQueryTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var Object.
+ * @var SpanQueryInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $mock;
@@ -51,9 +51,7 @@ class SpanFirstQueryTest extends \PHPUnit_Framework_TestCase
*/
public function testSpanFirstQueryToArray()
{
- /** @var SpanQueryInterface $mock */
- $mock = $this->mock;
- $query = new SpanFirstQuery($mock, 5);
+ $query = new SpanFirstQuery($this->mock, 5);
$result = [
'match' => [
'span_or' => [ 'key' => 'value'],
@@ -68,9 +66,7 @@ class SpanFirstQueryTest extends \PHPUnit_Framework_TestCase
*/
public function testSpanFirstQueryGetType()
{
- /** @var SpanQueryInterface $mock */
- $mock = $this->mock;
- $query = new SpanFirstQuery($mock, 5);
+ $query = new SpanFirstQuery($this->mock, 5);
$result = $query->getType();
$this->assertEquals('span_first', $result);
}
diff --git a/tests/Query/Span/SpanMultiTermQueryTest.php b/tests/Query/Span/SpanMultiTermQueryTest.php
index 3852861..59553c4 100644
--- a/tests/Query/Span/SpanMultiTermQueryTest.php
+++ b/tests/Query/Span/SpanMultiTermQueryTest.php
@@ -20,7 +20,7 @@ use ONGR\ElasticsearchDSL\Query\Span\SpanMultiTermQuery;
class SpanMultiTermQueryTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var array.
+ * @var array
*/
protected $mock;
diff --git a/tests/Query/Span/SpanNearQueryTest.php b/tests/Query/Span/SpanNearQueryTest.php
index 23b254c..f01a38f 100644
--- a/tests/Query/Span/SpanNearQueryTest.php
+++ b/tests/Query/Span/SpanNearQueryTest.php
@@ -20,7 +20,7 @@ use ONGR\ElasticsearchDSL\Query\Span\SpanQueryInterface;
class SpanNearQueryTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var Object.
+ * @var SpanQueryInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $mock;
@@ -51,11 +51,9 @@ class SpanNearQueryTest extends \PHPUnit_Framework_TestCase
*/
public function testSpanMultiTermQueryToArray()
{
- /** @var SpanQueryInterface $mock */
- $mock = $this->mock;
$query = new SpanNearQuery(['name']);
$query->setSlop(5);
- $query->addQuery($mock);
+ $query->addQuery($this->mock);
$result = [
'clauses' => [
0 => [
diff --git a/tests/Query/Span/SpanNotQueryTest.php b/tests/Query/Span/SpanNotQueryTest.php
index 4f0afdf..e51f854 100644
--- a/tests/Query/Span/SpanNotQueryTest.php
+++ b/tests/Query/Span/SpanNotQueryTest.php
@@ -20,7 +20,7 @@ use ONGR\ElasticsearchDSL\Query\Span\SpanQueryInterface;
class SpanNotQueryTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var Object.
+ * @var SpanQueryInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $mock;
@@ -51,9 +51,7 @@ class SpanNotQueryTest extends \PHPUnit_Framework_TestCase
*/
public function testSpanNotQueryGetType()
{
- /** @var SpanQueryInterface $mock */
- $mock = $this->mock;
- $query = new SpanNotQuery($mock, $mock);
+ $query = new SpanNotQuery($this->mock, $this->mock);
$result = $query->getType();
$this->assertEquals('span_not', $result);
}
@@ -63,9 +61,7 @@ class SpanNotQueryTest extends \PHPUnit_Framework_TestCase
*/
public function testSpanNotQueryToArray()
{
- /** @var SpanQueryInterface $mock */
- $mock = $this->mock;
- $query = new SpanNotQuery($mock, $mock);
+ $query = new SpanNotQuery($this->mock, $this->mock);
$result = [
'include' => [
'span_or' => ['key' => 'value'],
diff --git a/tests/Query/Span/SpanOrQueryTest.php b/tests/Query/Span/SpanOrQueryTest.php
index b9eead5..856f47c 100644
--- a/tests/Query/Span/SpanOrQueryTest.php
+++ b/tests/Query/Span/SpanOrQueryTest.php
@@ -20,7 +20,7 @@ use ONGR\ElasticsearchDSL\Query\Span\SpanQueryInterface;
class SpanOrQueryTest extends \PHPUnit_Framework_TestCase
{
/**
- * @var Object.
+ * @var SpanQueryInterface|\PHPUnit_Framework_MockObject_MockObject
*/
protected $mock;
@@ -61,10 +61,8 @@ class SpanOrQueryTest extends \PHPUnit_Framework_TestCase
*/
public function testSpanOrQueryToArray()
{
- /** @var SpanQueryInterface $mock */
- $mock = $this->mock;
$query = new SpanOrQuery();
- $query->addQuery($mock);
+ $query->addQuery($this->mock);
$result = [
'clauses' => [
0 => [
--
GitLab