PATH:
home
/
lab2454c
/
sothebry.softkinesis.com
/
backups
/
core
/
vendor
/
facade
/
ignition
/
src
/
SolutionProviders
<?php namespace Facade\Ignition\SolutionProviders; use Facade\IgnitionContracts\BaseSolution; use Facade\IgnitionContracts\HasSolutionsForThrowable; use Illuminate\Support\Str; use ParseError; use Throwable; class MergeConflictSolutionProvider implements HasSolutionsForThrowable { public function canSolve(Throwable $throwable): bool { if (! ($throwable instanceof ParseError)) { return false; } if (! $this->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 ($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; } }
[-] UndefinedVariableSolutionProvider.php
[edit]
[-] UndefinedPropertySolutionProvider.php
[edit]
[-] MissingImportSolutionProvider.php
[edit]
[-] ViewNotFoundSolutionProvider.php
[edit]
[+]
..
[-] MissingAppKeySolutionProvider.php
[edit]
[-] SolutionProviderRepository.php
[edit]
[-] DefaultDbNameSolutionProvider.php
[edit]
[-] IncorrectValetDbCredentialsSolutionProvider.php
[edit]
[-] MissingPackageSolutionProvider.php
[edit]
[-] MergeConflictSolutionProvider.php
[edit]
[-] TableNotFoundSolutionProvider.php
[edit]
[-] MissingColumnSolutionProvider.php
[edit]
[-] MissingMixManifestSolutionProvider.php
[edit]
[-] RunningLaravelDuskInProductionProvider.php
[edit]
[-] RouteNotDefinedSolutionProvider.php
[edit]
[-] MissingLivewireComponentSolutionProvider.php
[edit]
[-] UnknownValidationSolutionProvider.php
[edit]
[-] LazyLoadingViolationSolutionProvider.php
[edit]
[-] BadMethodCallSolutionProvider.php
[edit]
[-] InvalidRouteActionSolutionProvider.php
[edit]