fix lowest version of elastic-query

Spameri · Feb 8, 2022 · 3631769 · 3631769
1 parent 1a75ca8
commit 3631769
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
 		"php": ">=7.4",
 		"ext-json": "*",
 		"ext-curl": "*",
-		"spameri/elastic-query": "^v1.0.0-alpha.10",
+		"spameri/elastic-query": "^v1.0.0-alpha.13",
 		"elasticsearch/elasticsearch": "^7.12.0",
 		"nette/di": "^3.0.5",
 		"nette/utils": "^3.2.5",

diff --git a/phpstan-low.neon b/phpstan-low.neon
@@ -11,15 +11,6 @@ parameters:
 	ignoreErrors:
 		- '#PHPDoc tag \@throws with type Elasticsearch\\Common\\Exceptions\\ElasticsearchException is not subtype of Throwable#'
 		- '#Call to function array_key_exists\(\) with string and array<int, mixed> will always evaluate to false.#'
-		-
-			message: "#^Call to method addSetup\\(\\) on an unknown class Nette\\\\DI\\\\Definitions\\\\ServiceDefinition\\.$#"
-			count: 1
-			path: src/DI/SpameriElasticSearchExtension.php
-
-		-
-			message: "#^PHPDoc tag @var for variable \\$definition contains unknown class Nette\\\\DI\\\\Definitions\\\\ServiceDefinition\\.$#"
-			count: 1
-			path: src/DI/SpameriElasticSearchExtension.php
 
 		-
 			message: "#^Method Spameri\\\\Elastic\\\\Diagnostics\\\\PanelLogger\\:\\:emergency\\(\\) should return null but return statement is missing\\.$#"

diff --git a/phpstan.neon b/phpstan.neon
@@ -29,9 +29,9 @@ parameters:
 			path: src/Model/TypeToNewIndex/Migrate.php
 
 		-
-			message: "#^Static method Nette\\\\DI\\\\Compiler\\:\\:loadDefinitions\\(\\) invoked with 3 parameters, 0 required\\.$#"
-			count: 1
-			path: src/DI/SpameriElasticSearchExtension.php
+			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

diff --git a/src/Entity/Collection/AbstractElasticEntityCollection.php b/src/Entity/Collection/AbstractElasticEntityCollection.php
@@ -72,6 +72,7 @@ public function initialize(): void
 			$entities = $this->service->getAllBy(
 				new \Spameri\ElasticQuery\ElasticQuery(
 					new \Spameri\ElasticQuery\Query\QueryCollection(
+						NULL,
 						new \Spameri\ElasticQuery\Query\MustCollection(
 							new \Spameri\ElasticQuery\Query\Terms(
 								'_id',