#218 - Correctly resolve relative local paths pointing to patch files from dependencies - Follow up

.gitignore

@@ -1 +1,2 @@
 vendor/
+tests/_data/test-package/src/

src/Patch.php

@@ -39,6 +39,13 @@ class Patch implements \JsonSerializable
      */
     public $depth;
 
+    /**
+     * The package that provides the patch.
+     *
+     * @var \Composer\Package\PackageInterface $provider
+     */
+    public $provider;
+
     /**
      * Create a Patch from a serialized representation.
      *

src/Plugin/Patches.php

@@ -281,6 +281,28 @@ public function checkPatches(Event $event)
         }
     }
 
+    /**
+     * Check whether a given path is relative.
+     *
+     * @param string $url
+     *   The URL to check.
+     *
+     * @return bool
+     *   True if URL is relative, false otherwise.
+     */
+    protected function isRelativeUrl($url)
+    {
+        if (parse_url($url, PHP_URL_SCHEME) !== '') {
+            return false;
+        }
+
+        if (strpos($url, '/') === 0) {
+            return false;
+        }
+
+        return true;
+    }
+
     /**
      * @param PackageEvent $event
      * @throws \Exception
@@ -322,6 +344,22 @@ public function postInstall(PackageEvent $event)
                     null,
                     new PatchEvent(PatchEvents::PRE_PATCH_APPLY, $package, $patch->url, $patch->description)
                 );
+
+                if ($this->isRelativeUrl($patch->url) && !empty($patch->provider)) {
+                    if (!$manager->isPackageInstalled($localRepository, $patch->provider)) {
+                        $this->io->write(
+                            ' - <info>Installing ' .
+                            $patch->provider->getName() .
+                            '</info> to ensure access to relative patches.'
+                        );
+                        $manager->getInstaller(
+                            $patch->provider->getType()
+                        )->install($localRepository, $patch->provider);
+                    }
+                    $providing_install_path = $manager->getInstallPath($patch->provider);
+                    $patch->url = $providing_install_path.'/'.$patch->url;
+                }
+
                 $this->getAndApplyPatch($downloader, $install_path, $patch->url);
                 $this->eventDispatcher->dispatch(
                     null,

src/Resolvers/DependencyPatches.php

@@ -32,12 +32,15 @@ public function resolve(PatchCollection $collection, PackageEvent $event)
                 $package = $this->getPackageFromOperation($operation);
                 /** @var PackageInterface $extra */
                 $extra = $package->getExtra();
-                if (isset($extra['patches'])) {
-                    $patches = $this->findPatchesInJson($extra['patches']);
-                    foreach ($patches as $package => $patch_list) {
-                        foreach ($patch_list as $patch) {
-                            $collection->addPatch($patch);
-                        }
+                if (!isset($extra['patches'])) {
+                    continue;
+                }
+
+                $patches = $this->findPatchesInJson($extra['patches']);
+                foreach ($patches as $patchList) {
+                    foreach ($patchList as $patch) {
+                        $patch->provider = $package;
+                        $collection->addPatch($patch);
                     }
                 }
             }

tests/_data/test-package/composer.json

@@ -0,0 +1,6 @@
+{
+    "name": "cweagans/test-package",
+    "description": "Project for use in cweagans/composer-patches acceptance tests.",
+    "type": "project",
+    "license": "BSD-2-Clause"
+}

tests/acceptance/ApplyPatchFromLocalDirectoryCept.php

@@ -0,0 +1,8 @@
+<?php
+$I = new AcceptanceTester($scenario);
+$I->wantTo('Apply a patch from a local directory.');
+$I->amInPath(realpath(__DIR__ . '/fixtures/apply-patch-from-local-directory'));
+$I->runShellCommand('composer install');
+$I->canSeeFileFound(
+    realpath(__DIR__ . '/fixtures/apply-patch-from-local-directory/vendor/cweagans/test-package/src/NewFile.php')
+);

tests/acceptance/fixtures/apply-patch-from-local-directory/composer.json

@@ -0,0 +1,29 @@
+{
+    "name": "cweagans/composer-patches-test-project",
+    "description": "Project for use in cweagans/composer-patches acceptance tests.",
+    "type": "project",
+    "license": "BSD-2-Clause",
+    "repositories": [
+        {
+            "type": "path",
+            "url": "../composer-patches"
+        },
+        {
+            "type": "path",
+            "url": "../../../_data/test-package"
+        }
+    ],
+    "require": {
+        "cweagans/composer-patches": "*@dev",
+        "cweagans/test-package": "*@dev"
+    },
+    "extra": {
+        "enable-patching": true,
+        "composer-exit-on-patch-failure": 1,
+        "patches": {
+            "cweagans/test-package": {
+                "test": "./resources/patches/newfile.patch"
+            }
+        }
+    }
+}

tests/acceptance/fixtures/apply-patch-from-local-directory/resources/patches/newfile.patch

@@ -0,0 +1,3 @@
+diff --git a/src/NewFile.php b/src/NewFile.php
+new file mode 100644
+index 0000000..e69de29