Remove empty files

Author: pinkeen

src/Patch.php

@@ -53,6 +53,11 @@ class Patch
      */
     private $method = PatchApplicator::METHOD_PATCH;
 
+    /**
+     * @var bool
+     */
+    private $keepEmptyFiles;
+
     /**
      * @param $sourcePackage
      * @param string $targetPackage
@@ -61,6 +66,7 @@ class Patch
      * @param string $description
      * @param int $stripPathComponents
      * @param string $method
+     * @param bool $keepEmptyFiles
      */
     public function __construct(
         $sourcePackage,
@@ -69,7 +75,8 @@ public function __construct(
         $filename,
         $description,
         $stripPathComponents = 1,
-        $method = PatchApplicator::METHOD_PATCH
+        $method = PatchApplicator::METHOD_PATCH,
+        $keepEmptyFiles = false
     ) {
         $this->sourcePackage = $sourcePackage;
         $this->targetPackage = $targetPackage;
@@ -78,6 +85,7 @@ public function __construct(
         $this->description = $description;
         $this->stripPathComponents = $stripPathComponents;
         $this->method = $method;
+        $this->keepEmptyFiles = $keepEmptyFiles;
     }
 
     /**
@@ -92,7 +100,8 @@ public static function createFromConfig($sourcePackage, $targetPackage, array $c
             'version-constraint' => '*',
             'description' => null,
             'strip-path-components' => 1,
-            'method' => PatchApplicator::METHOD_PATCH
+            'method' => PatchApplicator::METHOD_PATCH,
+            'keep-empty-files' => false,
         ], $config);
 
         if (!in_array($config['method'], PatchApplicator::METHODS)) {
@@ -110,7 +119,8 @@ public static function createFromConfig($sourcePackage, $targetPackage, array $c
             $config['filename'],
             $config['description'],
             $config['strip-path-components'],
-            $config['method']
+            $config['method'],
+            $config['keep-empty-files']
         );
     }
 
@@ -124,7 +134,8 @@ public static function createFromArray(array $data)
             $data['filename'],
             $data['description'],
             $data['strip_path_components'],
-            $data['method']
+            $data['method'],
+            $data['keep_empty_files']
         );
     }
 
@@ -193,6 +204,14 @@ public function getStripPathComponents()
         return $this->stripPathComponents;
     }
 
+    /**
+     * @return bool
+     */
+    public function getKeepEmptyFiles()
+    {
+        return $this->keepEmptyFiles;
+    }
+
     /**
      * @return string
      */
@@ -210,7 +229,8 @@ public function toArray()
             'filename' => $this->filename,
             'description' => $this->description,
             'strip_path_components' => $this->stripPathComponents,
-            'method' => $this->method
+            'method' => $this->method,
+            'keep_empty_files' => $this->keepEmptyFiles,
         ];
     }
 }

src/PatchApplicator.php

@@ -119,14 +119,20 @@ private function hasPatchCommand()
      * @param string $targetDirectory
      * @param string $patchFile
      * @param int $stripPathComponents
+     * @param bool $keepEmptyFiles
      * @return bool
      */
-    private function executePatchCommand($method, $targetDirectory, $patchFile, $stripPathComponents)
+    private function executePatchCommand($method, $targetDirectory, $patchFile, $stripPathComponents, $keepEmptyFiles = false)
     {
         $cwd = null;
 
         if ($method === self::METHOD_PATCH && $this->hasPatchCommand()) {
             $cmd = ['patch', '--posix', '--batch', '--forward', '--strip=' . $stripPathComponents, '--input='.$patchFile,  '--directory='.$targetDirectory];
+
+            if (!$keepEmptyFiles) {
+                $cmd[] = '--remove-empty-files';
+            }
+
         } else {
             $cmd = ['git', 'apply', '-v', '-p' . $stripPathComponents, $patchFile];