Merge branch '2.15' into 2.16

Author: keradus

.circleci/config.yml

@@ -3,7 +3,8 @@ version: 2
 jobs:
     build:
         macos:
-            xcode: '11.7.0'
+            # https://circleci.com/docs/2.0/testing-ios/#supported-xcode-versions
+            xcode: '12.2.0'
         steps:
             - checkout
 

src/Fixer/ClassNotation/NoUnneededFinalMethodFixer.php

@@ -90,6 +90,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens)
     private function fixClass(Tokens $tokens, $classOpenIndex, $classIsFinal)
     {
         $tokensCount = \count($tokens);
+
         for ($index = $classOpenIndex + 1; $index < $tokensCount; ++$index) {
             // Class end
             if ($tokens[$index]->equals('}')) {
@@ -107,15 +108,16 @@ private function fixClass(Tokens $tokens, $classOpenIndex, $classIsFinal)
                 continue;
             }
 
-            if (!$classIsFinal && !$this->isPrivateMethod($tokens, $index, $classOpenIndex)) {
+            if (!$classIsFinal && !$this->isPrivateMethodOtherThanConstructor($tokens, $index, $classOpenIndex)) {
                 continue;
             }
 
             $tokens->clearAt($index);
 
-            $nextTokenIndex = $index + 1;
-            if ($tokens[$nextTokenIndex]->isWhitespace()) {
-                $tokens->clearAt($nextTokenIndex);
+            ++$index;
+
+            if ($tokens[$index]->isWhitespace()) {
+                $tokens->clearAt($index);
             }
         }
     }
@@ -126,18 +128,19 @@ private function fixClass(Tokens $tokens, $classOpenIndex, $classIsFinal)
      *
      * @return bool
      */
-    private function isPrivateMethod(Tokens $tokens, $index, $classOpenIndex)
+    private function isPrivateMethodOtherThanConstructor(Tokens $tokens, $index, $classOpenIndex)
     {
         $index = max($classOpenIndex + 1, $tokens->getPrevTokenOfKind($index, [';', '{', '}']));
+        $private = false;
 
         while (!$tokens[$index]->isGivenKind(T_FUNCTION)) {
             if ($tokens[$index]->isGivenKind(T_PRIVATE)) {
-                return true;
+                $private = true;
             }
 
-            ++$index;
+            $index = $tokens->getNextMeaningfulToken($index);
         }
 
-        return false;
+        return $private && '__construct' !== strtolower($tokens[$tokens->getNextMeaningfulToken($index)]->getContent());
     }
 }

tests/Fixer/ClassNotation/NoUnneededFinalMethodFixerTest.php

@@ -217,6 +217,15 @@ private final function bar() {}
             'trait' => [
                 '<php trait Foo { final public function foo() {} }',
             ],
+            'do not fix constructors' => [
+                '<?php
+class Bar
+{
+    final private function __construct()
+    {
+    }
+}',
+            ],
         ];
     }