PHP 7.4 and PHPStan tweaks

Author: Spamercz

src/Aggregation/Histogram.php

@@ -9,15 +9,9 @@
 class Histogram implements LeafAggregationInterface
 {
 
-	/**
-	 * @var string
-	 */
-	private $field;
-
-	/**
-	 * @var int
-	 */
-	private $interval;
+	private string $field;
+
+	private int $interval;
 
 
 	public function __construct(

src/Collection/AbstractCollection.php

@@ -49,11 +49,7 @@ public function get(
 		string $key
 	): ?\Spameri\ElasticQuery\Entity\EntityInterface
 	{
-		if (isset($this->collection[$key])) {
-			return $this->collection[$key];
-		}
-
-		return NULL;
+		return $this->collection[$key] ?? NULL;
 	}
 
 

src/Mapping/Tokenizer/CharGroup.php

@@ -17,7 +17,7 @@ public function getType(): string
 	public function toArray(): array
 	{
 		return [
-			$this->getType()
+			$this->getType(),
 		];
 	}
 

src/Mapping/Tokenizer/Classic.php

@@ -17,7 +17,7 @@ public function getType(): string
 	public function toArray(): array
 	{
 		return [
-			$this->getType()
+			$this->getType(),
 		];
 	}
 

src/Query/Exists.php

@@ -9,10 +9,7 @@
 class Exists implements LeafQueryInterface
 {
 
-	/**
-	 * @var string
-	 */
-	private $field;
+	private string $field;
 
 
 	public function __construct(

src/Query/Range.php

@@ -94,11 +94,17 @@ public function toArray(): array
 		];
 
 		if ($this->gte !== NULL) {
-			$array['range'][$this->field]['gte'] = $this->gte instanceof \DateTimeInterface ? $this->gte->format('Y-m-d H:i:s') : $this->gte;
+			$array['range'][$this->field]['gte'] =
+				$this->gte instanceof \DateTimeInterface
+					? $this->gte->format('Y-m-d H:i:s')
+					: $this->gte;
 		}
 
 		if ($this->lte !== NULL) {
-			$array['range'][$this->field]['lte'] = $this->lte instanceof \DateTimeInterface ? $this->lte->format('Y-m-d H:i:s') : $this->lte;
+			$array['range'][$this->field]['lte'] =
+				$this->lte instanceof \DateTimeInterface
+					? $this->lte->format('Y-m-d H:i:s')
+					: $this->lte;
 		}
 
 		return $array;

src/Query/Term.php

@@ -2,32 +2,28 @@
 
 namespace Spameri\ElasticQuery\Query;
 
-
 /**
  * @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-term-query.html
  */
 class Term implements LeafQueryInterface
 {
 
-	/**
-	 * @var string
-	 */
-	private $field;
+	private string $field;
 
 	/**
-	 * @var string
+	 * @var string|int|bool|float
 	 */
 	private $query;
 
-	/**
-	 * @var float
-	 */
-	private $boost;
+	private float $boost;
 
 
+	/**
+	 * @param string|int|bool|float $query
+	 */
 	public function __construct(
 		string $field
-		, string $query
+		, $query
 		, float $boost = 1.0
 	)
 	{
@@ -45,17 +41,14 @@ public function key(): string
 
 	public function toArray(): array
 	{
-		// phpcs:ignore SlevomatCodingStandard.Variables.UselessVariable
-		$array = [
+		return [
 			'term' => [
 				$this->field => [
 					'value' => $this->query,
 					'boost' => $this->boost,
 				],
 			],
 		];
-
-		return $array;
 	}
 
 }

src/Query/Terms.php

@@ -9,20 +9,14 @@
 class Terms implements LeafQueryInterface
 {
 
-	/**
-	 * @var string
-	 */
-	private $field;
+	private string $field;
 
 	/**
-	 * @var array
+	 * @var array<string|int|bool|float>
 	 */
-	private $query;
+	private array $query;
 
-	/**
-	 * @var float
-	 */
-	private $boost;
+	private float $boost;
 
 
 	public function __construct(

src/Query/WildCard.php

@@ -2,27 +2,17 @@
 
 namespace Spameri\ElasticQuery\Query;
 
-
 /**
  * @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-wildcard-query.html
  */
 class WildCard implements LeafQueryInterface
 {
 
-	/**
-	 * @var string
-	 */
-	private $field;
+	private string $field;
 
-	/**
-	 * @var string
-	 */
-	private $query;
+	private string $query;
 
-	/**
-	 * @var float
-	 */
-	private $boost;
+	private float $boost;
 
 
 	public function __construct(
@@ -45,17 +35,14 @@ public function key(): string
 
 	public function toArray(): array
 	{
-		// phpcs:ignore SlevomatCodingStandard.Variables.UselessVariable
-		$array = [
+		return [
 			'wildcard' => [
 				$this->field => [
 					'value' => $this->query,
 					'boost' => $this->boost,
 				],
 			],
 		];
-
-		return $array;
 	}
 
 }