!!!TASK: Remove old AST objects and adjust dependent classes/tests

Author: grebaldi

scripts/test

@@ -17,6 +17,5 @@
     --display-deprecations \
     --display-errors \
     --display-notices \
-    --testdox \
     --coverage-html build/coverage-report \
     --coverage-filter src $@

src/Definition/BinaryOperator.php

@@ -22,6 +22,8 @@
 
 namespace PackageFactory\ComponentEngine\Domain\ComponentName;
 
+use PackageFactory\ComponentEngine\Domain\TypeName\TypeName;
+
 final class ComponentName
 {
     private function __construct(
@@ -33,4 +35,9 @@ public static function from(string $string): self
     {
         return new self($string);
     }
+
+    public function toTypeName(): TypeName
+    {
+        return TypeName::from($this->value);
+    }
 }

src/Definition/Precedence.php

@@ -22,6 +22,8 @@
 
 namespace PackageFactory\ComponentEngine\Domain\EnumName;
 
+use PackageFactory\ComponentEngine\Domain\TypeName\TypeName;
+
 final class EnumName
 {
     private function __construct(
@@ -33,4 +35,9 @@ public static function from(string $string): self
     {
         return new self($string);
     }
+
+    public function toTypeName(): TypeName
+    {
+        return TypeName::from($this->value);
+    }
 }

src/Domain/ComponentName/ComponentName.php

@@ -22,6 +22,8 @@
 
 namespace PackageFactory\ComponentEngine\Domain\PropertyName;
 
+use PackageFactory\ComponentEngine\Domain\EnumMemberName\EnumMemberName;
+
 final class PropertyName
 {
     private function __construct(
@@ -33,4 +35,9 @@ public static function from(string $string): self
     {
         return new self($string);
     }
+
+    public function toEnumMemberName(): EnumMemberName
+    {
+        return EnumMemberName::from($this->value);
+    }
 }

src/Domain/EnumName/EnumName.php

@@ -22,6 +22,8 @@
 
 namespace PackageFactory\ComponentEngine\Domain\StructName;
 
+use PackageFactory\ComponentEngine\Domain\TypeName\TypeName;
+
 final class StructName
 {
     private function __construct(
@@ -33,4 +35,9 @@ public static function from(string $string): self
     {
         return new self($string);
     }
+
+    public function toTypeName(): TypeName
+    {
+        return TypeName::from($this->value);
+    }
 }

src/Domain/PropertyName/PropertyName.php

@@ -2,7 +2,7 @@
 
 /**
  * PackageFactory.ComponentEngine - Universal View Components for PHP
- *   Copyright (C) 2022 Contributors of PackageFactory.ComponentEngine
+ *   Copyright (C) 2023 Contributors of PackageFactory.ComponentEngine
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -22,6 +22,8 @@
 
 namespace PackageFactory\ComponentEngine\Domain\TypeName;
 
+use PackageFactory\ComponentEngine\Domain\VariableName\VariableName;
+
 final class TypeName
 {
     private function __construct(
@@ -33,4 +35,9 @@ public static function from(string $string): self
     {
         return new self($string);
     }
+
+    public function toVariableName(): VariableName
+    {
+        return VariableName::from($this->value);
+    }
 }

src/Domain/StructName/StructName.php

@@ -38,4 +38,9 @@ public function __construct(PropertyDeclarationNode ...$items)
 
         $this->items = $itemsAsHashMap;
     }
+
+    public function isEmpty(): bool
+    {
+        return count($this->items) === 0;
+    }
 }

src/Domain/TypeName/TypeName.php

@@ -45,6 +45,7 @@
 use PackageFactory\ComponentEngine\Parser\Tokenizer\Token;
 use PackageFactory\ComponentEngine\Parser\Tokenizer\TokenType;
 use PackageFactory\ComponentEngine\Parser\Tokenizer\TokenTypes;
+use PhpParser\Parser\Tokens;
 
 final class ExpressionParser
 {
@@ -69,23 +70,31 @@ public function __construct(
      */
     public function parse(\Iterator &$tokens): ExpressionNode
     {
+        Scanner::skipSpaceAndComments($tokens);
+
         $result = $this->parseUnaryStatement($tokens);
 
         if ($this->shouldStop($tokens)) {
             return $result;
         }
 
-        $result = match (Scanner::type($tokens)) {
+        $binaryOperationTokens = TokenTypes::from(
             TokenType::OPERATOR_BOOLEAN_AND,
             TokenType::OPERATOR_BOOLEAN_OR,
             TokenType::COMPARATOR_EQUAL,
             TokenType::COMPARATOR_NOT_EQUAL,
             TokenType::COMPARATOR_GREATER_THAN,
             TokenType::COMPARATOR_GREATER_THAN_OR_EQUAL,
             TokenType::COMPARATOR_LESS_THAN,
-            TokenType::COMPARATOR_LESS_THAN_OR_EQUAL => $this->parseBinaryOperation($tokens, $result),
-            default => $result
-        };
+            TokenType::COMPARATOR_LESS_THAN_OR_EQUAL
+        );
+
+        while (
+            !$this->shouldStop($tokens) &&
+            $binaryOperationTokens->contains(Scanner::type($tokens))
+        ) {
+            $result = $this->parseBinaryOperation($tokens, $result);
+        }
 
         if ($this->shouldStop($tokens)) {
             return $result;