Merge branch 'pr-218' into develop-new

Author: stucki

src/Patch.php

@@ -41,6 +41,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

@@ -286,6 +286,24 @@ public function checkPatches(Event $event)
         }
     }
 
+    /**
+     * Check whether a given path is relative.
+     *
+     * @param string $url
+     * @return bool
+     */
+    protected function isRelativeUrl($url) {
+        if (parse_url($url, PHP_URL_SCHEME) != '') {
+            return FALSE;
+        }
+
+        if ($url[0] == '/') {
+            return FALSE;
+        }
+
+        return TRUE;
+    }
+
     /**
      * @param PackageEvent $event
      * @throws \Exception
@@ -327,6 +345,16 @@ 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

@@ -34,8 +34,9 @@ public function resolve(PatchCollection $collection, PackageEvent $event)
                 $extra = $package->getExtra();
                 if (isset($extra['patches'])) {
                     $patches = $this->findPatchesInJson($extra['patches']);
-                    foreach ($patches as $package => $patch_list) {
+                    foreach ($patches as $patch_package => $patch_list) {
                         foreach ($patch_list as $patch) {
+                            $patch->provider = $package;
                             $collection->addPatch($patch);
                         }
                     }