natas_hw
/
exporter
mirror of https://github.com/sebastianbergmann/exporter
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make SplObjectStorage exporting in HHVM match Zend 

SplObjectStorage::$storage is the current method.
HHVM is about to be changed so that it uses $__storage instead to reduce
the chance of a conflict in cases like this:

```PHP
<?php

$o1 = new stdClass();
$store = new SplObjectStorage;
$store->attach($o1);
$store->storage = 'herpderp';
```

This gets PHPUnit to 100%, but #1 still depends on an array_keys fix for
recursive structures that hasn't reached master yet.
This commit is contained in:
Fred Emmott 2014-01-29 13:56:39 -08:00
parent 5f53aea6f9
commit 5e5cedfbf2
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Exporter.php
View File

@ -270,9 +270,16 @@ class Exporter
}
// Some internal classes like SplObjectStorage don't work with the
// above (fast) mechanism nor with reflection
// above (fast) mechanism nor with reflection in Zend.
// Format the output similarly to print_r() in this case
if ($value instanceof \SplObjectStorage) {
// However, the fast method does work in HHVM, and exposes the
// internal implementation. Hide it again.
if (property_exists('\SplObjectStorage', '__storage')) {
unset($array['__storage']);
} else if (property_exists('\SplObjectStorage', 'storage')) {
unset($array['storage']);
}
foreach ($value as $key => $val) {
$array[spl_object_hash($val)] = array(
'obj' => $val,