misc: handle class name in function definition

romm · Mar 17, 2022 · e2451df · e2451df
1 parent 1a599b0
commit e2451df
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 4 deletions.
diff --git a/src/Definition/FunctionDefinition.php b/src/Definition/FunctionDefinition.php
@@ -17,10 +17,22 @@ final class FunctionDefinition
 
     private Type $returnType;
 
-    public function __construct(string $name, string $signature, Parameters $parameters, Type $returnType)
-    {
+    /** @var class-string|null */
+    private ?string $class;
+
+    /**
+     * @param class-string|null $class
+     */
+    public function __construct(
+        string $name,
+        string $signature,
+        ?string $class,
+        Parameters $parameters,
+        Type $returnType
+    ) {
         $this->name = $name;
         $this->signature = $signature;
+        $this->class = $class;
         $this->parameters = $parameters;
         $this->returnType = $returnType;
     }
@@ -35,6 +47,14 @@ public function signature(): string
         return $this->signature;
     }
 
+    /**
+     * @return class-string|null
+     */
+    public function class(): ?string
+    {
+        return $this->class;
+    }
+
     /**
      * @phpstan-return Parameters
      * @return Parameters&ParameterDefinition[]

diff --git a/src/Definition/Repository/Cache/Compiler/FunctionDefinitionCompiler.php b/src/Definition/Repository/Cache/Compiler/FunctionDefinitionCompiler.php
@@ -8,6 +8,8 @@
 use CuyZ\Valinor\Definition\FunctionDefinition;
 use CuyZ\Valinor\Definition\ParameterDefinition;
 
+use function var_export;
+
 /** @internal */
 final class FunctionDefinitionCompiler implements CacheCompiler
 {
@@ -30,13 +32,15 @@ public function compile($value): string
             iterator_to_array($value->parameters())
         );
 
+        $class = var_export($value->class(), true);
         $parameters = implode(', ', $parameters);
         $returnType = $this->typeCompiler->compile($value->returnType());
 
         return <<<PHP
             new \CuyZ\Valinor\Definition\FunctionDefinition(
                 '{$value->name()}',
                 '{$value->signature()}',
+                $class,
                 new \CuyZ\Valinor\Definition\Parameters($parameters),
                 $returnType
             )

diff --git a/src/Definition/Repository/Reflection/ReflectionFunctionDefinitionRepository.php b/src/Definition/Repository/Reflection/ReflectionFunctionDefinitionRepository.php
@@ -9,6 +9,8 @@
 use CuyZ\Valinor\Definition\Repository\AttributesRepository;
 use CuyZ\Valinor\Definition\Repository\FunctionDefinitionRepository;
 use CuyZ\Valinor\Type\Parser\Factory\Specifications\AliasSpecification;
+use CuyZ\Valinor\Type\Parser\Factory\Specifications\ClassContextSpecification;
+use CuyZ\Valinor\Type\Parser\Factory\Specifications\HandleClassGenericSpecification;
 use CuyZ\Valinor\Type\Parser\Factory\TypeParserFactory;
 use CuyZ\Valinor\Utility\Reflection\Reflection;
 use ReflectionFunction;
@@ -43,15 +45,28 @@ public function for(callable $function): FunctionDefinition
         return new FunctionDefinition(
             $reflection->getName(),
             Reflection::signature($reflection),
+            // @PHP 8.0 nullsafe operator
+            $reflection->getClosureScopeClass() ? $reflection->getClosureScopeClass()->name : null,
             new Parameters(...$parameters),
             $returnType
         );
     }
 
     private function typeResolver(ReflectionFunction $reflection): ReflectionTypeResolver
     {
-        $advancedParser = $this->typeParserFactory->get(new AliasSpecification($reflection));
-        $nativeParser = $this->typeParserFactory->get();
+        $class = $reflection->getClosureScopeClass();
+
+        $nativeSpecifications = [];
+        $advancedSpecification = [new AliasSpecification($reflection)];
+
+        if ($class !== null) {
+            $nativeSpecifications[] = new ClassContextSpecification($class->name);
+            $advancedSpecification[] = new ClassContextSpecification($class->name);
+            $advancedSpecification[] = new HandleClassGenericSpecification();
+        }
+
+        $nativeParser = $this->typeParserFactory->get(...$nativeSpecifications);
+        $advancedParser = $this->typeParserFactory->get(...$advancedSpecification);
 
         return new ReflectionTypeResolver($nativeParser, $advancedParser);
     }

diff --git a/tests/Fake/Definition/FakeFunctionDefinition.php b/tests/Fake/Definition/FakeFunctionDefinition.php
@@ -9,6 +9,7 @@
 use CuyZ\Valinor\Definition\ParameterDefinition;
 use CuyZ\Valinor\Definition\Parameters;
 use CuyZ\Valinor\Type\Types\NativeStringType;
+use stdClass;
 
 final class FakeFunctionDefinition
 {
@@ -17,6 +18,7 @@ public static function new(): FunctionDefinition
         return new FunctionDefinition(
             'foo',
             'foo:42-1337',
+            stdClass::class,
             new Parameters(
                 new ParameterDefinition(
                     'bar',

diff --git a/tests/Functional/Definition/Repository/Cache/Compiler/FunctionDefinitionCompilerTest.php b/tests/Functional/Definition/Repository/Cache/Compiler/FunctionDefinitionCompilerTest.php
@@ -12,6 +12,7 @@
 use CuyZ\Valinor\Type\Types\NativeStringType;
 use Error;
 use PHPUnit\Framework\TestCase;
+use stdClass;
 
 final class FunctionDefinitionCompilerTest extends TestCase
 {
@@ -29,6 +30,7 @@ public function test_function_is_compiled_correctly(): void
         $function = new FunctionDefinition(
             'foo',
             'foo:42-1337',
+            stdClass::class,
             new Parameters(
                 new ParameterDefinition(
                     'bar',
@@ -48,6 +50,7 @@ public function test_function_is_compiled_correctly(): void
 
         self::assertSame('foo', $compiledFunction->name());
         self::assertSame('foo:42-1337', $compiledFunction->signature());
+        self::assertSame(stdClass::class, $compiledFunction->class());
         self::assertTrue($compiledFunction->parameters()->has('bar'));
         self::assertInstanceOf(NativeStringType::class, $compiledFunction->returnType());
     }