trailing commas

Spamercz · Spamercz · commit 427fe6dca39a · 2024-01-03T23:40:22.000+01:00
diff --git a/src/Aggregation/AggregationCollection.php b/src/Aggregation/AggregationCollection.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery\Aggregation;
 
@@ -18,8 +20,8 @@ class AggregationCollection implements LeafAggregationInterface
 
 
 	public function __construct(
-		\Spameri\ElasticQuery\Filter\FilterCollection|null $filter = NULL
-		, \Spameri\ElasticQuery\Aggregation\LeafAggregationCollection ... $aggregations,
+		\Spameri\ElasticQuery\Filter\FilterCollection|null $filter = NULL,
+		\Spameri\ElasticQuery\Aggregation\LeafAggregationCollection ... $aggregations,
 	)
 	{
 		if ( ! $filter) {
diff --git a/src/Aggregation/Avg.php b/src/Aggregation/Avg.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery\Aggregation;
 
diff --git a/src/Aggregation/Filter.php b/src/Aggregation/Filter.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery\Aggregation;
 
diff --git a/src/Aggregation/Histogram.php b/src/Aggregation/Histogram.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery\Aggregation;
 
@@ -15,8 +17,8 @@ class Histogram implements LeafAggregationInterface
 
 
 	public function __construct(
-		string $field
-		, int $interval,
+		string $field,
+		int $interval,
 	)
 	{
 		$this->field = $field;
diff --git a/src/Aggregation/LeafAggregationCollection.php b/src/Aggregation/LeafAggregationCollection.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery\Aggregation;
 
diff --git a/src/Aggregation/Range.php b/src/Aggregation/Range.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery\Aggregation;
 
@@ -26,9 +28,9 @@ class Range implements LeafAggregationInterface
 
 
 	public function __construct(
-		string $field
-		, bool $keyed = FALSE
-		, \Spameri\ElasticQuery\Aggregation\RangeValueCollection $rangeValueCollection = NULL,
+		string $field,
+		bool $keyed = FALSE,
+		\Spameri\ElasticQuery\Aggregation\RangeValueCollection $rangeValueCollection = NULL,
 	)
 	{
 		$this->field = $field;
diff --git a/src/Aggregation/RangeValue.php b/src/Aggregation/RangeValue.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery\Aggregation;
 
diff --git a/src/Document.php b/src/Document.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery;
 
diff --git a/src/ElasticQuery.php b/src/ElasticQuery.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery;
 
diff --git a/src/FunctionScore.php b/src/FunctionScore.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery;
 
diff --git a/src/Highlight.php b/src/Highlight.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery;
 
diff --git a/src/Mapping/AllowedValues.php b/src/Mapping/AllowedValues.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery\Mapping;
 
diff --git a/src/Mapping/AnalyzerInterface.php b/src/Mapping/AnalyzerInterface.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery\Mapping;
 
diff --git a/src/Mapping/CustomAnalyzerInterface.php b/src/Mapping/CustomAnalyzerInterface.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery\Mapping;
 
diff --git a/src/Mapping/FilterInterface.php b/src/Mapping/FilterInterface.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery\Mapping;
 
diff --git a/src/Options.php b/src/Options.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery;
 
diff --git a/src/Options/Sort.php b/src/Options/Sort.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery\Options;
 
@@ -31,9 +33,9 @@ class Sort implements \Spameri\ElasticQuery\Entity\EntityInterface
 
 
 	public function __construct(
-		string $field
-		, string $type = self::DESC
-		, string $missing = self::MISSING_LAST,
+		string $field,
+		string $type = self::DESC,
+		string $missing = self::MISSING_LAST,
 	)
 	{
 		if ( ! \in_array($type, [self::ASC, self::DESC], TRUE)) {
diff --git a/src/Query/Fuzzy.php b/src/Query/Fuzzy.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery\Query;
 
@@ -44,12 +46,12 @@ class Fuzzy implements LeafQueryInterface
 	 * @param string|int|bool|null $query
 	 */
 	public function __construct(
-		string $field
-		, $query
-		, float $boost = 1.0
-		, int $fuzziness = 2
-		, int $prefixLength = 0
-		, int $maxExpansion = 100,
+		string $field,
+		$query,
+		float $boost = 1.0,
+		int $fuzziness = 2,
+		int $prefixLength = 0,
+		int $maxExpansion = 100,
 	)
 	{
 		$this->field = $field;
diff --git a/src/Query/GeoDistance.php b/src/Query/GeoDistance.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery\Query;
 
@@ -26,9 +28,9 @@ class GeoDistance implements LeafQueryInterface
 
 
 	public function __construct(
-		string $field
-		, float $lat
-		, float $lon,
+		string $field,
+		float $lat,
+		float $lon,
 	)
 	{
 
diff --git a/src/Query/MatchPhrase.php b/src/Query/MatchPhrase.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery\Query;
 
diff --git a/src/Query/Term.php b/src/Query/Term.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery\Query;
 
@@ -22,9 +24,9 @@ class Term implements LeafQueryInterface
 	 * @param string|int|bool|float $query
 	 */
 	public function __construct(
-		string $field
-		, $query
-		, float $boost = 1.0,
+		string $field,
+		$query,
+		float $boost = 1.0,
 	)
 	{
 		$this->field = $field;
diff --git a/src/Query/Terms.php b/src/Query/Terms.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery\Query;
 
@@ -20,9 +22,9 @@ class Terms implements LeafQueryInterface
 
 
 	public function __construct(
-		string $field
-		, array $query
-		, float $boost = 1.0,
+		string $field,
+		array $query,
+		float $boost = 1.0,
 	)
 	{
 		if ( ! \count($query)) {
diff --git a/src/Query/WildCard.php b/src/Query/WildCard.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery\Query;
 
@@ -16,9 +18,9 @@ class WildCard implements LeafQueryInterface
 
 
 	public function __construct(
-		string $field
-		, string $query
-		, float $boost = 1.0,
+		string $field,
+		string $query,
+		float $boost = 1.0,
 	)
 	{
 		$this->field = $field;
diff --git a/src/Response/Result/Aggregation.php b/src/Response/Result/Aggregation.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery\Response\Result;
 
@@ -25,10 +27,10 @@ class Aggregation
 
 
 	public function __construct(
-		string $name
-		, int $position
-		, \Spameri\ElasticQuery\Response\Result\Aggregation\BucketCollection $bucketCollection
-		, \Spameri\ElasticQuery\Response\Result\AggregationCollection $subAggregations,
+		string $name,
+		int $position,
+		\Spameri\ElasticQuery\Response\Result\Aggregation\BucketCollection $bucketCollection,
+		\Spameri\ElasticQuery\Response\Result\AggregationCollection $subAggregations,
 	)
 	{
 		$this->name = $name;
diff --git a/src/Response/Result/Aggregation/Bucket.php b/src/Response/Result/Aggregation/Bucket.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery\Response\Result\Aggregation;
 
diff --git a/src/Response/Result/BulkAction.php b/src/Response/Result/BulkAction.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery\Response\Result;
 
@@ -58,16 +60,16 @@ class BulkAction
 
 
 	public function __construct(
-		string $action
-		, string $index
-		, string $type
-		, string $id
-		, int $version
-		, string $result
-		, \Spameri\ElasticQuery\Response\Shards $shards
-		, int $status
-		, int $seqNo
-		, int $primaryTerm,
+		string $action,
+		string $index,
+		string $type,
+		string $id,
+		int $version,
+		string $result,
+		\Spameri\ElasticQuery\Response\Shards $shards,
+		int $status,
+		int $seqNo,
+		int $primaryTerm,
 	)
 	{
 		$this->action = $action;
diff --git a/src/Response/Result/Hit.php b/src/Response/Result/Hit.php
@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php
+
+declare(strict_types = 1);
 
 namespace Spameri\ElasticQuery\Response\Result;
 
@@ -37,13 +39,13 @@ class Hit
 
 
 	public function __construct(
-		array $source
-		, int $position
-		, string $index
-		, string $type
-		, string $id
-		, float $score
-		, int $version,
+		array $source,
+		int $position,
+		string $index,
+		string $type,
+		string $id,
+		float $score,
+		int $version,
 	)
 	{
 		$this->source = $source;
diff --git a/src/Response/Result/Version.php b/src/Response/Result/Version.php
diff --git a/src/Response/ResultBulk.php b/src/Response/ResultBulk.php
diff --git a/src/Response/ResultMapper.php b/src/Response/ResultMapper.php
diff --git a/src/Response/ResultSearch.php b/src/Response/ResultSearch.php
diff --git a/src/Response/ResultSingle.php b/src/Response/ResultSingle.php
diff --git a/src/Response/Shards.php b/src/Response/Shards.php
diff --git a/src/Response/Stats.php b/src/Response/Stats.php
diff --git a/src/Response/StatsSingle.php b/src/Response/StatsSingle.php

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-<?php declare(strict_types = 1);`
	`1`	`+<?php`
	`2`	`+`
	`3`	`+declare(strict_types = 1);`
`2`	`4`
`3`	`5`	`namespace Spameri\ElasticQuery\Aggregation;`
`4`	`6`
`@@ -18,8 +20,8 @@ class AggregationCollection implements LeafAggregationInterface`
`18`	`20`
`19`	`21`
`20`	`22`	`public function __construct(`
`21`		`- \Spameri\ElasticQuery\Filter\FilterCollection\|null $filter = NULL`
`22`		`- , \Spameri\ElasticQuery\Aggregation\LeafAggregationCollection ... $aggregations,`
	`23`	`+ \Spameri\ElasticQuery\Filter\FilterCollection\|null $filter = NULL,`
	`24`	`+ \Spameri\ElasticQuery\Aggregation\LeafAggregationCollection ... $aggregations,`
`23`	`25`	`)`
`24`	`26`	`{`
`25`	`27`	`if ( ! $filter) {`