refactor

Author: michalsn

system/Database/BaseConnection.php

@@ -468,17 +468,29 @@ private function castScalarValueForTypedProperty(mixed $value, array $types): mi
     private function getBuiltinPropertyTypesMap(array $properties): array
     {
         $className = static::class;
+        $requested = array_fill_keys($properties, true);
 
         if (! isset(self::$propertyBuiltinTypesCache[$className])) {
             self::$propertyBuiltinTypesCache[$className] = [];
+        }
+
+        // Fill only the properties requested by this call that are not cached yet.
+        $missing = array_diff_key($requested, self::$propertyBuiltinTypesCache[$className]);
 
+        if ($missing !== []) {
             $reflection = new ReflectionClass($className);
 
             foreach ($reflection->getProperties() as $property) {
+                $propertyName = $property->getName();
+
+                if (! isset($missing[$propertyName])) {
+                    continue;
+                }
+
                 $type = $property->getType();
 
                 if (! $type instanceof ReflectionType) {
-                    self::$propertyBuiltinTypesCache[$className][$property->getName()] = [];
+                    self::$propertyBuiltinTypesCache[$className][$propertyName] = [];
 
                     continue;
                 }
@@ -498,7 +510,12 @@ private function getBuiltinPropertyTypesMap(array $properties): array
                     $builtinTypes[] = 'null';
                 }
 
-                self::$propertyBuiltinTypesCache[$className][$property->getName()] = $builtinTypes;
+                self::$propertyBuiltinTypesCache[$className][$propertyName] = $builtinTypes;
+            }
+
+            // Untyped or unresolved properties are cached as empty to avoid re-reflecting them.
+            foreach (array_keys($missing) as $propertyName) {
+                self::$propertyBuiltinTypesCache[$className][$propertyName] ??= [];
             }
         }
 

tests/system/Database/BaseConnectionTest.php

@@ -187,6 +187,30 @@ public function getWithTrue(): int|true
         $this->assertTrue($db->getWithTrue());
     }
 
+    public function testCachesTypedPropertiesIncrementally(): void
+    {
+        $factory = fn (array $options) => new class ($options) extends MockConnection {
+            protected ?int $synchronous = null;
+            protected ?int $busyTimeout = null;
+
+            public function getSynchronous(): ?int
+            {
+                return $this->synchronous;
+            }
+
+            public function getBusyTimeout(): ?int
+            {
+                return $this->busyTimeout;
+            }
+        };
+
+        $first = $factory([...$this->options, 'synchronous' => '1']);
+        $second = $factory([...$this->options, 'busyTimeout' => '4000']);
+
+        $this->assertSame(1, $first->getSynchronous());
+        $this->assertSame(4000, $second->getBusyTimeout());
+    }
+
     public function testInvalidStringValueForTypedPropertyThrowsTypeError(): void
     {
         $this->expectException(TypeError::class);