Merge branch 'master' into fix-abstract

src/Definition/Repository/Reflection/ReflectionClassDefinitionRepository.php

@@ -15,6 +15,7 @@
 use CuyZ\Valinor\Definition\PropertyDefinition;
 use CuyZ\Valinor\Definition\Repository\AttributesRepository;
 use CuyZ\Valinor\Definition\Repository\ClassDefinitionRepository;
+use CuyZ\Valinor\Type\ClassType;
 use CuyZ\Valinor\Type\GenericType;
 use CuyZ\Valinor\Type\Parser\Exception\InvalidType;
 use CuyZ\Valinor\Type\Parser\Factory\Specifications\AliasSpecification;
@@ -23,12 +24,12 @@
 use CuyZ\Valinor\Type\Parser\Factory\TypeParserFactory;
 use CuyZ\Valinor\Type\Parser\TypeParser;
 use CuyZ\Valinor\Type\Type;
-use CuyZ\Valinor\Type\ClassType;
 use CuyZ\Valinor\Type\Types\UnresolvableType;
 use CuyZ\Valinor\Utility\Reflection\Reflection;
 use ReflectionClass;
 use ReflectionMethod;
 use ReflectionProperty;
+use CuyZ\Valinor\Utility\Reflection\DocParser;
 
 use function array_filter;
 use function array_keys;
@@ -162,7 +163,7 @@ private function typeResolver(ClassType $type, ReflectionClass $target): Reflect
     private function localTypeAliases(ClassType $type): array
     {
         $reflection = Reflection::class($type->className());
-        $rawTypes = Reflection::localTypeAliases($reflection);
+        $rawTypes = DocParser::localTypeAliases($reflection);
 
         $typeParser = $this->typeParser($type);
 
@@ -187,7 +188,7 @@ private function localTypeAliases(ClassType $type): array
     private function importedTypeAliases(ClassType $type): array
     {
         $reflection = Reflection::class($type->className());
-        $importedTypesRaw = Reflection::importedTypeAliases($reflection);
+        $importedTypesRaw = DocParser::importedTypeAliases($reflection);
 
         $typeParser = $this->typeParser($type);
 

src/Definition/Repository/Reflection/ReflectionTypeResolver.php

@@ -10,6 +10,7 @@
 use CuyZ\Valinor\Type\Type;
 use CuyZ\Valinor\Type\Types\MixedType;
 use CuyZ\Valinor\Type\Types\UnresolvableType;
+use CuyZ\Valinor\Utility\Reflection\DocParser;
 use CuyZ\Valinor\Utility\Reflection\Reflection;
 use ReflectionFunctionAbstract;
 use ReflectionParameter;
@@ -23,7 +24,7 @@ public function __construct(
         private TypeParser $advancedParser
     ) {}
 
-    public function resolveType(\ReflectionProperty|\ReflectionParameter|\ReflectionFunctionAbstract $reflection): Type
+    public function resolveType(ReflectionProperty|ReflectionParameter|ReflectionFunctionAbstract $reflection): Type
     {
         $nativeType = $this->nativeType($reflection);
         $typeFromDocBlock = $this->typeFromDocBlock($reflection);
@@ -51,11 +52,24 @@ public function resolveType(\ReflectionProperty|\ReflectionParameter|\Reflection
         return $typeFromDocBlock;
     }
 
-    private function typeFromDocBlock(\ReflectionProperty|\ReflectionParameter|\ReflectionFunctionAbstract $reflection): ?Type
+    private function typeFromDocBlock(ReflectionProperty|ReflectionParameter|ReflectionFunctionAbstract $reflection): ?Type
     {
-        $type = $reflection instanceof ReflectionFunctionAbstract
-            ? Reflection::docBlockReturnType($reflection)
-            : Reflection::docBlockType($reflection);
+        if ($reflection instanceof ReflectionFunctionAbstract) {
+            $type = DocParser::functionReturnType($reflection);
+        } elseif ($reflection instanceof ReflectionProperty) {
+            $type = DocParser::propertyType($reflection);
+        } else {
+            $type = null;
+
+            if ($reflection->isPromoted()) {
+                // @phpstan-ignore-next-line / parameter is promoted so class exists for sure
+                $type = DocParser::propertyType($reflection->getDeclaringClass()->getProperty($reflection->name));
+            }
+
+            if ($type === null) {
+                $type = DocParser::parameterType($reflection);
+            }
+        }
 
         if ($type === null) {
             return null;
@@ -64,7 +78,7 @@ private function typeFromDocBlock(\ReflectionProperty|\ReflectionParameter|\Refl
         return $this->parseType($type, $reflection, $this->advancedParser);
     }
 
-    private function nativeType(\ReflectionProperty|\ReflectionParameter|\ReflectionFunctionAbstract $reflection): ?Type
+    private function nativeType(ReflectionProperty|ReflectionParameter|ReflectionFunctionAbstract $reflection): ?Type
     {
         $reflectionType = $reflection instanceof ReflectionFunctionAbstract
             ? $reflection->getReturnType()
@@ -83,7 +97,7 @@ private function nativeType(\ReflectionProperty|\ReflectionParameter|\Reflection
         return $this->parseType($type, $reflection, $this->nativeParser);
     }
 
-    private function parseType(string $raw, \ReflectionProperty|\ReflectionParameter|\ReflectionFunctionAbstract $reflection, TypeParser $parser): Type
+    private function parseType(string $raw, ReflectionProperty|ReflectionParameter|ReflectionFunctionAbstract $reflection, TypeParser $parser): Type
     {
         try {
             return $parser->parse($raw);

src/Library/Container.php

@@ -50,8 +50,6 @@
 use CuyZ\Valinor\Type\ClassType;
 use CuyZ\Valinor\Type\Parser\Factory\LexingTypeParserFactory;
 use CuyZ\Valinor\Type\Parser\Factory\TypeParserFactory;
-use CuyZ\Valinor\Type\Parser\Template\BasicTemplateParser;
-use CuyZ\Valinor\Type\Parser\Template\TemplateParser;
 use CuyZ\Valinor\Type\Parser\TypeParser;
 use CuyZ\Valinor\Type\ScalarType;
 use CuyZ\Valinor\Type\Types\ArrayType;
@@ -196,14 +194,10 @@ public function __construct(Settings $settings)
 
             AttributesRepository::class => fn () => new NativeAttributesRepository(),
 
-            TypeParserFactory::class => fn () => new LexingTypeParserFactory(
-                $this->get(TemplateParser::class)
-            ),
+            TypeParserFactory::class => fn () => new LexingTypeParserFactory(),
 
             TypeParser::class => fn () => $this->get(TypeParserFactory::class)->get(),
 
-            TemplateParser::class => fn () => new BasicTemplateParser(),
-
             RecursiveCacheWarmupService::class => fn () => new RecursiveCacheWarmupService(
                 $this->get(TypeParser::class),
                 $this->get(ObjectImplementations::class),

src/Type/Parser/Exception/Template/DuplicatedTemplateName.php

@@ -7,12 +7,15 @@
 use LogicException;
 
 /** @internal */
-final class DuplicatedTemplateName extends LogicException implements InvalidTemplate
+final class DuplicatedTemplateName extends LogicException
 {
-    public function __construct(string $template)
+    /**
+     * @param class-string $className
+     */
+    public function __construct(string $className, string $template)
     {
         parent::__construct(
-            "The template `$template` was defined at least twice.",
+            "The template `$template` in class `$className` was defined at least twice.",
             1604612898
         );
     }

src/Type/Parser/Exception/Template/InvalidClassTemplate.php

@@ -4,18 +4,19 @@
 
 namespace CuyZ\Valinor\Type\Parser\Exception\Template;
 
+use CuyZ\Valinor\Type\Parser\Exception\InvalidType;
 use LogicException;
 
 /** @internal */
-final class InvalidClassTemplate extends LogicException implements InvalidTemplate
+final class InvalidClassTemplate extends LogicException
 {
     /**
      * @param class-string $className
      */
-    public function __construct(string $className, InvalidTemplate $exception)
+    public function __construct(string $className, string $template, InvalidType $exception)
     {
         parent::__construct(
-            "Template error for class `$className`: {$exception->getMessage()}",
+            "Invalid template `$template` for class `$className`: {$exception->getMessage()}",
             1630092678,
             $exception
         );

src/Type/Parser/Factory/LexingTypeParserFactory.php

@@ -9,24 +9,21 @@
 use CuyZ\Valinor\Type\Parser\Lexer\AdvancedClassLexer;
 use CuyZ\Valinor\Type\Parser\Lexer\NativeLexer;
 use CuyZ\Valinor\Type\Parser\LexingParser;
-use CuyZ\Valinor\Type\Parser\Template\TemplateParser;
 use CuyZ\Valinor\Type\Parser\TypeParser;
 
 /** @internal */
 final class LexingTypeParserFactory implements TypeParserFactory
 {
     private TypeParser $nativeParser;
 
-    public function __construct(private TemplateParser $templateParser) {}
-
     public function get(TypeParserSpecification ...$specifications): TypeParser
     {
         if (empty($specifications)) {
             return $this->nativeParser ??= $this->nativeParser();
         }
 
         $lexer = new NativeLexer();
-        $lexer = new AdvancedClassLexer($lexer, $this, $this->templateParser);
+        $lexer = new AdvancedClassLexer($lexer, $this);
 
         foreach ($specifications as $specification) {
             $lexer = $specification->transform($lexer);
@@ -38,9 +35,9 @@ public function get(TypeParserSpecification ...$specifications): TypeParser
     private function nativeParser(): TypeParser
     {
         $lexer = new NativeLexer();
-        $lexer = new AdvancedClassLexer($lexer, $this, $this->templateParser);
-        $lexer = new LexingParser($lexer);
+        $lexer = new AdvancedClassLexer($lexer, $this);
+        $parser = new LexingParser($lexer);
 
-        return new CachedParser($lexer);
+        return new CachedParser($parser);
     }
 }

src/Type/Parser/Lexer/AdvancedClassLexer.php

@@ -8,23 +8,21 @@
 use CuyZ\Valinor\Type\Parser\Lexer\Token\ClassNameToken;
 use CuyZ\Valinor\Type\Parser\Lexer\Token\AdvancedClassNameToken;
 use CuyZ\Valinor\Type\Parser\Lexer\Token\Token;
-use CuyZ\Valinor\Type\Parser\Template\TemplateParser;
 
 /** @internal */
 final class AdvancedClassLexer implements TypeLexer
 {
     public function __construct(
         private TypeLexer $delegate,
         private TypeParserFactory $typeParserFactory,
-        private TemplateParser $templateParser
     ) {}
 
     public function tokenize(string $symbol): Token
     {
         $token = $this->delegate->tokenize($symbol);
 
         if ($token instanceof ClassNameToken) {
-            return new AdvancedClassNameToken($token, $this->typeParserFactory, $this->templateParser);
+            return new AdvancedClassNameToken($token, $this->typeParserFactory);
         }
 
         return $token;