refactor: Introduce a factory for the PHP compactor

box-project · Nov 22, 2023 · 7934383 · 7934383
1 parent 412d17d
commit 7934383
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/src/Compactor/Php.php b/src/Compactor/Php.php
@@ -14,7 +14,9 @@
 
 namespace KevinGH\Box\Compactor;
 
+use KevinGH\Box\Annotation\CompactedFormatter;
 use KevinGH\Box\Annotation\DocblockAnnotationParser;
+use phpDocumentor\Reflection\DocBlockFactory;
 use PhpToken;
 use RuntimeException;
 use Webmozart\Assert\Assert;
@@ -46,6 +48,20 @@
  */
 final class Php extends FileExtensionCompactor
 {
+    /**
+     * @param list<string> $ignoredAnnotations
+     */
+    public static function create(array $ignoredAnnotations): self
+    {
+        return new self(
+            new DocblockAnnotationParser(
+                DocBlockFactory::createInstance(),
+                new CompactedFormatter(),
+                $ignoredAnnotations,
+            ),
+        );
+    }
+
     public function __construct(
         private ?DocblockAnnotationParser $annotationParser,
         array $extensions = ['php'],

diff --git a/src/Configuration/Configuration.php b/src/Configuration/Configuration.php
@@ -21,8 +21,6 @@
 use Humbug\PhpScoper\Configuration\Configuration as PhpScoperConfiguration;
 use Humbug\PhpScoper\Container;
 use InvalidArgumentException;
-use KevinGH\Box\Annotation\CompactedFormatter;
-use KevinGH\Box\Annotation\DocblockAnnotationParser;
 use KevinGH\Box\Compactor\Compactor;
 use KevinGH\Box\Compactor\Compactors;
 use KevinGH\Box\Compactor\Php as PhpCompactor;
@@ -36,7 +34,6 @@
 use KevinGH\Box\Phar\SigningAlgorithm;
 use KevinGH\Box\PhpScoper\SerializableScoper;
 use Phar;
-use phpDocumentor\Reflection\DocBlockFactory;
 use RuntimeException;
 use Seld\JsonLint\ParsingException;
 use SplFileInfo;
@@ -2686,13 +2683,7 @@ private static function createPhpCompactor(?array $ignoredAnnotations): Compacto
             ),
         );
 
-        return new PhpCompactor(
-            new DocblockAnnotationParser(
-                DocBlockFactory::createInstance(),
-                new CompactedFormatter(),
-                $ignoredAnnotations,
-            ),
-        );
+        return PhpCompactor::create($ignoredAnnotations);
     }
 
     private static function createPhpScoperCompactor(