Fix "Option 'indent' must either be all spaces or a single tab"

Author: staabm

src/Analyser/RuleErrorTransformer.php

@@ -29,6 +29,7 @@
 use SebastianBergmann\Diff\Output\UnifiedDiffOutputBuilder;
 use function get_class;
 use function sha1;
+use function str_contains;
 use function str_repeat;
 
 #[AutowiredService]
@@ -137,7 +138,12 @@ public function transform(
 			$newStmts = $traverser->traverse($newStmts);
 
 			if ($visitor->isFound()) {
-				$printer = new PhpPrinter(['indent' => str_repeat($indentDetector->indentCharacter, $indentDetector->indentSize)]);
+				if (str_contains($indentDetector->indentCharacter, "\t")) {
+					$indent = "\t";
+				} else {
+					$indent = str_repeat($indentDetector->indentCharacter, $indentDetector->indentSize);
+				}
+				$printer = new PhpPrinter(['indent' => $indent]);
 				$newCode = $printer->printFormatPreserving($newStmts, $fileNodes, $oldTokens);
 
 				if ($oldCode !== $newCode) {

tests/PHPStan/Rules/Methods/OverridingMethodRuleTest.php

@@ -820,4 +820,12 @@ public function testFixOverride(): void
 		$this->fix(__DIR__ . '/data/fix-override-attribute.php', __DIR__ . '/data/fix-override-attribute.php.fixed');
 	}
 
+	#[RequiresPhp('>= 8.3')]
+	public function testFixWithTabs(): void
+	{
+		$this->phpVersionId = PHP_VERSION_ID;
+		$this->checkMissingOverrideMethodAttribute = true;
+		$this->fix(__DIR__ . '/data/fix-with-tabs.php', __DIR__ . '/data/fix-with-tabs.php.fixed');
+	}
+
 }

tests/PHPStan/Rules/Methods/data/fix-with-tabs.php

@@ -0,0 +1,28 @@
+<?php declare(strict_types = 1);
+
+namespace FixWithTabs;
+
+interface FooInterface {
+		/** @return Collection<BarI> */
+	public function foo(): Collection;
+}
+
+interface BarI
+{
+	
+}
+class Bar implements BarI {}
+
+/** @template-coveriant TValue */
+class Collection {}
+
+
+class Baz implements FooInterface
+{
+	/** @return Collection<Bar> */
+	public function foo(): Collection
+	{
+		/** @var Collection<Bar> */
+		return new Collection();
+	}
+}

tests/PHPStan/Rules/Methods/data/fix-with-tabs.php.fixed

@@ -0,0 +1,29 @@
+<?php declare(strict_types = 1);
+
+namespace FixWithTabs;
+
+interface FooInterface {
+		/** @return Collection<BarI> */
+	public function foo(): Collection;
+}
+
+interface BarI
+{
+	
+}
+class Bar implements BarI {}
+
+/** @template-coveriant TValue */
+class Collection {}
+
+
+class Baz implements FooInterface
+{
+	/** @return Collection<Bar> */
+	#[\Override]
+	public function foo(): Collection
+	{
+		/** @var Collection<Bar> */
+		return new Collection();
+	}
+}