diff options
| author | Marcus Boerger <helly@php.net> | 2006-02-20 22:21:54 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2006-02-20 22:21:54 +0000 |
| commit | 289f45c2791f28e159918d8d4efe36d6246c550e (patch) | |
| tree | a8734805806c0ad06cb145f63c2583891dc14f06 | |
| parent | 4ea898b79fc1c859bb9f59a84a90a30ba5ddf4be (diff) | |
| download | php-git-289f45c2791f28e159918d8d4efe36d6246c550e.tar.gz | |
- Synch docu
| -rwxr-xr-x | ext/spl/doxygen.cfg | 4 | ||||
| -rwxr-xr-x | ext/spl/php_spl.c | 9 | ||||
| -rwxr-xr-x | ext/spl/spl.php | 10 |
3 files changed, 17 insertions, 6 deletions
diff --git a/ext/spl/doxygen.cfg b/ext/spl/doxygen.cfg index 1d79e40465..d58017a6ad 100755 --- a/ext/spl/doxygen.cfg +++ b/ext/spl/doxygen.cfg @@ -87,8 +87,8 @@ FILTER_SOURCE_FILES = NO #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- -SOURCE_BROWSER = NO -INLINE_SOURCES = NO +SOURCE_BROWSER = YES +INLINE_SOURCES = YES STRIP_CODE_COMMENTS = YES REFERENCED_BY_RELATION = YES REFERENCES_RELATION = YES diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c index 64cc72d60d..13c80a1268 100755 --- a/ext/spl/php_spl.c +++ b/ext/spl/php_spl.c @@ -598,6 +598,11 @@ PHP_MINFO_FUNCTION(spl) } /* }}} */ +static +ZEND_BEGIN_ARG_INFO(arginfo_iterator, 0) + ZEND_ARG_INFO(0, iterator) +ZEND_END_ARG_INFO(); + /* {{{ spl_functions */ zend_function_entry spl_functions[] = { @@ -611,8 +616,8 @@ zend_function_entry spl_functions[] = { PHP_FE(class_parents, NULL) PHP_FE(class_implements, NULL) #ifdef SPL_ITERATORS_H - PHP_FE(iterator_to_array, NULL) - PHP_FE(iterator_count, NULL) + PHP_FE(iterator_to_array, arginfo_iterator) + PHP_FE(iterator_count, arginfo_iterator) #endif /* SPL_ITERATORS_H */ {NULL, NULL, NULL} }; diff --git a/ext/spl/spl.php b/ext/spl/spl.php index 89689fc0fa..4ba58fceb4 100755 --- a/ext/spl/spl.php +++ b/ext/spl/spl.php @@ -102,8 +102,14 @@ * - interface SplObserver * - interface SplSubject * - class SplObjectStorage + * + * 8) @ref Examples + * + * The classes and interfaces in this group are contained as PHP code in the + * examples subdirectory of ext/SPL. Sooner or later they will be moved to + * c-code. * - * Some articles about SPL: + * 9) Some articles about SPL: * - <a href="http://www.sitepoint.com/article/php5-standard-library/1">Introducing PHP 5's Standard Library</a> * - <a href="http://www.ramikayyali.com/archives/2005/02/25/iterators">Iterators in PHP5</a> * - <a href="http://www.phpriot.com/d/articles/php/oop/oop-with-spl-php-5-1/index.html">Advanced OOP with SPL in PHP 5</a> @@ -112,7 +118,7 @@ * - <a href="http://www.wiki.cc/php/SPL">SPL on PHP Wiki</a> * - <a href="http://www.professionelle-softwareentwicklung-mit-php5.de/erste_auflage/oop.iterators.spl.html">Die Standard PHP Library (SPL) [german]</a> * - * Talks on SPL: + * 10) Talks on SPL: * - SPL for the masses <a href="http://somabo.de/talks/200504_php_quebec_spl_for_the_masses.pps">[pps]</a>, <a href="http://somabo.de/talks/200504_php_quebec_spl_for_the_masses.pdf">[pdf]</a> * - From engine overloading to SPL <a href="http://somabo.de/talks/200505_cancun_from_engine_overloading_to_spl.pps">[pps]</a>, <a href="http://somabo.de/talks/200505_cancun_from_engine_overloading_to_spl.pdf">[pdf]</a> * - Happy SPLing <a href="http://somabo.de/talks/200509_toronto_happy_spling.pps">[pps]</a>, <a href="http://somabo.de/talks/200509_toronto_happy_spling.pdf">[pdf]</a> |