芝麻web文件管理V1.00
编辑当前文件:/home/qrafawbu/www/vendor/facade/ignition/src/SolutionProviders/MergeConflictSolutionProvider.php
hasMergeConflictExceptionMessage($throwable)) { return false; } $file = file_get_contents($throwable->getFile()); if (strpos($file, '=======') === false) { return false; } if (strpos($file, '>>>>>>>') === false) { return false; } return true; } public function getSolutions(Throwable $throwable): array { $file = file_get_contents($throwable->getFile()); preg_match('/\>\>\>\>\>\>\> (.*?)\n/', $file, $matches); $source = $matches[1]; $target = $this->getCurrentBranch(basename($throwable->getFile())); return [ BaseSolution::create("Merge conflict from branch '$source' into $target") ->setSolutionDescription('You have a Git merge conflict. To undo your merge do `git reset --hard HEAD`'), ]; } protected function getCurrentBranch(string $directory): string { $branch = "'".trim(shell_exec("cd ${directory}; git branch | grep \\* | cut -d ' ' -f2"))."'"; if (! isset($branch) || $branch === "''") { $branch = 'current branch'; } return $branch; } protected function hasMergeConflictExceptionMessage(Throwable $throwable): bool { // For PHP 7.x and below if (Str::startsWith($throwable->getMessage(), 'syntax error, unexpected \'<<\'')) { return true; } // For PHP 8+ if (Str::startsWith($throwable->getMessage(), 'syntax error, unexpected token "<<"')) { return true; } return false; } }