Root project package can define patches and patch itself

Author: pinkeen

README.md

@@ -72,11 +72,6 @@ the actions necessary to get there.
  Also you will not be able to specify patches in any composer package. You have to use a dedicated packages for this 
  purpose. I can hardly imagine a legit use case when it would be desirable that installing package X will automatically 
  patch some other package Y in your project without explicitly being advertised as a patchset.
- 
-### What is missing
-
- - Patch the root package / files in root directory
- - Allow to specify patches in the root composer.json
 
 ## Running tests
 

src/PatchCollector.php

@@ -5,6 +5,7 @@
 use Composer\Package\AliasPackage;
 use Composer\Package\Package;
 use Composer\Package\PackageInterface;
+use Composer\Package\RootPackageInterface;
 use Composer\Repository\RepositoryInterface;
 
 use Psr\Log\LoggerInterface;
@@ -88,7 +89,7 @@ protected function collectFromPackage(PackageInterface $package)
      */
     public function isAValidPatchset(PackageInterface $package)
     {
-        return $package->getType() === 'patchset' && isset($package->getExtra()['patchset']);
+        return ($package instanceof RootPackageInterface || $package->getType() === 'patchset') && isset($package->getExtra()['patchset']);
     }
 
     /**

tests/Functional/CoreFeatureTest.php

@@ -180,4 +180,50 @@ public function testRootPackageCanBePatched()
 
         $this->assertThatComposerRunHasAppliedPatches($installRun, self::ROOT_PACKAGE_APPLICATIONS);
     }
+
+    public function testRootCanDefinePatches()
+    {
+        $project = $this->getSandbox()->createProjectSandBox('test/project-template-patchset', 'dev-master', [
+            'require' => [
+                'test/package-a'=> 'dev-master',
+                'creativestyle/composer-plugin-patchset'=> 'dev-master'
+            ],
+            'extra' => [
+                'patchset' => [
+                    'test/package-a' => [
+                        [
+                            'description' => 'Patch in echo in the middle',
+                            'filename' => 'patches/package-a-patch-1.diff'
+                        ]
+                    ]
+                ]
+            ]
+        ]);
+
+        $installRun = $project->runComposerCommand('install');
+        $this->assertThatComposerRunHasAppliedPatches($installRun, self::PACKAGEA_PATCH1_APPLICATIONS);
+    }
+
+    public function testRootCanPatchItself()
+    {
+        $project = $this->getSandbox()->createProjectSandBox('test/project-template-patchset', 'dev-master', [
+            'require' => [
+                'test/package-a'=> 'dev-master',
+                'creativestyle/composer-plugin-patchset'=> 'dev-master'
+            ],
+            'extra' => [
+                'patchset' => [
+                    'test/project-template-patchset' => [
+                        [
+                            'description' => 'Patch project root',
+                            'filename' => 'patches/root-project-patch-1.diff'
+                        ]
+                    ]
+                ]
+            ]
+        ]);
+
+        $installRun = $project->runComposerCommand('install');
+        $this->assertThatComposerRunHasAppliedPatches($installRun, self::ROOT_PACKAGE_APPLICATIONS);
+    }
 }

tests/Functional/Fixtures/packages/project-template-patchset/composer.json

@@ -0,0 +1,7 @@
+{
+    "name": "test/project-template-patchset",
+    "type": "project",
+    "version": "dev-master",
+    "require": {},
+    "minimum-stability": "dev"
+}

tests/Functional/Fixtures/packages/project-template-patchset/patches/package-a-patch-1.diff

@@ -0,0 +1,9 @@
+--- a/src/test.php
++++ b/src/test.php
+@@ -1,5 +1,6 @@
+ <?php
+ 
+ echo 'first-echo';
++echo 'patched-in-echo';
+ echo 'last-echo';
+ 

tests/Functional/Fixtures/packages/project-template-patchset/patches/root-project-patch-1.diff

@@ -0,0 +1,12 @@
+diff --git a/src/root-code.php b/src/root-code.php
+index 78866cc..732f877 100644
+--- a/src/root-code.php
++++ b/src/root-code.php
+@@ -2,6 +2,7 @@
+ 
+ foreach (['this', 'is', 'root', 'package', 'code'] as $word) {
+     echo $word;
++    echo "-is-patched\n";
+ }
+ 
+ echo 'done';

tests/Functional/Fixtures/packages/project-template-patchset/src/root-code.php

@@ -0,0 +1,7 @@
+<?php
+
+foreach (['this', 'is', 'root', 'package', 'code'] as $word) {
+    echo $word;
+}
+
+echo 'done';