RetailCRM-Mirror/graphql-php
1
0
Fork 0
mirror of https://github.com/retailcrm/graphql-php.git synced 2024-11-25 22:36:02 +03:00
Code Issues Projects Releases Wiki Activity

Preserve backwards compatibility of Ast\Node::toArray(): do shallow conversion by default

Browse Source
This commit is contained in:
Vladimir Razuvaev 2017-04-25 18:02:45 +07:00
parent 835e4e6b2d
commit 848f9c3edf
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Language/AST/Node.php
View File

@ -81,22 +81,26 @@ abstract class Node
*/ */
public function __toString() public function __toString()
{ {
$tmp = $this->toArray(); $tmp = $this->toArray(true);
return json_encode($tmp); return json_encode($tmp);
} }
/** /**
* @param bool $recursive
* @return array * @return array
*/ */
public function toArray() public function toArray($recursive = false)
{ {
$tmp = (array) $this; $tmp = (array) $this;
$tmp['loc'] = [ $tmp['loc'] = [
'start' => $this->loc->start, 'start' => $this->loc->start,
'end' => $this->loc->end 'end' => $this->loc->end
]; ];
$this->recursiveToArray($tmp); if ($recursive) {
$this->recursiveToArray($tmp);
}
return $tmp; return $tmp;
} }
@ -108,7 +112,7 @@ abstract class Node
{ {
if ($object instanceof Node) { if ($object instanceof Node) {
/** @var Node $object */ /** @var Node $object */
$object = $object->toArray(); $object = $object->toArray(true);
} elseif (is_object($object)) { } elseif (is_object($object)) {
$object = (array) $object; $object = (array) $object;
} elseif (is_array($object)) { } elseif (is_array($object)) {