From 9b1fafae58b6c596d2627002f032ef5e87605ace Mon Sep 17 00:00:00 2001
From: Maarten Staa <maartenstaa@gmail.com>
Date: Sun, 3 Dec 2017 22:42:01 +0100
Subject: [PATCH] fix(diagnostics): update checking of $this usage to only
 error in static methods (#545)

---
 .../diagnostics/errors/this_in_function.php   |  6 ----
 fixtures/diagnostics/errors/this_in_root.php  |  3 --
 src/TreeAnalyzer.php                          |  6 ++--
 tests/Diagnostics/InvalidThisUsageTest.php    | 36 -------------------
 4 files changed, 2 insertions(+), 49 deletions(-)
 delete mode 100644 fixtures/diagnostics/errors/this_in_function.php
 delete mode 100644 fixtures/diagnostics/errors/this_in_root.php

diff --git a/fixtures/diagnostics/errors/this_in_function.php b/fixtures/diagnostics/errors/this_in_function.php
deleted file mode 100644
index db6139d..0000000
--- a/fixtures/diagnostics/errors/this_in_function.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-function foo()
-{
-    return $this;
-}
diff --git a/fixtures/diagnostics/errors/this_in_root.php b/fixtures/diagnostics/errors/this_in_root.php
deleted file mode 100644
index 95f5ed7..0000000
--- a/fixtures/diagnostics/errors/this_in_root.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-echo $this;
diff --git a/src/TreeAnalyzer.php b/src/TreeAnalyzer.php
index 37e2c16..c6bd6d7 100644
--- a/src/TreeAnalyzer.php
+++ b/src/TreeAnalyzer.php
@@ -99,11 +99,9 @@ class TreeAnalyzer
             // Find the first ancestor that's a class method. Return an error
             // if there is none, or if the method is static.
             $method = $node->getFirstAncestor(Node\MethodDeclaration::class);
-            if ($method === null || $method->isStatic()) {
+            if ($method->isStatic()) {
                 $this->diagnostics[] = new Diagnostic(
-                    $method === null
-                        ? "\$this can only be used in an object context."
-                        : "\$this can not be used in static methods.",
+                    "\$this can not be used in static methods.",
                     Range::fromNode($node),
                     null,
                     DiagnosticSeverity::ERROR,
diff --git a/tests/Diagnostics/InvalidThisUsageTest.php b/tests/Diagnostics/InvalidThisUsageTest.php
index 7542918..b7e8196 100644
--- a/tests/Diagnostics/InvalidThisUsageTest.php
+++ b/tests/Diagnostics/InvalidThisUsageTest.php
@@ -71,42 +71,6 @@ class InvalidThisUsageTest extends TestCase
         );
     }
 
-    public function testThisInFunctionProducesError()
-    {
-        $diagnostics = $this->collectDiagnostics(
-            __DIR__ . '/../../fixtures/diagnostics/errors/this_in_function.php'
-        );
-
-        $this->assertCount(1, $diagnostics);
-        $this->assertDiagnostic(
-            $diagnostics[0],
-            '$this can only be used in an object context.',
-            DiagnosticSeverity::ERROR,
-            new Range(
-                new Position(4, 11),
-                new Position(4, 16)
-            )
-        );
-    }
-
-    public function testThisInRoot()
-    {
-        $diagnostics = $this->collectDiagnostics(
-            __DIR__ . '/../../fixtures/diagnostics/errors/this_in_root.php'
-        );
-
-        $this->assertCount(1, $diagnostics);
-        $this->assertDiagnostic(
-            $diagnostics[0],
-            '$this can only be used in an object context.',
-            DiagnosticSeverity::ERROR,
-            new Range(
-                new Position(2, 5),
-                new Position(2, 10)
-            )
-        );
-    }
-
     public function testThisInMethodProducesNoError()
     {
         $diagnostics = $this->collectDiagnostics(