Fix #37 - check parent calls for staticness

vimeo · Jan 30, 2017 · d978966 · d978966
1 parent a45c477
commit d978966
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 1 deletion.
diff --git a/src/Psalm/Checker/Statements/Expression/CallChecker.php b/src/Psalm/Checker/Statements/Expression/CallChecker.php
@@ -955,7 +955,7 @@ public static function analyzeStaticCall(
                 }
 
                 if ($stmt->class instanceof PhpParser\Node\Name
-                    && $stmt->class->parts[0] !== 'parent'
+                    && ($stmt->class->parts[0] !== 'parent' || $statements_checker->isStatic())
                     && (!$context->self
                         || $statements_checker->isStatic()
                         || !ClassChecker::classExtends($context->self, $fq_class_name)

diff --git a/tests/MethodCallTest.php b/tests/MethodCallTest.php
@@ -53,6 +53,56 @@ public function barBar() : void {}
         $file_checker->visitAndAnalyzeMethods($context);
     }
 
+    /**
+     * @expectedException        \Psalm\Exception\CodeException
+     * @expectedExceptionMessage InvalidStaticInvocation
+     * @return                   void
+     */
+    public function testInvalidParentStaticCall()
+    {
+        $stmts = self::$parser->parse('<?php
+        class A {
+            /** @return void */
+            public function foo(){}
+        }
+
+        class B extends A {
+            /** @return void */
+            public static function bar(){
+                parent::foo();
+            }
+        }
+        ');
+
+        $file_checker = new FileChecker('somefile.php', $this->project_checker, $stmts);
+        $context = new Context();
+        $file_checker->visitAndAnalyzeMethods($context);
+    }
+
+    /**
+     * @return void
+     */
+    public function testValidParentStaticCall()
+    {
+        $stmts = self::$parser->parse('<?php
+        class A {
+            /** @return void */
+            public static function foo(){}
+        }
+
+        class B extends A {
+            /** @return void */
+            public static function bar(){
+                parent::foo();
+            }
+        }
+        ');
+
+        $file_checker = new FileChecker('somefile.php', $this->project_checker, $stmts);
+        $context = new Context();
+        $file_checker->visitAndAnalyzeMethods($context);
+    }
+
     /**
      * @return void
      */