Add ability to patch the root package / any file in root dir

Author: pinkeen

src/PackageApplicationRepository.php

@@ -19,10 +19,12 @@ class PackageApplicationRepository
      * @var InstallationManager
      */
     private $installationManager;
+
     /**
      * @var PathResolver
      */
     private $pathResolver;
+
     /**
      * @var LoggerInterface
      */

src/PatchApplicator.php

@@ -34,6 +34,11 @@ class PatchApplicator
      */
     private $executor;
 
+    /**
+     * @var string
+     */
+    private $cmdErr;
+
     public function __construct(
         LoggerInterface $logger,
         InstallationManager $installationManager,
@@ -61,7 +66,10 @@ private function executeCommand($cmd, $cwd = null)
             $cmd = $cmd[0] . ' ' .implode(' ', array_map([ProcessExecutor::class, 'escape'], array_slice($cmd, 1)));
         }
 
-        return $this->executor->execute($cmd, $output, $cwd);
+        $returnCode = $this->executor->execute($cmd, $output, $cwd);
+        $this->cmdErr = $this->executor->getErrorOutput();
+
+        return $returnCode;
     }
 
     /**
@@ -99,7 +107,7 @@ public function applyPatch(Patch $patch, PackageInterface $sourcePackage, Packag
         $patchFilename = $this->pathResolver->getPatchSourceFilePath($sourcePackage, $patch);
 
         if (!$this->executePatchCommand($targetDirectory, $patchFilename, 1)) {
-            throw new \RuntimeException('Could not apply it!');
+            throw new \RuntimeException('Could not apply patch: ' . $this->cmdErr);
         }
 
         $this->logger->notice(sprintf('Applied patch <info>%s:%s</info> [<comment>%s</comment>] (<comment>%s</comment>)',

src/Patcher.php

@@ -7,6 +7,8 @@
 use Composer\Installer\InstallationManager;
 use Composer\Package\PackageInterface;
 
+use Composer\Package\RootPackageInterface;
+use Composer\Repository\ArrayRepository;
 use Composer\Repository\RepositoryManager;
 use Composer\Util\ProcessExecutor;
 use Psr\Log\LoggerInterface;
@@ -83,6 +85,16 @@ class Patcher
      */
     private $processExecutor;
 
+    /**
+     * @var ArrayRepository
+     */
+    private $installedRepository;
+
+    /**
+     * @var RootPackageInterface
+     */
+    private $rootPackage;
+
     /**
      * The constructor computes state, so it needs to be called only after all packages have been installed
      * and the local composer repository updated.
@@ -91,20 +103,24 @@ class Patcher
      * @param InstallationManager $installationManager
      * @param RepositoryManager $repositoryManager
      * @param ProcessExecutor $processExecutor
+     * @param RootPackageInterface $rootPackage
      */
     public function __construct(
         LoggerInterface $logger,
         InstallationManager $installationManager,
         RepositoryManager $repositoryManager,
-        ProcessExecutor $processExecutor
+        ProcessExecutor $processExecutor,
+        RootPackageInterface $rootPackage
     ) {
         $this->logger = $logger;
+        $this->rootPackage = $rootPackage;
         $this->collector = new PatchCollector($this->logger);
         $this->operationResolver = new OperationResolver();
         $this->installationManager = $installationManager;
         $this->repositoryManager = $repositoryManager;
         $this->pathResolver = new PathResolver($installationManager);
         $this->processExecutor = $processExecutor;
+        $this->installedRepository = $this->buildInstalledRepository();
 
         $this->applicator = new PatchApplicator(
             $this->logger,
@@ -114,7 +130,7 @@ public function __construct(
         );
 
         $this->packageApplicationRepository = new PackageApplicationRepository(
-            $this->repositoryManager->getLocalRepository(),
+            $this->installedRepository,
             $this->installationManager,
             $this->pathResolver,
             $this->logger
@@ -125,6 +141,23 @@ public function __construct(
         $this->installedPackageApplications = $this->packageApplicationRepository->getPackageApplications();
 
         list($this->packagesToReinstall, $this->packagesToPatch) = $this->computeChanges();
+
+    }
+
+    /**
+     * @return ArrayRepository
+     */
+    private function buildInstalledRepository()
+    {
+        $repo = new ArrayRepository(array_map(function(PackageInterface $package) {
+            return clone $package;
+        }, $this->repositoryManager->getLocalRepository()->getCanonicalPackages()));
+
+        $rootPackage = clone $this->rootPackage;
+
+        $repo->addPackage($rootPackage);
+
+        return $repo;
     }
 
     /**
@@ -133,7 +166,7 @@ public function __construct(
     private function collectPatches()
     {
         return $this->collector->collectFromRepository(
-            $this->repositoryManager->getLocalRepository()
+           $this->installedRepository
         );
     }
 
@@ -143,7 +176,7 @@ private function collectPatches()
     private function computeTargetPackageApplications()
     {
         $packageApplications = [];
-        $repo = $this->repositoryManager->getLocalRepository();
+        $repo = $this->installedRepository;
 
         $patchesByPackage = [];
 

src/PathResolver.php

@@ -4,6 +4,7 @@
 
 use Composer\Installer\InstallationManager;
 use Composer\Package\PackageInterface;
+use Composer\Package\RootPackageInterface;
 
 class PathResolver
 {
@@ -26,6 +27,12 @@ public function __construct(
      */
     public function getPackageInstallPath(PackageInterface $package)
     {
+        if ($package instanceof RootPackageInterface) {
+            // This is not an ideal solution but should work for now.
+            // I haven't found an easy way to get this information from composer itself.
+            return getcwd();
+        }
+
         $installer = $this->installationManager->getInstaller($package->getType());
 
         return $installer->getInstallPath($package);

src/Plugin.php

@@ -5,7 +5,9 @@
 use Composer\Composer;
 use Composer\EventDispatcher\EventSubscriberInterface;
 use Composer\IO\IOInterface;
+use Composer\Package\PackageInterface;
 use Composer\Plugin\PluginInterface;
+use Composer\Repository\ArrayRepository;
 use Composer\Script\ScriptEvents;
 use Composer\Script\Event as ScriptEvent;
 
@@ -62,7 +64,8 @@ public function applyPatches(Composer $composer)
             $this->logger,
             $composer->getInstallationManager(),
             $composer->getRepositoryManager(),
-            new ProcessExecutor($this->io)
+            new ProcessExecutor($this->io),
+            $composer->getPackage()
         );
 
         $patcher->patch();

tests/Functional/CoreFeatureTest.php

@@ -16,6 +16,10 @@ class CoreFeatureTest extends SandboxTestCase
         ]
     ];
 
+    const ROOT_PACKAGE_APPLICATIONS = [
+        '/src/root-code.php' => '-is-patched'
+    ];
+
     public function testSimplePatchingDuringFirstInstallWorks()
     {
         $project = $this->getSandbox()->createProjectSandBox('test/project-template', 'dev-master', [
@@ -162,6 +166,18 @@ public function testRemovingPatchsetWillRemovePatches()
             self::PACKAGEA_PATCH1_APPLICATIONS,
             self::PACKAGEA_PATCH2_APPLICATIONS
         );
+    }
+
+    public function testRootPackageCanBePatched()
+    {
+        $project = $this->getSandbox()->createProjectSandBox('test/project-template', 'dev-master', [
+            'require' => [
+                'test/patchset-root'=> '~1.0',
+            ]
+        ]);
+
+        $installRun = $project->runComposerCommand('install');
 
+        $this->assertThatComposerRunHasAppliedPatches($installRun, self::ROOT_PACKAGE_APPLICATIONS);
     }
 }

tests/Functional/Fixtures/packages/patchset-root/composer.json

@@ -0,0 +1,18 @@
+{
+    "name": "test/patchset-root",
+    "type": "patchset",
+    "version": "1.0",
+    "require": {
+        "creativestyle/composer-plugin-patchset": "dev-master"
+    },
+    "extra": {
+        "patchset": {
+            "test/project-template": [
+                {
+                    "description": "Patch project root",
+                    "filename": "patches/root-project-patch-1.diff"
+                }
+            ]
+        }
+    }
+}

tests/Functional/Fixtures/packages/patchset-root/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/src/root-code.php

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