Deduplicate patches on package level

Author: pinkeen

src/Patcher.php

@@ -157,28 +157,42 @@ private function computeTargetPackageApplications()
         }
 
         foreach ($patchesByPackage as $targetPackageName => $packagePatches) {
+            /** @var PatchApplication[] $applications */
             $applications = [];
 
             $targetPackage = $repo->findPackage($targetPackageName, '*');
 
             if (null === $targetPackage) {
-                // No package to pach, nothing to do
+                // No package to patch, nothing to do
                 continue;
             }
 
             /** @var Patch $patch */
             foreach ($packagePatches as $patch) {
                 if ($patch->canBeAppliedTo($targetPackage)) {
                     $sourcePackage = $repo->findPackage($patch->getSourcePackage(), '*');
-                    $applications[] = new PatchApplication(
+
+                    $applicationHash = $this->computeApplicationHash($sourcePackage, $patch);
+
+                    if (isset($applications[$applicationHash])) {
+                        $this->logger->notice(sprintf('Skipping patch <info>%s</info> (<comment>%s</comment> as it was already added by package <comment>%s</comment>',
+                            $patch->getDescription(),
+                            $patch->getSourcePackage(),
+                            $applications[$applicationHash]->getSourcePackage()->getName()
+                        ));
+                    }
+
+                    $applications[$applicationHash] = new PatchApplication(
                         $patch,
                         $sourcePackage,
                         $targetPackage,
-                        $this->computeApplicationHash($sourcePackage, $patch)
+                        $applicationHash
                     );
                 }
             }
 
+            $applications = array_values($applications);
+
             $packageApplications[$targetPackage->getName()] = new PackagePatchApplication($targetPackage, $applications);
         }
 

tests/Functional/BasicPatchingTest.php tests/Functional/CoreFeatureTest.phptests/Functional/BasicPatchingTest.php renamed to tests/Functional/CoreFeatureTest.php

@@ -2,7 +2,7 @@
 
 namespace Creativestyle\Composer\Patchset\Tests\Functional;
 
-class BasicPatchingTest extends SandboxTestCase
+class CoreFeatureTest extends SandboxTestCase
 {
     const PACKAGEA_PATCH1_APPLICATIONS = [
         '/vendor/test/package-a/src/test.php' => 'patched-in-echo'
@@ -108,4 +108,26 @@ public function testThatLayeredPatchesAreAppliedInCorrectOrder()
         $this->assertNotContains('Applied patch', $updateRun->getFullOutput(), 'no patches were applied', true);
     }
 
+    public function testThatPatchesAreDeduplicated()
+    {
+        // Same patch coming from multiple patchsets shall be applied only once
+
+        $project = $this->getSandbox()->createProjectSandBox('test/project-template', 'dev-master', [
+            'require' => [
+                'test/patchset'=> '~1.0',
+                'test/patchset-extra'=> '~1.0',
+                'test/package-a'=> 'dev-master',
+                'creativestyle/composer-plugin-patchset'=> 'dev-master'
+            ]
+        ]);
+
+        $installRun = $project->runComposerCommand('install');
+
+        $this->assertThatComposerRunHasAppliedPatches($installRun,
+            array_merge_recursive(
+                self::PACKAGEA_PATCH1_APPLICATIONS,
+                self::PACKAGEA_PATCH2_APPLICATIONS
+            )
+        );
+    }
 }

tests/Functional/Fixtures/ProjectSandbox.php

@@ -68,7 +68,7 @@ class ProjectSandbox
     public function __construct(
         $packageName,
         $packageVersion,
-        array $config = [],
+        array $config,
         ComposerSandbox $repository,
         ProcessExecutor $executor,
         Filesystem $filesystem,
@@ -145,7 +145,7 @@ public function runComposerCommand($cmd, ...$args)
         // to be applied to our source fixtures and the project templates modified.
         $_ENV['COMPOSER_MIRROR_PATH_REPOS'] = '1';
 
-        $cmdElements = array_merge([$this->composerBinary, $cmd], $args);
+        $cmdElements = array_merge([$this->composerBinary, '--ansi', $cmd], $args);
         $cmdString = $cmdElements[0] . ' ' .implode(' ', array_map([ProcessExecutor::class, 'escape'], array_slice($cmdElements, 1)));
 
         $fullOut = '';