laruence                                 Wed, 14 Sep 2011 06:48:26 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=316720

Log:
Fix tests

Changed paths:
    U   
php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_001.phpt
    U   
php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_002.phpt
    U   
php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_003.phpt
    U   
php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_004.phpt
    U   
php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_005.phpt
    U   
php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_007.phpt
    U   
php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_008.phpt
    U   
php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_009.phpt
    U   
php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_010.phpt
    U   
php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_012.phpt
    U   
php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_013.phpt
    U   
php/php-src/trunk/ext/session/tests/session_set_save_handler_class_001.phpt
    U   
php/php-src/trunk/ext/session/tests/session_set_save_handler_class_002.phpt
    U   
php/php-src/trunk/ext/session/tests/session_set_save_handler_class_003.phpt
    U   
php/php-src/trunk/ext/session/tests/session_set_save_handler_class_004.phpt
    U   
php/php-src/trunk/ext/session/tests/session_set_save_handler_class_005.phpt
    U   
php/php-src/trunk/ext/session/tests/session_set_save_handler_class_007.phpt
    U   
php/php-src/trunk/ext/session/tests/session_set_save_handler_class_008.phpt
    U   
php/php-src/trunk/ext/session/tests/session_set_save_handler_class_009.phpt
    U   
php/php-src/trunk/ext/session/tests/session_set_save_handler_class_010.phpt
    U   
php/php-src/trunk/ext/session/tests/session_set_save_handler_class_012.phpt
    U   
php/php-src/trunk/ext/session/tests/session_set_save_handler_class_013.phpt

Modified: php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_001.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_001.phpt	2011-09-14 06:07:30 UTC (rev 316719)
+++ php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_001.phpt	2011-09-14 06:48:26 UTC (rev 316720)
@@ -53,15 +53,15 @@
 --EXPECTF--
 *** Testing session_set_save_handler() : basic class wrapping existing handler ***
 Open
-Read %x
-string(32) "%x"
+Read %s
+string(%d) "%s"
 string(5) "files"
 string(4) "user"
 int(2)
 array(0) {
 }
-Open %x
-Read %x
+Open %s
+Read %s
 array(1) {
   ["foo"]=>
   string(5) "hello"

Modified: php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_002.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_002.phpt	2011-09-14 06:07:30 UTC (rev 316719)
+++ php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_002.phpt	2011-09-14 06:48:26 UTC (rev 316720)
@@ -91,7 +91,7 @@

 --EXPECTF--
 *** Testing session_set_save_handler() : full handler implementation ***
-string(32) "%x"
+string(%d) "%s"
 string(4) "user"
 array(1) {
   ["foo"]=>
@@ -101,7 +101,7 @@
   ["foo"]=>
   string(5) "hello"
 }
-string(32) "%x"
+string(%d) "%s"
 string(4) "user"
 array(1) {
   ["foo"]=>

Modified: php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_003.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_003.phpt	2011-09-14 06:07:30 UTC (rev 316719)
+++ php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_003.phpt	2011-09-14 06:48:26 UTC (rev 316720)
@@ -70,7 +70,7 @@
   string(5) "hello"
 }
 int(4)
-string(32) "%x"
+string(%d) "%s"
 array(1) {
   ["foo"]=>
   string(5) "hello"

Modified: php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_004.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_004.phpt	2011-09-14 06:07:30 UTC (rev 316719)
+++ php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_004.phpt	2011-09-14 06:48:26 UTC (rev 316720)
@@ -36,7 +36,7 @@

 --EXPECTF--
 *** Testing session_set_save_handler() : default object ***
-string(32) "%x"
+string(%d) "%s"
 string(4) "user"
 array(1) {
   ["foo"]=>

Modified: php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_005.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_005.phpt	2011-09-14 06:07:30 UTC (rev 316719)
+++ php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_005.phpt	2011-09-14 06:48:26 UTC (rev 316720)
@@ -44,7 +44,7 @@
 *** Testing session_set_save_handler() : incomplete implementation ***

 Warning: SessionHandler::read(): Parent session handler is not open in %ssession_set_save_handler_class_005.php on line %d
-string(32) "%x"
+string(%d) "%s"
 string(4) "user"
 array(0) {
 }

Modified: php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_007.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_007.phpt	2011-09-14 06:07:30 UTC (rev 316719)
+++ php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_007.phpt	2011-09-14 06:48:26 UTC (rev 316720)
@@ -63,12 +63,12 @@
 --EXPECTF--
 *** Testing session_set_save_handler() : manual shutdown, reopen ***
 (#1) constructor called
-(#1) finish called %x
-(#1) writing %x = foo|s:3:"bar";
-(#1) closing %x
+(#1) finish called %s
+(#1) writing %s = foo|s:3:"bar";
+(#1) closing %s
 (#2) constructor called
 (#1) destructor called
 done
-(#2) writing %x = foo|s:3:"bar";
-(#2) closing %x
+(#2) writing %s = foo|s:3:"bar";
+(#2) closing %s
 (#2) destructor called

Modified: php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_008.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_008.phpt	2011-09-14 06:07:30 UTC (rev 316719)
+++ php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_008.phpt	2011-09-14 06:48:26 UTC (rev 316720)
@@ -58,8 +58,8 @@
 --EXPECTF--
 *** Testing session_set_save_handler() : manual shutdown ***
 (#1) constructor called
-(#1) finish called %x
-(#1) writing %x = foo|s:3:"bar";
-(#1) closing %x
+(#1) finish called %s
+(#1) writing %s = foo|s:3:"bar";
+(#1) closing %s
 done
 (#1) destructor called

Modified: php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_009.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_009.phpt	2011-09-14 06:07:30 UTC (rev 316719)
+++ php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_009.phpt	2011-09-14 06:48:26 UTC (rev 316720)
@@ -57,6 +57,6 @@
 *** Testing session_set_save_handler() : implicit shutdown ***
 (#1) constructor called
 done
-(#1) writing %x = foo|s:3:"bar";
-(#1) closing %x
+(#1) writing %s = foo|s:3:"bar";
+(#1) closing %s
 (#1) destructor called

Modified: php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_010.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_010.phpt	2011-09-14 06:07:30 UTC (rev 316719)
+++ php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_010.phpt	2011-09-14 06:48:26 UTC (rev 316720)
@@ -57,7 +57,7 @@
 *** Testing session_set_save_handler() : manual shutdown function ***
 (#1) constructor called
 done
-(#1) finish called %x
-(#1) writing %x = foo|s:3:"bar";
-(#1) closing %x
+(#1) finish called %s
+(#1) writing %s = foo|s:3:"bar";
+(#1) closing %s
 (#1) destructor called

Modified: php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_012.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_012.phpt	2011-09-14 06:07:30 UTC (rev 316719)
+++ php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_012.phpt	2011-09-14 06:48:26 UTC (rev 316720)
@@ -44,10 +44,10 @@
 Open

 Warning: SessionHandler::open() expects exactly 2 parameters, 0 given in %s on line %d
-Read %x
+Read %s

 Warning: SessionHandler::read(): Parent session handler is not open in %s on line %d
-string(32) "%x"
+string(%d) "%s"
 string(5) "files"
 string(4) "user"
 int(2)

Modified: php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_013.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_013.phpt	2011-09-14 06:07:30 UTC (rev 316719)
+++ php/php-src/branches/PHP_5_4/ext/session/tests/session_set_save_handler_class_013.phpt	2011-09-14 06:48:26 UTC (rev 316720)
@@ -45,8 +45,8 @@
 --EXPECTF--
 *** Testing session_set_save_handler() : incorrect arguments for existing handler close ***
 Open
-Read %x
-string(32) "%x"
+Read %s
+string(%d) "%s"
 string(5) "files"
 string(4) "user"
 int(2)

Modified: php/php-src/trunk/ext/session/tests/session_set_save_handler_class_001.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/session_set_save_handler_class_001.phpt	2011-09-14 06:07:30 UTC (rev 316719)
+++ php/php-src/trunk/ext/session/tests/session_set_save_handler_class_001.phpt	2011-09-14 06:48:26 UTC (rev 316720)
@@ -53,15 +53,15 @@
 --EXPECTF--
 *** Testing session_set_save_handler() : basic class wrapping existing handler ***
 Open
-Read %x
-string(32) "%x"
+Read %s
+string(%d) "%s"
 string(5) "files"
 string(4) "user"
 int(2)
 array(0) {
 }
-Open %x
-Read %x
+Open %s
+Read %s
 array(1) {
   ["foo"]=>
   string(5) "hello"

Modified: php/php-src/trunk/ext/session/tests/session_set_save_handler_class_002.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/session_set_save_handler_class_002.phpt	2011-09-14 06:07:30 UTC (rev 316719)
+++ php/php-src/trunk/ext/session/tests/session_set_save_handler_class_002.phpt	2011-09-14 06:48:26 UTC (rev 316720)
@@ -91,7 +91,7 @@

 --EXPECTF--
 *** Testing session_set_save_handler() : full handler implementation ***
-string(32) "%x"
+string(%d) "%s"
 string(4) "user"
 array(1) {
   ["foo"]=>
@@ -101,7 +101,7 @@
   ["foo"]=>
   string(5) "hello"
 }
-string(32) "%x"
+string(%d) "%s"
 string(4) "user"
 array(1) {
   ["foo"]=>

Modified: php/php-src/trunk/ext/session/tests/session_set_save_handler_class_003.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/session_set_save_handler_class_003.phpt	2011-09-14 06:07:30 UTC (rev 316719)
+++ php/php-src/trunk/ext/session/tests/session_set_save_handler_class_003.phpt	2011-09-14 06:48:26 UTC (rev 316720)
@@ -70,7 +70,7 @@
   string(5) "hello"
 }
 int(4)
-string(32) "%x"
+string(%d) "%s"
 array(1) {
   ["foo"]=>
   string(5) "hello"

Modified: php/php-src/trunk/ext/session/tests/session_set_save_handler_class_004.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/session_set_save_handler_class_004.phpt	2011-09-14 06:07:30 UTC (rev 316719)
+++ php/php-src/trunk/ext/session/tests/session_set_save_handler_class_004.phpt	2011-09-14 06:48:26 UTC (rev 316720)
@@ -36,7 +36,7 @@

 --EXPECTF--
 *** Testing session_set_save_handler() : default object ***
-string(32) "%x"
+string(%d) "%s"
 string(4) "user"
 array(1) {
   ["foo"]=>

Modified: php/php-src/trunk/ext/session/tests/session_set_save_handler_class_005.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/session_set_save_handler_class_005.phpt	2011-09-14 06:07:30 UTC (rev 316719)
+++ php/php-src/trunk/ext/session/tests/session_set_save_handler_class_005.phpt	2011-09-14 06:48:26 UTC (rev 316720)
@@ -44,7 +44,7 @@
 *** Testing session_set_save_handler() : incomplete implementation ***

 Warning: SessionHandler::read(): Parent session handler is not open in %ssession_set_save_handler_class_005.php on line %d
-string(32) "%x"
+string(%d) "%s"
 string(4) "user"
 array(0) {
 }

Modified: php/php-src/trunk/ext/session/tests/session_set_save_handler_class_007.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/session_set_save_handler_class_007.phpt	2011-09-14 06:07:30 UTC (rev 316719)
+++ php/php-src/trunk/ext/session/tests/session_set_save_handler_class_007.phpt	2011-09-14 06:48:26 UTC (rev 316720)
@@ -63,12 +63,12 @@
 --EXPECTF--
 *** Testing session_set_save_handler() : manual shutdown, reopen ***
 (#1) constructor called
-(#1) finish called %x
-(#1) writing %x = foo|s:3:"bar";
-(#1) closing %x
+(#1) finish called %s
+(#1) writing %s = foo|s:3:"bar";
+(#1) closing %s
 (#2) constructor called
 (#1) destructor called
 done
-(#2) writing %x = foo|s:3:"bar";
-(#2) closing %x
+(#2) writing %s = foo|s:3:"bar";
+(#2) closing %s
 (#2) destructor called

Modified: php/php-src/trunk/ext/session/tests/session_set_save_handler_class_008.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/session_set_save_handler_class_008.phpt	2011-09-14 06:07:30 UTC (rev 316719)
+++ php/php-src/trunk/ext/session/tests/session_set_save_handler_class_008.phpt	2011-09-14 06:48:26 UTC (rev 316720)
@@ -58,8 +58,8 @@
 --EXPECTF--
 *** Testing session_set_save_handler() : manual shutdown ***
 (#1) constructor called
-(#1) finish called %x
-(#1) writing %x = foo|s:3:"bar";
-(#1) closing %x
+(#1) finish called %s
+(#1) writing %s = foo|s:3:"bar";
+(#1) closing %s
 done
 (#1) destructor called

Modified: php/php-src/trunk/ext/session/tests/session_set_save_handler_class_009.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/session_set_save_handler_class_009.phpt	2011-09-14 06:07:30 UTC (rev 316719)
+++ php/php-src/trunk/ext/session/tests/session_set_save_handler_class_009.phpt	2011-09-14 06:48:26 UTC (rev 316720)
@@ -57,6 +57,6 @@
 *** Testing session_set_save_handler() : implicit shutdown ***
 (#1) constructor called
 done
-(#1) writing %x = foo|s:3:"bar";
-(#1) closing %x
+(#1) writing %s = foo|s:3:"bar";
+(#1) closing %s
 (#1) destructor called

Modified: php/php-src/trunk/ext/session/tests/session_set_save_handler_class_010.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/session_set_save_handler_class_010.phpt	2011-09-14 06:07:30 UTC (rev 316719)
+++ php/php-src/trunk/ext/session/tests/session_set_save_handler_class_010.phpt	2011-09-14 06:48:26 UTC (rev 316720)
@@ -57,7 +57,7 @@
 *** Testing session_set_save_handler() : manual shutdown function ***
 (#1) constructor called
 done
-(#1) finish called %x
-(#1) writing %x = foo|s:3:"bar";
-(#1) closing %x
+(#1) finish called %s
+(#1) writing %s = foo|s:3:"bar";
+(#1) closing %s
 (#1) destructor called

Modified: php/php-src/trunk/ext/session/tests/session_set_save_handler_class_012.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/session_set_save_handler_class_012.phpt	2011-09-14 06:07:30 UTC (rev 316719)
+++ php/php-src/trunk/ext/session/tests/session_set_save_handler_class_012.phpt	2011-09-14 06:48:26 UTC (rev 316720)
@@ -44,10 +44,10 @@
 Open

 Warning: SessionHandler::open() expects exactly 2 parameters, 0 given in %s on line %d
-Read %x
+Read %s

 Warning: SessionHandler::read(): Parent session handler is not open in %s on line %d
-string(32) "%x"
+string(%d) "%s"
 string(5) "files"
 string(4) "user"
 int(2)

Modified: php/php-src/trunk/ext/session/tests/session_set_save_handler_class_013.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/session_set_save_handler_class_013.phpt	2011-09-14 06:07:30 UTC (rev 316719)
+++ php/php-src/trunk/ext/session/tests/session_set_save_handler_class_013.phpt	2011-09-14 06:48:26 UTC (rev 316720)
@@ -45,8 +45,8 @@
 --EXPECTF--
 *** Testing session_set_save_handler() : incorrect arguments for existing handler close ***
 Open
-Read %x
-string(32) "%x"
+Read %s
+string(%d) "%s"
 string(5) "files"
 string(4) "user"
 int(2)
-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to