Fix #4540 - use correct method when simulating property setting

vimeo · Nov 13, 2020 · 5a62dc5 · 5a62dc5
1 parent 556fb12
commit 5a62dc5
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/...nal/Analyzer/Statements/Expression/Call/StaticMethod/ExistingAtomicStaticCallAnalyzer.php b/...nal/Analyzer/Statements/Expression/Call/StaticMethod/ExistingAtomicStaticCallAnalyzer.php
@@ -80,7 +80,7 @@ public static function analyze(
                 $file_analyzer = $statements_analyzer->getFileAnalyzer();
 
                 if ($context->collect_mutations) {
-                    $file_analyzer->getMethodMutations($method_id, $context);
+                    $file_analyzer->getMethodMutations($appearing_method_id, $context);
                 } else {
                     // collecting initializations
                     $local_vars_in_scope = [];
@@ -98,14 +98,14 @@ public static function analyze(
                         }
                     }
 
-                    if (!isset($context->initialized_methods[(string) $method_id])) {
+                    if (!isset($context->initialized_methods[(string) $appearing_method_id])) {
                         if ($context->initialized_methods === null) {
                             $context->initialized_methods = [];
                         }
 
-                        $context->initialized_methods[(string) $method_id] = true;
+                        $context->initialized_methods[(string) $appearing_method_id] = true;
 
-                        $file_analyzer->getMethodMutations($method_id, $context);
+                        $file_analyzer->getMethodMutations($appearing_method_id, $context);
 
                         foreach ($local_vars_in_scope as $var => $type) {
                             $context->vars_in_scope[$var] = $type;

diff --git a/tests/PropertyTypeTest.php b/tests/PropertyTypeTest.php
@@ -2121,6 +2121,27 @@ public function bar() : int {
                         }
                     }'
             ],
+            'skipConstructor' => [
+                '<?php
+                    class A {
+                        protected string $s;
+
+                        public function __construct() {
+                            $this->s = "hello";
+                        }
+                    }
+
+                    class B extends A {}
+
+                    class C extends B {
+                        public function __construct()
+                        {
+                            parent::__construct();
+
+                            echo $this->s;
+                        }
+                    }'
+            ],
         ];
     }