[DX] Remove XmlFileFormatter, as Rector does not handle it (#2375)

rectorphp · May 27, 2022 · a7e6b68 · a7e6b68
1 parent 64f93c8
commit a7e6b68
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 253 deletions.
diff --git a/packages-tests/FileFormatter/Formatter/XmlFileFormatter/XmlFileFormatterTest.php b/packages-tests/FileFormatter/Formatter/XmlFileFormatter/XmlFileFormatterTest.php
diff --git a/packages/FileFormatter/Contract/Formatter/FileFormatterInterface.php b/packages/FileFormatter/Contract/Formatter/FileFormatterInterface.php
@@ -6,13 +6,10 @@
 
 use Rector\Core\ValueObject\Application\File;
 use Rector\FileFormatter\ValueObject\EditorConfigConfiguration;
-use Rector\FileFormatter\ValueObjectFactory\EditorConfigConfigurationBuilder;
 
 interface FileFormatterInterface
 {
     public function supports(File $file): bool;
 
     public function format(File $file, EditorConfigConfiguration $editorConfigConfiguration): void;
-
-    public function createDefaultEditorConfigConfigurationBuilder(): EditorConfigConfigurationBuilder;
 }
diff --git a/packages/FileFormatter/FileFormatter.php b/packages/FileFormatter/FileFormatter.php
@@ -43,7 +43,7 @@ public function format(array $files): void
                     continue;
                 }
 
-                $editorConfigConfigurationBuilder = $fileFormatter->createDefaultEditorConfigConfigurationBuilder();
+                $editorConfigConfigurationBuilder = new EditorConfigConfigurationBuilder();
                 $this->sniffOriginalFileContent($file, $editorConfigConfigurationBuilder);
 
                 $editorConfiguration = $this->createEditorConfiguration($file, $editorConfigConfigurationBuilder);

diff --git a/packages/FileFormatter/Formatter/JsonFileFormatter.php b/packages/FileFormatter/Formatter/JsonFileFormatter.php
@@ -8,8 +8,6 @@
 use Rector\Core\ValueObject\Application\File;
 use Rector\FileFormatter\Contract\Formatter\FileFormatterInterface;
 use Rector\FileFormatter\ValueObject\EditorConfigConfiguration;
-use Rector\FileFormatter\ValueObject\Indent;
-use Rector\FileFormatter\ValueObjectFactory\EditorConfigConfigurationBuilder;
 
 /**
  * @see \Rector\Tests\FileFormatter\Formatter\JsonFileFormatter\JsonFileFormatterTest
@@ -40,13 +38,4 @@ public function format(File $file, EditorConfigConfiguration $editorConfigConfig
 
         $file->changeFileContent($newFileContent);
     }
-
-    public function createDefaultEditorConfigConfigurationBuilder(): EditorConfigConfigurationBuilder
-    {
-        $editorConfigConfigurationBuilder = new EditorConfigConfigurationBuilder();
-
-        $editorConfigConfigurationBuilder->withIndent(Indent::createSpaceWithSize(4));
-
-        return $editorConfigConfigurationBuilder;
-    }
 }
diff --git a/packages/FileFormatter/Formatter/XmlFileFormatter.php b/packages/FileFormatter/Formatter/XmlFileFormatter.php
diff --git a/packages/FileFormatter/Formatter/YamlFileFormatter.php b/packages/FileFormatter/Formatter/YamlFileFormatter.php
@@ -7,8 +7,6 @@
 use Rector\Core\ValueObject\Application\File;
 use Rector\FileFormatter\Contract\Formatter\FileFormatterInterface;
 use Rector\FileFormatter\ValueObject\EditorConfigConfiguration;
-use Rector\FileFormatter\ValueObject\Indent;
-use Rector\FileFormatter\ValueObjectFactory\EditorConfigConfigurationBuilder;
 use Symfony\Component\Yaml\Yaml;
 
 /**
@@ -31,13 +29,4 @@ public function format(File $file, EditorConfigConfiguration $editorConfigConfig
 
         $file->changeFileContent($newFileContent);
     }
-
-    public function createDefaultEditorConfigConfigurationBuilder(): EditorConfigConfigurationBuilder
-    {
-        $editorConfigConfigurationBuilder = new EditorConfigConfigurationBuilder();
-
-        $editorConfigConfigurationBuilder->withIndent(Indent::createSpaceWithSize(2));
-
-        return $editorConfigConfigurationBuilder;
-    }
 }
diff --git a/packages/FileFormatter/ValueObjectFactory/EditorConfigConfigurationBuilder.php b/packages/FileFormatter/ValueObjectFactory/EditorConfigConfigurationBuilder.php
@@ -18,17 +18,12 @@ final class EditorConfigConfigurationBuilder
      */
     public function __construct(
         private string $indentStyle = IndentType::SPACE,
-        private int $indentSize = 2,
+        private int $indentSize = 4,
         private bool $insertFinalNewline = true
     ) {
         $this->newLine = NewLine::fromEditorConfig('lf');
     }
 
-    public static function create(): self
-    {
-        return new self();
-    }
-
     public function withNewLine(NewLine $newLine): self
     {
         $this->newLine = $newLine;