Skip to content

src or dst can be null #20

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
dbu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

src or dst can be null #20

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
18 changes: 10 additions & 8 deletions src/JsonPatch.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,17 +290,17 @@ private static function diff_values($path, $value, $other)
// Walk associative arrays $src and $dst, returning a list of patches
private static function diff_assoc($path, $src, $dst)
{
$result = array();
if (count($src) == 0 && count($dst) != 0)
if ((!is_array($src) || count($src)) == 0 && is_array($dst) && count($dst) != 0)
{
$result[] = array("op" => "replace", "path" => "$path", "value" => $dst);
return array(array("op" => "replace", "path" => "$path", "value" => $dst));
}
else
{

$result = array();
if (is_array($src)) {
foreach (array_keys($src) as $key)
{
$ekey = self::escape_pointer_part($key);
if (!array_key_exists($key, $dst))
if (!is_array($dst) || !array_key_exists($key, $dst))
{
$result[] = array("op" => "remove", "path" => "$path/$ekey");
}
Expand All @@ -311,9 +311,11 @@ private static function diff_assoc($path, $src, $dst)
$src[$key], $dst[$key]));
}
}
}
if (is_array($dst)) {
foreach (array_keys($dst) as $key)
{
if (!array_key_exists($key, $src))
if (!is_array($src) || !array_key_exists($key, $src))
{
$ekey = self::escape_pointer_part($key);
$result[] = array("op" => "add", "path" => "$path/$ekey",
Expand All @@ -337,7 +339,7 @@ private static function diff_array($path, $src, $dst)
$i = $max - 1;
while ($i >= 0) // equivalent for loop didn't work?
{
if ($i < $lsrc && $i < $ldst &&
if ($i < $lsrc && $i < $ldst &&
array_key_exists($i, $src) && array_key_exists($i, $dst))
{
$result = array_merge($result,
Expand Down