Fix tests

diff --git a/ext/session/tests/003.phpt b/ext/session/tests/003.phpt
index 638506e31ee299f907c602a7cab6a4ae55eb4c81..f9fa28f4eae4cd115b7265e7028ce457b9bb79bd 100644 (file)
--- a/ext/session/tests/003.phpt
+++ b/ext/session/tests/003.phpt
@@ -27,7 +27,7 @@ var_dump($baz);
 var_dump($arr);
 session_destroy();
 --EXPECT--
-object(foo)(2) {
+object(foo)#1 (2) {
   ["bar"]=>
   string(2) "ok"
   ["yes"]=>
@@ -35,7 +35,7 @@ object(foo)(2) {
 }
 array(1) {
   [3]=>
-  &object(foo)(2) {
+  object(foo)#2 (2) {
     ["bar"]=>
     string(2) "ok"
     ["yes"]=>

diff --git a/ext/session/tests/004.phpt b/ext/session/tests/004.phpt
index 0d930c5307e129f17630271e748016cc2e64d2a9..79383705e65085dcc696af12b8366e99b05c986b 100644 (file)
--- a/ext/session/tests/004.phpt
+++ b/ext/session/tests/004.phpt
@@ -75,7 +75,7 @@ session_destroy();
 --EXPECT--
 OPEN: PHPSESSID
 READ: abtest
-object(foo)(2) {
+object(foo)#2 (2) {
   ["bar"]=>
   string(2) "ok"
   ["yes"]=>
@@ -83,7 +83,7 @@ object(foo)(2) {
 }
 array(1) {
   [3]=>
-  &object(foo)(2) {
+  object(foo)#3 (2) {
     ["bar"]=>
     string(2) "ok"
     ["yes"]=>
@@ -93,7 +93,7 @@ array(1) {
 WRITE: abtest, baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:2;}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:2;}}
 OPEN: PHPSESSID
 READ: abtest
-object(foo)(2) {
+object(foo)#4 (2) {
   ["bar"]=>
   string(2) "ok"
   ["yes"]=>
@@ -101,7 +101,7 @@ object(foo)(2) {
 }
 array(1) {
   [3]=>
-  object(foo)(2) {
+  object(foo)#2 (2) {
     ["bar"]=>
     string(2) "ok"
     ["yes"]=>

diff --git a/ext/session/tests/005.phpt b/ext/session/tests/005.phpt
index 3c9205277ff4d4e7bc52fc1663cb5a810450e9fe..6127ad22f2cba3c4c18bb834f67c22589aa85c85 100644 (file)
--- a/ext/session/tests/005.phpt
+++ b/ext/session/tests/005.phpt
@@ -87,7 +87,7 @@ session_destroy();
 --EXPECT--
 OPEN: PHPSESSID
 READ: abtest
-object(foo)(2) {
+object(foo)#2 (2) {
   ["bar"]=>
   string(2) "ok"
   ["yes"]=>
@@ -95,7 +95,7 @@ object(foo)(2) {
 }
 array(1) {
   [3]=>
-  &object(foo)(2) {
+  object(foo)#3 (2) {
     ["bar"]=>
     string(2) "ok"
     ["yes"]=>
@@ -106,7 +106,7 @@ WRITE: abtest, baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:2;}arr|a:1:{i:3;O
 CLOSE
 OPEN: PHPSESSID
 READ: abtest
-object(foo)(2) {
+object(foo)#4 (2) {
   ["bar"]=>
   string(2) "ok"
   ["yes"]=>
@@ -114,7 +114,7 @@ object(foo)(2) {
 }
 array(1) {
   [3]=>
-  &object(foo)(2) {
+  object(foo)#2 (2) {
     ["bar"]=>
     string(2) "ok"
     ["yes"]=>
@@ -126,7 +126,7 @@ WRITE: abtest, baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:3;}arr|a:1:{i:3;O
 CLOSE
 OPEN: PHPSESSID
 READ: abtest
-object(foo)(2) {
+object(foo)#3 (2) {
   ["bar"]=>
   string(2) "ok"
   ["yes"]=>
@@ -134,7 +134,7 @@ object(foo)(2) {
 }
 array(1) {
   [3]=>
-  object(foo)(2) {
+  object(foo)#4 (2) {
     ["bar"]=>
     string(2) "ok"
     ["yes"]=>

diff --git a/ext/session/tests/006.phpt b/ext/session/tests/006.phpt
index 2cdeace074552dc6b7509830645c43cfd9fb6760..d93474765d4155acb4e9d39d8d7ba70ecacee1e8 100644 (file)
--- a/ext/session/tests/006.phpt
+++ b/ext/session/tests/006.phpt
@@ -43,28 +43,28 @@ session_start();
 echo "values after session:\n";
 var_dump($a,$b);
 ?>
---EXPECT--
+--EXPECTF--
 original values:
-object(a)(1) {
+object(a)#%d (1) {
   ["test"]=>
   string(5) "hallo"
 }
-object(b)(1) {
+object(b)#%d (1) {
   ["a"]=>
-  &object(a)(1) {
+  &object(a)#%d (1) {
     ["test"]=>
     string(5) "hallo"
   }
 }
 values after session:
-object(a)(1) {
+object(a)#%d (1) {
   ["test"]=>
   string(5) "hallo"
 }
-object(b)(1) {
+object(b)#%d (1) {
   ["a"]=>
-  &object(a)(1) {
+  &object(a)#%d (1) {
     ["test"]=>
     string(5) "hallo"
   }
-}
+}
\ No newline at end of file

diff --git a/ext/session/tests/019.phpt b/ext/session/tests/019.phpt
index c8b969e44ff91703b598339346d41ebf8b5e1cf5..a7676f8e85c83e5e286f254bc0999f95daeda89f 100644 (file)
--- a/ext/session/tests/019.phpt
+++ b/ext/session/tests/019.phpt
@@ -48,24 +48,24 @@ session_destroy();
 --EXPECT--
 array(2) {
   ["o1"]=>
-  &object(tfoo)(1) {
+  &object(tfoo)#1 (1) {
     ["c"]=>
     int(42)
   }
   ["o2"]=>
-  &object(tfoo)(1) {
+  &object(tfoo)#1 (1) {
     ["c"]=>
     int(42)
   }
 }
 array(2) {
   ["o1"]=>
-  &object(tfoo)(1) {
+  &object(tfoo)#1 (1) {
     ["c"]=>
     int(44)
   }
   ["o2"]=>
-  &object(tfoo)(1) {
+  &object(tfoo)#1 (1) {
     ["c"]=>
     int(44)
   }