Move git merge base to shell

PhpcsChanged/Cli.php

@@ -16,7 +16,6 @@
 use PhpcsChanged\CacheManager;
 use function PhpcsChanged\{getNewPhpcsMessages, getNewPhpcsMessagesFromFiles, getVersion};
 use function PhpcsChanged\SvnWorkflow\{getSvnUnifiedDiff, getSvnFileInfo, isNewSvnFile, getSvnUnmodifiedPhpcsOutput, getSvnModifiedPhpcsOutput, getSvnRevisionId};
-use function PhpcsChanged\GitWorkflow\getGitMergeBase;
 
 function getDebug(bool $debugEnabled): callable {
 	return
@@ -324,7 +323,7 @@ function runGitWorkflow(CliOptions $options, ShellOperator $shell, CacheManager
 		$shell->validateExecutableExists('cat', $cat);
 		$debug('executables are valid');
 		if ($options->gitBase) {
-			$options->gitBase = getGitMergeBase($git, [$shell, 'executeCommand'], $options->toArray(), $debug);
+			$options->gitBase = $shell->getGitMergeBase();
 		}
 	} catch(\Exception $err) {
 		$shell->printError($err->getMessage());

PhpcsChanged/ShellOperator.php

@@ -35,4 +35,6 @@ public function getPhpcsOutputOfModifiedGitFile(string $fileName): string;
 	public function getPhpcsOutputOfUnmodifiedGitFile(string $fileName): string;
 
 	public function getGitUnifiedDiff(string $fileName): string;
+
+	public function getGitMergeBase(): string;
 }

PhpcsChanged/UnixShell.php

@@ -219,6 +219,23 @@ public function getGitUnifiedDiff(string $fileName): string {
 		return $unifiedDiff;
 	}
 
+	public function getGitMergeBase(): string {
+		if ($this->options->mode !== Modes::GIT_BASE) {
+			return '';
+		}
+		$debug = getDebug($this->options->debug);
+		$git = getenv('GIT') ?: 'git';
+		$mergeBaseCommand = "{$git} merge-base " . escapeshellarg($this->options->gitBase) . ' HEAD';
+		$debug('running merge-base command:', $mergeBaseCommand);
+		$mergeBase = $this->executeCommand($mergeBaseCommand);
+		if (! $mergeBase) {
+			$debug('merge-base command produced no output');
+			return $this->options->gitBase;
+		}
+		$debug('merge-base command output:', $mergeBase);
+		return trim($mergeBase);
+	}
+
 	public function isReadable(string $fileName): bool {
 		return is_readable($fileName);
 	}

composer.json

@@ -34,7 +34,6 @@
         "files": [
             "PhpcsChanged/Cli.php",
             "PhpcsChanged/SvnWorkflow.php",
-            "PhpcsChanged/GitWorkflow.php",
             "PhpcsChanged/functions.php"
         ]
     },

index.php

@@ -32,4 +32,3 @@
 require_once __DIR__ . '/PhpcsChanged/functions.php';
 require_once __DIR__ . '/PhpcsChanged/Cli.php';
 require_once __DIR__ . '/PhpcsChanged/SvnWorkflow.php';
-require_once __DIR__ . '/PhpcsChanged/GitWorkflow.php';

tests/helpers/TestShell.php

@@ -235,4 +235,17 @@ public function getGitUnifiedDiff(string $fileName): string {
 		}
 		return $unifiedDiff;
 	}
+
+	public function getGitMergeBase(): string {
+		if ($this->options->mode !== Modes::GIT_BASE) {
+			return '';
+		}
+		$git = getenv('GIT') ?: 'git';
+		$mergeBaseCommand = "{$git} merge-base " . escapeshellarg($this->options->gitBase) . ' HEAD';
+		$mergeBase = $this->executeCommand($mergeBaseCommand);
+		if (! $mergeBase) {
+			return $this->options->gitBase;
+		}
+		return trim($mergeBase);
+	}
 }