bircher / php-merge

src/PhpMerge/PhpMerge.php

Spacing +3 added lines, -3 removed lines

@@ -66,7 +66,7 @@ 
 
         $baseLines = Line::createArray(
             array_map(
-                function ($l) {
+                function($l) {
                     return [$l, 0];
                 },
                 self::splitStringByLines($base)
@@ -115,7 +115,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);
@@ -163,7 +163,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/GitMerge.php

Spacing +2 added lines, -2 removed lines

@@ -344,11 +344,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);
         }
         if ($this->git) {