Internal: changing private functions to return a string

Author: weaverryan

src/Configurator/AddLinesConfigurator.php

@@ -78,7 +78,8 @@ public function configure(Recipe $recipe, $config, Lock $lock, array $options =
             }
             $target = isset($patch['target']) ? $patch['target'] : null;
 
-            $this->patchFile($file, $content, $position, $target, $warnIfMissing);
+            $newContents = $this->getPatchedContents($file, $content, $position, $target, $warnIfMissing);
+            file_put_contents($file, $newContents);
         }
     }
 
@@ -106,7 +107,8 @@ public function unconfigure(Recipe $recipe, $config, Lock $lock): void
             }
             $value = $patch['content'];
 
-            $this->unPatchFile($file, $value);
+            $newContents = $this->getUnPatchedContents($file, $value);
+            file_put_contents($file, $newContents);
         }
     }
 
@@ -145,12 +147,12 @@ public function update(RecipeUpdate $recipeUpdate, array $originalConfig, array
         $this->configure($recipeUpdate->getNewRecipe(), $filteredNewConfig, $recipeUpdate->getLock());
     }
 
-    private function patchFile(string $file, string $value, string $position, ?string $target, bool $warnIfMissing)
+    private function getPatchedContents(string $file, string $value, string $position, ?string $target, bool $warnIfMissing): string
     {
         $fileContents = file_get_contents($file);
 
         if (false !== strpos($fileContents, $value)) {
-            return; // already includes value, skip
+            return $fileContents; // already includes value, skip
         }
 
         switch ($position) {
@@ -188,15 +190,15 @@ private function patchFile(string $file, string $value, string $position, ?strin
                 break;
         }
 
-        file_put_contents($file, $fileContents);
+        return $fileContents;
     }
 
-    private function unPatchFile(string $file, $value)
+    private function getUnPatchedContents(string $file, $value): string
     {
         $fileContents = file_get_contents($file);
 
         if (false === strpos($fileContents, $value)) {
-            return; // value already gone!
+            return $fileContents; // value already gone!
         }
 
         if (false !== strpos($fileContents, "\n".$value)) {
@@ -208,7 +210,7 @@ private function unPatchFile(string $file, $value)
         $position = strpos($fileContents, $value);
         $fileContents = substr_replace($fileContents, '', $position, \strlen($value));
 
-        file_put_contents($file, $fileContents);
+        return $fileContents;
     }
 
     private function isPackageInstalled($packages): bool