Normalize enum value to ClassConstFetch

Fixes nikic#930
ruudk · Aug 15, 2023 · 2cc8059 · 2cc8059
1 parent a6303e5
commit 2cc8059
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/lib/PhpParser/BuilderHelpers.php b/lib/PhpParser/BuilderHelpers.php
@@ -215,7 +215,7 @@ public static function normalizeType($type) {
  * Normalizes a value: Converts nulls, booleans, integers,
  * floats, strings and arrays into their respective nodes
  *
- * @param Node\Expr|bool|null|int|float|string|array $value The value to normalize
+ * @param Node\Expr|bool|null|int|float|string|array|\UnitEnum $value The value to normalize
  *
  * @return Expr The normalized value
  */
@@ -269,6 +269,10 @@ public static function normalizeValue($value) : Expr {
  return new Expr\Array_($items);
  }
 
+ if ($value instanceof \UnitEnum) {
+ return new Expr\ClassConstFetch(new Name(\get_class($value)), $value->name);
+ }
+
  throw new \LogicException('Invalid value');
  }
 

diff --git a/test/PhpParser/BuilderHelpersPHP81Test.php b/test/PhpParser/BuilderHelpersPHP81Test.php
@@ -0,0 +1,24 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser;
+
+use PhpParser\Node\Expr;
+use PhpParser\Node\Name;
+
+/**
+ * @requires php 8.1
+ */
+class BuilderHelpersPHP81Test extends \PHPUnit\Framework\TestCase
+{
+ public function testNormalizeValueEnum() {
+ $this->assertEquals(new Expr\ClassConstFetch(new Name(Suit::class), 'Hearts'), BuilderHelpers::normalizeValue(Suit::Hearts));
+ }
+}
+
+enum Suit
+{
+ case Hearts;
+ case Diamonds;
+ case Clubs;
+ case Spades;
+}