updated tests

Author: Spamercz

phpstan.neon

@@ -7,9 +7,10 @@ parameters:
 			message: "#^Unable to resolve the template type T in call to method Nette\\\\DI\\\\Container\\:\\:getByType\\(\\)$#"
 			count: 2
 			path: src/Model/ServiceLocator.php
-
-	checkGenericClassInNonGenericObjectType: false
-	checkMissingIterableValueType: false
+		-
+			identifier: missingType.iterableValue
+		-
+			identifier: missingType.generics
 
 	bootstrapFiles:
 		- %rootDir%/../../../phpstanConstants.php

src/Entity/Collection/AbstractElasticEntityCollection.php

@@ -215,4 +215,16 @@ public function first(): \Spameri\Elastic\Entity\ElasticEntityInterface|null
 		return \reset($this->collection) ?: null;
 	}
 
+	public function __serialize(): array
+	{
+		return [
+			'collection' => $this->collection,
+		];
+	}
+
+	public function __unserialize(array $data): void
+	{
+		$this->collection = $data;
+	}
+
 }

tests/SpameriTests/Elastic/DI/Extension.phpt

@@ -17,7 +17,7 @@ class Extension extends \SpameriTests\Elastic\AbstractTestCase
 
 		/** @var \Spameri\Elastic\ClientProvider $clientProvider */
 		$clientProvider = $this->container->getByType(\Spameri\Elastic\ClientProvider::class);
-		$connection = $clientProvider->client()->transport->connectionPool->nextConnection();
+		$connection = $clientProvider->client()->getTransport()->getNodePool()->nextNode()->getUri();
 
 		/** @var \Spameri\Elastic\Model\VersionProvider $versionProvider */
 		$versionProvider = $this->container->getByType(\Spameri\Elastic\Model\VersionProvider::class);

tests/SpameriTests/Elastic/Data/Config/Common.neon

@@ -16,7 +16,7 @@ parameters:
 
 services:
 	elastic.person.personMapping:
-		factory: SpameriTests\Elastic\Data\Model\PersonMapping(%elasticSearch.personIndex%, SpameriTests\Elastic\Data\Entity\Person::class)
+		factory: SpameriTests\Elastic\Data\Model\PersonMapping(%elasticSearch.personIndex%, [SpameriTests\Elastic\Data\Entity\Person::class])
 
 	elastic.person.personFactory:
 		factory: SpameriTests\Elastic\Data\Model\PersonFactory
@@ -35,7 +35,7 @@ services:
 ########################################################################################################################
 
 	elastic.video.videoMapping:
-		factory: SpameriTests\Elastic\Data\Model\VideoMapping(%elasticSearch.personIndex%, SpameriTests\Elastic\Data\Entity\Video::class)
+		factory: SpameriTests\Elastic\Data\Model\VideoMapping(%elasticSearch.personIndex%, [SpameriTests\Elastic\Data\Entity\Video::class])
 
 	elastic.video.videoFactory:
 		factory: SpameriTests\Elastic\Data\Model\VideoFactory

tests/SpameriTests/Elastic/Data/Model/PersonFactory.php

@@ -11,7 +11,7 @@ class PersonFactory implements \Spameri\Elastic\Factory\EntityFactoryInterface
 	public function create(
 		\Spameri\ElasticQuery\Response\Result\Hit $hit,
 		string|null $class,
-		\Spameri\Elastic\EntityManager $entityManager,
+		\Spameri\Elastic\EntityManager|null $entityManager,
 	): \Generator
 	{
 		yield new \SpameriTests\Elastic\Data\Entity\Person(

tests/SpameriTests/Elastic/Data/Model/VideoFactory.php

@@ -18,7 +18,7 @@ public function __construct(
 	public function create(
 		\Spameri\ElasticQuery\Response\Result\Hit $hit,
 		string|null $class,
-		\Spameri\Elastic\EntityManager $entityManager,
+		\Spameri\Elastic\EntityManager|null $entityManager,
 	): \Generator
 	{
 		yield new \SpameriTests\Elastic\Data\Entity\Video(

tests/SpameriTests/Elastic/Factory/EntityFactory.phpt

@@ -12,10 +12,10 @@ class EntityFactory extends \SpameriTests\Elastic\AbstractTestCase
 
 	public function testCreate()
 	{
-		$entityFactory = new \Spameri\Elastic\Factory\EntityFactory();
-		$prepareEntityArray = new \Spameri\Elastic\Model\Insert\PrepareEntityArray(
-			\Mockery::mock(\Spameri\Elastic\Model\ServiceLocator::class)
-		);
+		$entityManager = $this->container->getByType(\Spameri\Elastic\EntityManager::class);
+		$entityFactory = $this->container->getByType(\Spameri\Elastic\Factory\EntityFactory::class);
+		$prepareEntityArray = $this->container->getByType(\Spameri\Elastic\Model\Insert\PrepareEntityArray::class);
+
 		$person = new \SpameriTests\Elastic\Data\Entity\Person(
 			new \Spameri\Elastic\Entity\Property\ElasticId('asd123'),
 			new \SpameriTests\Elastic\Data\Entity\Video\Identification(
@@ -52,7 +52,8 @@ class EntityFactory extends \SpameriTests\Elastic\AbstractTestCase
 		);
 
 		/** @var \SpameriTests\Elastic\Data\Entity\Person $entity */
-		$entity = $entityFactory->create($hit, \SpameriTests\Elastic\Data\Entity\Person::class)->current();
+		$entity = $entityFactory->create($hit, \SpameriTests\Elastic\Data\Entity\Person::class, $entityManager)
+			->current();
 
 		\Tester\Assert::same($person->id->value(), $entity->id->value());
 		\Tester\Assert::same($person->identification->imdb->value(), $entity->identification->imdb->value());

tests/SpameriTests/Elastic/Model/Indices/CreateTest.php

@@ -21,13 +21,11 @@ public function testProcess(): void
 
 		$create = new \Spameri\Elastic\Model\Indices\Create(
 			$this->container->getByType(\Spameri\Elastic\ClientProvider::class),
-			$this->container->getByType(\Spameri\Elastic\Model\VersionProvider::class),
 		);
 
 		$create->execute(
 			\SpameriTests\Elastic\Config::INDEX_CREATE,
 			$videoMapping->provide()->toArray(),
-			\SpameriTests\Elastic\Config::INDEX_CREATE,
 		);
 		$response = $getMapping->execute(\SpameriTests\Elastic\Config::INDEX_CREATE);
 

tests/SpameriTests/Elastic/Model/Insert.phpt

@@ -14,7 +14,7 @@ class Insert extends \SpameriTests\Elastic\AbstractTestCase
 		$video = new \SpameriTests\Elastic\Data\Entity\Video(
 			new \Spameri\Elastic\Entity\Property\EmptyElasticId(),
 			new \SpameriTests\Elastic\Data\Entity\Video\Identification(
-				new \SpameriTests\Elastic\Data\Entity\Property\ImdbId(4154796)
+				new \SpameriTests\Elastic\Data\Entity\Property\ImdbId('4154796')
 			),
 			new \SpameriTests\Elastic\Data\Entity\Property\Name('Avengers: Endgame'),
 			new \SpameriTests\Elastic\Data\Entity\Property\Year(2019),

tests/SpameriTests/Elastic/Model/RestoreIndex/Execute.phpt

@@ -29,7 +29,7 @@ class Execute extends \SpameriTests\Elastic\AbstractTestCase
 		$id = new \Spameri\Elastic\Entity\Property\ElasticId('192461');
 		/** @var \Spameri\Elastic\Model\Get $get */
 		$get = $this->container->getByType(\Spameri\Elastic\Model\Get::class);
-		$result = $get->execute($id, \SpameriTests\Elastic\Config::INDEX_RESTORE, \SpameriTests\Elastic\Config::INDEX_RESTORE);
+		$result = $get->execute($id, \SpameriTests\Elastic\Config::INDEX_RESTORE);
 
 		\Tester\Assert::same($id->value(), $result->hit()->id());
 	}