PHP 81

.github/workflows/ci.yml

@@ -9,8 +9,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php: [ 7.4 ]
-        elastic: [ 7.12.1, 6.8.15, 5.6.16 ]
+        php: [ 7.4, 8.1 ]
+        elastic: [ 7.17.0 ]
 
     steps:
       - uses: actions/checkout@v2
@@ -33,14 +33,14 @@ jobs:
       - name: Composer
         run: make composer
 
-      - if: matrix.php == '7.4' && matrix.elastic == '7.12.1'
+      - if: matrix.php == '8.1' && matrix.elastic == '7.17.0'
         name: Coding standard
         run: make cs
 
-      - if: matrix.php == '7.4' && matrix.elastic == '7.12.1'
+      - if: matrix.php == '8.1' && matrix.elastic == '7.17.0'
         name: PHPStan
         run: make phpstan
 
-      - if: matrix.php == '7.4'
+      - if: matrix.php == '8.1'
         name: Tests
         run: make tests

composer.json

@@ -16,7 +16,7 @@
 	},
 	"require-dev": {
 		"ext-curl": "*",
-		"phpstan/phpstan": "v0.12.37",
+		"phpstan/phpstan": "^1.4.6",
 		"nette/tester": "v2.3.1",
 		"elasticsearch/elasticsearch": "^7",
 		"guzzlehttp/guzzle": "^6.3",

phpstan.neon

@@ -1,6 +1,6 @@
 parameters:
 	ignoreErrors:
-		- "#Call to function array_key_exists\\(\\) with string and array<int, mixed> will always evaluate to false#"
+		- "#Call to function array_key_exists\\(\\) with string and array<int, string> will always evaluate to false#"
 
 	checkMissingIterableValueType: false
 	checkGenericClassInNonGenericObjectType: false

src/Exception/ResponseCouldNotBeMapped.php

@@ -6,6 +6,9 @@
 class ResponseCouldNotBeMapped extends \InvalidArgumentException
 {
 
+	/**
+	 * @param string $message [optional] The Exception message to throw.
+	 */
 	public function __construct(
 		$message,
 		int $code = 0,

src/Mapping/Settings.php

@@ -77,7 +77,7 @@ public function addMappingFieldKeyword(string $name): void
 		$this->addMappingField(
 			new \Spameri\ElasticQuery\Mapping\Settings\Mapping\Field(
 				$name,
-				\Spameri\Elastic\Model\ValidateMapping\AllowedValues::TYPE_KEYWORD
+				\Spameri\ElasticQuery\Mapping\AllowedValues::TYPE_KEYWORD
 			)
 		);
 	}
@@ -88,7 +88,7 @@ public function addMappingFieldFloat(string $name): void
 		$this->addMappingField(
 			new \Spameri\ElasticQuery\Mapping\Settings\Mapping\Field(
 				$name,
-				\Spameri\Elastic\Model\ValidateMapping\AllowedValues::TYPE_FLOAT
+				\Spameri\ElasticQuery\Mapping\AllowedValues::TYPE_FLOAT
 			)
 		);
 	}
@@ -99,7 +99,7 @@ public function addMappingFieldInteger(string $name): void
 		$this->addMappingField(
 			new \Spameri\ElasticQuery\Mapping\Settings\Mapping\Field(
 				$name,
-				\Spameri\Elastic\Model\ValidateMapping\AllowedValues::TYPE_INTEGER
+				\Spameri\ElasticQuery\Mapping\AllowedValues::TYPE_INTEGER
 			)
 		);
 	}
@@ -110,7 +110,7 @@ public function addMappingFieldBoolean(string $name): void
 		$this->addMappingField(
 			new \Spameri\ElasticQuery\Mapping\Settings\Mapping\Field(
 				$name,
-				\Spameri\Elastic\Model\ValidateMapping\AllowedValues::TYPE_BOOLEAN
+				\Spameri\ElasticQuery\Mapping\AllowedValues::TYPE_BOOLEAN
 			)
 		);
 	}

tests/SpameriTests/ElasticQuery/Mapping/Analyzer/Custom/CzechDictionary.phpt

@@ -5,7 +5,10 @@ namespace SpameriTests\ElasticQuery\Mapping\Analyzer\Custom;
 
 require_once __DIR__ . '/../../../../bootstrap.php';
 
-
+/**
+ * @skip
+ * Should be run only locally, dictionaries are not initialized on GHA yet.
+ */
 class CzechDictionary extends \Tester\TestCase
 {