Merge pull request #798 from werlos/over-eager-stringable

Fix over-eager stringable matching

Author: kubawerlos

README.md

@@ -3,7 +3,7 @@
 [![Latest stable version](https://img.shields.io/packagist/v/kubawerlos/php-cs-fixer-custom-fixers.svg?label=current%20version)](https://packagist.org/packages/kubawerlos/php-cs-fixer-custom-fixers)
 [![PHP version](https://img.shields.io/packagist/php-v/kubawerlos/php-cs-fixer-custom-fixers.svg)](https://php.net)
 [![License](https://img.shields.io/github/license/kubawerlos/php-cs-fixer-custom-fixers.svg)](LICENSE)
-![Tests](https://img.shields.io/badge/tests-3450-brightgreen.svg)
+![Tests](https://img.shields.io/badge/tests-3451-brightgreen.svg)
 [![Downloads](https://img.shields.io/packagist/dt/kubawerlos/php-cs-fixer-custom-fixers.svg)](https://packagist.org/packages/kubawerlos/php-cs-fixer-custom-fixers)
 
 [![CI Status](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/workflows/CI/badge.svg?branch=main)](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/actions)

composer.json

@@ -31,6 +31,14 @@
             "Tests\\": "tests"
         }
     },
+    "config": {
+        "allow-plugins": {
+            "infection/extension-installer": false,
+            "ergebnis/composer-normalize": false,
+            "kubawerlos/composer-smaller-lock": false,
+            "phpstan/extension-installer": false
+        }
+    },
     "scripts": {
         "analyse": [
             "@install-dev-tools",

src/Fixer/StringableInterfaceFixer.php

@@ -86,17 +86,22 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
 
     private function doesHaveToStringMethod(Tokens $tokens, int $classStartIndex, int $classEndIndex): bool
     {
-        for ($index = $classStartIndex + 1; $index < $classEndIndex; $index++) {
-            if (!$tokens[$index]->isGivenKind(\T_FUNCTION)) {
+        $index = $classStartIndex;
+
+        while ($index < $classEndIndex) {
+            $index++;
+
+            if ($tokens[$index]->equals('{')) {
+                $index = $tokens->findBlockEnd(Tokens::BLOCK_TYPE_CURLY_BRACE, $index);
                 continue;
             }
 
-            $functionNameIndex = $tokens->getNextTokenOfKind($index, [[\T_STRING]]);
-
-            if ($functionNameIndex === null || $functionNameIndex > $classEndIndex) {
-                return false;
+            if (!$tokens[$index]->isGivenKind(\T_FUNCTION)) {
+                continue;
             }
 
+            $functionNameIndex = $tokens->getNextMeaningfulToken($index);
+
             if ($tokens[$functionNameIndex]->equals([\T_STRING, '__toString'], false)) {
                 return true;
             }

tests/Fixer/StringableInterfaceFixerTest.php

@@ -300,5 +300,17 @@ class Foo5 { public function __noString() { return "5"; } }
             ;
             ',
         ];
+
+        yield ['<?php
+            namespace Foo;
+            use Stringable;
+            class Bar {
+                public function foo() {
+                    new class () implements Stringable {
+                        public function __toString() { return ""; }
+                    };
+                }
+            }
+        '];
     }
 }