Query collection has fist argument key for convinience

Spamercz · Spamercz · commit 7b49033eacc7 · 2021-05-19T14:35:14.000+02:00
diff --git a/src/Aggregation/RangeValue.php b/src/Aggregation/RangeValue.php
@@ -53,10 +53,10 @@ public function toArray(): array
 		$from = $this->from;
 		$to = $this->to;
 
-		if ( ! $this->fromEqual) {
+		if ( ! $this->fromEqual && \is_int($from)) {
 			$from++;
 		}
-		if ($this->toEqual) {
+		if ($this->toEqual && \is_int($to)) {
 			$to++;
 		}
 
diff --git a/src/Query/QueryCollection.php b/src/Query/QueryCollection.php
@@ -31,10 +31,10 @@ class QueryCollection implements LeafQueryInterface
 	 * @param int|string|null $key
 	 */
 	public function __construct(
-		?\Spameri\ElasticQuery\Query\MustCollection $mustCollection = NULL
-		, ?\Spameri\ElasticQuery\Query\ShouldCollection $shouldCollection = NULL
-		, ?\Spameri\ElasticQuery\Query\MustNotCollection $mustNotCollection = NULL
-		, $key = NULL
+		$key = NULL,
+		?\Spameri\ElasticQuery\Query\MustCollection $mustCollection = NULL,
+		?\Spameri\ElasticQuery\Query\ShouldCollection $shouldCollection = NULL,
+		?\Spameri\ElasticQuery\Query\MustNotCollection $mustNotCollection = NULL
 	)
 	{
 		if ( ! $mustCollection) {
diff --git a/tests/SpameriTests/ElasticQuery/ElasticQuery.phpt b/tests/SpameriTests/ElasticQuery/ElasticQuery.phpt
@@ -71,6 +71,7 @@ class ElasticQuery extends \Tester\TestCase
 				(
 					new \Spameri\ElasticQuery\ElasticQuery(
 						new \Spameri\ElasticQuery\Query\QueryCollection(
+							NULL,
 							new \Spameri\ElasticQuery\Query\MustCollection(
 								$match
 							)
diff --git a/tests/SpameriTests/ElasticQuery/Query/Fuzzy.phpt b/tests/SpameriTests/ElasticQuery/Query/Fuzzy.phpt
@@ -50,6 +50,7 @@ class Fuzzy extends \Tester\TestCase
 				(
 				new \Spameri\ElasticQuery\ElasticQuery(
 					new \Spameri\ElasticQuery\Query\QueryCollection(
+						NULL,
 						new \Spameri\ElasticQuery\Query\MustCollection(
 							$fuzzy
 						)
diff --git a/tests/SpameriTests/ElasticQuery/Query/Match.phpt b/tests/SpameriTests/ElasticQuery/Query/Match.phpt
@@ -54,6 +54,7 @@ class Match extends \Tester\TestCase
 				(
 				new \Spameri\ElasticQuery\ElasticQuery(
 					new \Spameri\ElasticQuery\Query\QueryCollection(
+						NULL,
 						new \Spameri\ElasticQuery\Query\MustCollection(
 							$match
 						)
diff --git a/tests/SpameriTests/ElasticQuery/Query/MatchPhrase.phpt b/tests/SpameriTests/ElasticQuery/Query/MatchPhrase.phpt
@@ -48,6 +48,7 @@ class MatchPhrase extends \Tester\TestCase
 				(
 				new \Spameri\ElasticQuery\ElasticQuery(
 					new \Spameri\ElasticQuery\Query\QueryCollection(
+						NULL,
 						new \Spameri\ElasticQuery\Query\MustCollection(
 							$match
 						)
diff --git a/tests/SpameriTests/ElasticQuery/Query/Range.phpt b/tests/SpameriTests/ElasticQuery/Query/Range.phpt
@@ -46,6 +46,7 @@ class Range extends \Tester\TestCase
 				(
 				new \Spameri\ElasticQuery\ElasticQuery(
 					new \Spameri\ElasticQuery\Query\QueryCollection(
+						NULL,
 						new \Spameri\ElasticQuery\Query\MustCollection(
 							$range
 						)
diff --git a/tests/SpameriTests/ElasticQuery/Query/Term.phpt b/tests/SpameriTests/ElasticQuery/Query/Term.phpt
@@ -44,6 +44,7 @@ class Term extends \Tester\TestCase
 				(
 				new \Spameri\ElasticQuery\ElasticQuery(
 					new \Spameri\ElasticQuery\Query\QueryCollection(
+						NULL,
 						new \Spameri\ElasticQuery\Query\MustCollection(
 							$term
 						)
diff --git a/tests/SpameriTests/ElasticQuery/Query/Terms.phpt b/tests/SpameriTests/ElasticQuery/Query/Terms.phpt
@@ -43,6 +43,7 @@ class Terms extends \Tester\TestCase
 				(
 				new \Spameri\ElasticQuery\ElasticQuery(
 					new \Spameri\ElasticQuery\Query\QueryCollection(
+						NULL,
 						new \Spameri\ElasticQuery\Query\MustCollection(
 							$terms
 						)
diff --git a/tests/SpameriTests/ElasticQuery/Query/WildCard.phpt b/tests/SpameriTests/ElasticQuery/Query/WildCard.phpt
@@ -44,6 +44,7 @@ class WildCard extends \Tester\TestCase
 				(
 				new \Spameri\ElasticQuery\ElasticQuery(
 					new \Spameri\ElasticQuery\Query\QueryCollection(
+						NULL,
 						new \Spameri\ElasticQuery\Query\MustCollection(
 							$wildCard
 						)

Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,10 @@ public function toArray(): array`
`53`	`53`	`$from = $this->from;`
`54`	`54`	`$to = $this->to;`
`55`	`55`
`56`		`- if ( ! $this->fromEqual) {`
	`56`	`+ if ( ! $this->fromEqual && \is_int($from)) {`
`57`	`57`	`$from++;`
`58`	`58`	`}`
`59`		`- if ($this->toEqual) {`
	`59`	`+ if ($this->toEqual && \is_int($to)) {`
`60`	`60`	`$to++;`
`61`	`61`	`}`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ class ElasticQuery extends \Tester\TestCase`
`71`	`71`	`(`
`72`	`72`	`new \Spameri\ElasticQuery\ElasticQuery(`
`73`	`73`	`new \Spameri\ElasticQuery\Query\QueryCollection(`
	`74`	`+ NULL,`
`74`	`75`	`new \Spameri\ElasticQuery\Query\MustCollection(`
`75`	`76`	`$match`
`76`	`77`	`)`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ class Fuzzy extends \Tester\TestCase`
`50`	`50`	`(`
`51`	`51`	`new \Spameri\ElasticQuery\ElasticQuery(`
`52`	`52`	`new \Spameri\ElasticQuery\Query\QueryCollection(`
	`53`	`+ NULL,`
`53`	`54`	`new \Spameri\ElasticQuery\Query\MustCollection(`
`54`	`55`	`$fuzzy`
`55`	`56`	`)`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ class Match extends \Tester\TestCase`
`54`	`54`	`(`
`55`	`55`	`new \Spameri\ElasticQuery\ElasticQuery(`
`56`	`56`	`new \Spameri\ElasticQuery\Query\QueryCollection(`
	`57`	`+ NULL,`
`57`	`58`	`new \Spameri\ElasticQuery\Query\MustCollection(`
`58`	`59`	`$match`
`59`	`60`	`)`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ class MatchPhrase extends \Tester\TestCase`
`48`	`48`	`(`
`49`	`49`	`new \Spameri\ElasticQuery\ElasticQuery(`
`50`	`50`	`new \Spameri\ElasticQuery\Query\QueryCollection(`
	`51`	`+ NULL,`
`51`	`52`	`new \Spameri\ElasticQuery\Query\MustCollection(`
`52`	`53`	`$match`
`53`	`54`	`)`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ class Range extends \Tester\TestCase`
`46`	`46`	`(`
`47`	`47`	`new \Spameri\ElasticQuery\ElasticQuery(`
`48`	`48`	`new \Spameri\ElasticQuery\Query\QueryCollection(`
	`49`	`+ NULL,`
`49`	`50`	`new \Spameri\ElasticQuery\Query\MustCollection(`
`50`	`51`	`$range`
`51`	`52`	`)`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ class Term extends \Tester\TestCase`
`44`	`44`	`(`
`45`	`45`	`new \Spameri\ElasticQuery\ElasticQuery(`
`46`	`46`	`new \Spameri\ElasticQuery\Query\QueryCollection(`
	`47`	`+ NULL,`
`47`	`48`	`new \Spameri\ElasticQuery\Query\MustCollection(`
`48`	`49`	`$term`
`49`	`50`	`)`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ class Terms extends \Tester\TestCase`
`43`	`43`	`(`
`44`	`44`	`new \Spameri\ElasticQuery\ElasticQuery(`
`45`	`45`	`new \Spameri\ElasticQuery\Query\QueryCollection(`
	`46`	`+ NULL,`
`46`	`47`	`new \Spameri\ElasticQuery\Query\MustCollection(`
`47`	`48`	`$terms`
`48`	`49`	`)`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ class WildCard extends \Tester\TestCase`
`44`	`44`	`(`
`45`	`45`	`new \Spameri\ElasticQuery\ElasticQuery(`
`46`	`46`	`new \Spameri\ElasticQuery\Query\QueryCollection(`
	`47`	`+ NULL,`
`47`	`48`	`new \Spameri\ElasticQuery\Query\MustCollection(`
`48`	`49`	`$wildCard`
`49`	`50`	`)`