Skip to content

Add missing DiffOpChange to ListPatcher #65

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.

Sign up for GitHub

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

Open
thiemowmde wants to merge 1 commit into
base: 2.x
Choose a base branch
from
Open

Add missing DiffOpChange to ListPatcher #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/Patcher/ListPatcher.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Diff\DiffOp\Diff\Diff;
use Diff\DiffOp\DiffOpAdd;
use Diff\DiffOp\DiffOpChange;
use Diff\DiffOp\DiffOpRemove;

/**
Expand Down Expand Up @@ -41,6 +42,16 @@ public function patch( array $base, Diff $diff ) {
foreach ( $diff as $diffOp ) {
if ( $diffOp instanceof DiffOpAdd ) {
$base[] = $diffOp->getNewValue();
} elseif ( $diffOp instanceof DiffOpChange ) {
$key = array_search( $diffOp->getOldValue(), $base, true );

if ( $key === false ) {
$this->handleError( 'Cannot change an element in a list if it is not present' );
continue;
}

unset( $base[$key] );
$base[] = $diffOp->getNewValue();
} elseif ( $diffOp instanceof DiffOpRemove ) {
$key = array_search( $diffOp->getOldValue(), $base, true );

Expand Down
29 changes: 29 additions & 0 deletions tests/phpunit/Patcher/ListPatcherTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use Diff\DiffOp\Diff\Diff;
use Diff\DiffOp\DiffOpAdd;
use Diff\DiffOp\DiffOpChange;
use Diff\DiffOp\DiffOpRemove;
use Diff\Patcher\ListPatcher;
use Diff\Patcher\Patcher;
Expand Down Expand Up @@ -67,6 +68,13 @@ public function patchProvider() {

$argLists[] = array( $patcher, $base, $diff, $expected );

$argLists[] = array(
new ListPatcher(),
array( 1 ),
new Diff( array( new DiffOpChange( 1, 2 ) ) ),
array( 2 )
);

$patcher = new ListPatcher();
$base = array( 0, 1, 2, 3, 4 );
$diff = new Diff( array(
Expand Down Expand Up @@ -139,6 +147,13 @@ public function getApplicableDiffProvider() {

$argLists[] = array( $diff, $currentObject, $expected, 'Empty diff should remain empty on non-empty base' );

$argLists[] = array(
new Diff( array( new Diff( array( new DiffOpAdd( 1 ) ) ) ) ),
array(),
new Diff(),
'Recursive diffs should be ignored by ListPatcher'
);

$diff = new Diff( array(
new DiffOpRemove( 9001 ),
), false );
Expand All @@ -149,6 +164,13 @@ public function getApplicableDiffProvider() {

$argLists[] = array( $diff, $currentObject, $expected, 'Remove ops should be removed on empty base' );

$argLists[] = array(
new Diff( array( new DiffOpChange( 1, 2 ) ) ),
array(),
new Diff(),
'Change ops should be removed on empty base'
);

$diff = new Diff( array(
new DiffOpAdd( 42 ),
new DiffOpRemove( 9001 ),
Expand Down Expand Up @@ -201,6 +223,13 @@ public function getApplicableDiffProvider() {
'list diffs containing only add ops should be retained even when not in the base'
);

$argLists[] = array(
new Diff( array( new DiffOpChange( 1, 2 ) ) ),
array( 1 ),
new Diff( array( new DiffOpRemove( 1 ), new DiffOpAdd( 2 ) ) ),
'Change ops with values present in the base should be retained in ListDiff'
);

$diff = new Diff( array(
new DiffOpRemove( 42 ),
new DiffOpRemove( 9001 ),
Expand Down