Don’t crash when conditionally defining classes with properties

vimeo · Mar 9, 2020 · 2c8688d · 2c8688d
1 parent 04bcc32
commit 2c8688d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/Psalm/Internal/Analyzer/ClassAnalyzer.php b/src/Psalm/Internal/Analyzer/ClassAnalyzer.php
@@ -1541,9 +1541,7 @@ private function checkForMissingPropertyType(
             );
 
             if (!$declaring_property_class) {
-                throw new \UnexpectedValueException(
-                    'Cannot get declaring class for ' . $property_id
-                );
+                return;
             }
 
             $fq_class_name = $declaring_property_class;

diff --git a/tests/ClassTest.php b/tests/ClassTest.php
@@ -525,6 +525,14 @@ public function get(): A {
                         echo A::SOME_CONST;
                     }'
             ],
+            'noCrashOnClassExists' => [
+                '<?php
+                    if (!class_exists(ReflectionGenerator::class)) {
+                        class ReflectionGenerator {
+                            private $prop;
+                        }
+                    }',
+            ]
         ];
     }