Fixed notice

slevomat · Aug 1, 2017 · 34ee67f · 34ee67f
1 parent e67db7d
commit 34ee67f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/SlevomatCodingStandard/Sniffs/Classes/UnusedPrivateElementsSniff.php b/SlevomatCodingStandard/Sniffs/Classes/UnusedPrivateElementsSniff.php
@@ -157,11 +157,15 @@ public function process(\PHP_CodeSniffer_File $phpcsFile, $classPointer)
 				$newTokenPointer = TokenHelper::findPreviousEffective($phpcsFile, $tokenPointer - 1);
 				if ($tokens[$newTokenPointer]['code'] === T_NEW) {
 					$variableTokenPointer = TokenHelper::findPreviousLocal($phpcsFile, T_VARIABLE, $newTokenPointer - 1);
-					$scopeMethodPointer = TokenHelper::findPrevious($phpcsFile, T_FUNCTION, $variableTokenPointer - 1);
-					for ($i = $tokens[$scopeMethodPointer]['scope_opener']; $i < $tokens[$scopeMethodPointer]['scope_closer']; $i++) {
-						if ($tokens[$i]['content'] === $tokens[$variableTokenPointer]['content']) {
-							$findUsagesStartTokenPointer = $checkVariable($i);
+					if ($variableTokenPointer !== null) {
+						$scopeMethodPointer = TokenHelper::findPrevious($phpcsFile, T_FUNCTION, $variableTokenPointer - 1);
+						for ($i = $tokens[$scopeMethodPointer]['scope_opener']; $i < $tokens[$scopeMethodPointer]['scope_closer']; $i++) {
+							if ($tokens[$i]['content'] === $tokens[$variableTokenPointer]['content']) {
+								$findUsagesStartTokenPointer = $checkVariable($i);
+							}
 						}
+					} else {
+						$findUsagesStartTokenPointer = $tokenPointer + 1;
 					}
 				} else {
 					$doubleColonTokenPointer = TokenHelper::findNextEffective($phpcsFile, $tokenPointer + 1);

diff --git a/tests/Sniffs/Classes/data/classWithPrivateMethodCalledOnSelfInstance.php b/tests/Sniffs/Classes/data/classWithPrivateMethodCalledOnSelfInstance.php
@@ -15,4 +15,9 @@ private function setUp()
 	{
 	}
 
+	public static function foo()
+	{
+		return new self();
+	}
+
 }
diff --git a/tests/Sniffs/Classes/data/classWithPrivateMethodCalledOnStaticInstance.php b/tests/Sniffs/Classes/data/classWithPrivateMethodCalledOnStaticInstance.php
@@ -5,7 +5,7 @@ class ClassWithPrivateMethodCalledOnSelfInstance
 
 	public static function create()
 	{
-		$self = new self();
+		$self = new static();
 		$self->setUp();
 
 		return $self;
@@ -15,4 +15,9 @@ private function setUp()
 	{
 	}
 
+	public static function foo()
+	{
+		return new static();
+	}
+
 }