File Manager Lite

Dir: /home/u540325668/domains/mccsociety.org/public_html/vendor/facade/ignition/src/SolutionProviders

[..]

BadMethodCallSolutionProvider.php (2.18 KB)

IncorrectValetDbCredentialsSolutionProvider.php (1.57 KB)

InvalidRouteActionSolutionProvider.php (2.85 KB)

MergeConflictSolutionProvider.php (1.74 KB)

MissingAppKeySolutionProvider.php (657 B)

MissingColumnSolutionProvider.php (953 B)

RouteNotDefinedSolutionProvider.php (2.01 KB)

RunningLaravelDuskInProductionProvider.php (1012 B)

Edit: MergeConflictSolutionProvider.php

<?php

namespace Facade\Ignition\SolutionProviders;

use Throwable;
use ParseError;
use Illuminate\Support\Str;
use Facade\IgnitionContracts\BaseSolution;
use Facade\IgnitionContracts\HasSolutionsForThrowable;
use Symfony\Component\Debug\Exception\FatalThrowableError;

class MergeConflictSolutionProvider implements HasSolutionsForThrowable
{
    public function canSolve(Throwable $throwable): bool
    {
        if (! ($throwable instanceof FatalThrowableError || $throwable instanceof ParseError)) {
            return false;
        }

if (! Str::startsWith($throwable->getMessage(), 'syntax error, unexpected \'<<\'')) {
            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`'),
        ];
    }

private 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;
    }
}