Merge pull request #136 from navarr/patch-1

Add switch to $patch_levels for Magento 2 Official Patches
cweagans · Jul 17, 2017 · f296498 · f296498
2 parents 6bd6ecd + 2ab836b
commit f296498
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Patches.php b/src/Patches.php
@@ -354,8 +354,8 @@ protected function getAndApplyPatch(RemoteFilesystem $downloader, $install_path,
     $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.
-    $patch_levels = array('-p1', '-p0', '-p2');
+    // it might be useful. p4 is useful for Magento 2 patches
+    $patch_levels = array('-p1', '-p0', '-p2', '-p4');
     foreach ($patch_levels as $patch_level) {
       $checked = $this->executeCommand('cd %s && git --git-dir=. apply --check %s %s', $install_path, $patch_level, $filename);
       if ($checked) {