MergeConflictSolutionProvider::getSolutions() - Code Metrics - Inspection of "Show nice error message for merge conflicts" - facade/ignition - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#58)

by James

created 2019-09-02 17:04 UTC

MergeConflictSolutionProvider::getSolutions() A

↳ Parent: MergeConflictSolutionProvider

Complexity

Conditions	1
Paths	1

Size

Total Lines

Duplication

Lines	0
Ratio	0 %

Importance

Changes

Metric	Value
dl	0
loc	13
rs	9.8333
c	0
b	0
f	0
cc	1
nc	1
nop	1

<?php

namespace Facade\Ignition\SolutionProviders;

use Throwable;
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 \'<<\'')) {
class A
{
    public function foo() { }
}

class B extends A
{
    public function bar() { }
}

/**
 * @param A|B $x
 */
function someFunction($x)
{
    $x->foo(); // This call is fine as the method exists in A and B.
    $x->bar(); // This method only exists in B and might cause an error.
}
            $file = file_get_contents($throwable->getFile());
class A
{
    public function foo() { }
}

class B extends A
{
    public function bar() { }
}

/**
 * @param A|B $x
 */
function someFunction($x)
{
    $x->foo(); // This call is fine as the method exists in A and B.
    $x->bar(); // This method only exists in B and might cause an error.
}
            if (strpos($file, '<<<<<<<') !== false &&
                strpos($file, '=======') !== false &&
                strpos($file, '>>>>>>>') !== false
            ) {
                return true;
            }
        }

        return false;
    }

    public function getSolutions(Throwable $throwable): array
    {
        $file = file_get_contents($throwable->getFile());
        preg_match('/\>\>\>\>\>\>\> (.*?)\n/', $file, $matches);
        $source = $matches[1];
        $folder = basename($throwable->getFile());
        $target = trim(`cd $folder; git branch | grep \* | cut -d ' ' -f2`);

        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`'),
        ];
    }
}


Pull Request — master (#58)

MergeConflictSolutionProvider::getSolutions() A

Complexity

Size

Duplication

Importance

Available Fixes

Available Fixes

1			<?php
2
3			namespace Facade\Ignition\SolutionProviders;
4
5			use Throwable;
6			use Illuminate\Support\Str;
7			use Facade\IgnitionContracts\BaseSolution;
8			use Facade\IgnitionContracts\HasSolutionsForThrowable;
9			use Symfony\Component\Debug\Exception\FatalThrowableError;
10
11			class MergeConflictSolutionProvider implements HasSolutionsForThrowable
12			{
13			public function canSolve(Throwable $throwable): bool
14			{
15			if (! ($throwable instanceof FatalThrowableError \|\| $throwable instanceof \ParseError)) {
16			return false;
17			}
18
19			if (Str::startsWith($throwable->getMessage(), 'syntax error, unexpected \'<<\'')) {
			0 ignored issues – show Bug introduced 2019-09-02 17:01 UTC by Report Bug Copy Issue Report The method `getMessage` does only exist in `ParseError`, but not in `Symfony\Component\Debug\...ion\FatalThrowableError`. It seems like the method you are trying to call exists only in some of the possible types. Let’s take a look at an example: class A { public function foo() { } } class B extends A { public function bar() { } } /** * @param A\|B $x / function someFunction($x) { $x->foo(); // This call is fine as the method exists in A and B. $x->bar(); // This method only exists in B and might cause an error. } Available Fixes Add an additional type-check: /* * @param A\|B $x / function someFunction($x) { $x->foo(); if ($x instanceof B) { $x->bar(); } } Only allow a single type to be passed if the variable comes from a parameter: function someFunction(B $x) { /* ... */ } Loading history...
20			$file = file_get_contents($throwable->getFile());
			0 ignored issues – show Bug introduced 2019-09-02 17:01 UTC by Report Bug Copy Issue Report The method `getFile` does only exist in `ParseError`, but not in `Symfony\Component\Debug\...ion\FatalThrowableError`. It seems like the method you are trying to call exists only in some of the possible types. Let’s take a look at an example: class A { public function foo() { } } class B extends A { public function bar() { } } /** * @param A\|B $x / function someFunction($x) { $x->foo(); // This call is fine as the method exists in A and B. $x->bar(); // This method only exists in B and might cause an error. } Available Fixes Add an additional type-check: /* * @param A\|B $x / function someFunction($x) { $x->foo(); if ($x instanceof B) { $x->bar(); } } Only allow a single type to be passed if the variable comes from a parameter: function someFunction(B $x) { /* ... */ } Loading history...
21			if (strpos($file, '<<<<<<<') !== false &&
22			strpos($file, '=======') !== false &&
23			strpos($file, '>>>>>>>') !== false
24			) {
25			return true;
26			}
27			}
28
29			return false;
30			}
31
32			public function getSolutions(Throwable $throwable): array
33			{
34			$file = file_get_contents($throwable->getFile());
35			preg_match('/\>\>\>\>\>\>\> (.*?)\n/', $file, $matches);
36			$source = $matches[1];
37			$folder = basename($throwable->getFile());
38			$target = trim(`cd $folder; git branch \| grep \* \| cut -d ' ' -f2`);
39
40			return [
41			BaseSolution::create("Merge conflict from branch '$source' into '$target'")
42			->setSolutionDescription('You have a Git merge conflict. To undo your merge do `git reset --hard HEAD`'),
43			];
44			}
45			}
46

facade / ignition

Pull Request — master (#58)

MergeConflictSolutionProvider::getSolutions() A

Complexity

Size

Duplication

Importance

Available Fixes

Available Fixes

Duplication Side-by-Side

Filter issues like