bircher / php-merge

src/PhpMerge/MergeConflict.php

Doc Comments +2 added lines, -3 removed lines

@@ -71,10 +71,9 @@
      *   The conflicting line changes from the first source.
      * @param string[] $local
      *   The conflicting line changes from the second source.
-     * @param int $line
-     *   The line number in the original text.
-     * @param int $merged
+     * @param integer $mergedLine
      *   The line number in the merged text.
+     * @param integer $baseLine
      */
     public function __construct($base, $remote, $local, $baseLine, $mergedLine)
     {

src/PhpMerge/PhpMerge.php

Doc Comments +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
      * @param MergeConflict[] $conflicts
      *   The merge conflicts.
      *
-     * @return string[]
+     * @return string
      *   The merged text.
      */
     protected static function mergeHunks($base, $remote, $local, &$conflicts = [])

Spacing +3 added lines, -3 removed lines

@@ -64,7 +64,7 @@ 
 
         $baseLines = Line::createArray(
             array_map(
-                function ($l) {
+                function($l) {
                     return [$l, 0];
                 },
                 explode("\n", $base)
@@ -112,7 +112,7 @@ 
         $i = -1;
 
         // Loop over all indexes of the base and all hunks.
-        while ($i <  count($base) || $a->valid() || $b->valid()) {
+        while ($i < count($base) || $a->valid() || $b->valid()) {
             // Assure that $aa is the first hunk by swaping $a and $b
             if ($a->valid() && $b->valid() && $a->current()->getStart() > $b->current()->getStart()) {
                 self::swap($a, $b, $flipped);
@@ -160,7 +160,7 @@ 
                 $a->next();
             } else {
                 // Not dealing with a change, so return the line from the base.
-                if ($i>=0) {
+                if ($i >= 0) {
                     $merged[] = $base[$i]->getContent();
                 }
             }

src/PhpMerge/XdiffMerge.php

Spacing +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
             // So there might be a merge conflict.
             $baseLines = $this->base = Line::createArray(
                 array_map(
-                    function ($l) {
+                    function($l) {
                         return [$l, 0];
                     },
                     explode("\n", $base)
@@ -119,10 +119,10 @@ 
                 if (!$removed) {
                     $hunks[] = new Hunk($added, Hunk::ADDED, $matches[1], $matches[1]);
                 } elseif (!$added) {
-                    $hunks[] = new Hunk($removed, Hunk::REMOVED, $matches[1], $matches[1] + $matches[2] -1);
+                    $hunks[] = new Hunk($removed, Hunk::REMOVED, $matches[1], $matches[1] + $matches[2] - 1);
                 } else {
                     $combined = array_merge($removed, $added);
-                    $hunks[] = new Hunk($combined, Hunk::REPLACED, $matches[1], $matches[1] + $matches[2] -1);
+                    $hunks[] = new Hunk($combined, Hunk::REPLACED, $matches[1], $matches[1] + $matches[2] - 1);
                 }
             }
             $i->next();

src/PhpMerge/Hunk.php

Spacing +4 added lines, -4 removed lines

@@ -62,7 +62,7 @@ 
     {
         $this->start = $start;
         if ($end === null) {
-            $end= $start;
+            $end = $start;
         }
         $this->end = $end;
         if (!is_array($lines)) {
@@ -202,7 +202,7 @@ 
     {
         return array_values(array_filter(
             $this->lines,
-            function (Line $line) {
+            function(Line $line) {
                 return $line->getType() == Line::REMOVED;
             }
         ));
@@ -217,7 +217,7 @@ 
     {
         return array_values(array_filter(
             $this->lines,
-            function (Line $line) {
+            function(Line $line) {
                 return $line->getType() == Line::ADDED;
             }
         ));
@@ -231,7 +231,7 @@ 
     public function getLinesContent()
     {
         return array_map(
-            function (Line $line) {
+            function(Line $line) {
                 return $line->getContent();
             },
             $this->getAddedLines()

src/PhpMerge/GitMerge.php

Spacing +3 added lines, -3 removed lines

@@ -297,7 +297,7 @@ 
     protected static function preMergeAlter($text)
     {
         // Append new lines so that conflicts at the end of the text work.
-        return $text . "\nthe\nend";
+        return $text."\nthe\nend";
     }
 
     /**
@@ -334,11 +334,11 @@ 
         if (!$this->dir) {
             // Greate a temporary directory.
             $tempfile = tempnam(sys_get_temp_dir(), '');
-            mkdir($tempfile . '.git');
+            mkdir($tempfile.'.git');
             if (file_exists($tempfile)) {
                 unlink($tempfile);
             }
-            $this->dir = $tempfile . '.git';
+            $this->dir = $tempfile.'.git';
             $this->git = $this->wrapper->init($this->dir);
         }
         $this->git->config('user.name', 'GitMerge')