helly Sun Apr 22 17:13:52 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/spl spl.php
/php-src/ext/spl/examples callbackfilteriterator.inc
Log:
- MFH Update docu
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/spl.php?r1=1.49.2.11.2.6&r2=1.49.2.11.2.7&diff_format=u
Index: php-src/ext/spl/spl.php
diff -u php-src/ext/spl/spl.php:1.49.2.11.2.6
php-src/ext/spl/spl.php:1.49.2.11.2.7
--- php-src/ext/spl/spl.php:1.49.2.11.2.6 Tue Apr 17 06:33:50 2007
+++ php-src/ext/spl/spl.php Sun Apr 22 17:13:52 2007
@@ -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 @@
*/
function isLink() {/**/}
+ /** @return target of link.
+ */
+ function getLinkTarget() {/**/}
+
+ /** @return The resolved path
+ */
+ function getRealPath() {/**/}
+
/** @return getPathname()
*/
function __toString() {/**/}
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/examples/callbackfilteriterator.inc?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/spl/examples/callbackfilteriterator.inc
diff -u php-src/ext/spl/examples/callbackfilteriterator.inc:1.1.2.2
php-src/ext/spl/examples/callbackfilteriterator.inc:1.1.2.3
--- php-src/ext/spl/examples/callbackfilteriterator.inc:1.1.2.2 Tue Nov 28
22:20:01 2006
+++ php-src/ext/spl/examples/callbackfilteriterator.inc Sun Apr 22 17:13:52 2007
@@ -28,7 +28,7 @@
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 @@
*
* @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 @@
}
}
- /** @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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
