fix: FullyQualifiedStrictTypesFixer - do not modify statements with…

… property fetch and `::` (#7749)
PHP-CS-Fixer · Jan 16, 2024 · e3afa32 · e3afa32
1 parent 64d0009
commit e3afa32
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/src/Fixer/Import/FullyQualifiedStrictTypesFixer.php b/src/Fixer/Import/FullyQualifiedStrictTypesFixer.php
@@ -617,6 +617,9 @@ private function fixPrevName(Tokens $tokens, int $index, array $uses, string $na
 
         while (true) {
             $index = $tokens->getPrevMeaningfulToken($index);
+            if ($tokens[$index]->isObjectOperator()) {
+                break;
+            }
 
             if ($tokens[$index]->equalsAny([[T_STRING], [T_NS_SEPARATOR]])) {
                 $typeStartIndex = $index;

diff --git a/tests/Fixer/Import/FullyQualifiedStrictTypesFixerTest.php b/tests/Fixer/Import/FullyQualifiedStrictTypesFixerTest.php
@@ -875,6 +875,21 @@ class Cl {}
                 new R\T();
                 EOD,
         ];
+
+        yield 'do not fix property named the same as class' => [
+            <<<'EOD'
+                <?php
+                namespace Foo;
+                use Bar\Service;
+                class Baz {
+                    public function getValue()
+                    {
+                        return $this->service::getValueFromService();
+                    }
+
+                }
+                EOD,
+        ];
     }
 
     /**
@@ -2057,6 +2072,15 @@ public function foo(): void {}
             ',
             ['import_symbols' => true],
         ];
+
+        yield 'do not fix property named the same as class' => [
+            <<<'EOD'
+                <?php
+                namespace Foo;
+                use Bar\Baz;
+                echo $x?->baz::CONSTANT_1;
+                EOD,
+        ];
     }
 
     /**