FM / SolutionProviders

/var/www/flurhymez/vendor/facade/ignition/src/SolutionProviders/

/var/www/flurhymez/vendor/facade/ignition/src/SolutionProviders

Name	Size	Mode	Actions
BadMethodCallSolutionProvider.php	2231	0644	edit dl rm
DefaultDbNameSolutionProvider.php	894	0644	edit dl rm
IncorrectValetDbCredentialsSolutionProvider.php	1609	0644	edit dl rm
InvalidRouteActionSolutionProvider.php	2923	0644	edit dl rm
LazyLoadingViolationSolutionProvider.php	1377	0644	edit dl rm
MergeConflictSolutionProvider.php	2073	0644	edit dl rm
MissingAppKeySolutionProvider.php	657	0644	edit dl rm
MissingColumnSolutionProvider.php	960	0644	edit dl rm
MissingImportSolutionProvider.php	1271	0644	edit dl rm
MissingLivewireComponentSolutionProvider.php	1077	0644	edit dl rm
MissingMixManifestSolutionProvider.php	695	0644	edit dl rm
MissingPackageSolutionProvider.php	1622	0644	edit dl rm
RouteNotDefinedSolutionProvider.php	2066	0644	edit dl rm
RunningLaravelDuskInProductionProvider.php	1012	0644	edit dl rm
SolutionProviderRepository.php	3019	0644	edit dl rm
TableNotFoundSolutionProvider.php	959	0644	edit dl rm
UndefinedPropertySolutionProvider.php	3009	0644	edit dl rm
UndefinedVariableSolutionProvider.php	3094	0644	edit dl rm
UnknownValidationSolutionProvider.php	2582	0644	edit dl rm
ViewNotFoundSolutionProvider.php	3738	0644	edit dl rm

Edit: /var/www/flurhymez/vendor/facade/ignition/src/SolutionProviders/MergeConflictSolutionProvider.php (2073B)

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

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