Tests fixed after rebase

Spamercz · Spamercz · commit 335eafb015fb · 2021-05-17T13:09:33.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,11 +33,11 @@ jobs:
       - name: Composer
         run: make composer
 
-      - if: matrix.php == '7.4' && matrix.elastic == "7.12.1"
+      - if: matrix.php == '7.4' && matrix.elastic == '7.12.1'
         name: Coding standard
         run: make cs
 
-      - if: matrix.php == '7.4' && matrix.elastic == "7.12.1"
+      - if: matrix.php == '7.4' && matrix.elastic == '7.12.1'
         name: PHPStan
         run: make phpstan
 
diff --git a/Makefile b/Makefile
@@ -17,6 +17,9 @@ cs:
 cs-local:
 	vendor/bin/phpcs --standard=ruleset.xml src tests/SpameriTests
 
+cbf:
+	vendor/bin/phpcbf --standard=ruleset.xml src tests/SpameriTests
+
 tests:
 	vendor/bin/tester -s -p php --colors 1 -C -j 1 tests
 
diff --git a/ruleset.xml b/ruleset.xml
@@ -6,6 +6,7 @@
 		<properties>
 			<property name="rootNamespaces" type="array">
 				<element key="src" value="Spameri\ElasticQuery"/>
+				<element key="tests/SpameriTests" value="SpameriTests"/>
 			</property>
 		</properties>
 	</rule>
diff --git a/src/Mapping/Analyzer/Fingerprint.php b/src/Mapping/Analyzer/Fingerprint.php
@@ -60,10 +60,4 @@ public function toArray(): array
 		];
 	}
 
-
-	public function name(): string
-	{
-		return 'customFingerprint';
-	}
-
 }
diff --git a/src/Mapping/Analyzer/Keyword.php b/src/Mapping/Analyzer/Keyword.php
@@ -29,10 +29,4 @@ public function toArray(): array
 		];
 	}
 
-
-	public function name(): string
-	{
-		return 'customKeyword';
-	}
-
 }
diff --git a/src/Mapping/Analyzer/Pattern.php b/src/Mapping/Analyzer/Pattern.php
@@ -68,10 +68,4 @@ public function toArray(): array
 		];
 	}
 
-
-	public function name(): string
-	{
-		return 'customPattern';
-	}
-
 }
diff --git a/src/Mapping/Analyzer/Simple.php b/src/Mapping/Analyzer/Simple.php
@@ -29,10 +29,4 @@ public function toArray(): array
 		];
 	}
 
-
-	public function name(): string
-	{
-		return 'customSimple';
-	}
-
 }
diff --git a/src/Mapping/Analyzer/Standard.php b/src/Mapping/Analyzer/Standard.php
@@ -52,10 +52,4 @@ public function toArray(): array
 		];
 	}
 
-
-	public function name(): string
-	{
-		return 'customStandard';
-	}
-
 }
diff --git a/src/Mapping/Analyzer/Stop.php b/src/Mapping/Analyzer/Stop.php
@@ -43,10 +43,4 @@ public function toArray(): array
 		];
 	}
 
-
-	public function name(): string
-	{
-		return 'customStop';
-	}
-
 }
diff --git a/src/Mapping/Analyzer/Whitespace.php b/src/Mapping/Analyzer/Whitespace.php
@@ -29,10 +29,4 @@ public function toArray(): array
 		];
 	}
 
-
-	public function name(): string
-	{
-		return 'customWhitespace';
-	}
-
 }
diff --git a/src/Mapping/Settings/Mapping.php b/src/Mapping/Settings/Mapping.php
@@ -31,6 +31,12 @@ public function __construct(
 	}
 
 
+	public function getIndexName(): string
+	{
+		return $this->indexName;
+	}
+
+
 	public function fields(): \Spameri\ElasticQuery\Mapping\Settings\Mapping\FieldCollection
 	{
 		return $this->fields;
diff --git a/src/Mapping/Tokenizer/EdgeNGram.php b/src/Mapping/Tokenizer/EdgeNGram.php
@@ -17,7 +17,7 @@ public function getType(): string
 	public function toArray(): array
 	{
 		return [
-			$this->getType()
+			$this->getType(),
 		];
 	}
 
diff --git a/src/Mapping/Tokenizer/Keyword.php b/src/Mapping/Tokenizer/Keyword.php
@@ -17,7 +17,7 @@ public function getType(): string
 	public function toArray(): array
 	{
 		return [
-			$this->getType()
+			$this->getType(),
 		];
 	}
 
diff --git a/src/Mapping/Tokenizer/Letter.php b/src/Mapping/Tokenizer/Letter.php
@@ -17,7 +17,7 @@ public function getType(): string
 	public function toArray(): array
 	{
 		return [
-			$this->getType()
+			$this->getType(),
 		];
 	}
 
diff --git a/src/Mapping/Tokenizer/Lowercase.php b/src/Mapping/Tokenizer/Lowercase.php
@@ -17,7 +17,7 @@ public function getType(): string
 	public function toArray(): array
 	{
 		return [
-			$this->getType()
+			$this->getType(),
 		];
 	}
 
diff --git a/src/Mapping/Tokenizer/NGram.php b/src/Mapping/Tokenizer/NGram.php
@@ -16,7 +16,7 @@ public function getType(): string
 	public function toArray(): array
 	{
 		return [
-			$this->getType()
+			$this->getType(),
 		];
 	}
 
diff --git a/src/Mapping/Tokenizer/Path.php b/src/Mapping/Tokenizer/Path.php
@@ -17,7 +17,7 @@ public function getType(): string
 	public function toArray(): array
 	{
 		return [
-			$this->getType()
+			$this->getType(),
 		];
 	}
 
diff --git a/src/Mapping/Tokenizer/Pattern.php b/src/Mapping/Tokenizer/Pattern.php
@@ -17,7 +17,7 @@ public function getType(): string
 	public function toArray(): array
 	{
 		return [
-			$this->getType()
+			$this->getType(),
 		];
 	}
 
diff --git a/src/Mapping/Tokenizer/SimplePattern.php b/src/Mapping/Tokenizer/SimplePattern.php
@@ -17,7 +17,7 @@ public function getType(): string
 	public function toArray(): array
 	{
 		return [
-			$this->getType()
+			$this->getType(),
 		];
 	}
 
diff --git a/src/Mapping/Tokenizer/SimplePatternSplit.php b/src/Mapping/Tokenizer/SimplePatternSplit.php
@@ -17,7 +17,7 @@ public function getType(): string
 	public function toArray(): array
 	{
 		return [
-			$this->getType()
+			$this->getType(),
 		];
 	}
 
diff --git a/src/Mapping/Tokenizer/Standard.php b/src/Mapping/Tokenizer/Standard.php
@@ -17,7 +17,7 @@ public function getType(): string
 	public function toArray(): array
 	{
 		return [
-			$this->getType()
+			$this->getType(),
 		];
 	}
 
diff --git a/src/Mapping/Tokenizer/Thai.php b/src/Mapping/Tokenizer/Thai.php
@@ -17,7 +17,7 @@ public function getType(): string
 	public function toArray(): array
 	{
 		return [
-			$this->getType()
+			$this->getType(),
 		];
 	}
 
diff --git a/src/Mapping/Tokenizer/UaxUrlEmail.php b/src/Mapping/Tokenizer/UaxUrlEmail.php
@@ -16,7 +16,7 @@ public function getType(): string
 	public function toArray(): array
 	{
 		return [
-			$this->getType()
+			$this->getType(),
 		];
 	}
 
diff --git a/src/Mapping/Tokenizer/Whitespace.php b/src/Mapping/Tokenizer/Whitespace.php
@@ -16,7 +16,7 @@ public function getType(): string
 	public function toArray(): array
 	{
 		return [
-			$this->getType()
+			$this->getType(),
 		];
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -60,10 +60,4 @@ public function toArray(): array`
`60`	`60`	`];`
`61`	`61`	`}`
`62`	`62`
`63`		`-`
`64`		`- public function name(): string`
`65`		`- {`
`66`		`- return 'customFingerprint';`
`67`		`- }`
`68`		`-`
`69`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,10 +29,4 @@ public function toArray(): array`
`29`	`29`	`];`
`30`	`30`	`}`
`31`	`31`
`32`		`-`
`33`		`- public function name(): string`
`34`		`- {`
`35`		`- return 'customKeyword';`
`36`		`- }`
`37`		`-`
`38`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,10 +68,4 @@ public function toArray(): array`
`68`	`68`	`];`
`69`	`69`	`}`
`70`	`70`
`71`		`-`
`72`		`- public function name(): string`
`73`		`- {`
`74`		`- return 'customPattern';`
`75`		`- }`
`76`		`-`
`77`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,10 +52,4 @@ public function toArray(): array`
`52`	`52`	`];`
`53`	`53`	`}`
`54`	`54`
`55`		`-`
`56`		`- public function name(): string`
`57`		`- {`
`58`		`- return 'customStandard';`
`59`		`- }`
`60`		`-`
`61`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,10 +43,4 @@ public function toArray(): array`
`43`	`43`	`];`
`44`	`44`	`}`
`45`	`45`
`46`		`-`
`47`		`- public function name(): string`
`48`		`- {`
`49`		`- return 'customStop';`
`50`		`- }`
`51`		`-`
`52`	`46`	`}`