summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatoliy Belsky <ab@php.net>2012-06-11 15:03:14 (GMT)
committerAnatoliy Belsky <ab@php.net>2012-06-11 15:03:14 (GMT)
commit0c6351778a2974342f630a25a3bab4d8fee7e0c6 (patch)
tree8a2e3252f8fd9beb54cd9b253d208d78d7ab4c12
parent32040b574e7b456ca7b03918adaabfec4bbd91e2 (diff)
parenta18cede1c5094d5255daeb99cd6debe09938399d (diff)
downloadphp-0c6351778a2974342f630a25a3bab4d8fee7e0c6.tar.gz
Merge branch 'PHP-5.4'
* PHP-5.4: Fix bug #62271 test bug - ext/wddx/tests/bug48562.phpt
-rw-r--r--ext/wddx/tests/bug48562.phpt6
1 files changed, 6 insertions, 0 deletions
diff --git a/ext/wddx/tests/bug48562.phpt b/ext/wddx/tests/bug48562.phpt
index ebd2004..ee9f271 100644
--- a/ext/wddx/tests/bug48562.phpt
+++ b/ext/wddx/tests/bug48562.phpt
@@ -16,6 +16,12 @@ $a['x'] = &$a;
var_dump(wddx_serialize_vars($a));
+// replace $a - the recursion detection seems to be causing $a to be not an array here, maybe its internally a pointer
+// replacing $a with a new array() allows this test to still check for 2 things
+// 1. recursion detection in &$a;
+// 2. recursion detection in adding $a to itself and then serializing $a
+// the one thing the test won't check is using $a as an array after doing &$a; which isn't really a wddx problem.
+$a = array();
$a['x'] = 'foo';
$a['x'] = $a;