Hello Dmitry, many thanks!
Monday, September 19, 2005, 9:49:14 AM, you wrote: > dmitry Mon Sep 19 03:49:14 2005 EDT > Modified files: > /php-src/ext/spl spl_array.c > /php-src/ext/spl/tests iterator_024.phpt iterator_027.phpt > Log: > Unicode support > > > http://cvs.php.net/diff.php/php-src/ext/spl/spl_array.c?r1=1.79&r2=1.80&ty=u > Index: php-src/ext/spl/spl_array.c > diff -u php-src/ext/spl/spl_array.c:1.79 php-src/ext/spl/spl_array.c:1.80 > --- php-src/ext/spl/spl_array.c:1.79 Sun Sep 18 13:32:52 2005 > +++ php-src/ext/spl/spl_array.c Mon Sep 19 03:49:10 2005 > @@ -16,7 +16,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: spl_array.c,v 1.79 2005/09/18 17:32:52 helly Exp $ */ > +/* $Id: spl_array.c,v 1.80 2005/09/19 07:49:10 dmitry Exp $ */ > > #ifdef HAVE_CONFIG_H > # include "config.h" > @@ -179,7 +179,7 @@ > intern->fptr_offset_del = NULL; > } > } > - intern->ce_get_iterator = spl_ce_ArrayIterator; > + intern->ce_get_iterator = U_CLASS_ENTRY(spl_ce_ArrayIterator); > > zend_hash_internal_pointer_reset_ex(spl_array_get_hash_table(intern, 0 > TSRMLS_CC), &intern->pos); > return retval; > } > @@ -870,7 +870,7 @@ > zval *object = getThis(); > spl_array_object *intern = > (spl_array_object*)zend_object_store_get_object(object TSRMLS_CC); > > - RETURN_STRING(intern->ce_get_iterator->name, 1); > + RETURN_TEXTL(intern->ce_get_iterator->name, > intern->ce_get_iterator->name_length, 1); > } > /* }}} */ > > http://cvs.php.net/diff.php/php-src/ext/spl/tests/iterator_024.phpt?r1=1.1&r2=1.2&ty=u > Index: php-src/ext/spl/tests/iterator_024.phpt > diff -u php-src/ext/spl/tests/iterator_024.phpt:1.1 > php-src/ext/spl/tests/iterator_024.phpt:1.2 > --- php-src/ext/spl/tests/iterator_024.phpt:1.1 Sun Sep 18 07:34:36 2005 > +++ php-src/ext/spl/tests/iterator_024.phpt Mon Sep 19 03:49:13 2005 > @@ -47,3 +47,21 @@ > 331 > 4 > ===DONE=== > +--UEXPECT-- > +1 > +2 > +31 > +32 > +331 > +4 > +unicode(13) "ArrayIterator" > +An instance of RecursiveIterator or IteratorAggregate creating it is required > +===MANUAL=== > +unicode(22) "RecursiveArrayIterator" > +1 > +2 > +31 > +32 > +331 > +4 > +===DONE=== > http://cvs.php.net/diff.php/php-src/ext/spl/tests/iterator_027.phpt?r1=1.1&r2=1.2&ty=u > Index: php-src/ext/spl/tests/iterator_027.phpt > diff -u php-src/ext/spl/tests/iterator_027.phpt:1.1 > php-src/ext/spl/tests/iterator_027.phpt:1.2 > --- php-src/ext/spl/tests/iterator_027.phpt:1.1 Sun Sep 18 07:34:36 2005 > +++ php-src/ext/spl/tests/iterator_027.phpt Mon Sep 19 03:49:13 2005 > @@ -81,3 +81,31 @@ > bool(false) > bool(false) > ===DONE=== > +--UEXPECT-- > +0=>1 > +1=>2 > +0=>31 > +1=>32 > +0=>331 > +3=>4 > +===CHECK=== > +int(0) > +int(331) > +int(1) > +int(32) > +int(3) > +int(4) > +unicode(3) "foo" > +unicode(3) "bar" > +unicode(2) "25" > +bool(false) > +bool(true) > +bool(false) > +bool(true) > +bool(false) > +===REWIND=== > +bool(true) > +bool(false) > +bool(false) > +bool(false) > +===DONE=== Best regards, Marcus -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
