Improve name + identifier ast nodes

Author: SerafimArts

composer.json

@@ -53,10 +53,7 @@
         "phpcs:check": ["phpcs", "cs", "psr", "per"]
     },
     "scripts": {
-        "test": [
-            "@test:unit"
-        ],
-        "test:unit": "phpunit --testdox --testsuite=unit",
+        "test:unit": "phpunit --testdox",
         "linter:check": "phpstan analyse --configuration phpstan.neon --memory-limit 256M",
         "linter:baseline": "@linter:check --generate-baseline",
         "phpcs:check": "@phpcs:fix --dry-run",

libs/parser/README.md

@@ -5,7 +5,7 @@
 ---
 
 <p align="center">
-    <a href="https://packagist.org/packages/type-lang/parser"><img src="https://poser.pugx.org/type-lang/parser/require/php?style=for-the-badge" alt="PHP 8.1+"></a>
+    <a href="https://packagist.org/packages/type-lang/parser"><img src="https://poser.pugx.org/type-lang/parser/require/php?style=for-the-badge" alt="PHP 8.4+"></a>
     <a href="https://packagist.org/packages/type-lang/parser"><img src="https://poser.pugx.org/type-lang/parser/version?style=for-the-badge" alt="Latest Stable Version"></a>
     <a href="https://packagist.org/packages/type-lang/parser"><img src="https://poser.pugx.org/type-lang/parser/v/unstable?style=for-the-badge" alt="Latest Unstable Version"></a>
     <a href="https://raw.githubusercontent.com/php-type-language/parser/blob/master/LICENSE"><img src="https://poser.pugx.org/type-lang/parser/license?style=for-the-badge" alt="License MIT"></a>

libs/parser/resources/grammar.php

@@ -277,16 +277,16 @@
     ],
     'reducers' => [
         0 => static function (\Phplrt\Parser\Context $ctx, $children) {
-            return new Node\FullQualifiedName($children);
+            return new Node\Name($children, true);
         },
         1 => static function (\Phplrt\Parser\Context $ctx, $children) {
-            return new Node\Name($children);
+            return new Node\Name($children, false);
         },
         3 => static function (\Phplrt\Parser\Context $ctx, $children) {
-            return new Node\Identifier($children->getValue());
+            return Node\Identifier::createFromString($children->getValue());
         },
         16 => static function (\Phplrt\Parser\Context $ctx, $children) {
-            return new Node\Identifier($children->getValue());
+            return Node\Identifier::createFromString($children->getValue());
         },
         17 => function (\Phplrt\Parser\Context $ctx, $children) {
             // The "$offset" variable is an auto-generated

libs/parser/resources/grammar/common.pp2

@@ -5,19 +5,19 @@ Name
   ;
 
 FullQualifiedName -> {
-    return new Node\FullQualifiedName($children);
+    return new Node\Name($children, true);
 }
   : ::T_NS_DELIMITER:: Identifier() (::T_NS_DELIMITER:: Identifier())*
   ;
 
 RelativeName -> {
-    return new Node\Name($children);
+    return new Node\Name($children, false);
 }
   : Identifier() (::T_NS_DELIMITER:: Identifier())*
   ;
 
 Identifier -> {
-    return new Node\Identifier($children->getValue());
+    return Node\Identifier::createFromString($children->getValue());
 }
   : <T_NAME>
   | <T_NAME_WITH_SPACE>
@@ -27,7 +27,7 @@ Identifier -> {
   ;
 
 IdentifierWithExtraSpace -> {
-    return new Node\Identifier($children->getValue());
+    return Node\Identifier::createFromString($children->getValue());
 }
     : <T_NAME_WITH_SPACE>
     ;

libs/parser/src/Node/FullQualifiedName.php

@@ -9,7 +9,7 @@ final class Identifier extends Node implements \Stringable
     /**
      * @var list<non-empty-string>
      */
-    private const SPECIAL_CLASS_NAME = [
+    private const array SPECIAL_CLASS_NAME = [
         'self',
         'parent',
         'static',
@@ -18,7 +18,7 @@ final class Identifier extends Node implements \Stringable
     /**
      * @var list<non-empty-string>
      */
-    private const BUILTIN_TYPE_NAME = [
+    private const array BUILTIN_TYPE_NAME = [
         'mixed',
         'string',
         'int',
@@ -35,23 +35,6 @@ final class Identifier extends Node implements \Stringable
         'false',
     ];
 
-    /**
-     * @var non-empty-string
-     */
-    public readonly string $value;
-
-    /**
-     * @param non-empty-string $value
-     */
-    public function __construct(string $value)
-    {
-        $value = \trim($value);
-
-        assert($value !== '', new \InvalidArgumentException('Identifier value cannot be empty'));
-
-        $this->value = $value;
-    }
-
     /**
      * Returns {@see true} if the identifier contains the name of
      * a "virtual" type, i.e. invalid in the PHP namespace.
@@ -61,41 +44,56 @@ public function __construct(string $value)
      * - `non-empty-array` - Virtual, cannot be defined in PHP.
      * - `empty-string` - Virtual, cannot be defined in PHP.
      */
-    public function isVirtual(): bool
-    {
-        return \str_contains($this->value, '-');
+    public bool $isVirtual {
+        get => \str_contains($this->value, '-');
     }
 
     /**
      * Returns {@see true} in case of name contains special class reference.
      */
-    public function isSpecial(): bool
-    {
-        return self::looksLikeSpecial($this->value);
+    public bool $isSpecial {
+        get => self::isLooksLikeSpecial($this->value);
     }
 
     /**
-     * Returns {@see true} in case of passed "$name" argument looks like
-     * a special type name or {@see false} instead.
+     * Returns {@see true} in case of name contains builtin type name.
      */
-    public static function looksLikeSpecial(string $name): bool
+    public bool $isBuiltin {
+        get => self::isLooksLikeBuiltin($this->value);
+    }
+
+    public function __construct(
+        /**
+         * @var non-empty-string
+         */
+        public readonly string $value,
+    ) {}
+
+    public static function createFromString(string|\Stringable $value): self
     {
-        return \in_array(\strtolower($name), self::SPECIAL_CLASS_NAME, true);
+        $normalized = \trim((string) $value);
+
+        if ($normalized === '') {
+            throw new \InvalidArgumentException('Name identifier cannot be empty');
+        }
+
+        return new self($normalized);
     }
 
     /**
-     * Returns {@see true} in case of name contains builtin type name.
+     * Returns {@see true} in case of passed "$name" argument looks like
+     * a special type name or {@see false} instead.
      */
-    public function isBuiltin(): bool
+    public static function isLooksLikeSpecial(string $name): bool
     {
-        return self::looksLikeBuiltin($this->value);
+        return \in_array(\strtolower($name), self::SPECIAL_CLASS_NAME, true);
     }
 
     /**
      * Returns {@see true} in case of passed "$name" argument looks like
      * a builtin type name or {@see false} instead.
      */
-    public static function looksLikeBuiltin(string $value): bool
+    public static function isLooksLikeBuiltin(string $value): bool
     {
         return \in_array(\strtolower($value), self::BUILTIN_TYPE_NAME, true);
     }