From: Marcus Boerger Date: Thu, 6 May 2004 22:55:25 +0000 (+0000) Subject: - Update examples X-Git-Tag: RELEASE_0_1~274 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7388b6b9acfae078523115f82a400cdc06d92d7e;p=php - Update examples --- diff --git a/ext/spl/examples/IniGroups.inc b/ext/spl/examples/IniGroups.inc new file mode 100755 index 0000000000..bb596c2717 --- /dev/null +++ b/ext/spl/examples/IniGroups.inc @@ -0,0 +1,44 @@ + \ No newline at end of file diff --git a/ext/spl/examples/key_filter.inc b/ext/spl/examples/KeyFilter.inc similarity index 97% rename from ext/spl/examples/key_filter.inc rename to ext/spl/examples/KeyFilter.inc index 2acfc69a34..ba73435955 100755 --- a/ext/spl/examples/key_filter.inc +++ b/ext/spl/examples/KeyFilter.inc @@ -23,7 +23,7 @@ class KeyFilter implements Iterator * method is called. * * @param it Object that implements at least spl_forward - * @patam regex Regular expression used as a filter. + * @param regex Regular expression used as a filter. */ function __construct(Iterator $it, $regex) { $this->it = $it; diff --git a/ext/spl/examples/dba_dump.php b/ext/spl/examples/dba_dump.php index b608c9fe63..cdee831b0a 100755 --- a/ext/spl/examples/dba_dump.php +++ b/ext/spl/examples/dba_dump.php @@ -25,7 +25,7 @@ EOF; } require_once("dba_reader.inc"); -require_once("key_filter.inc"); +require_once("KeyFilter.inc"); $db = new DbaReader($argv[1], $argv[2]); diff --git a/ext/spl/examples/ini_groups.php b/ext/spl/examples/ini_groups.php index 7ebdaed7f9..2e76752e23 100755 --- a/ext/spl/examples/ini_groups.php +++ b/ext/spl/examples/ini_groups.php @@ -9,7 +9,7 @@ * * Note: configure with --enable-dba * - * (c) Marcus Boerger, 2003 + * (c) Marcus Boerger, 2003 - 2004 */ if ($argc < 2) { @@ -25,50 +25,11 @@ EOF; } require_once("dba_reader.inc"); -require_once("key_filter.inc"); +require_once("IniGroups.inc"); -/** - * @brief Class to iterate all groups within an ini file. - * @author Marcus Boerger - * @version 1.0 - * - * Using this class you can iterator over all groups of a ini file. - * - * This class uses a 'is-a' relation to key_filter in contrast to a 'has-a' - * relation. Doing so both current() and key() methods must be overwritten. - * If it would use a 'has-a' relation there would be much more to type... - * but for puritists that would allow correctness in so far as then no - * key() would be needed. - */ -class ini_groups extends key_filter -{ - /** - * Construct an ini file group iterator from a filename. - * - * @param file Ini file to open. - */ - function __construct($file) { - parent::__construct(new dba_reader($file, 'inifile'), '^\[.*\]$'); - } - - /** - * @return The current group. - */ - function current() { - return substr(parent::key(),1,-1); - } - - /** - * @return The current group. - */ - function key() { - return substr(parent::key(),1,-1); - } -} - -$it = new ini_groups($argv[1]); +$it = new IniGroups($argv[1]); if ($argc>2) { - $it = new key_filter($it, $argv[2]); + $it = new KeyFilter($it, $argv[2]); } foreach($it as $group) { diff --git a/ext/spl/spl.php b/ext/spl/spl.php index ba5ea688db..744f8c79cb 100755 --- a/ext/spl/spl.php +++ b/ext/spl/spl.php @@ -1,10 +1,36 @@