Fix #1974 - prevent bad property defaults on static properties

vimeo · Jul 30, 2019 · f718c2f · f718c2f
1 parent c887d90
commit f718c2f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/src/Psalm/Internal/Analyzer/StatementsAnalyzer.php b/src/Psalm/Internal/Analyzer/StatementsAnalyzer.php
@@ -637,17 +637,15 @@ function ($line) {
                         ExpressionAnalyzer::analyze($this, $prop->default, $context);
 
                         if (isset($prop->default->inferredType)) {
-                            if (!$stmt->isStatic()) {
-                                if (PropertyAssignmentAnalyzer::analyzeInstance(
-                                    $this,
-                                    $prop,
-                                    $prop->name->name,
-                                    $prop->default,
-                                    $prop->default->inferredType,
-                                    $context
-                                ) === false) {
-                                    // fall through
-                                }
+                            if (PropertyAssignmentAnalyzer::analyzeInstance(
+                                $this,
+                                $prop,
+                                $prop->name->name,
+                                $prop->default,
+                                $prop->default->inferredType,
+                                $context
+                            ) === false) {
+                                // fall through
                             }
                         }
                     }

diff --git a/tests/PropertyTypeTest.php b/tests/PropertyTypeTest.php
@@ -2569,6 +2569,16 @@ public function __construct() {
                     }',
                 'error_message' => 'UninitializedProperty',
             ],
+            'badStaticPropertyDefault' => [
+                '<?php
+                    class TestStatic {
+                        /**
+                         * @var array<string, bool>
+                         */
+                        public static $test = ["string-key" => 1];
+                    }',
+                'error_message' => 'InvalidPropertyAssignmentValue'
+            ],
         ];
     }
 }