forked from sebastianbergmann/diff
-
Notifications
You must be signed in to change notification settings - Fork 3
Add Diff v3 backport #7
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -158,7 +158,7 @@ public function diffToArray($from, $to, LongestCommonSubsequenceCalculator $lcs | |
} | ||
|
||
if ($this->detectUnmatchedLineEndings($diff)) { | ||
\array_unshift($diff, ["#Warning: Strings contain different line endings!\n", 3]); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @keradus same here, not sure why this change is needed for v3.0? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. i copy-pasted v2 from original repo as well, that was the change from there |
||
\array_unshift($diff, ["#Warnings contain different line endings!\n", 3]); | ||
} | ||
|
||
return $diff; | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
<?php | ||
/* | ||
* This file is part of sebastian/diff. | ||
* | ||
* (c) Sebastian Bergmann <sebastian@phpunit.de> | ||
* | ||
* For the full copyright and license information, please view the LICENSE | ||
* file that was distributed with this source code. | ||
*/ | ||
|
||
namespace PhpCsFixer\Diff\v3_0; | ||
|
||
final class Chunk | ||
{ | ||
/** | ||
* @var int | ||
*/ | ||
private $start; | ||
|
||
/** | ||
* @var int | ||
*/ | ||
private $startRange; | ||
|
||
/** | ||
* @var int | ||
*/ | ||
private $end; | ||
|
||
/** | ||
* @var int | ||
*/ | ||
private $endRange; | ||
|
||
/** | ||
* @var array | ||
*/ | ||
private $lines; | ||
|
||
public function __construct($start = 0, $startRange = 1, $end = 0, $endRange = 1, array $lines = []) | ||
{ | ||
$this->start = $start; | ||
$this->startRange = $startRange; | ||
$this->end = $end; | ||
$this->endRange = $endRange; | ||
$this->lines = $lines; | ||
} | ||
|
||
public function getStart() | ||
{ | ||
return $this->start; | ||
} | ||
|
||
public function getStartRange() | ||
{ | ||
return $this->startRange; | ||
} | ||
|
||
public function getEnd() | ||
{ | ||
return $this->end; | ||
} | ||
|
||
public function getEndRange() | ||
{ | ||
return $this->endRange; | ||
} | ||
|
||
public function getLines() | ||
{ | ||
return $this->lines; | ||
} | ||
|
||
public function setLines(array $lines) | ||
{ | ||
$this->lines = $lines; | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
<?php | ||
/* | ||
* This file is part of sebastian/diff. | ||
* | ||
* (c) Sebastian Bergmann <sebastian@phpunit.de> | ||
* | ||
* For the full copyright and license information, please view the LICENSE | ||
* file that was distributed with this source code. | ||
*/ | ||
|
||
namespace PhpCsFixer\Diff\v3_0; | ||
|
||
final class Diff | ||
{ | ||
/** | ||
* @var string | ||
*/ | ||
private $from; | ||
|
||
/** | ||
* @var string | ||
*/ | ||
private $to; | ||
|
||
/** | ||
* @var Chunk[] | ||
*/ | ||
private $chunks; | ||
|
||
/** | ||
* @param string $from | ||
* @param string $to | ||
* @param Chunk[] $chunks | ||
*/ | ||
public function __construct($from, $to, array $chunks = []) | ||
{ | ||
$this->from = $from; | ||
$this->to = $to; | ||
$this->chunks = $chunks; | ||
} | ||
|
||
public function getFrom() | ||
{ | ||
return $this->from; | ||
} | ||
|
||
public function getTo() | ||
{ | ||
return $this->to; | ||
} | ||
|
||
/** | ||
* @return Chunk[] | ||
*/ | ||
public function getChunks() | ||
{ | ||
return $this->chunks; | ||
} | ||
|
||
/** | ||
* @param Chunk[] $chunks | ||
*/ | ||
public function setChunks(array $chunks) | ||
{ | ||
$this->chunks = $chunks; | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@keradus why was change needed for v3.0?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i copy-pasted v1 from original repo as well, that was the change from there