Merge branch '2.3'

keradus · keradus · commit 5d509fbed1c7 · 2017-06-08T21:56:04.000+02:00
diff --git a/src/Fixer/ClassNotation/SelfAccessorFixer.php b/src/Fixer/ClassNotation/SelfAccessorFixer.php
@@ -115,8 +115,8 @@ private function replaceNameOccurrences(Tokens $tokens, $name, $startIndex, $end
             $prevToken = $tokens[$tokens->getPrevMeaningfulToken($i)];
             $nextToken = $tokens[$tokens->getNextMeaningfulToken($i)];
 
-            // skip tokens that are part of a fully qualified name
-            if ($prevToken->isGivenKind(T_NS_SEPARATOR) || $nextToken->isGivenKind(T_NS_SEPARATOR)) {
+            // skip tokens that are part of a fully qualified name or used in class property access
+            if ($prevToken->isGivenKind([T_NS_SEPARATOR, T_OBJECT_OPERATOR]) || $nextToken->isGivenKind(T_NS_SEPARATOR)) {
                 continue;
             }
 
diff --git a/tests/Fixer/ClassNotation/SelfAccessorFixerTest.php b/tests/Fixer/ClassNotation/SelfAccessorFixerTest.php
@@ -113,6 +113,9 @@ public function provide70Cases()
                     new class() { function baz() { new Foo(); } };
                 } }',
             ],
+            [
+                '<?php class Foo { protected $foo; function bar() { return $this->foo::find(2); } }',
+            ],
         ];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -115,8 +115,8 @@ private function replaceNameOccurrences(Tokens $tokens, $name, $startIndex, $end`
`115`	`115`	`$prevToken = $tokens[$tokens->getPrevMeaningfulToken($i)];`
`116`	`116`	`$nextToken = $tokens[$tokens->getNextMeaningfulToken($i)];`
`117`	`117`
`118`		`- // skip tokens that are part of a fully qualified name`
`119`		`- if ($prevToken->isGivenKind(T_NS_SEPARATOR) \|\| $nextToken->isGivenKind(T_NS_SEPARATOR)) {`
	`118`	`+ // skip tokens that are part of a fully qualified name or used in class property access`
	`119`	`+ if ($prevToken->isGivenKind([T_NS_SEPARATOR, T_OBJECT_OPERATOR]) \|\| $nextToken->isGivenKind(T_NS_SEPARATOR)) {`
`120`	`120`	`continue;`
`121`	`121`	`}`
`122`	`122`
Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,9 @@ public function provide70Cases()`
`113`	`113`	`new class() { function baz() { new Foo(); } };`
`114`	`114`	`} }',`
`115`	`115`	`],`
	`116`	`+ [`
	`117`	`+ '<?php class Foo { protected $foo; function bar() { return $this->foo::find(2); } }',`
	`118`	`+ ],`
`116`	`119`	`];`
`117`	`120`	`}`
`118`	`121`	`}`