bircher / php-merge

src/PhpMerge/GitMerge.php

Doc Comments +2 added lines, -2 removed lines

@@ -290,7 +290,7 @@ 
     }
 
     /**
-     * @param $text
+     * @param string $text
      * @return string
      */
     protected static function preMergeAlter($text) : string
@@ -300,7 +300,7 @@ 
     }
 
     /**
-     * @param $text
+     * @param string $text
      * @return bool|string
      */
     protected static function postMergeAlter($text) : string

Spacing +3 added lines, -3 removed lines

@@ -296,7 +296,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";
     }
 
     /**
@@ -333,11 +333,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')