removed type

Spamercz · Spamercz · commit e84409ac2d51 · 2024-06-04T23:33:45.000+02:00
diff --git a/src/Document.php b/src/Document.php
@@ -9,28 +9,15 @@ class Document implements \Spameri\ElasticQuery\Entity\ArrayInterface
 {
 
 	public function __construct(
-		private string|null $index,
-		private \Spameri\ElasticQuery\Document\BodyInterface|null $body = null,
-		private string|null $type = null,
-		private string|null $id = null,
-		private array $options = [],
+		public string|null $index,
+		public \Spameri\ElasticQuery\Document\BodyInterface|null $body = null,
+		public string|null $id = null,
+		public array $options = [],
 	)
 	{
 	}
 
 
-	public function index(): string|null
-	{
-		return $this->index;
-	}
-
-
-	public function type(): string|null
-	{
-		return $this->type;
-	}
-
-
 	public function toArray(): array
 	{
 		$array = [];
@@ -43,10 +30,6 @@ public function toArray(): array
 			$array['body'] = $this->body->toArray();
 		}
 
-		if ($this->type) {
-			$array['type'] = $this->type;
-		}
-
 		if ($this->id) {
 			$array['id'] = $this->id;
 		}
diff --git a/tests/SpameriTests/ElasticQuery/ElasticQuery.phpt b/tests/SpameriTests/ElasticQuery/ElasticQuery.phpt
@@ -113,7 +113,7 @@ class ElasticQuery extends \Tester\TestCase
 		);
 
 		$ch = \curl_init();
-		\curl_setopt($ch, \CURLOPT_URL, 'localhost:9200/' . $document->index() . '/_search');
+		\curl_setopt($ch, \CURLOPT_URL, 'localhost:9200/' . $document->index . '/_search');
 		\curl_setopt($ch, \CURLOPT_RETURNTRANSFER, 1);
 		\curl_setopt($ch, \CURLOPT_CUSTOMREQUEST, 'GET');
 		\curl_setopt($ch, \CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
diff --git a/tests/SpameriTests/ElasticQuery/Mapping/Analyzer/Custom/CzechDictionary.phpt b/tests/SpameriTests/ElasticQuery/Mapping/Analyzer/Custom/CzechDictionary.phpt
@@ -23,14 +23,13 @@ class CzechDictionary extends \Tester\TestCase
 			self::INDEX,
 			new \Spameri\ElasticQuery\Document\Body\Plain(
 				$settings->toArray()
-			),
-			self::INDEX
+			)
 		);
 
 		// Set up index and analyzer
 
 		$ch = \curl_init();
-		\curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index() . '/');
+		\curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index . '/');
 		\curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 		\curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'PUT');
 		\curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
@@ -45,7 +44,7 @@ class CzechDictionary extends \Tester\TestCase
 
 		// Fetch settings and test if analyzer is configured
 
-		\curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index() . '/_settings');
+		\curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index . '/_settings');
 		\curl_setopt($ch, CURLOPT_POSTFIELDS, []);
 		\curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'GET');
 
@@ -67,7 +66,7 @@ class CzechDictionary extends \Tester\TestCase
 
 		$text = 'Playstation 4 je nejlepší se SodaStream drinkem a kouskem GS-condro!';
 
-		\curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index() . '/_analyze');
+		\curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index . '/_analyze');
 		\curl_setopt($ch, CURLOPT_POSTFIELDS, \json_encode([
 			'text' => $text,
 			'analyzer' => 'czechDictionary',
diff --git a/tests/SpameriTests/ElasticQuery/Query/ElasticMatch.phpt b/tests/SpameriTests/ElasticQuery/Query/ElasticMatch.phpt
@@ -61,12 +61,11 @@ class ElasticMatch extends \Tester\TestCase
 					)
 				)
 				)->toArray()
-			),
-			self::INDEX
+			)
 		);
 
 		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index() . '/_search');
+		curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index . '/_search');
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'GET');
 		curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
diff --git a/tests/SpameriTests/ElasticQuery/Query/Fuzzy.phpt b/tests/SpameriTests/ElasticQuery/Query/Fuzzy.phpt
@@ -57,12 +57,11 @@ class Fuzzy extends \Tester\TestCase
 					)
 				)
 				)->toArray()
-			),
-			self::INDEX
+			)
 		);
 
 		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index() . '/_search');
+		curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index . '/_search');
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'GET');
 		curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
diff --git a/tests/SpameriTests/ElasticQuery/Query/MatchPhrase.phpt b/tests/SpameriTests/ElasticQuery/Query/MatchPhrase.phpt
@@ -55,12 +55,11 @@ class MatchPhrase extends \Tester\TestCase
 					)
 				)
 				)->toArray()
-			),
-			self::INDEX
+			)
 		);
 
 		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index() . '/_search');
+		curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index . '/_search');
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'GET');
 		curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
diff --git a/tests/SpameriTests/ElasticQuery/Query/Range.phpt b/tests/SpameriTests/ElasticQuery/Query/Range.phpt
@@ -53,12 +53,11 @@ class Range extends \Tester\TestCase
 					)
 				)
 				)->toArray()
-			),
-			self::INDEX
+			)
 		);
 
 		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index() . '/_search');
+		curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index . '/_search');
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'GET');
 		curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
diff --git a/tests/SpameriTests/ElasticQuery/Query/Term.phpt b/tests/SpameriTests/ElasticQuery/Query/Term.phpt
@@ -51,12 +51,11 @@ class Term extends \Tester\TestCase
 					)
 				)
 				)->toArray()
-			),
-			self::INDEX
+			)
 		);
 
 		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index() . '/_search');
+		curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index . '/_search');
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'GET');
 		curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
diff --git a/tests/SpameriTests/ElasticQuery/Query/Terms.phpt b/tests/SpameriTests/ElasticQuery/Query/Terms.phpt
@@ -50,12 +50,11 @@ class Terms extends \Tester\TestCase
 					)
 				)
 				)->toArray()
-			),
-			self::INDEX
+			)
 		);
 
 		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index() . '/_search');
+		curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index . '/_search');
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'GET');
 		curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
diff --git a/tests/SpameriTests/ElasticQuery/Query/WildCard.phpt b/tests/SpameriTests/ElasticQuery/Query/WildCard.phpt
@@ -51,12 +51,11 @@ class WildCard extends \Tester\TestCase
 					)
 				)
 				)->toArray()
-			),
-			self::INDEX
+			)
 		);
 
 		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index() . '/_search');
+		curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index . '/_search');
 		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 		curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'GET');
 		curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
diff --git a/tests/SpameriTests/ElasticQuery/Response/Result.phpt b/tests/SpameriTests/ElasticQuery/Response/Result.phpt
@@ -26,7 +26,7 @@ class Result extends \Tester\TestCase
 				'hits' => [
 					0 => [
 						'_index' => 'spameri_guessed-2018-11-29_21-25-34',
-						'_type' => 'spameri_guessed',
+						'_type' => '_doc',
 						'_id' => 'EWhVcWcBhsjlL-GzEP8i',
 						'_score' => 1.0,
 						'_source' => [
@@ -40,7 +40,7 @@ class Result extends \Tester\TestCase
 					],
 					1 => [
 						'_index' => 'spameri_guessed-2018-11-29_21-25-34',
-						'_type' => 'spameri_guessed',
+						'_type' => '_doc',
 						'_id' => 'yQ8Bi2cBx3V83AUUwx3m',
 						'_score' => 1.0,
 						'_source' => [

Original file line number	Diff line number	Diff line change
`@@ -9,28 +9,15 @@ class Document implements \Spameri\ElasticQuery\Entity\ArrayInterface`
`9`	`9`	`{`
`10`	`10`
`11`	`11`	`public function __construct(`
`12`		`- private string\|null $index,`
`13`		`- private \Spameri\ElasticQuery\Document\BodyInterface\|null $body = null,`
`14`		`- private string\|null $type = null,`
`15`		`- private string\|null $id = null,`
`16`		`- private array $options = [],`
	`12`	`+ public string\|null $index,`
	`13`	`+ public \Spameri\ElasticQuery\Document\BodyInterface\|null $body = null,`
	`14`	`+ public string\|null $id = null,`
	`15`	`+ public array $options = [],`
`17`	`16`	`)`
`18`	`17`	`{`
`19`	`18`	`}`
`20`	`19`
`21`	`20`
`22`		`- public function index(): string\|null`
`23`		`- {`
`24`		`- return $this->index;`
`25`		`- }`
`26`		`-`
`27`		`-`
`28`		`- public function type(): string\|null`
`29`		`- {`
`30`		`- return $this->type;`
`31`		`- }`
`32`		`-`
`33`		`-`
`34`	`21`	`public function toArray(): array`
`35`	`22`	`{`
`36`	`23`	`$array = [];`
`@@ -43,10 +30,6 @@ public function toArray(): array`
`43`	`30`	`$array['body'] = $this->body->toArray();`
`44`	`31`	`}`
`45`	`32`
`46`		`- if ($this->type) {`
`47`		`- $array['type'] = $this->type;`
`48`		`- }`
`49`		`-`
`50`	`33`	`if ($this->id) {`
`51`	`34`	`$array['id'] = $this->id;`
`52`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,12 +61,11 @@ class ElasticMatch extends \Tester\TestCase`
`61`	`61`	`)`
`62`	`62`	`)`
`63`	`63`	`)->toArray()`
`64`		`- ),`
`65`		`- self::INDEX`
	`64`	`+ )`
`66`	`65`	`);`
`67`	`66`
`68`	`67`	`$ch = curl_init();`
`69`		`- curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index() . '/_search');`
	`68`	`+ curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index . '/_search');`
`70`	`69`	`curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);`
`71`	`70`	`curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'GET');`
`72`	`71`	`curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);`
Original file line number	Diff line number	Diff line change
`@@ -57,12 +57,11 @@ class Fuzzy extends \Tester\TestCase`
`57`	`57`	`)`
`58`	`58`	`)`
`59`	`59`	`)->toArray()`
`60`		`- ),`
`61`		`- self::INDEX`
	`60`	`+ )`
`62`	`61`	`);`
`63`	`62`
`64`	`63`	`$ch = curl_init();`
`65`		`- curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index() . '/_search');`
	`64`	`+ curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index . '/_search');`
`66`	`65`	`curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);`
`67`	`66`	`curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'GET');`
`68`	`67`	`curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);`
Original file line number	Diff line number	Diff line change
`@@ -55,12 +55,11 @@ class MatchPhrase extends \Tester\TestCase`
`55`	`55`	`)`
`56`	`56`	`)`
`57`	`57`	`)->toArray()`
`58`		`- ),`
`59`		`- self::INDEX`
	`58`	`+ )`
`60`	`59`	`);`
`61`	`60`
`62`	`61`	`$ch = curl_init();`
`63`		`- curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index() . '/_search');`
	`62`	`+ curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index . '/_search');`
`64`	`63`	`curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);`
`65`	`64`	`curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'GET');`
`66`	`65`	`curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);`
Original file line number	Diff line number	Diff line change
`@@ -53,12 +53,11 @@ class Range extends \Tester\TestCase`
`53`	`53`	`)`
`54`	`54`	`)`
`55`	`55`	`)->toArray()`
`56`		`- ),`
`57`		`- self::INDEX`
	`56`	`+ )`
`58`	`57`	`);`
`59`	`58`
`60`	`59`	`$ch = curl_init();`
`61`		`- curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index() . '/_search');`
	`60`	`+ curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index . '/_search');`
`62`	`61`	`curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);`
`63`	`62`	`curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'GET');`
`64`	`63`	`curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);`
Original file line number	Diff line number	Diff line change
`@@ -51,12 +51,11 @@ class Term extends \Tester\TestCase`
`51`	`51`	`)`
`52`	`52`	`)`
`53`	`53`	`)->toArray()`
`54`		`- ),`
`55`		`- self::INDEX`
	`54`	`+ )`
`56`	`55`	`);`
`57`	`56`
`58`	`57`	`$ch = curl_init();`
`59`		`- curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index() . '/_search');`
	`58`	`+ curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index . '/_search');`
`60`	`59`	`curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);`
`61`	`60`	`curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'GET');`
`62`	`61`	`curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);`
Original file line number	Diff line number	Diff line change
`@@ -50,12 +50,11 @@ class Terms extends \Tester\TestCase`
`50`	`50`	`)`
`51`	`51`	`)`
`52`	`52`	`)->toArray()`
`53`		`- ),`
`54`		`- self::INDEX`
	`53`	`+ )`
`55`	`54`	`);`
`56`	`55`
`57`	`56`	`$ch = curl_init();`
`58`		`- curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index() . '/_search');`
	`57`	`+ curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index . '/_search');`
`59`	`58`	`curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);`
`60`	`59`	`curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'GET');`
`61`	`60`	`curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);`
Original file line number	Diff line number	Diff line change
`@@ -51,12 +51,11 @@ class WildCard extends \Tester\TestCase`
`51`	`51`	`)`
`52`	`52`	`)`
`53`	`53`	`)->toArray()`
`54`		`- ),`
`55`		`- self::INDEX`
	`54`	`+ )`
`56`	`55`	`);`
`57`	`56`
`58`	`57`	`$ch = curl_init();`
`59`		`- curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index() . '/_search');`
	`58`	`+ curl_setopt($ch, CURLOPT_URL, 'localhost:9200/' . $document->index . '/_search');`
`60`	`59`	`curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);`
`61`	`60`	`curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'GET');`
`62`	`61`	`curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);`