Neur0toxine/pock
1
0
Fork 0
mirror of https://github.com/Neur0toxine/pock.git synced 2025-01-31 04:51:42 +03:00
Code Issues Projects Releases Wiki Activity

fix for internal array comparison logic

Browse Source
This commit is contained in:
Pavel 2022-04-14 15:43:40 +03:00
parent f455ba52d5
commit bbfe55bc94
4 changed files with 120 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Comparator/RecursiveArrayComparator.php
View File

@ -50,8 +50,12 @@ class RecursiveArrayComparator implements ComparatorInterface
} }
foreach ($first as $key => $value) { foreach ($first as $key => $value) {
if (is_array($value) && !self::recursiveCompareArrays($value, $second[$key])) { if (is_array($value)) {
return false; if (!is_array($second[$key]) || !self::recursiveCompareArrays($value, $second[$key])) {
return false;
}
continue;
} }
if ($value !== $second[$key]) { if ($value !== $second[$key]) {

11
src/Comparator/RecursiveLtrArrayComparator.php
View File

@ -47,11 +47,12 @@ class RecursiveLtrArrayComparator extends RecursiveArrayComparator
} }
foreach ($needle as $key => $value) { foreach ($needle as $key => $value) {
if ( if (is_array($value)) {
is_array($value) && if (!is_array($haystack[$key]) || !self::recursiveCompareArrays($value, $haystack[$key])) {
(!is_array($haystack[$key]) || !self::recursiveCompareArrays($value, $haystack[$key])) return false;
) { }
return false;
continue;
} }
if ($value !== $haystack[$key]) { if ($value !== $haystack[$key]) {

75
tests/src/Comparator/RecursiveArrayComparatorTest.php Normal file
View File

@ -0,0 +1,75 @@
<?php
/**
* PHP version 7.3
*
* @category RecursiveArrayComparatorTest
* @package Pock\Tests\Comparator
*/
namespace Pock\Tests\Comparator;
use PHPUnit\Framework\TestCase;
use Pock\Comparator\ComparatorLocator;
use Pock\Comparator\RecursiveArrayComparator;
/**
* Class RecursiveArrayComparatorTest
*
* @category RecursiveArrayComparatorTest
* @package Pock\Tests\Comparator
*/
class RecursiveArrayComparatorTest extends TestCase
{
public function testMatches(): void
{
$needle = [
'filter' => [
'createdAtFrom' => '2020-01-01 00:00:00',
'createdAtTo' => '2021-08-01 00:00:00',
],
'test' => ''
];
$haystack = [
'filter' => [
'createdAtFrom' => '2020-01-01 00:00:00',
'createdAtTo' => '2021-08-01 00:00:00',
],
'test' => ''
];
self::assertTrue(ComparatorLocator::get(RecursiveArrayComparator::class)->compare($needle, $haystack));
}
public function testNotMatches(): void
{
$needle = [
'filter' => [
'createdAtFrom' => '2020-01-01 00:00:00',
'createdAtTo' => '2021-08-01 00:00:00',
],
'test2' => [1]
];
$haystack = [
'filter' => [
'createdAtFrom' => '2020-01-01 00:00:00',
'createdAtTo' => '2021-08-01 00:00:00',
],
'test2' => 1
];
self::assertFalse(ComparatorLocator::get(RecursiveArrayComparator::class)->compare($needle, $haystack));
}
public function testNotMatchesKeyPositions(): void
{
$needle = [
'source' => json_decode('{"medium":"tiktok","source":"Test Ad","campaign":"Test Campaign"}', true)
];
$haystack = [
'source' => json_decode('{"source":"Test Ad","medium":"tiktok","campaign":"Test Campaign"}', true)
];
self::assertTrue(ComparatorLocator::get(RecursiveArrayComparator::class)->compare($needle, $haystack));
}
}

33
tests/src/Comparator/RecursiveArrayLtrComparatorTest.php
View File

@ -39,4 +39,37 @@ class RecursiveArrayLtrComparatorTest extends TestCase
self::assertTrue(ComparatorLocator::get(RecursiveLtrArrayComparator::class)->compare($needle, $haystack)); self::assertTrue(ComparatorLocator::get(RecursiveLtrArrayComparator::class)->compare($needle, $haystack));
} }
public function testNotMatches(): void
{
$needle = [
'filter' => [
'createdAtFrom' => '2020-01-01 00:00:00',
'createdAtTo' => '2021-08-01 00:00:00',
],
'test2' => [1]
];
$haystack = [
'filter' => [
'createdAtFrom' => '2020-01-01 00:00:00',
'createdAtTo' => '2021-08-01 00:00:00',
],
'test2' => 1,
'test' => ''
];
self::assertFalse(ComparatorLocator::get(RecursiveLtrArrayComparator::class)->compare($needle, $haystack));
}
public function testNotMatchesKeyPositions(): void
{
$needle = [
'source' => json_decode('{"medium":"tiktok","source":"Test Ad","campaign":"Test Campaign"}', true)
];
$haystack = [
'source' => json_decode('{"source":"Test Ad","medium":"tiktok","campaign":"Test Campaign"}', true)
];
self::assertTrue(ComparatorLocator::get(RecursiveLtrArrayComparator::class)->compare($needle, $haystack));
}
} }