diff options
| -rwxr-xr-x | ext/spl/examples/callbackfilteriterator.inc | 18 | ||||
| -rwxr-xr-x | ext/spl/spl.php | 27 |
2 files changed, 28 insertions, 17 deletions
diff --git a/ext/spl/examples/callbackfilteriterator.inc b/ext/spl/examples/callbackfilteriterator.inc index 96a8abfc04..51757012ec 100755 --- a/ext/spl/examples/callbackfilteriterator.inc +++ b/ext/spl/examples/callbackfilteriterator.inc @@ -28,7 +28,7 @@ class CallbackFilterIterator extends FilterIterator private $callback; /**< callback to use */ private $mode; /**< mode any of USE_VALUE, USE_KEY, USE_BOTH */ - private $flags; /**< flags */ + private $flags; /**< flags (REPLACE) */ private $key; /**< key value */ private $current; /**< current value */ @@ -36,8 +36,8 @@ class CallbackFilterIterator extends FilterIterator * * @param it inner iterator (iterator to filter) * @param callback callback function - * @param mode @copy $mode - * @param flags @copy $flags + * @param mode any of USE_VALUE, USE_KEY, USE_BOTH + * @param flags any of 0, REPLACE */ public function __construct(Iterator $it, $callback, $mode = self::USE_VALUE, $flags = 0) { @@ -82,37 +82,37 @@ class CallbackFilterIterator extends FilterIterator } } - /** @return @copy $key */ + /** @return current key value */ function key() { return $this->key; } - /** @return @copy $current */ + /** @return current value */ function current() { return $this->current; } - /** @return @copy $mode */ + /** @return operation mode */ function getMode() { return $this->mode; } - /** @param $mode set new mode, @see $mode */ + /** @param $mode set new mode, @see mode */ function setMode($mode) { $this->mode = $mode; } - /** @return @copy $flags */ + /** @return operation flags */ function getFlags() { return $this->flags; } - /** @param $flags set new flags, @see @copy $flags */ + /** @param $flags set new flags, @see flags */ function setFlags($flags) { $this->flags = $flags; diff --git a/ext/spl/spl.php b/ext/spl/spl.php index 1dd82ca998..bb6af7e050 100755 --- a/ext/spl/spl.php +++ b/ext/spl/spl.php @@ -6,7 +6,7 @@ * * SPL - Standard PHP Library * - * (c) Marcus Boerger, 2003 - 2006 + * (c) Marcus Boerger, 2003 - 2007 */ /** @mainpage SPL - Standard PHP Library @@ -118,20 +118,23 @@ * - <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> * - <a href="http://www.devshed.com/c/a/PHP/The-Standard-PHP-Library-Part-1/">The Standard PHP Library, Part 1</a> * - <a href="http://www.devshed.com/c/a/PHP/The-Standard-PHP-Library-Part-2/">The Standard PHP Library, Part 2</a> - * - <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> * * 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> - * - Debug session 1 <a href="http://somabo.de/talks/200509_toronto_iterator_debug_session_1.pps">[pps]</a>, <a href="http://somabo.de/talks/200509_toronto_iterator_debug_session_1.pdf">[pdf]</a> - * - Debug session 2 <a href="http://somabo.de/talks/200509_toronto_iterator_debug_session_2.pps">[pps]</a>, <a href="http://somabo.de/talks/200509_toronto_iterator_debug_session_2.pdf">[pdf]</a> + * - SPL Update <a href="http://talks.somabo.de/200702_vancouver_spl_update.pps">[pps]</a>, <a href="http://talks.somabo.de/200702_vancouver_spl_update.pdf">[pdf]</a> + * - Happy SPLing <a href="http://talks.somabo.de/200509_toronto_happy_spling.pps">[pps]</a>, <a href="http://talks.somabo.de/200509_toronto_happy_spling.pdf">[pdf]</a> + * - From engine overloading to SPL <a href="http://talks.somabo.de/200505_cancun_from_engine_overloading_to_spl.pps">[pps]</a>, <a href="http://talks.somabo.de/200505_cancun_from_engine_overloading_to_spl.pdf">[pdf]</a> + * - SPL for the masses <a href="http://talks.somabo.de/200504_php_quebec_spl_for_the_masses.pps">[pps]</a>, <a href="http://talks.somabo.de/200504_php_quebec_spl_for_the_masses.pdf">[pdf]</a> + * + * 11) Debug sessions: + * - Debug session 1 <a href="200407_oscon_introduction_to_iterators_debug.pps">[pps]</a>, <a href="200407_oscon_introduction_to_iterators_debug.pdf">[pdf]</a> + * - Debug session 2 <a href="http://talks.somabo.de/200509_toronto_iterator_debug_session_1.pps">[pps]</a>, <a href="http://talks.somabo.de/200509_toronto_iterator_debug_session_1.pdf">[pdf]</a>, <a href="http://taks.somabo.de/200411_php_conference_frankfrurt_iterator_debug_session.swf">[swf]</a> + * - Debug session 3 <a href="http://talks.somabo.de/200509_toronto_iterator_debug_session_2.pps">[pps]</a>, <a href="http://talks.somabo.de/200509_toronto_iterator_debug_session_2.pdf">[pdf]</a> * * You can download this documentation as a chm file * <a href="http://php.net/~helly/php/ext/spl/spl.chm">here</a>. * - * (c) Marcus Boerger, 2003 - 2006 + * (c) Marcus Boerger, 2003 - 2007 */ /** @defgroup ZendEngine Zend engine classes @@ -928,6 +931,14 @@ class SplFileInfo */ function isLink() {/**/} + /** @return target of link. + */ + function getLinkTarget() {/**/} + + /** @return The resolved path + */ + function getRealPath() {/**/} + /** @return getPathname() */ function __toString() {/**/} |