Enum: value can be expression

Author: dg

src/PhpGenerator/EnumCase.php

@@ -22,17 +22,17 @@ final class EnumCase
 	use Traits\CommentAware;
 	use Traits\AttributeAware;
 
-	private string|int|null $value = null;
+	private string|int|Literal|null $value = null;
 
 
-	public function setValue(string|int|null $val): static
+	public function setValue(string|int|Literal|null $val): static
 	{
 		$this->value = $val;
 		return $this;
 	}
 
 
-	public function getValue(): string|int|null
+	public function getValue(): string|int|Literal|null
 	{
 		return $this->value;
 	}

src/PhpGenerator/EnumType.php

@@ -26,6 +26,20 @@ final class EnumType extends ClassLike
 
 	/** @var array<string, EnumCase> */
 	private array $cases = [];
+	private ?string $type = null;
+
+
+	public function setType(?string $type): static
+	{
+		$this->type = $type;
+		return $this;
+	}
+
+
+	public function getType(): ?string
+	{
+		return $this->type;
+	}
 
 
 	/**
@@ -85,7 +99,7 @@ public function getCases(): array
 
 
 	/** Adds case to enum */
-	public function addCase(string $name, string|int|null $value = null): EnumCase
+	public function addCase(string $name, string|int|Literal|null $value = null): EnumCase
 	{
 		if (isset($this->cases[$name])) {
 			throw new Nette\InvalidStateException("Cannot add cases '$name', because it already exists.");

src/PhpGenerator/Extractor.php

@@ -275,6 +275,7 @@ private function addTraitToFile(PhpFile $phpFile, Node\Stmt\Trait_ $node): Trait
 	private function addEnumToFile(PhpFile $phpFile, Node\Stmt\Enum_ $node): EnumType
 	{
 		$enum = $phpFile->addEnum($node->namespacedName->toString());
+		$enum->setType($node->scalarType?->toString());
 		foreach ($node->implements as $item) {
 			$enum->addImplement($item->toString());
 		}
@@ -362,7 +363,12 @@ private function addConstantToClass(ClassLike $class, Node\Stmt\ClassConst $node
 
 	private function addEnumCaseToClass(EnumType $class, Node\Stmt\EnumCase $node): void
 	{
-		$case = $class->addCase($node->name->toString(), $node->expr?->value);
+		$value = match (true) {
+			$node->expr === null => null,
+			$node->expr instanceof Node\Scalar\LNumber, $node->expr instanceof Node\Scalar\String_ => $node->expr->value,
+			default => new Literal($this->getReformattedContents([$node->expr], 1)),
+		};
+		$case = $class->addCase($node->name->toString(), $value);
 		$this->addCommentAndAttributes($case, $node);
 	}
 

src/PhpGenerator/Printer.php

@@ -147,8 +147,11 @@ public function printClass(ClassLike $class, ?PhpNamespace $namespace = null): s
 		}
 
 		$cases = [];
+		$enumType = null;
 		if ($class instanceof EnumType) {
+			$enumType = $class->getType();
 			foreach ($class->getCases() as $case) {
+				$enumType ??= is_scalar($case->getValue()) ? get_debug_type($case->getValue()) : null;
 				$cases[] = Helpers::formatDocComment((string) $case->getComment())
 					. self::printAttributes($case->getAttributes())
 					. 'case ' . $case->getName()
@@ -157,10 +160,6 @@ public function printClass(ClassLike $class, ?PhpNamespace $namespace = null): s
 			}
 		}
 
-		$enumType = isset($case) && $case->getValue() !== null
-			? $this->returnTypeColon . get_debug_type($case->getValue())
-			: '';
-
 		$consts = [];
 		$methods = [];
 		if (
@@ -209,8 +208,8 @@ public function printClass(ClassLike $class, ?PhpNamespace $namespace = null): s
 
 		$members = array_filter([
 			implode('', $traits),
-			$this->joinProperties($cases),
 			$this->joinProperties($consts),
+			$this->joinProperties($cases),
 			$this->joinProperties($properties),
 			($methods && $properties ? str_repeat("\n", $this->linesBetweenMethods - 1) : '')
 			. implode(str_repeat("\n", $this->linesBetweenMethods), $methods),
@@ -228,7 +227,7 @@ public function printClass(ClassLike $class, ?PhpNamespace $namespace = null): s
 			. self::printAttributes($class->getAttributes())
 			. ($class instanceof ClassType && $class->isAbstract() ? 'abstract ' : '')
 			. ($class instanceof ClassType && $class->isFinal() ? 'final ' : '')
-			. ($class->getName() ? $type . ' ' . $class->getName() . $enumType . ' ' : '')
+			. ($class->getName() ? $type . ' ' . $class->getName() . ($enumType ? $this->returnTypeColon . $enumType : '') . ' ' : '')
 			. (($class instanceof ClassType || $class instanceof InterfaceType) && $class->getExtends()
 				? 'extends ' . implode(', ', array_map($resolver, (array) $class->getExtends())) . ' '
 				: '')

tests/PhpGenerator/expected/ClassType.enum.expect

@@ -7,6 +7,8 @@ enum Suit
 {
 	use ObjectTrait;
 
+	public const ACTIVE = false;
+
 	/** ♣ */
 	#[ValueAttribute]
 	case Clubs;
@@ -16,8 +18,6 @@ enum Suit
 	case Hearts;
 	case Spades;
 
-	public const ACTIVE = false;
-
 	public function foo()
 	{
 		return 10;

tests/PhpGenerator/expected/ClassType.from.enum.expect

@@ -4,6 +4,9 @@
 #[\ExampleAttribute]
 enum Enum1
 {
+	public const FOO = 123;
+	public const BAR = \Abc\Enum1::Clubs;
+
 	/** Commented */
 	case Clubs;
 
@@ -12,9 +15,6 @@ enum Enum1
 	case Hearts;
 	case Spades;
 
-	public const FOO = 123;
-	public const BAR = \Abc\Enum1::Clubs;
-
 	public function foo($x = self::Diamonds)
 	{
 	}

tests/PhpGenerator/expected/Extractor.enum.expect

@@ -10,6 +10,9 @@ namespace Abc;
 #[\ExampleAttribute]
 enum Enum1
 {
+	public const FOO = 123;
+	public const BAR = self::Clubs;
+
 	/** Commented */
 	case Clubs;
 
@@ -18,9 +21,6 @@ enum Enum1
 	case Hearts;
 	case Spades;
 
-	public const FOO = 123;
-	public const BAR = self::Clubs;
-
 	public function foo($x = self::Diamonds)
 	{
 	}
@@ -35,3 +35,11 @@ enum Enum2: string implements \Countable
 	{
 	}
 }
+
+enum Enum3: int
+{
+	public const FOO = 123;
+
+	case A = self::FOO;
+	case B = 20 + 5;
+}

tests/PhpGenerator/fixtures/enum.php

@@ -35,3 +35,10 @@ function count(): int
 	{
 	}
 }
+
+enum Enum3: int
+{
+	const FOO = 123;
+	case A = self::FOO;
+	case B = 20 + 5;
+}