Merge branch '2.14'

Author: keradus

src/Fixer/Operator/IncrementStyleFixer.php

@@ -137,6 +137,7 @@ private function findEnd(Tokens $tokens, $index)
             [CT::T_DYNAMIC_PROP_BRACE_OPEN],
             [CT::T_DYNAMIC_VAR_BRACE_OPEN],
             [T_NS_SEPARATOR],
+            [T_STATIC],
             [T_STRING],
             [T_VARIABLE],
         ])) {
@@ -194,11 +195,11 @@ private function findStart(Tokens $tokens, $index)
 
         if ($prevToken->isGivenKind(T_PAAMAYIM_NEKUDOTAYIM)) {
             $prevPrevIndex = $tokens->getPrevMeaningfulToken($prevIndex);
-            if (!$tokens[$prevPrevIndex]->isGivenKind(T_STRING)) {
+            if (!$tokens[$prevPrevIndex]->isGivenKind([T_STATIC, T_STRING])) {
                 return $this->findStart($tokens, $prevIndex);
             }
 
-            $index = $tokens->getTokenNotOfKindSibling($prevIndex, -1, [[T_NS_SEPARATOR], [T_STRING]]);
+            $index = $tokens->getTokenNotOfKindSibling($prevIndex, -1, [[T_NS_SEPARATOR], [T_STATIC], [T_STRING]]);
             $index = $tokens->getNextMeaningfulToken($index);
         }
 

tests/Fixer/FunctionNotation/MethodArgumentSpaceFixerTest.php

@@ -34,21 +34,25 @@ final class MethodArgumentSpaceFixerTest extends AbstractFixerTestCase
      */
     public function testFix($expected, $input = null, array $configuration = null)
     {
-        if (null !== $configuration) {
-            $this->fixer->configure($configuration);
-        }
         $indent = '    ';
         $lineEnding = "\n";
-        if (null !== $input) {
-            if (false !== strpos($input, "\t")) {
+
+        if (null !== $expected) {
+            if (false !== strpos($expected, "\t")) {
                 $indent = "\t";
-            } elseif (preg_match('/\n  \S/', $input)) {
+            } elseif (preg_match('/\n  \S/', $expected)) {
                 $indent = '  ';
             }
-            if (false !== strpos($input, "\r")) {
+
+            if (false !== strpos($expected, "\r")) {
                 $lineEnding = "\r\n";
             }
         }
+
+        if (null !== $configuration) {
+            $this->fixer->configure($configuration);
+        }
+
         $this->fixer->setWhitespacesConfig(new WhitespacesFixerConfig(
             $indent,
             $lineEnding

tests/Fixer/Operator/IncrementStyleFixerTest.php

@@ -138,6 +138,36 @@ public function provideFixPreIncrementCases()
             ['<?php foo($a, ++$b);'],
             ['<?php $a[++$b];'],
             ['<?php echo ++$a;'],
+
+            [
+                '<?php class Test {
+    public function foo() {
+        $a = 123;
+        ++self::$st;
+    }
+}',
+                '<?php class Test {
+    public function foo() {
+        $a = 123;
+        self::$st++;
+    }
+}',
+            ],
+
+            [
+                '<?php class Test {
+    public function foo() {
+        $a = 123;
+        ++static::$st;
+    }
+}',
+                '<?php class Test {
+    public function foo() {
+        $a = 123;
+        static::$st++;
+    }
+}',
+            ],
         ];
     }
 }