Mercurial > hg > isophonics-drupal-site
diff vendor/symfony/var-dumper/Cloner/Data.php @ 12:7a779792577d
Update Drupal core to v8.4.5 (via Composer)
author | Chris Cannam |
---|---|
date | Fri, 23 Feb 2018 15:52:07 +0000 |
parents | 4c8ae668cc8c |
children | 5fb285c0d0e3 |
line wrap: on
line diff
--- a/vendor/symfony/var-dumper/Cloner/Data.php Fri Feb 23 15:51:18 2018 +0000 +++ b/vendor/symfony/var-dumper/Cloner/Data.php Fri Feb 23 15:52:07 2018 +0000 @@ -63,7 +63,7 @@ /** * @param bool $recursive Whether values should be resolved recursively or not * - * @return scalar|array|null|Data[] A native representation of the original value + * @return string|int|float|bool|array|null|Data[] A native representation of the original value */ public function getValue($recursive = false) { @@ -172,7 +172,7 @@ */ public function getRawData() { - @trigger_error(sprintf('The %s() method is deprecated since version 3.3 and will be removed in 4.0. Use the array or object access instead.', __METHOD__)); + @trigger_error(sprintf('The %s() method is deprecated since Symfony 3.3 and will be removed in 4.0. Use the array or object access instead.', __METHOD__)); return $this->data; } @@ -356,10 +356,16 @@ $withChildren = $children && $cursor->depth !== $this->maxDepth && $this->maxItemsPerDepth; $dumper->enterHash($cursor, $item->type, $item->class, $withChildren); if ($withChildren) { - $cut = $this->dumpChildren($dumper, $cursor, $refs, $children, $cut, $item->type, null !== $item->class); + if ($cursor->skipChildren) { + $withChildren = false; + $cut = -1; + } else { + $cut = $this->dumpChildren($dumper, $cursor, $refs, $children, $cut, $item->type, null !== $item->class); + } } elseif ($children && 0 <= $cut) { $cut += count($children); } + $cursor->skipChildren = false; $dumper->leaveHash($cursor, $item->type, $item->class, $withChildren, $cut); break;