[TypeInfo] Add result cache to TypeContextFactory

landure · landure · commit 8a9f8b58c844 · 2025-09-16T10:24:20.000+02:00
Add a cache to method with the aims to optimize deserialization and form validation. Closes #61725
diff --git a/src/Symfony/Component/TypeInfo/Tests/TypeContext/TypeContextFactoryTest.php b/src/Symfony/Component/TypeInfo/Tests/TypeContext/TypeContextFactoryTest.php
@@ -60,6 +60,13 @@ public function testCollectClassNames()
         $this->assertSame('Dummy', $typeContext->declaringClassName);
     }
 
+    public function testCacheResultWhenToStringTypeResolver()
+    {
+        $typeContext = $this->typeContextFactory->createFromClassName(Dummy::class, AbstractDummy::class);
+        $cachedtypeContext = $this->typeContextFactory->createFromClassName(Dummy::class, AbstractDummy::class);
+        $this->assertSame($typeContext, $cachedtypeContext);
+    }
+
     public function testCollectNamespace()
     {
         $namespace = 'Symfony\\Component\\TypeInfo\\Tests\\Fixtures';
diff --git a/src/Symfony/Component/TypeInfo/TypeContext/TypeContextFactory.php b/src/Symfony/Component/TypeInfo/TypeContext/TypeContextFactory.php
@@ -33,6 +33,7 @@
  *
  * @author Mathias Arlaud <mathias.arlaud@gmail.com>
  * @author Baptiste Leduc <baptiste.leduc@gmail.com>
+ * @author Pierre-Yves Landuré <landure@gmail.com>
  */
 final class TypeContextFactory
 {
@@ -41,6 +42,16 @@ final class TypeContextFactory
      */
     private static array $reflectionClassCache = [];
 
+    /**
+     * @var array<string,array<string,TypeContext>
+     */
+    private array $intermediateTypeContextCache = [];
+
+    /**
+     * @var array<string,array<string,TypeContext>
+     */
+    private array $typeContextCache = [];
+
     private ?Lexer $phpstanLexer = null;
     private ?PhpDocParser $phpstanParser = null;
 
@@ -53,26 +64,9 @@ public function createFromClassName(string $calledClassName, ?string $declaringC
     {
         $declaringClassName ??= $calledClassName;
 
-        $calledClassPath = explode('\\', $calledClassName);
-        $declaringClassPath = explode('\\', $declaringClassName);
-
-        $declaringClassReflection = self::$reflectionClassCache[$declaringClassName] ??= new \ReflectionClass($declaringClassName);
+        $this->typeContextCache[$declaringClassName][$calledClassName] ??= $this->createNewInstanceFromClassName($calledClassName, $declaringClassName);
 
-        $typeContext = new TypeContext(
-            end($calledClassPath),
-            end($declaringClassPath),
-            trim($declaringClassReflection->getNamespaceName(), '\\'),
-            $this->collectUses($declaringClassReflection),
-        );
-
-        return new TypeContext(
-            $typeContext->calledClassName,
-            $typeContext->declaringClassName,
-            $typeContext->namespace,
-            $typeContext->uses,
-            $this->collectTemplates($declaringClassReflection, $typeContext),
-            $this->collectTypeAliases($declaringClassReflection, $typeContext),
-        );
+        return $this->typeContextCache[$declaringClassName][$calledClassName];
     }
 
     public function createFromReflection(\Reflector $reflection): ?TypeContext
@@ -90,12 +84,7 @@ public function createFromReflection(\Reflector $reflection): ?TypeContext
             return null;
         }
 
-        $typeContext = new TypeContext(
-            $declaringClassReflection->getShortName(),
-            $declaringClassReflection->getShortName(),
-            $declaringClassReflection->getNamespaceName(),
-            $this->collectUses($declaringClassReflection),
-        );
+        $typeContext = $this->createIntermediateTypeContext($declaringClassReflection->getShortName(), $declaringClassReflection);
 
         $templates = match (true) {
             $reflection instanceof \ReflectionFunctionAbstract => $this->collectTemplates($reflection, $typeContext) + $this->collectTemplates($declaringClassReflection, $typeContext),
@@ -113,6 +102,39 @@ public function createFromReflection(\Reflector $reflection): ?TypeContext
         );
     }
 
+    private function createNewInstanceFromClassName(string $calledClassName, string $declaringClassName): TypeContext
+    {
+        $calledClassPath = explode('\\', $calledClassName);
+        $declaringClassPath = explode('\\', $declaringClassName);
+
+        $declaringClassReflection = self::$reflectionClassCache[$declaringClassName] ??= new \ReflectionClass($declaringClassName);
+
+        $typeContext = $this->createIntermediateTypeContext(end($calledClassPath), $declaringClassReflection);
+
+        return new TypeContext(
+            $typeContext->calledClassName,
+            $typeContext->declaringClassName,
+            $typeContext->namespace,
+            $typeContext->uses,
+            $this->collectTemplates($declaringClassReflection, $typeContext),
+            $this->collectTypeAliases($declaringClassReflection, $typeContext),
+        );
+    }
+
+    private function createIntermediateTypeContext(string $calledClassShortName, \ReflectionClass $declaringClassReflection): TypeContext
+    {
+        $declaringClassName = $declaringClassReflection->getName();
+
+        self::$intermediateTypeContextCache[$declaringClassName][$calledClassShortName] ??= new TypeContext(
+            $calledClassShortName,
+            $declaringClassReflection->getShortName(),
+            trim($declaringClassReflection->getNamespaceName(), '\\'),
+            $this->collectUses($declaringClassReflection),
+        );
+
+        return self::$intermediateTypeContextCache[$declaringClassName][$calledClassShortName];
+    }
+
     /**
      * @return array<string, string>
      */

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,13 @@ public function testCollectClassNames()`
`60`	`60`	`$this->assertSame('Dummy', $typeContext->declaringClassName);`
`61`	`61`	`}`
`62`	`62`
	`63`	`+ public function testCacheResultWhenToStringTypeResolver()`
	`64`	`+ {`
	`65`	`+ $typeContext = $this->typeContextFactory->createFromClassName(Dummy::class, AbstractDummy::class);`
	`66`	`+ $cachedtypeContext = $this->typeContextFactory->createFromClassName(Dummy::class, AbstractDummy::class);`
	`67`	`+ $this->assertSame($typeContext, $cachedtypeContext);`
	`68`	`+ }`
	`69`	`+`
`63`	`70`	`public function testCollectNamespace()`
`64`	`71`	`{`
`65`	`72`	`$namespace = 'Symfony\\Component\\TypeInfo\\Tests\\Fixtures';`