use current infra better

nextras · Oct 19, 2022 · 2419af1 · 2419af1
1 parent 20f8740
commit 2419af1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 20 deletions.
diff --git a/src/SqlProcessor.php b/src/SqlProcessor.php
@@ -168,6 +168,10 @@ function ($matches) use ($args, &$j, $last): string {
 	 */
 	public function processModifier(string $type, $value): string
 	{
+		if ($value instanceof \BackedEnum) {
+			$value = $value->value;
+		}
+
 		if ($type === 'any') {
 			$type = $this->detectType($value) ?? 'any';
 		}
@@ -316,21 +320,6 @@ public function processModifier(string $type, $value): string
 						case '_like_':
 							return $this->platform->formatStringLike((string) $value, 0);
 					}
-				} elseif ($value instanceof \BackedEnum) {
-					$valueType = gettype($value->value);
-					if ($type === 's') {
-						if ($valueType === 'string') {
-							// we know for sure that value is string...
-							// @phpstan-ignore-next-line
-							return $this->platform->formatString($value->value);
-						} elseif ($valueType === 'integer') {
-							return (string) $value->value;
-						}
-					} elseif ($type === 'i') {
-						if ($valueType === 'integer') {
-							return (string) $value->value;
-						}
-					}
 				}
 
 				break;

diff --git a/tests/cases/unit/SqlProcessorTest.backed_enum.phpt b/tests/cases/unit/SqlProcessorTest.backed_enum.phpt
@@ -59,7 +59,13 @@ class SqlProcessorBackedEnumTest extends TestCase
 
 		$cases = BinaryEnum::cases();
 		foreach ($cases as $case) {
-			Assert::same((string) $case->value, $this->parser->processModifier('s', $case));
+			Assert::exception(
+				function () use ($case) {
+					$this->parser->processModifier('s', $case);
+				},
+				InvalidArgumentException::class,
+				'Modifier %s expects value to be string, integer given.'
+			);
 		}
 
 	}
@@ -73,8 +79,14 @@ class SqlProcessorBackedEnumTest extends TestCase
 			->andReturnArg(0);
 		Assert::same('(left, right)', $this->parser->processModifier('s[]', $cases));
 
-		$cases = BinaryEnum::cases();
-		Assert::same('(0, 1)', $this->parser->processModifier('s[]', $cases));
+		Assert::exception(
+			function () {
+				$cases = BinaryEnum::cases();
+				$this->parser->processModifier('s[]', $cases);
+			},
+			InvalidArgumentException::class,
+			'Modifier %s expects value to be string, integer given.'
+		);
 
 	}
 
@@ -88,7 +100,8 @@ class SqlProcessorBackedEnumTest extends TestCase
 					$this->parser->processModifier('i', $case);
 				},
 				InvalidArgumentException::class,
-				'Modifier %i expects value to be int, NextrasTests\Dbal\DirectionEnum given.');
+				'Modifier %i expects value to be int, string given.'
+			);
 		}
 
 		$cases = BinaryEnum::cases();
@@ -107,7 +120,7 @@ class SqlProcessorBackedEnumTest extends TestCase
 				$this->parser->processModifier('i[]', $cases);
 			},
 			InvalidArgumentException::class,
-			'Modifier %i expects value to be int, NextrasTests\Dbal\DirectionEnum given.'
+			'Modifier %i expects value to be int, string given.'
 		);
 
 		$cases = BinaryEnum::cases();