Minor property hook improvements

Author: danog

psalm-baseline.xml

@@ -2545,6 +2545,13 @@
       <code><![CDATA[$this_var_id]]></code>
     </RiskyTruthyFalsyComparison>
   </file>
+  <file src="src/Psalm/Storage/PropertyHookStorage.php">
+    <PossiblyUnusedProperty>
+      <code><![CDATA[$by_ref]]></code>
+      <code><![CDATA[$is_final]]></code>
+      <code><![CDATA[$location]]></code>
+    </PossiblyUnusedProperty>
+  </file>
   <file src="src/Psalm/Type.php">
     <RiskyTruthyFalsyComparison>
       <code><![CDATA[!$namespace]]></code>

src/Psalm/Internal/Analyzer/ClassAnalyzer.php

@@ -1128,7 +1128,7 @@ private function checkPropertyInitialization(
             $uninitialized_variables[] = '$this->' . $property_name;
             $uninitialized_properties[$property_class_name . '::$' . $property_name] = $property;
 
-            if ($property->type) {
+            if ($property->type && !$property->hook_get) {
                 // Complain about all natively typed properties and all non-mixed docblock typed properties
                 if (!$property->type->from_docblock || !$property->type->isMixed()) {
                     $uninitialized_typed_properties[$property_class_name . '::$' . $property_name] = $property;

src/Psalm/Internal/Analyzer/Statements/Expression/Assignment/InstancePropertyAssignmentAnalyzer.php

@@ -67,7 +67,6 @@
 use Psalm\Node\VirtualIdentifier;
 use Psalm\Plugin\EventHandler\Event\AddRemoveTaintsEvent;
 use Psalm\Storage\ClassLikeStorage;
-use Psalm\Storage\PropertyHookStorage;
 use Psalm\Storage\PropertyStorage;
 use Psalm\Type;
 use Psalm\Type\Atomic;
@@ -80,7 +79,6 @@
 use Psalm\Type\Union;
 use UnexpectedValueException;
 
-use function array_any;
 use function array_diff;
 use function array_merge;
 use function array_pop;
@@ -992,10 +990,8 @@ private static function analyzeAtomicAssignment(
                 $interface_property = $stmt->name instanceof PhpParser\Node\Identifier
                     ? $interface_storage->properties[$stmt->name->name] ?? null
                     : null;
-                $has_set_hook = $codebase->analysis_php_version_id >= 8_04_00 && array_any(
-                    $interface_property?->hooks ?? [],
-                    static fn(PropertyHookStorage $hook) => $hook->name === 'set',
-                );
+                $has_set_hook = $codebase->analysis_php_version_id >= 8_04_00
+                    && $interface_property?->hook_set !== null;
 
                 if (!$class_exists && !$has_set_hook) {
                     if (IssueBuffer::accepts(

src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/AtomicPropertyFetchAnalyzer.php

@@ -48,7 +48,6 @@
 use Psalm\Node\VirtualIdentifier;
 use Psalm\Plugin\EventHandler\Event\AddRemoveTaintsEvent;
 use Psalm\Storage\ClassLikeStorage;
-use Psalm\Storage\PropertyHookStorage;
 use Psalm\Type;
 use Psalm\Type\Atomic;
 use Psalm\Type\Atomic\TEnumCase;
@@ -64,7 +63,6 @@
 use Psalm\Type\Atomic\TTemplateParam;
 use Psalm\Type\Union;
 
-use function array_any;
 use function array_diff;
 use function array_filter;
 use function array_keys;
@@ -1179,10 +1177,8 @@ private static function handleNonExistentClass(
             $interface_property = $stmt->name instanceof PhpParser\Node\Identifier
                 ? $interface_storage->properties[$stmt->name->name] ?? null
                 : null;
-            $has_get_hook = $codebase->analysis_php_version_id >= 8_04_00 && array_any(
-                $interface_property?->hooks ?? [],
-                static fn(PropertyHookStorage $hook) => $hook->name === 'get',
-            );
+            $has_get_hook = $codebase->analysis_php_version_id >= 8_04_00 &&
+                $interface_property?->hook_get !== null;
 
             if (!$class_exists && !$is_enum_interface && !$has_get_hook) {
                 if (IssueBuffer::accepts(

src/Psalm/Internal/PhpVisitor/Reflector/ClassLikeNodeScanner.php

@@ -80,7 +80,6 @@
 use function assert;
 use function count;
 use function implode;
-use function in_array;
 use function ltrim;
 use function preg_match;
 use function preg_split;
@@ -1811,17 +1810,25 @@ private function visitPropertyDeclaration(
             // Process property hooks
             foreach ($stmt->hooks as $hook) {
                 $hook_name = strtolower($hook->name->toString());
-                if (in_array($hook_name, ['get', 'set'], true)) {
-                    $hook_storage = new PropertyHookStorage($hook_name);
-                    $hook_storage->is_final = $hook->isFinal();
-                    $hook_storage->by_ref = $hook->byRef;
-                    $hook_storage->location = new CodeLocation(
-                        $this->file_scanner,
-                        $hook,
-                        null,
-                        true,
+                if ($hook_name === 'get'
+                    || $hook_name === 'set'
+                ) {
+                    $hook_storage = new PropertyHookStorage(
+                        $hook_name === 'get',
+                        $hook->isFinal(),
+                        $hook->byRef,
+                        new CodeLocation(
+                            $this->file_scanner,
+                            $hook,
+                            null,
+                            true,
+                        ),
                     );
-                    $property_storage->hooks[$hook_name] = $hook_storage;
+                    if ($hook_storage->is_get) {
+                        $property_storage->hook_get = $hook_storage;
+                    } else {
+                        $property_storage->hook_set = $hook_storage;
+                    }
                 } else {
                     $storage->docblock_issues[] = new ParseError(
                         'Property hooks must be either "get" or "set"',
@@ -1832,7 +1839,7 @@ private function visitPropertyDeclaration(
 
             // Validate interface properties
             if ($storage->is_interface && $this->codebase->analysis_php_version_id >= 8_04_00) {
-                if (empty($property_storage->hooks)) {
+                if (!$property_storage->hook_get && !$property_storage->hook_set) {
                     $storage->docblock_issues[] = new ParseError(
                         'Interface properties must have at least one hook',
                         new CodeLocation($this->file_scanner, $stmt, null, true),

src/Psalm/Storage/PropertyHookStorage.php

@@ -8,24 +8,18 @@
 
 /**
  * Storage for property hooks ('get' & 'set') introduced in PHP 8.4
+ *
+ * @psalm-immutable
  */
 final class PropertyHookStorage
 {
     use UnserializeMemoryUsageSuppressionTrait;
 
-    public bool $is_final = false;
-
-    /**
-     * Whether the hook returns by reference
-     */
-    public bool $by_ref = false;
-
-    public ?CodeLocation $location = null;
-
-    /**
-     * @param 'get'|'set' $name
-     */
-    public function __construct(public string $name)
-    {
+    public function __construct(
+        public bool $is_get,
+        public bool $is_final,
+        public bool $by_ref,
+        public ?CodeLocation $location,
+    ) {
     }
 }

src/Psalm/Storage/PropertyStorage.php

@@ -67,10 +67,8 @@ final class PropertyStorage implements HasAttributesInterface
 
     public ?string $description = null;
 
-    /**
-     * @var array<string, PropertyHookStorage>
-     */
-    public array $hooks = [];
+    public ?PropertyHookStorage $hook_get = null;
+    public ?PropertyHookStorage $hook_set = null;
 
     public function getInfo(): string
     {