- Update docu

2 files changed, 58 insertions, 19 deletions

diff --git a/ext/spl/doxygen.cfg b/ext/spl/doxygen.cfg
index 6f8eda9bd1..c61e6987fe 100755
--- a/ext/spl/doxygen.cfg
+++ b/ext/spl/doxygen.cfg
@@ -1,20 +1,22 @@
-# Doxyfile 1.3.6
+# Doxyfile 1.3.9.1
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = SPL - Standard PHP Library
+PROJECT_NAME           = SPL-StandardPHPLibrary
 PROJECT_NUMBER         = 
 OUTPUT_DIRECTORY       = 
+CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
 USE_WINDOWS_ENCODING   = YES
-BRIEF_MEMBER_DESC      = YES
+BRIEF_MEMBER_DESC      =
 REPEAT_BRIEF           = YES
 ABBREVIATE_BRIEF       = 
-ALWAYS_DETAILED_SEC    = NO
-INLINE_INHERITED_MEMB  = NO
+ALWAYS_DETAILED_SEC    = YES
+INLINE_INHERITED_MEMB  = YES
 FULL_PATH_NAMES        = NO
 STRIP_FROM_PATH        = 
+STRIP_FROM_INC_PATH    = 
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
 MULTILINE_CPP_IS_BRIEF = YES
@@ -33,6 +35,7 @@ EXTRACT_ALL            = YES
 EXTRACT_PRIVATE        = YES
 EXTRACT_STATIC         = YES
 EXTRACT_LOCAL_CLASSES  = YES
+EXTRACT_LOCAL_METHODS  = YES
 HIDE_UNDOC_MEMBERS     = NO
 HIDE_UNDOC_CLASSES     = NO
 HIDE_FRIEND_COMPOUNDS  = NO
@@ -52,6 +55,7 @@ GENERATE_DEPRECATEDLIST= YES
 ENABLED_SECTIONS       = 
 MAX_INITIALIZER_LINES  = 30
 SHOW_USED_FILES        = YES
+SHOW_DIRECTORIES       = YES
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
@@ -64,8 +68,10 @@ WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = spl.php examples
-FILE_PATTERNS          = *.inc *.php
+INPUT                  = spl.php \
+                         examples
+FILE_PATTERNS          = *.inc \
+                         *.php
 RECURSIVE              = NO
 EXCLUDE                = 
 EXCLUDE_SYMLINKS       = NO
@@ -75,6 +81,7 @@ EXAMPLE_PATTERNS       =
 EXAMPLE_RECURSIVE      = NO
 IMAGE_PATH             = 
 INPUT_FILTER           = 
+FILTER_PATTERNS        = 
 FILTER_SOURCE_FILES    = NO
 #---------------------------------------------------------------------------
 # configuration options related to source browsing
diff --git a/ext/spl/spl.php b/ext/spl/spl.php
index f3c0ba3047..7afc68170e 100755
--- a/ext/spl/spl.php
+++ b/ext/spl/spl.php
@@ -69,39 +69,71 @@ class Exception
 
 	/** Prevent clone
 	 */
-    final private function __clone();
+    final private function __clone() {}
 
-	/**
-	 */
-	public function __construct($message, $code);
+	/** Construct an exception
+	 *
+	 * @param $message Some text describing the exception
+	 * @param $code    Some code describing the exception
+	 */
+	function __construct($message = NULL, $code = 0) {
+		if (func_num_args()) {
+			$this->message = $message;
+		}
+		$this->code = $code;
+		$this->file = __FILE__; // of throw clause
+		$this->line = __LINE__; // of throw clause
+		$this->trace = debug_backtrace();
+		$this->string = StringFormat($this);
+	} 
 
 	/** @return the message passed to the constructor
 	 */
-    final public function getMessage();
+    final public function getMessage()
+    {
+    	return $this->message;
+    }
 
 	/** @return the code passed to the constructor
 	 */
-    final public function getCode();
+    final public function getCode()
+    {
+    	return $this->code;
+    }
 
 	/** @return the name of the file where the exception was thrown
 	 */
-    final public function getFile();
+    final public function getFile()
+    {
+    	return $this->file;
+    }
 
 	/** @return the line number where the exception was thrown
 	 */
-    final public function getLine();
+    final public function getLine()
+    {
+    	return $this->line;
+    }
 
 	/** @return the stack trace as array
 	 */
-    final public function getTrace();
+    final public function getTrace()
+    {
+    	return $this->trace;
+    }
 
 	/** @return the stack trace as string
 	 */
-    final public function getTraceAsString();
+    final public function getTraceAsString()
+    {
+    }
 
 	/** @return string represenation of exception
 	 */
-    public function __toString();
+    public function __toString()
+    {
+    	return $this->string;
+    }
 }
 
 /** @ingroup SPL
@@ -165,7 +197,7 @@ class RuntimeException extends Exception
  *
  * @see OutOfRangeException
  */
-class OutOfBoundsException extends LogicException
+class OutOfBoundsException extends RuntimeException
 {
 }