updated tests (may not work yet)

Author: Spamercz

tests/SpameriTests/Elastic/Data/Entity/Person/CharacterCollectionElastic.php

@@ -7,7 +7,7 @@ class CharacterCollectionElastic extends \Spameri\Elastic\Entity\Collection\Abst
 
 	public function character(
 		\SpameriTests\Elastic\Data\Entity\Property\ImdbId $id,
-		\SpameriTests\Elastic\Data\Entity\Property\ImdbId|null $episode = NULL,
+		\SpameriTests\Elastic\Data\Entity\Property\ImdbId|null $episode = null,
 	): Character
 	{
 		/** @var \SpameriTests\Elastic\Data\Entity\Person\Character $character */

tests/SpameriTests/Elastic/Data/Entity/Person/Job.php

@@ -12,37 +12,19 @@ class Job implements \Spameri\Elastic\Entity\EntityInterface
 	public const VIDEO_WRITER = "Writing Credits\n  ";
 	public const SERIES_WRITER = "Series Writing Credits\n  ";
 
-	/**
-	 * @var \SpameriTests\Elastic\Data\Entity\Property\ImdbId
-	 */
-	private $id;
-
-	/**
-	 * @var \SpameriTests\Elastic\Data\Entity\Property\Name
-	 */
-	private $name;
-
-	/**
-	 * @var \SpameriTests\Elastic\Data\Entity\Property\Description
-	 */
-	private $description;
-
 	/**
 	 * @var \SpameriTests\Elastic\Data\Entity\Property\ImdbId|NULL
 	 */
-	private $episode;
+	private ?\SpameriTests\Elastic\Data\Entity\Property\ImdbId $episode = null;
 
 
 	public function __construct(
-		\SpameriTests\Elastic\Data\Entity\Property\ImdbId $id,
-		\SpameriTests\Elastic\Data\Entity\Property\Name $name,
-		\SpameriTests\Elastic\Data\Entity\Property\Description $description,
+		private \SpameriTests\Elastic\Data\Entity\Property\ImdbId $id,
+		private \SpameriTests\Elastic\Data\Entity\Property\Name $name,
+		private \SpameriTests\Elastic\Data\Entity\Property\Description $description,
 		\SpameriTests\Elastic\Data\Entity\Property\ImdbId|null $episode,
 	)
 	{
-		$this->id = $id;
-		$this->name = $name;
-		$this->description = $description;
 		$this->episode = $episode;
 	}
 

tests/SpameriTests/Elastic/Data/Entity/Person/JobCollectionElastic.php

@@ -7,7 +7,7 @@ class JobCollectionElastic extends \Spameri\Elastic\Entity\Collection\AbstractEn
 
 	public function job(
 		\SpameriTests\Elastic\Data\Entity\Property\ImdbId $imdbId,
-		\SpameriTests\Elastic\Data\Entity\Property\ImdbId|null $episode = NULL,
+		\SpameriTests\Elastic\Data\Entity\Property\ImdbId|null $episode = null,
 	): Job
 	{
 		/** @var \SpameriTests\Elastic\Data\Entity\Person\Job $job */

tests/SpameriTests/Elastic/Data/Entity/Property/CountryShort.php

@@ -5,17 +5,14 @@
 class CountryShort implements \Spameri\Elastic\Entity\ValueInterface
 {
 
-	/**
-	 * @var string
-	 */
-	private $value;
+	private string $value;
 
 
 	public function __construct(
 		string|null $value,
 	)
 	{
-		if ($value === '' || $value === NULL) {
+		if ($value === '' || $value === null) {
 			throw new \InvalidArgumentException();
 		}
 

tests/SpameriTests/Elastic/Data/Entity/Property/Description.php

@@ -5,10 +5,7 @@
 class Description implements \Spameri\Elastic\Entity\ValueInterface
 {
 
-	/**
-	 * @var ?string
-	 */
-	private $value;
+	private ?string $value = null;
 
 
 	public function __construct(

tests/SpameriTests/Elastic/Data/Entity/Property/ElasticIdCollection.php

@@ -8,7 +8,7 @@ class ElasticIdCollection implements \Spameri\Elastic\Entity\ValueCollectionInte
 	/**
 	 * @var array<\Spameri\Elastic\Entity\Property\ElasticIdInterface>
 	 */
-	private $collection;
+	private array $collection;
 
 
 	public function __construct(

tests/SpameriTests/Elastic/Data/Entity/Property/ImdbIdCollection.php

@@ -8,7 +8,7 @@ class ImdbIdCollection implements \Spameri\Elastic\Entity\ValueCollectionInterfa
 	/**
 	 * @var array<\SpameriTests\Elastic\Data\Entity\Property\ImdbId>
 	 */
-	private $collection;
+	private array $collection;
 
 
 	public function __construct(
@@ -40,7 +40,7 @@ public function find(
 			}
 		}
 
-		return NULL;
+		return null;
 	}
 
 
@@ -54,7 +54,7 @@ public function first(): ImdbId|null
 	{
 		$first = \reset($this->collection);
 
-		if ($first === FALSE) {
+		if ($first === false) {
 			throw new \Nette\InvalidStateException();
 		}
 

tests/SpameriTests/Elastic/Data/Entity/Property/Name.php

@@ -5,10 +5,7 @@
 class Name implements \Spameri\Elastic\Entity\ValueInterface
 {
 
-	/**
-	 * @var string
-	 */
-	private $value;
+	private string $value;
 
 
 	public function __construct(

tests/SpameriTests/Elastic/Data/Entity/Property/Text.php

@@ -5,17 +5,10 @@
 class Text implements \Spameri\Elastic\Entity\ValueInterface
 {
 
-	/**
-	 * @var string
-	 */
-	private $value;
-
-
 	public function __construct(
-		string $value,
+		private string $value,
 	)
 	{
-		$this->value = $value;
 	}
 
 

tests/SpameriTests/Elastic/Data/Entity/Property/Url.php

@@ -5,21 +5,14 @@
 class Url implements \Spameri\Elastic\Entity\ValueInterface
 {
 
-	/**
-	 * @var string
-	 */
-	private $value;
-
-
 	public function __construct(
-		string $value,
+		private string $value,
 	)
 	{
 		if ( ! \Nette\Utils\Validators::isUrl($value)) {
 			throw new \InvalidArgumentException();
 		}
 
-		$this->value = $value;
 	}