MergeConflict::fixEOL() - Code Metrics - Inspection of "backwards compatibility for 2.x branch" - bircher/php-merge - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — 2.x ( 8cf368 )

by Fabian

created 2019-03-14 07:52 UTC

MergeConflict::fixEOL() A

↳ Parent: MergeConflict

Complexity

Conditions	1
Paths	1

Size

Total Lines

Duplication

Lines	0
Ratio	0 %

Code Coverage

Tests	4
CRAP Score	1

Importance

Changes

Metric	Value
dl	0
loc	7
ccs	4
cts	4
cp	1
rs	10
c	0
b	0
f	0
cc	1
nc	1
nop	1
crap	1

<?php
/**
 * This file is part of the php-merge package.
 *
 * (c) Fabian Bircher <[email protected]>
 *
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
 */

namespace PhpMerge;

/**
 * Class MergeConflict
 *
 * This represents a merge conflict it includes the lines of the original and
 * both variations as well as the index on the original text where the conflict
 * starts.
 *
 * @package    PhpMerge
 * @author     Fabian Bircher <[email protected]>
 * @copyright  Fabian Bircher <[email protected]>
 * @license    https://opensource.org/licenses/MIT
 * @version    Release: @package_version@
 * @link       http://github.com/bircher/php-merge
 */
final class MergeConflict
{

    /**
     * The lines from the original.
     *
     * @var string[]
     */
    protected $base;

    /**
     * The conflicting line changes from the first source.
     *
     * @var string[]
     */
    protected $remote;

    /**
     * The conflicting line changes from the second source.
     *
     * @var string[]
     */
    protected $local;

    /**
     * The line number in the original text.
     *
     * @var int
     */
    protected $baseLine;

    /**
     * The line number in the merged text.
     *
     * @var int
     */
    protected $mergedLine;

    /**
     * MergeConflict constructor.
     *
     * @param string[] $base
     *   The original lines where the conflict happened.
     * @param string[] $remote
     *   The conflicting line changes from the first source.
     * @param string[] $local
     *   The conflicting line changes from the second source.
     * @param int $baseLine
     *   The line number in the original text.
     * @param int $mergedLine
     *   The line number in the merged text.
     */
    public function __construct($base, $remote, $local, $baseLine, $mergedLine)
    {
        // Compatibility for 2.x branch and sebastian/diff 2.x and 3.x.
        $this->base = static::fixEOL($base);

        $this->remote = static::fixEOL($remote);

        $this->local = static::fixEOL($local);

        $this->baseLine = $baseLine;
        $this->mergedLine = $mergedLine;
    }

    /**
     * Get the base text of the conflict.
     *
     * @return string[]
     *   The array of lines which are involved in the conflict.
     */
    public function getBase()
    {
        return $this->base;
    }

    /**
     * Get the lines from the first text.
     *
     * @return string[]
     *   The array of lines from the first text involved in the conflict.
     */
    public function getRemote()
    {
        return $this->remote;
    }

    /**
     * Get the lines from the second text.
     *
     * @return string[]
     *   The array of lines from the first text involved in the conflict.
     */
    public function getLocal()
    {
        return $this->local;
    }

    /**
     * Get the line number in the original text where the conflict starts.
     *
     * @return int
     *   The line number as in the original text.
     */
    public function getBaseLine()
    {
        return $this->baseLine;
    }

    /**
     * Get the line number in the merged text where the conflict starts.
     *
     * @return int
     *   The line number in the merged text.
     */
    public function getMergedLine()
    {
        return $this->mergedLine;
    }

    /**
     * Remove the trailing EOL that are now added by sebastian/diff.
     *
     * @param string[] $lines
     *   The lines to fix.
     *
     * @return string[]
     *   The fixed lines.
     */
    private static function fixEOL(array $lines)
    {
        $ltrim = function ($line) {
            return rtrim($line, "\n");
        };
        return array_map($ltrim, $lines);
    }
}


1		<?php
2		/**
3		* This file is part of the php-merge package.
4		*
5		* (c) Fabian Bircher <[email protected]>
6		*
7		* For the full copyright and license information, please view the LICENSE
8		* file that was distributed with this source code.
9		*/
10
11		namespace PhpMerge;
12
13		/**
14		* Class MergeConflict
15		*
16		* This represents a merge conflict it includes the lines of the original and
17		* both variations as well as the index on the original text where the conflict
18		* starts.
19		*
20		* @package PhpMerge
21		* @author Fabian Bircher <[email protected]>
22		* @copyright Fabian Bircher <[email protected]>
23		* @license https://opensource.org/licenses/MIT
24		* @version Release: @package_version@
25		* @link http://github.com/bircher/php-merge
26		*/
27		final class MergeConflict
28		{
29
30		/**
31		* The lines from the original.
32		*
33		* @var string[]
34		*/
35		protected $base;
36
37		/**
38		* The conflicting line changes from the first source.
39		*
40		* @var string[]
41		*/
42		protected $remote;
43
44		/**
45		* The conflicting line changes from the second source.
46		*
47		* @var string[]
48		*/
49		protected $local;
50
51		/**
52		* The line number in the original text.
53		*
54		* @var int
55		*/
56		protected $baseLine;
57
58		/**
59		* The line number in the merged text.
60		*
61		* @var int
62		*/
63		protected $mergedLine;
64
65		/**
66		* MergeConflict constructor.
67		*
68		* @param string[] $base
69		* The original lines where the conflict happened.
70		* @param string[] $remote
71		* The conflicting line changes from the first source.
72		* @param string[] $local
73		* The conflicting line changes from the second source.
74		* @param int $baseLine
75		* The line number in the original text.
76		* @param int $mergedLine
77		* The line number in the merged text.
78		*/
79	10	public function __construct($base, $remote, $local, $baseLine, $mergedLine)
80		{
81		// Compatibility for 2.x branch and sebastian/diff 2.x and 3.x.
82	10	$this->base = static::fixEOL($base);
		0 ignored issues – show Comprehensibility introduced 2019-03-14 08:05 UTC by Report Bug Copy Issue Report Since `PhpMerge\MergeConflict` is declared final, using late-static binding will have no effect. You might want to replace `static` with `self` instead. Late static binding only has effect in subclasses. A `final` class cannot be extended anymore so late static binding cannot occurr. Consider replacing `static::` with `self::`. To learn more about late static binding, please refer to the PHP core documentation. Loading history...
83	10	$this->remote = static::fixEOL($remote);
		0 ignored issues – show Comprehensibility introduced 2019-03-14 08:05 UTC by Report Bug Copy Issue Report Since `PhpMerge\MergeConflict` is declared final, using late-static binding will have no effect. You might want to replace `static` with `self` instead. Late static binding only has effect in subclasses. A `final` class cannot be extended anymore so late static binding cannot occurr. Consider replacing `static::` with `self::`. To learn more about late static binding, please refer to the PHP core documentation. Loading history...
84	10	$this->local = static::fixEOL($local);
		0 ignored issues – show Comprehensibility introduced 2019-03-14 08:05 UTC by Report Bug Copy Issue Report Since `PhpMerge\MergeConflict` is declared final, using late-static binding will have no effect. You might want to replace `static` with `self` instead. Late static binding only has effect in subclasses. A `final` class cannot be extended anymore so late static binding cannot occurr. Consider replacing `static::` with `self::`. To learn more about late static binding, please refer to the PHP core documentation. Loading history...
85	10	$this->baseLine = $baseLine;
86	10	$this->mergedLine = $mergedLine;
87	10	}
88
89		/**
90		* Get the base text of the conflict.
91		*
92		* @return string[]
93		* The array of lines which are involved in the conflict.
94		*/
95	6	public function getBase()
96		{
97	6	return $this->base;
98		}
99
100		/**
101		* Get the lines from the first text.
102		*
103		* @return string[]
104		* The array of lines from the first text involved in the conflict.
105		*/
106	2	public function getRemote()
107		{
108	2	return $this->remote;
109		}
110
111		/**
112		* Get the lines from the second text.
113		*
114		* @return string[]
115		* The array of lines from the first text involved in the conflict.
116		*/
117	2	public function getLocal()
118		{
119	2	return $this->local;
120		}
121
122		/**
123		* Get the line number in the original text where the conflict starts.
124		*
125		* @return int
126		* The line number as in the original text.
127		*/
128	6	public function getBaseLine()
129		{
130	6	return $this->baseLine;
131		}
132
133		/**
134		* Get the line number in the merged text where the conflict starts.
135		*
136		* @return int
137		* The line number in the merged text.
138		*/
139	2	public function getMergedLine()
140		{
141	2	return $this->mergedLine;
142		}
143
144		/**
145		* Remove the trailing EOL that are now added by sebastian/diff.
146		*
147		* @param string[] $lines
148		* The lines to fix.
149		*
150		* @return string[]
151		* The fixed lines.
152		*/
153	10	private static function fixEOL(array $lines)
154		{
155		$ltrim = function ($line) {
156	10	return rtrim($line, "\n");
157	10	};
158	10	return array_map($ltrim, $lines);
159		}
160		}
161

bircher / php-merge

Push — 2.x ( 8cf368 )

MergeConflict::fixEOL() A

Complexity

Size

Duplication

Code Coverage

Importance

Duplication Side-by-Side

Filter issues like