PHPCS - promoted properties

Author: Spamercz

ruleset.xml

@@ -61,7 +61,7 @@
 	<!-- PHP -->
 	<rule ref="Generic.PHP.DeprecatedFunctions"/>
 	<rule ref="Generic.PHP.ForbiddenFunctions"/>
-	<rule ref="Generic.PHP.UpperCaseConstant"/>
+	<rule ref="Generic.PHP.LowerCaseConstant"/>
 	<rule ref="SlevomatCodingStandard.PHP.OptimizedFunctionsWithoutUnpacking"/>
 
 	<!-- NewLines -->

src/Aggregation/AggregationCollection.php

@@ -8,17 +8,15 @@
 class AggregationCollection implements LeafAggregationInterface
 {
 
-	private \Spameri\ElasticQuery\Filter\FilterCollection $filter;
-
 	/**
 	 * @var array<\Spameri\ElasticQuery\Aggregation\LeafAggregationCollection>
 	 */
 	private array $aggregations;
 
 
 	public function __construct(
-		\Spameri\ElasticQuery\Filter\FilterCollection|null $filter = NULL,
-		\Spameri\ElasticQuery\Aggregation\LeafAggregationCollection ... $aggregations,
+		private \Spameri\ElasticQuery\Filter\FilterCollection|null $filter = null,
+		\Spameri\ElasticQuery\Aggregation\LeafAggregationCollection ...$aggregations,
 	)
 	{
 		if ( ! $filter) {

src/Aggregation/Histogram.php

@@ -29,7 +29,7 @@ public function toArray(): array
 	{
 		return [
 			'histogram' => [
-				'field'    => $this->field,
+				'field' => $this->field,
 				'interval' => $this->interval,
 			],
 		];

src/Aggregation/LeafAggregationCollection.php

@@ -8,8 +8,6 @@
 class LeafAggregationCollection implements LeafAggregationInterface, \IteratorAggregate
 {
 
-	private \Spameri\ElasticQuery\Filter\FilterCollection $filter;
-
 	/**
 	 * @var array<\Spameri\ElasticQuery\Aggregation\LeafAggregationInterface>
 	 */
@@ -18,8 +16,8 @@ class LeafAggregationCollection implements LeafAggregationInterface, \IteratorAg
 
 	public function __construct(
 		private string $name,
-		\Spameri\ElasticQuery\Filter\FilterCollection|null $filter,
-		\Spameri\ElasticQuery\Aggregation\LeafAggregationInterface ... $aggregations,
+		private \Spameri\ElasticQuery\Filter\FilterCollection|null $filter,
+		\Spameri\ElasticQuery\Aggregation\LeafAggregationInterface ...$aggregations,
 	)
 	{
 		if ( ! $filter) {

src/Aggregation/Min.php

@@ -9,7 +9,8 @@ class Min implements \Spameri\ElasticQuery\Aggregation\LeafAggregationInterface
 
 	public function __construct(
 		private string $field,
-	) {
+	)
+	{
 	}
 
 

src/Aggregation/Nested.php

@@ -9,7 +9,8 @@ class Nested implements \Spameri\ElasticQuery\Aggregation\LeafAggregationInterfa
 
 	public function __construct(
 		private string $path,
-	) {
+	)
+	{
 	}
 
 

src/Aggregation/Range.php

@@ -16,8 +16,8 @@ class Range implements LeafAggregationInterface
 
 	public function __construct(
 		private string $field,
-		private bool $keyed = FALSE,
-		\Spameri\ElasticQuery\Aggregation\RangeValueCollection $rangeValueCollection = NULL,
+		private bool $keyed = false,
+		\Spameri\ElasticQuery\Aggregation\RangeValueCollection $rangeValueCollection = null,
 	)
 	{
 		$this->ranges = $rangeValueCollection ?: new \Spameri\ElasticQuery\Aggregation\RangeValueCollection();
@@ -36,8 +36,8 @@ public function toArray(): array
 			'field' => $this->field,
 		];
 
-		if ($this->keyed === TRUE) {
-			$array['keyed'] = TRUE;
+		if ($this->keyed === true) {
+			$array['keyed'] = true;
 		}
 
 		foreach ($this->ranges as $range) {

src/Aggregation/RangeValue.php

@@ -8,16 +8,12 @@
 class RangeValue implements \Spameri\ElasticQuery\Entity\EntityInterface
 {
 
-	/**
-	 * @param int|float|string|\DateTimeInterface|null $from
-	 * @param int|float|string|\DateTimeInterface|null $to
-	 */
 	public function __construct(
 		private string $key,
-		private $from,
-		private $to,
-		private bool $fromEqual = TRUE,
-		private bool $toEqual = TRUE,
+		private int|float|string|\DateTimeInterface|null $from,
+		private int|float|string|\DateTimeInterface|null $to,
+		private bool $fromEqual = true,
+		private bool $toEqual = true,
 	)
 	{
 	}
@@ -42,7 +38,7 @@ public function toArray(): array
 		}
 
 		return [
-			'key'  => $this->key,
+			'key' => $this->key,
 			'from' => $from,
 			'to' => $to,
 		];

src/Aggregation/RangeValueCollection.php

@@ -15,7 +15,7 @@ class RangeValueCollection implements \IteratorAggregate
 
 
 	public function __construct(
-		RangeValue ... $collection,
+		RangeValue ...$collection,
 	)
 	{
 		$this->collection = $collection;

src/Aggregation/Term.php

@@ -11,21 +11,18 @@
 class Term implements LeafAggregationInterface
 {
 
-	private int|null $missing;
-
 	private \Spameri\ElasticQuery\Aggregation\Terms\OrderCollection $order;
 
 	public function __construct(
 		private string $field,
 		private int $size = 0,
-		int $missing = NULL,
-		\Spameri\ElasticQuery\Aggregation\Terms\OrderCollection|null $order = NULL,
-		private string|null $include = NULL,
-		private string|null $exclude = NULL,
-		private string|null $key = NULL,
+		private int|null $missing = null,
+		\Spameri\ElasticQuery\Aggregation\Terms\OrderCollection|null $order = null,
+		private string|null $include = null,
+		private string|null $exclude = null,
+		private string|null $key = null,
 	)
 	{
-		$this->missing = $missing;
 		$this->order = $order ?? new \Spameri\ElasticQuery\Aggregation\Terms\OrderCollection();
 	}
 
@@ -43,22 +40,22 @@ public function toArray(): array
 		];
 
 		if ($this->size > 0) {
-			$array['size']  = $this->size;
+			$array['size'] = $this->size;
 		}
 
-		if ($this->missing !== NULL) {
+		if ($this->missing !== null) {
 			$array['missing'] = $this->missing;
 		}
 
 		if (\count($this->order)) {
 			$array['order'] = $this->order->toArray();
 		}
 
-		if ($this->include !== NULL) {
+		if ($this->include !== null) {
 			$array['include'] = $this->include;
 		}
 
-		if ($this->exclude !== NULL) {
+		if ($this->exclude !== null) {
 			$array['exclude'] = $this->exclude;
 		}