Test that patches are removed

Author: pinkeen

src/PackageApplicationRepository.php

@@ -6,6 +6,7 @@
 use Composer\Package\AliasPackage;
 use Composer\Package\PackageInterface;
 use Composer\Repository\RepositoryInterface;
+use Psr\Log\LoggerInterface;
 
 class PackageApplicationRepository
 {
@@ -22,20 +23,27 @@ class PackageApplicationRepository
      * @var PathResolver
      */
     private $pathResolver;
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
 
     /**
      * @param RepositoryInterface $installedRepository
      * @param InstallationManager $installationManager
      * @param PathResolver $pathResolver
+     * @param LoggerInterface $logger
      */
     public function __construct(
         RepositoryInterface $installedRepository,
         InstallationManager $installationManager,
-        PathResolver $pathResolver
+        PathResolver $pathResolver,
+        LoggerInterface $logger
     ) {
         $this->installedRepository = $installedRepository;
         $this->installationManager = $installationManager;
         $this->pathResolver = $pathResolver;
+        $this->logger = $logger;
     }
 
     /**
@@ -137,7 +145,7 @@ private function createPatchApplication(array $data)
         );
 
         if (!$sourcePackage) {
-            throw new \RuntimeException(sprintf('Could not find source package %s (%s) for installed patch',
+            $this->logger->debug(sprintf('Could not find source package %s (%s) for installed patch, it was removed probably',
                 $data['source_package']['name'],
                 $data['source_package']['version']
             ));

src/PatchApplication.php

@@ -15,7 +15,7 @@ class PatchApplication
     private $patch;
 
     /**
-     * @var PackageInterface
+     * @var PackageInterface|null
      */
     private $sourcePackage;
 
@@ -37,7 +37,7 @@ class PatchApplication
      */
     public function __construct(
         Patch $patch,
-        PackageInterface $sourcePackage,
+        PackageInterface $sourcePackage = null,
         PackageInterface $targetPackage,
         $hash
     ) {
@@ -64,7 +64,10 @@ public function getPatch()
     }
 
     /**
-     * @return PackageInterface
+     * Source package may be null if the patchset has been removed,
+     * but the patch is still applied.
+     *
+     * @return PackageInterface|null
      */
     public function getSourcePackage()
     {

src/Patcher.php

@@ -116,7 +116,8 @@ public function __construct(
         $this->packageApplicationRepository = new PackageApplicationRepository(
             $this->repositoryManager->getLocalRepository(),
             $this->installationManager,
-            $this->pathResolver
+            $this->pathResolver,
+            $this->logger
         );
 
         $this->patches = $this->collectPatches();

tests/Functional/CoreFeatureTest.php

@@ -63,7 +63,7 @@ public function testPatchesAreAppliedWhenPackageIsAddedToExistingProject()
         $this->assertThatComposerRunHasAppliedPatches($requireRun, self::PACKAGEA_PATCH1_APPLICATIONS);
     }
 
-    public function testThatPatchesAreNotReappliedOnUpdate()
+    public function testPatchesAreNotReappliedOnUpdate()
     {
         $project = $this->getSandbox()->createProjectSandBox('test/project-template', 'dev-master', [
             'require' => [
@@ -83,7 +83,7 @@ public function testThatPatchesAreNotReappliedOnUpdate()
         $this->assertNotContains('Applied patch', $updateRun->getFullOutput(), 'no patches were applied', true);
     }
 
-    public function testThatLayeredPatchesAreAppliedInCorrectOrder()
+    public function testLayeredPatchesAreAppliedInCorrectOrder()
     {
         $project = $this->getSandbox()->createProjectSandBox('test/project-template', 'dev-master', [
             'require' => [
@@ -108,7 +108,7 @@ public function testThatLayeredPatchesAreAppliedInCorrectOrder()
         $this->assertNotContains('Applied patch', $updateRun->getFullOutput(), 'no patches were applied', true);
     }
 
-    public function testThatPatchesAreDeduplicated()
+    public function testPatchesAreDeduplicated()
     {
         // Same patch coming from multiple patchsets shall be applied only once
 
@@ -130,4 +130,38 @@ public function testThatPatchesAreDeduplicated()
             )
         );
     }
+
+    public function testRemovingPatchsetWillRemovePatches()
+    {
+        // 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
+            )
+        );
+
+        $removeRun = $project->runComposerCommand('remove', 'test/patchset-extra');
+
+        $this->assertContains('Reinstalling test/package-a', $removeRun->getFullOutput(), 'test/package-a has been reinstalled', true);
+
+        // First patch is coming from the first patchset so it still should be applied
+        $this->assertThatComposerRunHasAppliedPatches($removeRun,
+            self::PACKAGEA_PATCH1_APPLICATIONS,
+            self::PACKAGEA_PATCH2_APPLICATIONS
+        );
+
+    }
 }