late nameScope creation

mvhirsch · mvhirsch · commit 83ab05c05ffc · 2024-05-17T11:45:55.000+02:00
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/PhpStanExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/PhpStanExtractor.php
@@ -94,8 +94,6 @@ public function getTypes(string $class, string $property, array $context = []):
             return null;
         }
 
-        $nameScope = $this->contexts[$class.$declaringClass] ??= $this->nameScopeFactory->create($class, $declaringClass);
-
         switch ($source) {
             case self::PROPERTY:
                 $tag = '@var';
@@ -125,6 +123,7 @@ public function getTypes(string $class, string $property, array $context = []):
                 continue;
             }
 
+            $nameScope = $this->contexts[$class.'/'.$declaringClass] ??= $this->nameScopeFactory->create($class, $declaringClass);
             foreach ($this->phpStanTypeHelper->getTypes($tagDocNode->value, $nameScope) as $type) {
                 switch ($type->getClassName()) {
                     case 'self':

Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,6 @@ public function getTypes(string $class, string $property, array $context = []):`
`94`	`94`	`return null;`
`95`	`95`	`}`
`96`	`96`
`97`		`- $nameScope = $this->contexts[$class.$declaringClass] ??= $this->nameScopeFactory->create($class, $declaringClass);`
`98`		`-`
`99`	`97`	`switch ($source) {`
`100`	`98`	`case self::PROPERTY:`
`101`	`99`	`$tag = '@var';`
`@@ -125,6 +123,7 @@ public function getTypes(string $class, string $property, array $context = []):`
`125`	`123`	`continue;`
`126`	`124`	`}`
`127`	`125`
	`126`	`+ $nameScope = $this->contexts[$class.'/'.$declaringClass] ??= $this->nameScopeFactory->create($class, $declaringClass);`
`128`	`127`	`foreach ($this->phpStanTypeHelper->getTypes($tagDocNode->value, $nameScope) as $type) {`
`129`	`128`	`switch ($type->getClassName()) {`
`130`	`129`	`case 'self':`