Add Configuration::withPatcher() factory (#749)

Author: theofidry

src/Configuration/Configuration.php

@@ -109,6 +109,19 @@ public function getExcludedFilesWithContents(): array
         return $this->excludedFilesWithContents;
     }
 
+    public function withPatcher(Patcher $patcher): self
+    {
+        return new self(
+            $this->path,
+            $this->outputDir,
+            $this->prefix,
+            $this->filesWithContents,
+            $this->excludedFilesWithContents,
+            $patcher,
+            $this->symbolsConfiguration,
+        );
+    }
+
     public function getPatcher(): Patcher
     {
         return $this->patcher;

tests/Configuration/ConfigurationTest.php

@@ -76,6 +76,33 @@ public function test_it_can_create_a_new_instance_with_a_different_prefix(): voi
         self::assertStateIs($newConfig, ...$expectedNewConfigValues);
     }
 
+    public function test_it_can_create_a_new_instance_with_a_different_patcher(): void
+    {
+        $values = [
+            '/path/to/config',
+            '/path/to/outputDir',
+            'initialPrefix',
+            ['/path/to/fileA' => ['/path/to/fileA', 'fileAContent']],
+            ['/path/to/fileB' => ['/path/to/fileB', 'fileBContent']],
+            new FakePatcher(),
+            SymbolsConfiguration::create(),
+        ];
+
+        $config = new Configuration(...$values);
+
+        // Sanity check
+        self::assertStateIs($config, ...$values);
+
+        $newPatcher = new FakePatcher();
+        $newConfig = $config->withPatcher($newPatcher);
+
+        $expectedNewConfigValues = $values;
+        $expectedNewConfigValues[5] = $newPatcher;
+
+        self::assertStateIs($config, ...$values);
+        self::assertStateIs($newConfig, ...$expectedNewConfigValues);
+    }
+
     public static function prefixProvider(): iterable
     {
         yield [

vendor-hotfix/Configuration.php

@@ -2764,17 +2764,7 @@ private static function configurePhpScoperPrefix(PhpScoperConfiguration $phpScop
             return $phpScoperConfig;
         }
 
-        // TODO: provide easier way to change the prefix
-        //  https://github.com/humbug/php-scoper/issues/616
-        return new PhpScoperConfiguration(
-            $phpScoperConfig->getPath(),
-            $phpScoperConfig->getOutputDir(),
-            unique_id('_HumbugBox'),
-            $phpScoperConfig->getFilesWithContents(),
-            $phpScoperConfig->getExcludedFilesWithContents(),
-            $phpScoperConfig->getPatcher(),
-            $phpScoperConfig->getSymbolsConfiguration(),
-        );
+        return $phpScoperConfig->withPrefix(unique_id('_HumbugBox'));
     }
 
     private static function checkIfDefaultValue(

vendor-hotfix/SerializableScoper.php

@@ -39,14 +39,8 @@ public function __construct(
         PhpScoperConfiguration $scoperConfig,
         string ...$excludedFilePaths,
     ) {
-        $this->scoperConfig = new PhpScoperConfiguration(
-            $scoperConfig->getPath(),
-            $scoperConfig->getOutputDir(),
-            $scoperConfig->getPrefix(),
-            $scoperConfig->getFilesWithContents(),
-            $scoperConfig->getExcludedFilesWithContents(),
-            PatcherFactory::createSerializablePatchers($scoperConfig->getPatcher()),
-            $scoperConfig->getSymbolsConfiguration(),
+        $this->scoperConfig = $scoperConfig->withPatcher(
+            PatcherFactory::createSerializablePatchers($scoperConfig->getPatcher())
         );
         $this->excludedFilePaths = $excludedFilePaths;
         $this->symbolsRegistry = new SymbolsRegistry();