Add type support to constants

Author: sunkan

src/PhpConstant.php

@@ -3,6 +3,7 @@
 namespace Stefna\PhpCodeBuilder;
 
 use Stefna\PhpCodeBuilder\ValueObject\Identifier;
+use Stefna\PhpCodeBuilder\ValueObject\Type;
 
 class PhpConstant
 {
@@ -14,26 +15,27 @@ class PhpConstant
 	public const CASE_LOWER = 1;
 	public const CASE_NONE = 2;
 
-	public static function public(string $identifier, mixed $value = null): self
+	public static function public(string $identifier, mixed $value = null, ?Type $type = null): self
 	{
-		return new self(self::PUBLIC_ACCESS, $identifier, $value);
+		return new self(self::PUBLIC_ACCESS, $identifier, $value, type: $type);
 	}
 
-	public static function private(string $identifier, mixed $value = null): self
+	public static function private(string $identifier, mixed $value = null, ?Type $type = null): self
 	{
-		return new self(self::PRIVATE_ACCESS, $identifier, $value);
+		return new self(self::PRIVATE_ACCESS, $identifier, $value, type: $type);
 	}
 
-	public static function protected(string $identifier, mixed $value = null): self
+	public static function protected(string $identifier, mixed $value = null, ?Type $type = null): self
 	{
-		return new self(self::PROTECTED_ACCESS, $identifier, $value);
+		return new self(self::PROTECTED_ACCESS, $identifier, $value, type: $type);
 	}
 
 	public function __construct(
 		protected string $access,
 		protected string $identifier,
 		protected mixed $value = null,
 		protected int $case = self::CASE_UPPER,
+		protected ?Type $type = null,
 	) {}
 
 	public function getName(): string
@@ -83,6 +85,11 @@ public function getAccess(): string
 		return $this->access;
 	}
 
+	public function getType(): ?Type
+	{
+		return $this->type;
+	}
+
 	public function setAccess(string $access): static
 	{
 		$this->access = $access;

src/Renderer/Php84Renderer.php

@@ -0,0 +1,57 @@
+<?php declare(strict_types=1);
+
+namespace Stefna\PhpCodeBuilder\Renderer;
+
+use Stefna\PhpCodeBuilder\FlattenSource;
+use Stefna\PhpCodeBuilder\FormatValue;
+use Stefna\PhpCodeBuilder\PhpClass;
+use Stefna\PhpCodeBuilder\PhpConstant;
+use Stefna\PhpCodeBuilder\PhpEnum;
+use Stefna\PhpCodeBuilder\PhpMethod;
+use Stefna\PhpCodeBuilder\PhpParam;
+use Stefna\PhpCodeBuilder\PhpTrait;
+use Stefna\PhpCodeBuilder\PhpVariable;
+use Stefna\PhpCodeBuilder\ValueObject\EnumBackedCase;
+use Stefna\PhpCodeBuilder\ValueObject\Identifier;
+use Stefna\PhpCodeBuilder\ValueObject\Type;
+
+class Php84Renderer extends Php82Renderer
+{
+	public function renderConstant(PhpConstant $constant): array
+	{
+		$ret = [];
+		$line = [];
+		$access = $constant->getAccess();
+		if ($access) {
+			$line[] = $access;
+		}
+
+		$line[] = 'const';
+		$type = $this->formatTypeHint($constant->getType());
+		if ($type) {
+			$line[] = $type;
+		}
+		$line[] = $constant->getName();
+		$line[] = '=';
+		$lineStr = implode(' ', $line);
+
+		$value = FormatValue::format($constant->getValue());
+		if (is_array($value)) {
+			if (count($value) > 1) {
+				$lineStr .= ' ' . array_shift($value);
+				$ret[] = $lineStr;
+			}
+			$ret = FlattenSource::applySourceOn($value, $ret);
+			$lastKey = (int)array_key_last($ret);
+			if (is_string($ret[$lastKey])) {
+				$ret[$lastKey] .= ';';
+			}
+		}
+		else {
+			$lineStr .= ' ' . $value;
+			$ret[] = $lineStr . ';';
+		}
+
+		return $ret;
+	}
+}

tests/Renderer/PhpConstantTest.php

@@ -5,6 +5,8 @@
 use PHPUnit\Framework\TestCase;
 use Stefna\PhpCodeBuilder\PhpConstant;
 use Stefna\PhpCodeBuilder\Renderer\Php7Renderer;
+use Stefna\PhpCodeBuilder\Renderer\Php84Renderer;
+use Stefna\PhpCodeBuilder\ValueObject\Type;
 
 final class PhpConstantTest extends TestCase
 {
@@ -108,4 +110,12 @@ public function testSanitizeConstNameFromSpecialCharacters(): void
 
 		$this->assertSame(['public const _S_2M = \'>2m\';'], $render->renderConstant($const));
 	}
+
+	public function testTypedConstants(): void
+	{
+		$const = PhpConstant::public('NAME', '>2m', type: Type::fromString('string'));
+		$render = new Php84Renderer();
+
+		$this->assertSame(['public const string NAME = \'>2m\';'], $render->renderConstant($const));
+	}
 }