Merge pull request #10615 from weirdan/10589-fix-missing-MissingConst…

…ructor-with-native-mixed-property
vimeo · Jan 30, 2024 · baa8660 · baa8660
2 parents e02276a + ca9a12d
commit baa8660
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/Psalm/Internal/Analyzer/ClassAnalyzer.php b/src/Psalm/Internal/Analyzer/ClassAnalyzer.php
@@ -1127,8 +1127,11 @@ private function checkPropertyInitialization(
             $uninitialized_variables[] = '$this->' . $property_name;
             $uninitialized_properties[$property_class_name . '::$' . $property_name] = $property;
 
-            if ($property->type && !$property->type->isMixed()) {
-                $uninitialized_typed_properties[$property_class_name . '::$' . $property_name] = $property;
+            if ($property->type) {
+                // 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;
+                }
             }
         }
 

diff --git a/tests/PropertyTypeTest.php b/tests/PropertyTypeTest.php
@@ -3827,6 +3827,15 @@ class A {
                 ',
                 'error_message' => 'UndefinedPropertyAssignment',
             ],
+            'nativeMixedPropertyWithNoConstructor' => [
+                'code' => <<< 'PHP'
+                    <?php
+                    class A {
+                        public mixed $foo;
+                    }
+                PHP,
+                'error_message' => 'MissingConstructor',
+            ],
         ];
     }
 }