Add parser ^2.0 compatibility

Author: Kirill Nesmeyanov

composer.json

@@ -10,18 +10,18 @@
     },
     "require": {
         "php": "^8.1",
-        "type-lang/parser": "^1.0.1"
+        "type-lang/parser": "^2.0"
     },
     "autoload": {
         "psr-4": {
             "TypeLang\\Printer\\": "src"
         }
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^3.35",
-        "phpunit/phpunit": "^10.4",
+        "friendsofphp/php-cs-fixer": "^3.42",
+        "phpunit/phpunit": "^10.5",
         "rector/rector": "^0.18",
-        "vimeo/psalm": "^5.15"
+        "vimeo/psalm": "^5.18"
     },
     "autoload-dev": {
         "psr-4": {

phpunit.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
          colors="true"
          backupGlobals="true"
          stopOnFailure="false"

src/NativeTypePrinter.php

@@ -20,6 +20,7 @@
 
 /**
  * @psalm-suppress UndefinedAttributeClass : For "Override" attribute support.
+ * @psalm-suppress InvalidAttribute : For "Override" attribute support.
  */
 class NativeTypePrinter extends PrettyPrinter
 {

src/PrettyPrinter.php

@@ -235,12 +235,12 @@ class: LogicalTypeNode::class,
                     // Break on non-empty template parameters.
                     $isInTemplate = $node instanceof NamedTypeNode
                         && $node->arguments !== null
-                        && $node->arguments->list !== [];
+                        && $node->arguments->items !== [];
 
                     // Break on non-empty shape fields.
                     $isInShape = $node instanceof NamedTypeNode
                         && $node->fields !== null
-                        && $node->fields->list !== [];
+                        && $node->fields->items !== [];
 
                     return $isInTemplate || $isInShape;
                 },
@@ -347,10 +347,8 @@ protected function printNamedTypeNode(NamedTypeNode $node): string
 
         if ($node->fields !== null) {
             $result .= $this->printShapeFieldsNode($node, $node->fields);
-        } else {
-            if ($node->arguments !== null) {
-                $result .= $this->printTemplateArgumentsNode($node->arguments);
-            }
+        } elseif ($node->arguments !== null) {
+            $result .= $this->printTemplateArgumentsNode($node->arguments);
         }
 
         /** @var non-empty-string */
@@ -364,7 +362,7 @@ protected function printTemplateArgumentsNode(TemplateArgumentsListNode $params)
     {
         $result = [];
 
-        foreach ($params->list as $param) {
+        foreach ($params->items as $param) {
             $result[] = $this->printTemplateArgumentNode($param);
         }
 
@@ -385,7 +383,7 @@ protected function printTemplateArgumentNode(TemplateArgumentNode $param): strin
      */
     protected function printShapeFieldsNode(NamedTypeNode $node, FieldsListNode $shape): string
     {
-        if (\count($shape->list) <= $this->multilineShape) {
+        if (\count($shape->items) <= $this->multilineShape) {
             /** @var non-empty-string */
             return \vsprintf('{%s}', [
                 \implode(', ', $this->getShapeFieldsNodes($node, $shape)),
@@ -411,7 +409,7 @@ private function getShapeFieldsNodes(NamedTypeNode $node, FieldsListNode $shape)
 
         $fields = [];
 
-        foreach ($shape->list as $field) {
+        foreach ($shape->items as $field) {
             $fields[] = $prefix . $this->printShapeFieldNode($field);
         }
 
@@ -444,19 +442,20 @@ protected function printShapeFieldNode(FieldNode $field): string
             /** @var non-empty-string */
             return \vsprintf('%s: %s', [
                 $name,
-                $this->make($field->getValue()),
+                $this->make($field->getType()),
             ]);
         }
 
-        return $this->make($field->getValue());
+        /** @var non-empty-string */
+        return $this->make($field->getType());
     }
 
     protected function printShapeFieldName(FieldNode $field): string
     {
         return match (true) {
-            $field instanceof StringNamedFieldNode => $field->name->getRawValue(),
-            $field instanceof NumericFieldNode => $field->index->getRawValue(),
-            $field instanceof NamedFieldNode => $field->name->toString(),
+            $field instanceof StringNamedFieldNode,
+            $field instanceof NumericFieldNode => $field->key->getRawValue(),
+            $field instanceof NamedFieldNode => $field->key->toString(),
             default => '',
         };
     }