Improve docblock reader

Author: SerafimArts

src/Mapping/Driver/DocBlockDriver.php

@@ -8,9 +8,9 @@
 use TypeLang\Mapper\Mapping\Driver\ArrayConfigDriver\ClassConfigLoaderInterface;
 use TypeLang\Mapper\Mapping\Driver\ArrayConfigDriver\PropertyConfigLoaderInterface;
 use TypeLang\Mapper\Mapping\Driver\DocBlockDriver\ClassDocBlockLoaderInterface;
-use TypeLang\Mapper\Mapping\Driver\DocBlockDriver\ClassPropertyTypeDriver;
-use TypeLang\Mapper\Mapping\Driver\DocBlockDriver\PromotedPropertyTypeDriver;
 use TypeLang\Mapper\Mapping\Driver\DocBlockDriver\PropertyDocBlockLoaderInterface;
+use TypeLang\Mapper\Mapping\Driver\DocBlockDriver\Reader\ParamTagReader;
+use TypeLang\Mapper\Mapping\Driver\DocBlockDriver\Reader\VarTagReader;
 use TypeLang\Mapper\Mapping\Driver\DocBlockDriver\TypePropertyDocBlockLoader;
 use TypeLang\Mapper\Mapping\Metadata\ClassMetadata;
 use TypeLang\Mapper\Runtime\Parser\TypeParserInterface;
@@ -36,9 +36,9 @@ final class DocBlockDriver extends LoadableDriver
      */
     private const DEFAULT_VAR_TAG_NAME = 'var';
 
-    private readonly PromotedPropertyTypeDriver $promotedProperties;
+    private readonly ParamTagReader $paramTags;
 
-    private readonly ClassPropertyTypeDriver $classProperties;
+    private readonly VarTagReader $varTags;
 
     /**
      * @var list<ClassConfigLoaderInterface>
@@ -68,14 +68,14 @@ public function __construct(
             $varTagName => new VarTagFactory(),
         ]));
 
-        $this->classProperties = new ClassPropertyTypeDriver(
+        $this->varTags = new VarTagReader(
             varTagName: $varTagName,
             parser: $parser,
         );
 
-        $this->promotedProperties = new PromotedPropertyTypeDriver(
+        $this->paramTags = new ParamTagReader(
             paramTagName: $paramTagName,
-            classProperties: $this->classProperties,
+            varTag: $this->varTags,
             parser: $parser,
         );
 
@@ -101,8 +101,8 @@ private function createPropertyLoaders(): array
     {
         return [
             new TypePropertyDocBlockLoader(
-                promotedProperties: $this->promotedProperties,
-                classProperties: $this->classProperties,
+                paramTags: $this->paramTags,
+                varTags: $this->varTags,
             ),
         ];
     }
@@ -163,6 +163,6 @@ class: $reflection,
             }
         }
 
-        $this->promotedProperties->cleanup();
+        $this->paramTags->cleanup();
     }
 }

src/Mapping/Driver/DocBlockDriver/PromotedPropertyTypeDriver.php renamed to src/Mapping/Driver/DocBlockDriver/Reader/ParamTagReader.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace TypeLang\Mapper\Mapping\Driver\DocBlockDriver;
+namespace TypeLang\Mapper\Mapping\Driver\DocBlockDriver\Reader;
 
 use TypeLang\Mapper\Mapping\Metadata\PropertyMetadata;
 use TypeLang\Parser\Node\Stmt\TypeStatement;
@@ -11,7 +11,7 @@
 use TypeLang\PHPDoc\Standard\ParamTag;
 use TypeLang\PHPDoc\Tag\TagInterface;
 
-final class PromotedPropertyTypeDriver
+final class ParamTagReader implements TagReaderInterface
 {
     /**
      * @var array<class-string, DocBlock>
@@ -23,7 +23,7 @@ final class PromotedPropertyTypeDriver
      */
     public function __construct(
         private readonly string $paramTagName,
-        private readonly ClassPropertyTypeDriver $classProperties,
+        private readonly VarTagReader $varTag,
         private readonly ParserInterface $parser,
     ) {}
 
@@ -32,7 +32,7 @@ public function __construct(
      */
     public function findType(\ReflectionProperty $property, PropertyMetadata $meta): ?TypeStatement
     {
-        $result = $this->classProperties->findType($property);
+        $result = $this->varTag->findType($property, $meta);
 
         if ($result !== null) {
             return $result;

src/Mapping/Driver/DocBlockDriver/Reader/TagReaderInterface.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TypeLang\Mapper\Mapping\Driver\DocBlockDriver\Reader;
+
+use TypeLang\Mapper\Mapping\Metadata\PropertyMetadata;
+use TypeLang\Parser\Node\Stmt\TypeStatement;
+
+interface TagReaderInterface
+{
+    public function findType(\ReflectionProperty $property, PropertyMetadata $meta): ?TypeStatement;
+}

src/Mapping/Driver/DocBlockDriver/ClassPropertyTypeDriver.php renamed to src/Mapping/Driver/DocBlockDriver/Reader/VarTagReader.php

@@ -2,15 +2,16 @@
 
 declare(strict_types=1);
 
-namespace TypeLang\Mapper\Mapping\Driver\DocBlockDriver;
+namespace TypeLang\Mapper\Mapping\Driver\DocBlockDriver\Reader;
 
+use TypeLang\Mapper\Mapping\Metadata\PropertyMetadata;
 use TypeLang\Parser\Node\Stmt\TypeStatement;
 use TypeLang\PHPDoc\DocBlock;
 use TypeLang\PHPDoc\ParserInterface;
 use TypeLang\PHPDoc\Standard\VarTag;
 use TypeLang\PHPDoc\Tag\TagInterface;
 
-final class ClassPropertyTypeDriver
+final class VarTagReader implements TagReaderInterface
 {
     /**
      * @param non-empty-string $varTagName
@@ -23,7 +24,7 @@ public function __construct(
     /**
      * Return type for given property from docblock.
      */
-    public function findType(\ReflectionProperty $property): ?TypeStatement
+    public function findType(\ReflectionProperty $property, PropertyMetadata $meta): ?TypeStatement
     {
         $phpdoc = $this->getDocBlockFromProperty($property);
 

src/Mapping/Driver/DocBlockDriver/TypePropertyDocBlockLoader.php

@@ -6,6 +6,8 @@
 
 use TypeLang\Mapper\Exception\Definition\PropertyTypeNotFoundException;
 use TypeLang\Mapper\Exception\Definition\TypeNotFoundException;
+use TypeLang\Mapper\Mapping\Driver\DocBlockDriver\Reader\ParamTagReader;
+use TypeLang\Mapper\Mapping\Driver\DocBlockDriver\Reader\VarTagReader;
 use TypeLang\Mapper\Mapping\Metadata\PropertyMetadata;
 use TypeLang\Mapper\Mapping\Metadata\TypeMetadata;
 use TypeLang\Mapper\Runtime\Parser\TypeParserInterface;
@@ -15,8 +17,8 @@
 final class TypePropertyDocBlockLoader extends PropertyDocBlockLoader
 {
     public function __construct(
-        private readonly PromotedPropertyTypeDriver $promotedProperties,
-        private readonly ClassPropertyTypeDriver $classProperties,
+        private readonly ParamTagReader $paramTags,
+        private readonly VarTagReader $varTags,
     ) {}
 
     public function load(
@@ -60,9 +62,9 @@ private function findType(\ReflectionClass $class, PropertyMetadata $meta): ?Typ
         $property = $class->getProperty($meta->name);
 
         if ($property->isPromoted()) {
-            return $this->promotedProperties->findType($property, $meta);
+            return $this->paramTags->findType($property, $meta);
         }
 
-        return $this->classProperties->findType($property);
+        return $this->varTags->findType($property, $meta);
     }
 }

src/Type/ClassType/ClassTypeDenormalizer.php

@@ -17,6 +17,7 @@
 use TypeLang\Mapper\Runtime\Path\Entry\ObjectPropertyEntry;
 use TypeLang\Mapper\Runtime\PropertyAccessor\PropertyAccessorInterface;
 use TypeLang\Mapper\Type\TypeInterface;
+use TypeLang\Parser\Node\Stmt\NamedTypeNode;
 
 /**
  * @template T of object
@@ -51,7 +52,7 @@ private function getPropertyType(PropertyMetadata $meta, Context $context): Type
         $info = $meta->type;
 
         if ($info === null) {
-            return $context->getTypeByDefinition('mixed');
+            return $context->getTypeByStatement(new NamedTypeNode('mixed'));
         }
 
         return $info->type;