Skip to content

Added support for objects implementing ArrayAccess Interface. #12

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

Added support for objects implementing ArrayAccess Interface. #12

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
69 changes: 42 additions & 27 deletions src/JsonPatch.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@ public static function patch($doc, $patches, $simplexml_mode=false)
}

$parts = self::decompose_pointer($path);



if (in_array($op, Array('test', 'add', 'replace', 'append')))
{
if (!array_key_exists('value', $patch))
Expand Down Expand Up @@ -412,10 +415,14 @@ private static function get_helper($doc, $path, $parts, $simplexml_mode)
// note: is_associative(array()) === false
private static function is_associative($a)
{
if (!is_array($a))
if (!is_array($a) && !($a instanceof \ArrayAccess))
{
return false;
}
if ($a instanceof \ArrayAccess)
{
return true;
}
foreach (array_keys($a) as $key)
{
if (is_string($key))
Expand Down Expand Up @@ -470,6 +477,7 @@ public static function considered_equal($a1, $a2)
private static function do_op($doc, $op, $path, $parts, $value,
$simplexml_mode)
{

// Special-case toplevel
if (count($parts) == 0)
{
Expand All @@ -492,38 +500,42 @@ private static function do_op($doc, $op, $path, $parts, $value,
// recur until we get to the target
if (count($parts) > 0)
{
if (!array_key_exists($part, $doc))
{
throw new JsonPatchException("Path '$path' not found");
}
// recur, adding resulting sub-doc into doc returned to caller

// special case for simplexml-style behavior - make singleton
// scalar leaves look like 1-length arrays
if ($simplexml_mode
&& count($parts) > 0
&& ($parts[0] == '0' || $parts[0] == '1' || $parts[0] == '-')
&& self::is_associative($doc)
&& !(is_array($doc[$part]) && !self::is_associative($doc[$part])))
{
$doc[$part] = self::do_op(array($doc[$part]), $op, $path, $parts,
$value, $simplexml_mode);
}
else
{
$doc[$part] = self::do_op($doc[$part], $op, $path, $parts,
$value, $simplexml_mode);
}
if( is_array($doc) || $doc instanceof \ArrayAccess )
{
//Array key or ArrayAccess object property not found
if ( ( is_array($doc) && !array_key_exists($part, $doc) ) || ( $doc instanceof \ArrayAccess && !property_exists($doc, $part) ) )
{
throw new JsonPatchException("Path '$path' not found");
}
// recur, adding resulting sub-doc into doc returned to caller

// special case for simplexml-style behavior - make singleton
// scalar leaves look like 1-length arrays
if ($simplexml_mode
&& count($parts) > 0
&& ($parts[0] == '0' || $parts[0] == '1' || $parts[0] == '-')
&& self::is_associative($doc)
&& !(is_array($doc[$part]) && !self::is_associative($doc[$part])))
{
$doc[$part] = self::do_op(array($doc[$part]), $op, $path, $parts,
$value, $simplexml_mode);
}
else
{
$doc[$part] = self::do_op($doc[$part], $op, $path, $parts,
$value, $simplexml_mode);
}
}
return $doc;
}

// at target
if (!is_array($doc))
if( !is_array($doc) && !($doc instanceof \ArrayAccess) )
{
throw new JsonPatchException('Target must be array or associative array');
}

if (!self::is_associative($doc)) // N.B. returns false for empty arrays
if (!self::is_associative($doc)) // N.B. returns false for empty arrays
{
if (count($doc) && !self::is_index($part)
&& !($part == '-' && ($op == 'add' || $op == 'append')))
Expand Down Expand Up @@ -572,10 +584,13 @@ private static function do_op($doc, $op, $path, $parts, $value,
}
else
{
if (!array_key_exists($part, $doc))
if (is_array($doc) && !array_key_exists($part, $doc))
{
throw new JsonPatchException("replace target '$path' not set");
}
if($doc instanceof \ArrayAccess && !\property_exists($doc, $part)){
throw new JsonPatchException("replace target '$path' in not a valid property of this document");
}
$doc[$part] = $value;
}
}
Expand Down