From: Marcus Boerger <helly@php.net>
Date: Fri, 11 Mar 2005 00:11:35 +0000 (+0000)
Subject: - Allow to work under php 5
X-Git-Tag: php-5.0.1b1~851
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04a08c757a9f485ed702559252dd04fc3bbbbe7e;p=php

- Allow to work under php 5
---

diff --git a/ext/standard/tests/serialize/bug31402.phpt b/ext/standard/tests/serialize/bug31402.phpt
index 4f8bf0ca5b..be1810b824 100644
--- a/ext/standard/tests/serialize/bug31402.phpt
+++ b/ext/standard/tests/serialize/bug31402.phpt
@@ -1,71 +1,73 @@
 --TEST--
 Bug #31402 (unserialize() generates references when it should not)
+--INI--
+error_reporting=E_ALL&~E_STRICT
 --FILE--
 <?php 
 
-class X {
+class TestX {
   var $i;
 
-  function X($i) {
+  function __construct($i) {
     $this->i = $i;
   }
 }
 
-class Y {
+class TestY {
   var $A = array();
   var $B;
 
-  function Y() {
-    $this->A[1] = new X(1);
-    $this->A[2] = new X(2);
+  function __construct() {
+    $this->A[1] = new TestX(1);
+    $this->A[2] = new TestX(2);
     $this->B = $this->A[1];
   }
 }
 
-$before = new Y();
+$before = new TestY();
 $ser = serialize($before);
 $after = unserialize($ser);
 
 var_dump($before, $after);
 
 ?>
---EXPECT--
-object(y)(2) {
+--EXPECTF--
+object(TestY)#%d (2) {
   ["A"]=>
   array(2) {
     [1]=>
-    object(x)(1) {
+    object(TestX)#%d (1) {
       ["i"]=>
       int(1)
     }
     [2]=>
-    object(x)(1) {
+    object(TestX)#%d (1) {
       ["i"]=>
       int(2)
     }
   }
   ["B"]=>
-  object(x)(1) {
+  object(TestX)#%d (1) {
     ["i"]=>
     int(1)
   }
 }
-object(y)(2) {
+object(TestY)#%d (2) {
   ["A"]=>
   array(2) {
     [1]=>
-    &object(x)(1) {
+    &object(TestX)#%d (1) {
       ["i"]=>
       int(1)
     }
     [2]=>
-    object(x)(1) {
+    object(TestX)#%d (1) {
       ["i"]=>
       int(2)
     }
   }
   ["B"]=>
-  &object(x)(1) {
+  &object(TestX)#%d (1) {
     ["i"]=>
     int(1)
   }