Skip to content

Commit e910699

Browse files
committed
- MFH Update docu
1 parent d82779e commit e910699

File tree

2 files changed

+28
-17
lines changed

2 files changed

+28
-17
lines changed

ext/spl/examples/callbackfilteriterator.inc

+9-9
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,16 @@ class CallbackFilterIterator extends FilterIterator
2828

2929
private $callback; /**< callback to use */
3030
private $mode; /**< mode any of USE_VALUE, USE_KEY, USE_BOTH */
31-
private $flags; /**< flags */
31+
private $flags; /**< flags (REPLACE) */
3232
private $key; /**< key value */
3333
private $current; /**< current value */
3434

3535
/** Construct a CallbackFilterIterator
3636
*
3737
* @param it inner iterator (iterator to filter)
3838
* @param callback callback function
39-
* @param mode @copy $mode
40-
* @param flags @copy $flags
39+
* @param mode any of USE_VALUE, USE_KEY, USE_BOTH
40+
* @param flags any of 0, REPLACE
4141
*/
4242
public function __construct(Iterator $it, $callback, $mode = self::USE_VALUE, $flags = 0)
4343
{
@@ -82,37 +82,37 @@ class CallbackFilterIterator extends FilterIterator
8282
}
8383
}
8484

85-
/** @return @copy $key */
85+
/** @return current key value */
8686
function key()
8787
{
8888
return $this->key;
8989
}
9090

91-
/** @return @copy $current */
91+
/** @return current value */
9292
function current()
9393
{
9494
return $this->current;
9595
}
9696

97-
/** @return @copy $mode */
97+
/** @return operation mode */
9898
function getMode()
9999
{
100100
return $this->mode;
101101
}
102102

103-
/** @param $mode set new mode, @see $mode */
103+
/** @param $mode set new mode, @see mode */
104104
function setMode($mode)
105105
{
106106
$this->mode = $mode;
107107
}
108108

109-
/** @return @copy $flags */
109+
/** @return operation flags */
110110
function getFlags()
111111
{
112112
return $this->flags;
113113
}
114114

115-
/** @param $flags set new flags, @see @copy $flags */
115+
/** @param $flags set new flags, @see flags */
116116
function setFlags($flags)
117117
{
118118
$this->flags = $flags;

ext/spl/spl.php

+19-8
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* SPL - Standard PHP Library
88
*
9-
* (c) Marcus Boerger, 2003 - 2006
9+
* (c) Marcus Boerger, 2003 - 2007
1010
*/
1111

1212
/** @mainpage SPL - Standard PHP Library
@@ -118,20 +118,23 @@
118118
* - <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>
119119
* - <a href="http://www.devshed.com/c/a/PHP/The-Standard-PHP-Library-Part-1/">The Standard PHP Library, Part 1</a>
120120
* - <a href="http://www.devshed.com/c/a/PHP/The-Standard-PHP-Library-Part-2/">The Standard PHP Library, Part 2</a>
121-
* - <a href="http://www.wiki.cc/php/SPL">SPL on PHP Wiki</a>
122121
* - <a href="http://www.professionelle-softwareentwicklung-mit-php5.de/erste_auflage/oop.iterators.spl.html">Die Standard PHP Library (SPL) [german]</a>
123122
*
124123
* 10) Talks on SPL:
125-
* - 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>
126-
* - 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>
127-
* - 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>
128-
* - 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>
129-
* - 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>
124+
* - 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>
125+
* - 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>
126+
* - 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>
127+
* - 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>
128+
*
129+
* 11) Debug sessions:
130+
* - 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>
131+
* - 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>
132+
* - 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>
130133
*
131134
* You can download this documentation as a chm file
132135
* <a href="http://php.net/~helly/php/ext/spl/spl.chm">here</a>.
133136
*
134-
* (c) Marcus Boerger, 2003 - 2006
137+
* (c) Marcus Boerger, 2003 - 2007
135138
*/
136139

137140
/** @defgroup ZendEngine Zend engine classes
@@ -928,6 +931,14 @@ function isDir() {/**/}
928931
*/
929932
function isLink() {/**/}
930933

934+
/** @return target of link.
935+
*/
936+
function getLinkTarget() {/**/}
937+
938+
/** @return The resolved path
939+
*/
940+
function getRealPath() {/**/}
941+
931942
/** @return getPathname()
932943
*/
933944
function __toString() {/**/}

0 commit comments

Comments
 (0)