Enum support for Condition class

phpfui · phpfui · commit c926404a8ddb · 2024-04-25T12:37:48.000-04:00
diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
         "psr/log": "^3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "<=11.0",
+        "phpunit/phpunit": "<=11.99",
         "phpfui/phpunit-syntax-coverage": "^1.0",
         "roave/security-advisories": "dev-latest",
         "friendsofphp/php-cs-fixer": "^3.0",
diff --git a/src/PHPFUI/ORM/Condition.php b/src/PHPFUI/ORM/Condition.php
@@ -210,6 +210,12 @@ public function orNot(string | \PHPFUI\ORM\Condition | \PHPFUI\ORM\Literal $cond
 	 */
 	private function add(string $logical, string | \PHPFUI\ORM\Condition | \PHPFUI\ORM\Literal $condition, \PHPFUI\ORM\Operator $operator, mixed $value) : static
 		{
+		// convert enum to the backed type
+		if (\is_object($value) && \enum_exists($value::class))
+			{
+			$value = $value->value;
+			}
+
 		if (null === $value && ! $operator->correctlyTyped($value))
 			{
 			if ($operator instanceof \PHPFUI\ORM\Operator\Equal)

Original file line number	Diff line number	Diff line change
`@@ -210,6 +210,12 @@ public function orNot(string \| \PHPFUI\ORM\Condition \| \PHPFUI\ORM\Literal $cond`
`210`	`210`	`*/`
`211`	`211`	`private function add(string $logical, string \| \PHPFUI\ORM\Condition \| \PHPFUI\ORM\Literal $condition, \PHPFUI\ORM\Operator $operator, mixed $value) : static`
`212`	`212`	`{`
	`213`	`+ // convert enum to the backed type`
	`214`	`+ if (\is_object($value) && \enum_exists($value::class))`
	`215`	`+ {`
	`216`	`+ $value = $value->value;`
	`217`	`+ }`
	`218`	`+`
`213`	`219`	`if (null === $value && ! $operator->correctlyTyped($value))`
`214`	`220`	`{`
`215`	`221`	`if ($operator instanceof \PHPFUI\ORM\Operator\Equal)`