Skip to content

Commit

Permalink
bug #30274 [VarDumper] fix serializing Stub instances (nicolas-grekas)
Browse files Browse the repository at this point in the history
This PR was merged into the 3.4 branch.

Discussion
----------

[VarDumper] fix serializing Stub instances

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

There are more properties in child classes, and we can skip serializing properties that are set to their default values.

Commits
-------

46d6a4d [VarDumper] fix serializing Stub instances
  • Loading branch information
nicolas-grekas committed Feb 17, 2019
2 parents eb32993 + 46d6a4d commit ce7afc2
Showing 1 changed file with 17 additions and 10 deletions.
27 changes: 17 additions & 10 deletions src/Symfony/Component/VarDumper/Cloner/Stub.php
Expand Up @@ -39,22 +39,29 @@ class Stub
public $position = 0;
public $attr = [];

private static $defaultProperties = [];

/**
* @internal
*/
public function __sleep()
{
$this->serialized = [$this->class, $this->position, $this->cut, $this->type, $this->value, $this->handle, $this->refCount, $this->attr];
$properties = [];

return ['serialized'];
}
if (!isset(self::$defaultProperties[$c = \get_class($this)])) {
self::$defaultProperties[$c] = get_class_vars($c);

/**
* @internal
*/
public function __wakeup()
{
list($this->class, $this->position, $this->cut, $this->type, $this->value, $this->handle, $this->refCount, $this->attr) = $this->serialized;
unset($this->serialized);
foreach ((new \ReflectionClass($c))->getStaticProperties() as $k => $v) {
unset(self::$defaultProperties[$c][$k]);
}
}

foreach (self::$defaultProperties[$c] as $k => $v) {
if ($this->$k !== $v) {
$properties[] = $k;
}
}

return $properties;
}
}

0 comments on commit ce7afc2

Please sign in to comment.