helly           Sat May 31 09:10:01 2003 EDT

  Modified files:              
    /php4/ext/session/tests     003.phpt 004.phpt 005.phpt 006.phpt 
                                019.phpt 
  Log:
  Fix tests
  
Index: php4/ext/session/tests/003.phpt
diff -u php4/ext/session/tests/003.phpt:1.11 php4/ext/session/tests/003.phpt:1.12
--- php4/ext/session/tests/003.phpt:1.11        Mon Nov 25 18:20:05 2002
+++ php4/ext/session/tests/003.phpt     Sat May 31 09:10:00 2003
@@ -27,7 +27,7 @@
 var_dump($arr);
 session_destroy();
 --EXPECT--
-object(foo)(2) {
+object(foo)#1 (2) {
   ["bar"]=>
   string(2) "ok"
   ["yes"]=>
@@ -35,7 +35,7 @@
 }
 array(1) {
   [3]=>
-  &object(foo)(2) {
+  object(foo)#2 (2) {
     ["bar"]=>
     string(2) "ok"
     ["yes"]=>
Index: php4/ext/session/tests/004.phpt
diff -u php4/ext/session/tests/004.phpt:1.14 php4/ext/session/tests/004.phpt:1.15
--- php4/ext/session/tests/004.phpt:1.14        Mon Nov 25 18:20:05 2002
+++ php4/ext/session/tests/004.phpt     Sat May 31 09:10:00 2003
@@ -75,7 +75,7 @@
 --EXPECT--
 OPEN: PHPSESSID
 READ: abtest
-object(foo)(2) {
+object(foo)#2 (2) {
   ["bar"]=>
   string(2) "ok"
   ["yes"]=>
@@ -83,7 +83,7 @@
 }
 array(1) {
   [3]=>
-  &object(foo)(2) {
+  object(foo)#3 (2) {
     ["bar"]=>
     string(2) "ok"
     ["yes"]=>
@@ -93,7 +93,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: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 @@
 }
 array(1) {
   [3]=>
-  object(foo)(2) {
+  object(foo)#2 (2) {
     ["bar"]=>
     string(2) "ok"
     ["yes"]=>
Index: php4/ext/session/tests/005.phpt
diff -u php4/ext/session/tests/005.phpt:1.12 php4/ext/session/tests/005.phpt:1.13
--- php4/ext/session/tests/005.phpt:1.12        Mon Nov 25 18:20:05 2002
+++ php4/ext/session/tests/005.phpt     Sat May 31 09:10:00 2003
@@ -87,7 +87,7 @@
 --EXPECT--
 OPEN: PHPSESSID
 READ: abtest
-object(foo)(2) {
+object(foo)#2 (2) {
   ["bar"]=>
   string(2) "ok"
   ["yes"]=>
@@ -95,7 +95,7 @@
 }
 array(1) {
   [3]=>
-  &object(foo)(2) {
+  object(foo)#3 (2) {
     ["bar"]=>
     string(2) "ok"
     ["yes"]=>
@@ -106,7 +106,7 @@
 CLOSE
 OPEN: PHPSESSID
 READ: abtest
-object(foo)(2) {
+object(foo)#4 (2) {
   ["bar"]=>
   string(2) "ok"
   ["yes"]=>
@@ -114,7 +114,7 @@
 }
 array(1) {
   [3]=>
-  &object(foo)(2) {
+  object(foo)#2 (2) {
     ["bar"]=>
     string(2) "ok"
     ["yes"]=>
@@ -126,7 +126,7 @@
 CLOSE
 OPEN: PHPSESSID
 READ: abtest
-object(foo)(2) {
+object(foo)#3 (2) {
   ["bar"]=>
   string(2) "ok"
   ["yes"]=>
@@ -134,7 +134,7 @@
 }
 array(1) {
   [3]=>
-  object(foo)(2) {
+  object(foo)#4 (2) {
     ["bar"]=>
     string(2) "ok"
     ["yes"]=>
Index: php4/ext/session/tests/006.phpt
diff -u php4/ext/session/tests/006.phpt:1.11 php4/ext/session/tests/006.phpt:1.12
--- php4/ext/session/tests/006.phpt:1.11        Mon Nov 25 18:20:05 2002
+++ php4/ext/session/tests/006.phpt     Sat May 31 09:10:00 2003
@@ -43,28 +43,28 @@
 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
Index: php4/ext/session/tests/019.phpt
diff -u php4/ext/session/tests/019.phpt:1.3 php4/ext/session/tests/019.phpt:1.4
--- php4/ext/session/tests/019.phpt:1.3 Mon Nov 25 18:20:05 2002
+++ php4/ext/session/tests/019.phpt     Sat May 31 09:10:00 2003
@@ -48,24 +48,24 @@
 --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)
   }



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to