bircher / php-merge

src/PhpMerge/MergeConflict.php

Spacing +1 added lines, -1 removed lines

@@ -152,7 +152,7 @@
      */
     private static function fixEOL(array $lines)
     {
-        $ltrim = function ($line) {
+        $ltrim = function($line) {
             return rtrim($line, "\n");
         };
         return array_map($ltrim, $lines);

src/PhpMerge/internal/PhpMergeBase.php

Spacing +1 added lines, -1 removed lines

@@ -77,7 +77,7 @@
     protected static function preMergeAlter($text) : string
     {
         // Append new lines so that conflicts at the end of the text work.
-        return $text . "\nthe\nend";
+        return $text."\nthe\nend";
     }
 
     /**

src/PhpMerge/internal/Hunk.php

Spacing +3 added lines, -3 removed lines

@@ -203,7 +203,7 @@ 
     {
         return array_values(array_filter(
             $this->lines,
-            function (Line $line) {
+            function(Line $line) {
                 return $line->getType() == Line::REMOVED;
             }
         ));
@@ -218,7 +218,7 @@ 
     {
         return array_values(array_filter(
             $this->lines,
-            function (Line $line) {
+            function(Line $line) {
                 return $line->getType() == Line::ADDED;
             }
         ));
@@ -232,7 +232,7 @@ 
     public function getLinesContent()
     {
         return array_map(
-            function (Line $line) {
+            function(Line $line) {
                 return $line->getContent();
             },
             $this->getAddedLines()

src/PhpMerge/PhpMerge.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
 
         $baseLines = Line::createArray(
             array_map(
-                function ($l) {
+                function($l) {
                     return [$l, 0];
                 },
                 self::splitStringByLines($base)