Skip to content

Remove parameter check from each iteration #4

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

Closed
wants to merge 5 commits into from
Closed

Remove parameter check from each iteration #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
37116e5
Add a new valid case to test.
ioanszabo Mar 15, 2018
1d38b21
Moved the is_array check at the end of the function.
ioanszabo Mar 15, 2018
8726305
Tests for cases when first or second argument is not array.
ioanszabo Mar 19, 2018
7c007db
I suspect this test fails for some incompatible versions.
ioanszabo Mar 19, 2018
fda8400
Nop, is not mine.
ioanszabo Mar 19, 2018
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
17 changes: 12 additions & 5 deletions src/ArrayDiffMultidimensional.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,25 @@ class ArrayDiffMultidimensional
{

/**
* Returns an array with the differences between $array1 and $array2
*
* @param array $aArray1
* @param array $aArray2
* Returns an array with items that are present in first array,
* but not in the second one. If second argument is not
* array first array is returned.
* @param mixed $array1
* @param mixed $array2
* @return array
* @internal param array $aArray1
* @internal param array $aArray2
*/
public static function compare($array1, $array2)
{
$result = array();

if (!is_array($array2)) {
return $array1;
}

foreach ($array1 as $key => $value) {
if (!is_array($array2) || !array_key_exists($key, $array2)) {
if (!array_key_exists($key, $array2)) {
$result[$key] = $value;
continue;
}
Expand Down
201 changes: 129 additions & 72 deletions tests/ArrayCompareTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,76 +6,133 @@

class ArrayCompareTest extends \PHPUnit_Framework_TestCase
{
protected $diff;

public function setUp()
{
$this->diff = new ArrayDiffMultidimensional();
}

/** @test */
public function returnsAnArray()
{
$this->assertTrue( is_array($this->diff->compare([],[])) );
}

/** @test */
public function DetectsTheDifferenceOnStringValue()
{
$old = [
'a' => 'b',
'c' => uniqid(),
];

$new = [
'a' => 'b',
'c' => uniqid(),
];

$this->assertEquals( count($this->diff->compare($new,$old)), 1 );
$this->assertTrue( isset($this->diff->compare($new,$old)['c']) );
}

/** @test */
public function DetectsChangeFromStringToArray()
{
$new = [
'a' => 'b',
'c' => [
'd' => uniqid(),
'e' => uniqid(),
],
];

$old = [
'a' => 'b',
'c' => uniqid(),
];

$this->assertEquals( count($this->diff->compare($new,$old)), 1 );
$this->assertTrue( is_array($this->diff->compare($new,$old)['c']) );
}

/** @test */
public function DetectsChangesOnNestedArrays()
{
$new = [
'a' => 'b',
'c' => [
'd' => 'e',
'f' => uniqid(),
],
];

$old = [
'a' => 'b',
'c' => [
'd' => 'e',
'f' => uniqid(),
],
];

$this->assertEquals( count($this->diff->compare($new,$old)), 1 );
$this->assertTrue( isset($this->diff->compare($new,$old)['c']['f']) );
}
protected $diff;

public function setUp()
{
$this->diff = new ArrayDiffMultidimensional();
}

/** @test */
public function returnsAnArray()
{
$this->assertTrue(is_array($this->diff->compare([], [])));
}

/** @test */
public function DetectsTheDifferenceOnStringValue()
{
$old = [
'a' => 'b',
'c' => uniqid(),
];

$new = [
'a' => 'b',
'c' => uniqid(),
];

$this->assertEquals(count($this->diff->compare($new, $old)), 1);
$this->assertTrue(isset($this->diff->compare($new, $old)['c']));
}

/** @test */
public function DetectsChangeFromStringToArray()
{
$new = [
'a' => 'b',
'c' => [
'd' => uniqid(),
'e' => uniqid(),
],
];

$old = [
'a' => 'b',
'c' => uniqid(),
];

$this->assertEquals(count($this->diff->compare($new, $old)), 1);
$this->assertTrue(is_array($this->diff->compare($new, $old)['c']));
}

/** @test */
public function DetectsChangesOnNestedArrays()
{
$new = [
'a' => 'b',
'c' => [
'd' => 'e',
'f' => uniqid(),
],
];

$old = [
'a' => 'b',
'c' => [
'd' => 'e',
'f' => uniqid(),
],
];

$this->assertEquals(count($this->diff->compare($new, $old)), 1);
$this->assertTrue(isset($this->diff->compare($new, $old)['c']['f']));
}

/** @test */
public function BeAwareThatThisArrayAreEquals()
{
$new = [
'a' => 'b',
'c' => [
'd' => 'e',
],
];

$old = [
'a' => 'b',
'c' => [
'd' => 'e',
'f' => uniqid(),
],
];

$this->assertNotEquals(1, count($this->diff->compare($new, $old)));
}


/** @test */
public function SecondArgumentIsNotArray()
{
$old = [
'a' => 'b',
'c' => [
'd' => 'e',
'ff' => [
'test'
]
],
];

$new = 100;

$this->assertEquals($old, $this->diff->compare($old, $new));
}

/**
* @test
* @expectedException \PHPUnit_Framework_Error
*/
public function FirstArgumentIsNotArray()
{
$old = null;
$new = [
'a' => 'b',
'c' => [
'd' => 'e',
],
];

$this->assertEquals($new, $this->diff->compare($old, $new));
}
}