- Update examples

diff --git a/ext/spl/examples/IniGroups.inc b/ext/spl/examples/IniGroups.inc
new file mode 100755 (executable)
index 0000000..bb596c2
--- /dev/null
+++ b/ext/spl/examples/IniGroups.inc
@@ -0,0 +1,44 @@
+<?php
+
+require_once("KeyFilter.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 KeyFilter 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 IniGroups extends KeyFilter
+{
+       /**
+        * 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);
+       }
+}
+
+?>
\ 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 2acfc69a34efe181d85f2836e907af33fcb56fb3..ba7343595556bc0a8868c8f54cacf871d84b8b38 100755 (executable)
--- 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 b608c9fe63d7d7e41a44533bab94e93b5275cdc5..cdee831b0a61d46bbbc334d4a8992e5a6d2e2a79 100755 (executable)
--- 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 7ebdaed7f93bbbc24789af8127d87d11eca908c4..2e76752e23c49af1e6f66942a5d733434cc38429 100755 (executable)
--- 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 ba5ea688db9b3593bf8f8270700bb655aed33673..744f8c79cb9c9b80f477997963b2405e67b9cd39 100755 (executable)
--- a/ext/spl/spl.php
+++ b/ext/spl/spl.php
@@ -1,10 +1,36 @@
 <?php
 
-/** Standard PHP Library
+/** \mainpage SPL - Standard PHP Library
+ *
+ * SPL - Standard PHP Library
  *
  * (c) Marcus Boerger, 2003 - 2004
  */
 
+/** Interface to override array access of objects.
+ */
+interface ArrayAccess
+{
+       /** \param $offset to modify
+        * \param $value new value
+        */
+       function offsetSet($offset, $value);
+
+       /** \param $offset to retrieve
+        * \return value at given offset
+        */
+       function offsetGet($offset);
+
+       /** \param $offset to delete
+        */
+       function offsetUnset($offset);
+
+       /** \param $offset to check
+        *\return whether the offset exists.
+        */
+       function offsetExists($offset);
+}
+
 /** Abstract base interface that cannot be implemented alone. Instead it
  * must be implemented by either IteratorAggregate or Iterator. 
  *
@@ -343,7 +369,7 @@ class CachingIterator implements Iterator
 
 /** The recursive version of the CachingIterator.
  */
-class CachingRecursiveIterator extends CachingIterator implemnets RecursiveIterator
+class CachingRecursiveIterator extends CachingIterator implements RecursiveIterator
 {
        /** Construct an instance form a RecursiveIterator.
         *