[CS] Fix dynamic and broken indent detection, allow to configure spac…

…ing via RectorConfig::indent() method

config/config.php

@@ -64,6 +64,7 @@
 
     $rectorConfig->disableImportNames();
     $rectorConfig->importShortClasses();
+    $rectorConfig->indent(' ', 4);
 
     $rectorConfig->fileExtensions(['php']);
     $rectorConfig->nestedChainMethodCallLimit(60);

packages/BetterPhpDocParser/PhpDocParser/ClassAnnotationMatcher.php

@@ -72,7 +72,12 @@ private function _resolveTagFullyQualifiedName(
     /**
      * @param Use_[]|GroupUse[] $uses
      */
-    private function resolveFullyQualifiedClass(array $uses, Node $node, string $tag, bool $returnNullOnUnknownClass): ?string
+    private function resolveFullyQualifiedClass(
+        array $uses,
+        Node $node,
+        string $tag,
+        bool $returnNullOnUnknownClass
+    ): ?string
     {
         $scope = $node->getAttribute(AttributeKey::SCOPE);
 
@@ -127,7 +132,7 @@ private function resolveAsAliased(array $uses, string $tag, bool $returnNullOnUn
 
     private function resolveClass(?string $class, bool $returnNullOnUnknownClass): ?string
     {
-        if (null === $class) {
+        if ($class === null) {
             return null;
         }
         $resolvedClass = $this->reflectionProvider->hasClass($class) ? $class : null;

packages/Config/RectorConfig.php

@@ -230,4 +230,14 @@ public function cacheClass(string $cacheClass): void
         $parameters = $this->parameters();
         $parameters->set(Option::CACHE_CLASS, $cacheClass);
     }
+
+    /**
+     * @see https://github.com/nikic/PHP-Parser/issues/723#issuecomment-712401963
+     */
+    public function indent(string $character, int $count): void
+    {
+        $parameters = $this->parameters();
+        $parameters->set(Option::INDENT_CHAR, $character);
+        $parameters->set(Option::INDENT_SIZE, $count);
+    }
 }

src/Configuration/Option.php

@@ -222,4 +222,16 @@ final class Option
      * @var string
      */
     public const MEMORY_LIMIT = 'memory-limit';
+
+    /**
+     * @deprecated Use @see \Rector\Config\RectorConfig::indent() method
+     * @var string
+     */
+    public const INDENT_CHAR = 'indent-char';
+
+    /**
+     * @deprecated Use @see \Rector\Config\RectorConfig::indent() method
+     * @var string
+     */
+    public const INDENT_SIZE = 'indent-size';
 }

src/Configuration/RectorConfigProvider.php

@@ -31,4 +31,14 @@ public function getSymfonyContainerXml(): string
     {
         return $this->parameterProvider->provideStringParameter(Option::SYMFONY_CONTAINER_XML_PATH_PARAMETER);
     }
+
+    public function getIndentChar(): string
+    {
+        return $this->parameterProvider->provideStringParameter(Option::INDENT_CHAR);
+    }
+
+    public function getIndentSize(): int
+    {
+        return $this->parameterProvider->provideIntParameter(Option::INDENT_SIZE);
+    }
 }

src/PhpParser/Printer/BetterStandardPrinter.php

@@ -27,9 +27,9 @@
 use PhpParser\Node\Stmt\Use_;
 use PhpParser\PrettyPrinter\Standard;
 use Rector\Comments\NodeDocBlock\DocBlockUpdater;
+use Rector\Core\Configuration\RectorConfigProvider;
 use Rector\Core\Contract\PhpParser\NodePrinterInterface;
 use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace;
-use Rector\Core\PhpParser\Printer\Whitespace\IndentCharacterDetector;
 use Rector\Core\Util\StringUtils;
 use Rector\NodeTypeResolver\Node\AttributeKey;
 
@@ -80,8 +80,8 @@ final class BetterStandardPrinter extends Standard implements NodePrinterInterfa
      * @param mixed[] $options
      */
     public function __construct(
-        private readonly IndentCharacterDetector $indentCharacterDetector,
         private readonly DocBlockUpdater $docBlockUpdater,
+        private readonly RectorConfigProvider $rectorConfigProvider,
         array $options = []
     ) {
         parent::__construct($options);
@@ -103,8 +103,7 @@ public function printFormatPreserving(array $stmts, array $origStmts, array $ori
     {
         $newStmts = $this->resolveNewStmts($stmts);
 
-        // detect per print
-        $this->tabOrSpaceIndentCharacter = $this->indentCharacterDetector->detect($origTokens);
+        $this->tabOrSpaceIndentCharacter = $this->rectorConfigProvider->getIndentChar();
 
         $content = parent::printFormatPreserving($newStmts, $origStmts, $origTokens);
 

tests/Issues/DoNotReplaceUnknownClasses/DoNotReplaceUnknownClassesTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Rector\Core\Tests\Issues\DoNotReplaceUnknownClasses;
 
 use Iterator;