colder Tue Jan 15 12:17:35 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/spl spl_dllist.c
/php-src/ext/spl/tests dllist_001.phpt dllist_004.phpt
dllist_005.phpt
Log:
Fix ZTS build, fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl_dllist.c?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/spl/spl_dllist.c
diff -u php-src/ext/spl/spl_dllist.c:1.1.2.2
php-src/ext/spl/spl_dllist.c:1.1.2.3
--- php-src/ext/spl/spl_dllist.c:1.1.2.2 Tue Jan 15 09:38:15 2008
+++ php-src/ext/spl/spl_dllist.c Tue Jan 15 12:17:35 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: spl_dllist.c,v 1.1.2.2 2008/01/15 09:38:15 colder Exp $ */
+/* $Id: spl_dllist.c,v 1.1.2.3 2008/01/15 12:17:35 colder Exp $ */
#ifdef HAVE_CONFIG_H
# include "config.h"
@@ -668,7 +668,7 @@
}
intern = (spl_dllist_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
- index = spl_dllist_offset_convert(zindex);
+ index = spl_dllist_offset_convert(zindex TSRMLS_CC);
RETURN_BOOL(index >= 0 && index < intern->llist->count);
} /* }}} */
@@ -687,7 +687,7 @@
}
intern = (spl_dllist_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
- index = spl_dllist_offset_convert(zindex);
+ index = spl_dllist_offset_convert(zindex TSRMLS_CC);
if (index < 0 || index >= intern->llist->count) {
zend_throw_exception(spl_ce_OutOfRangeException, "Offset out of
range", 0 TSRMLS_CC);
@@ -727,7 +727,7 @@
long index;
spl_ptr_llist_element *element;
- index = spl_dllist_offset_convert(zindex);
+ index = spl_dllist_offset_convert(zindex TSRMLS_CC);
if (index < 0 || index >= intern->llist->count) {
zend_throw_exception(spl_ce_OutOfRangeException,
"Offset out of range", 0 TSRMLS_CC);
@@ -763,7 +763,7 @@
}
intern = (spl_dllist_object*)zend_object_store_get_object(getThis()
TSRMLS_CC);
- index = (int)spl_dllist_offset_convert(zindex);
+ index = (int)spl_dllist_offset_convert(zindex TSRMLS_CC);
llist = intern->llist;
if (index < 0 || index >= intern->llist->count) {
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/dllist_001.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/spl/tests/dllist_001.phpt
diff -u php-src/ext/spl/tests/dllist_001.phpt:1.1.2.2
php-src/ext/spl/tests/dllist_001.phpt:1.1.2.3
--- php-src/ext/spl/tests/dllist_001.phpt:1.1.2.2 Tue Jan 15 09:38:15 2008
+++ php-src/ext/spl/tests/dllist_001.phpt Tue Jan 15 12:17:35 2008
@@ -2,6 +2,8 @@
SPL: DoublyLinkedList: std operations
--SKIPIF--
<?php if (!extension_loaded("spl")) print "skip"; ?>
+--INI--
+allow_call_time_pass_reference=1
--FILE--
<?php
$dll = new SplDoublyLinkedList();
@@ -59,9 +61,6 @@
===DONE===
<?php exit(0); ?>
--EXPECTF--
-Warning: Call-time pass-by-reference has been deprecated; If you would like to
pass it by reference, modify the declaration of [runtime function name](). If
you would like to enable call-time pass-by-reference, you can set
allow_call_time_pass_reference to true in your INI file in %s on line %d
-
-Warning: Call-time pass-by-reference has been deprecated; If you would like to
pass it by reference, modify the declaration of [runtime function name](). If
you would like to enable call-time pass-by-reference, you can set
allow_call_time_pass_reference to true in your INI file in %s on line %d
Exception: Can't pop from an empty datastructure
Exception: Can't shift from an empty datastructure
3
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/dllist_004.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/spl/tests/dllist_004.phpt
diff -u php-src/ext/spl/tests/dllist_004.phpt:1.1.2.2
php-src/ext/spl/tests/dllist_004.phpt:1.1.2.3
--- php-src/ext/spl/tests/dllist_004.phpt:1.1.2.2 Tue Jan 15 09:38:15 2008
+++ php-src/ext/spl/tests/dllist_004.phpt Tue Jan 15 12:17:35 2008
@@ -2,6 +2,8 @@
SPL: DoublyLinkedList: Stacks
--SKIPIF--
<?php if (!extension_loaded("spl")) print "skip"; ?>
+--INI--
+allow_call_time_pass_reference=1
--FILE--
<?php
$stack = new SplStack();
@@ -53,7 +55,6 @@
===DONE===
<?php exit(0); ?>
--EXPECTF--
-Warning: Call-time pass-by-reference has been deprecated; If you would like to
pass it by reference, modify the declaration of [runtime function name](). If
you would like to enable call-time pass-by-reference, you can set
allow_call_time_pass_reference to true in your INI file in %s on line %d
Exception: Can't pop from an empty datastructure
Exception: Can't shift from an empty datastructure
3
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/tests/dllist_005.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/spl/tests/dllist_005.phpt
diff -u php-src/ext/spl/tests/dllist_005.phpt:1.1.2.2
php-src/ext/spl/tests/dllist_005.phpt:1.1.2.3
--- php-src/ext/spl/tests/dllist_005.phpt:1.1.2.2 Tue Jan 15 09:38:15 2008
+++ php-src/ext/spl/tests/dllist_005.phpt Tue Jan 15 12:17:35 2008
@@ -2,6 +2,8 @@
SPL: DoublyLinkedList: Queues
--SKIPIF--
<?php if (!extension_loaded("spl")) print "skip"; ?>
+--INI--
+allow_call_time_pass_reference=1
--FILE--
<?php
$queue = new SplQueue();
@@ -53,7 +55,6 @@
===DONE===
<?php exit(0); ?>
--EXPECTF--
-Warning: Call-time pass-by-reference has been deprecated; If you would like to
pass it by reference, modify the declaration of [runtime function name](). If
you would like to enable call-time pass-by-reference, you can set
allow_call_time_pass_reference to true in your INI file in %s on line %d
Exception: Can't shift from an empty datastructure
Exception: Can't shift from an empty datastructure
2
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
