Merge pull request cweagans#175 from danepowell/issue-174

Fixes cweagans#174: Compatibility with older Git versions.

Modifying source to promet/composer-patches, adding a var_dump(); die

composer.json

@@ -1,16 +1,20 @@
 {
-  "name": "cweagans/composer-patches",
-  "description": "Provides a way to patch Composer packages.",
+  "name": "promet/composer-patches",
+  "description": "Provides a newer way to patch Composer packages.",
   "minimum-stability": "dev",
   "license": "BSD-2-Clause",
   "type": "composer-plugin",
   "extra": {
-    "class": "cweagans\\Composer\\Patches"
+    "class": "promet\\Composer\\Patches"
   },
   "authors": [
     {
       "name": "Cameron Eagans",
       "email": "me@cweagans.net"
+    },
+    {
+      "name": "Lisa Ridley",
+      "email": "lisa@prometsource.com"
     }
   ],
   "require": {
@@ -22,9 +26,9 @@
     "phpunit/phpunit": "~4.6"
   },
   "autoload": {
-    "psr-4": {"cweagans\\Composer\\": "src"}
+    "psr-4": {"promet\\Composer\\": "src"}
   },
   "autoload-dev": {
-    "psr-4": {"cweagans\\Composer\\Tests\\": "tests"}
+    "psr-4": {"promet\\Composer\\Tests\\": "tests"}
   }
 }

src/PatchEvent.php

@@ -5,7 +5,7 @@
  * Dispatch events when patches are applied.
  */
 
-namespace cweagans\Composer;
+namespace promet\Composer;
 
 use Composer\EventDispatcher\Event;
 use Composer\Package\PackageInterface;

src/PatchEvents.php

@@ -5,14 +5,14 @@
  * Dispatch events when patches are applied.
  */
 
-namespace cweagans\Composer;
+namespace promet\Composer;
 
 class PatchEvents {
 
   /**
    * The PRE_PATCH_APPLY event occurs before a patch is applied.
    *
-   * The event listener method receives a cweagans\Composer\PatchEvent instance.
+   * The event listener method receives a promet\Composer\PatchEvent instance.
    *
    * @var string
    */
@@ -21,7 +21,7 @@ class PatchEvents {
   /**
    * The POST_PATCH_APPLY event occurs after a patch is applied.
    *
-   * The event listener method receives a cweagans\Composer\PatchEvent instance.
+   * The event listener method receives a promet\Composer\PatchEvent instance.
    *
    * @var string
    */

src/Patches.php

@@ -5,7 +5,7 @@
  * Provides a way to patch Composer packages after installation.
  */
 
-namespace cweagans\Composer;
+namespace promet\Composer;
 
 use Composer\Composer;
 use Composer\DependencyResolver\Operation\InstallOperation;
@@ -97,7 +97,7 @@ public function checkPatches(Event $event) {
       $localRepository = $repositoryManager->getLocalRepository();
       $installationManager = $this->composer->getInstallationManager();
       $packages = $localRepository->getPackages();
-
+      var_dump(array('packages' => $packages));
       $tmp_patches = $this->grabPatches();
       foreach ($packages as $package) {
         $extra = $package->getExtra();
@@ -361,32 +361,13 @@ protected function getAndApplyPatch(RemoteFilesystem $downloader, $install_path,
       $downloader->copy($hostname, $patch_url, $filename, FALSE);
     }
 
-    // Modified from drush6:make.project.inc
-    $patched = FALSE;
     // The order here is intentional. p1 is most likely to apply with git apply.
     // p0 is next likely. p2 is extremely unlikely, but for some special cases,
     // it might be useful. p4 is useful for Magento 2 patches
     $patch_levels = array('-p1', '-p0', '-p2', '-p4');
-    foreach ($patch_levels as $patch_level) {
-      if ($this->io->isVerbose()) {
-        $comment = 'Testing ability to patch with git apply.';
-        $comment .= ' This command may produce errors that can be safely ignored.';
-        $this->io->write('<comment>' . $comment . '</comment>');
-      }
-      $checked = $this->executeCommand('git -C %s apply --check -v %s %s', $install_path, $patch_level, $filename);
-      $output = $this->executor->getErrorOutput();
-      if (substr($output, 0, 7) == 'Skipped') {
-        // Git will indicate success but silently skip patches in some scenarios.
-        //
-        // @see https://github.com/cweagans/composer-patches/pull/165
-        $checked = false;
-      }
-      if ($checked) {
-        // Apply the first successful style.
-        $patched = $this->executeCommand('git -C %s apply %s %s', $install_path, $patch_level, $filename);
-        break;
-      }
-    }
+
+    // Attempt to apply with git apply.
+    $patched = $this->applyPatchWithGit($install_path, $patch_levels, $filename);
 
     // In some rare cases, git will fail to apply a patch, fallback to using
     // the 'patch' command.
@@ -437,7 +418,7 @@ protected function isPatchingEnabled() {
    * @param string $directory
    */
   protected function writePatchReport($patches, $directory) {
-    $output = "This file was automatically generated by Composer Patches (https://github.com/cweagans/composer-patches)\n";
+    $output = "This file was automatically generated by Composer Patches (https://github.com/promet/composer-patches)\n";
     $output .= "Patches applied to this directory:\n\n";
     foreach ($patches as $description => $url) {
       $output .= $description . "\n";
@@ -510,4 +491,45 @@ protected function arrayMergeRecursiveDistinct(array $array1, array $array2) {
     return $merged;
   }
 
+  /**
+   * Attempts to apply a patch with git apply.
+   *
+   * @param $install_path
+   * @param $patch_levels
+   * @param $filename
+   *
+   * @return bool
+   *   TRUE if patch was applied, FALSE otherwise.
+   */
+  protected function applyPatchWithGit($install_path, $patch_levels, $filename) {
+    // Do not use git apply unless the install path is itself a git repo
+    // @see https://stackoverflow.com/a/27283285
+    if (!is_dir($install_path . '/.git')) {
+      return FALSE;
+    }
+
+    $patched = FALSE;
+    foreach ($patch_levels as $patch_level) {
+      if ($this->io->isVerbose()) {
+        $comment = 'Testing ability to patch with git apply.';
+        $comment .= ' This command may produce errors that can be safely ignored.';
+        $this->io->write('<comment>' . $comment . '</comment>');
+      }
+      $checked = $this->executeCommand('git -C %s apply --check -v %s %s', $install_path, $patch_level, $filename);
+      $output = $this->executor->getErrorOutput();
+      if (substr($output, 0, 7) == 'Skipped') {
+        // Git will indicate success but silently skip patches in some scenarios.
+        //
+        // @see https://github.com/cweagans/composer-patches/pull/165
+        $checked = FALSE;
+      }
+      if ($checked) {
+        // Apply the first successful style.
+        $patched = $this->executeCommand('git -C %s apply %s %s', $install_path, $patch_level, $filename);
+        break;
+      }
+    }
+    return $patched;
+  }
+
 }