chamilo / chamilo-lms

main/inc/lib/phpdocx/lib/log4php/helpers/LoggerPatternParser.php

Doc Comments +3 added lines

@@ -237,6 +237,9 @@
 		return $this->head;
 	}
 
+	/**
+	 * @param string $c
+	 */
 	public function finalizeConverter($c) {
 		$pc = null;
 		switch($c) {

Indentation +301 added lines, -301 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 /**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *	   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @package log4php
- */
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements. See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License. You may obtain a copy of the License at
+     *
+     *	   http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     *
+     * @package log4php
+     */
 
 /**
  * Most of the work of the {@link LoggerPatternLayout} class 
@@ -33,309 +33,309 @@ 
  */
 class LoggerPatternParser {
 
-	const ESCAPE_CHAR = '%';
+    const ESCAPE_CHAR = '%';
 	
-	const LITERAL_STATE = 0;
-	const CONVERTER_STATE = 1;
-	const MINUS_STATE = 2;
-	const DOT_STATE = 3;
-	const MIN_STATE = 4;
-	const MAX_STATE = 5;
+    const LITERAL_STATE = 0;
+    const CONVERTER_STATE = 1;
+    const MINUS_STATE = 2;
+    const DOT_STATE = 3;
+    const MIN_STATE = 4;
+    const MAX_STATE = 5;
 	
-	const FULL_LOCATION_CONVERTER = 1000;
-	const METHOD_LOCATION_CONVERTER = 1001;
-	const CLASS_LOCATION_CONVERTER = 1002;
-	const FILE_LOCATION_CONVERTER = 1003;
-	const LINE_LOCATION_CONVERTER = 1004;
+    const FULL_LOCATION_CONVERTER = 1000;
+    const METHOD_LOCATION_CONVERTER = 1001;
+    const CLASS_LOCATION_CONVERTER = 1002;
+    const FILE_LOCATION_CONVERTER = 1003;
+    const LINE_LOCATION_CONVERTER = 1004;
 	
-	const RELATIVE_TIME_CONVERTER = 2000;
-	const THREAD_CONVERTER = 2001;
-	const LEVEL_CONVERTER = 2002;
-	const NDC_CONVERTER = 2003;
-	const MESSAGE_CONVERTER = 2004;
+    const RELATIVE_TIME_CONVERTER = 2000;
+    const THREAD_CONVERTER = 2001;
+    const LEVEL_CONVERTER = 2002;
+    const NDC_CONVERTER = 2003;
+    const MESSAGE_CONVERTER = 2004;
 	
-	const DATE_FORMAT_ISO8601 = 'Y-m-d H:i:s,u'; 
-	const DATE_FORMAT_ABSOLUTE = 'H:i:s';
-	const DATE_FORMAT_DATE = 'd M Y H:i:s,u';
+    const DATE_FORMAT_ISO8601 = 'Y-m-d H:i:s,u'; 
+    const DATE_FORMAT_ABSOLUTE = 'H:i:s';
+    const DATE_FORMAT_DATE = 'd M Y H:i:s,u';
 
-	private $state;
-	private $currentLiteral;
-	private $patternLength;
-	private $i;
+    private $state;
+    private $currentLiteral;
+    private $patternLength;
+    private $i;
 	
-	/**
-	 * @var LoggerPatternConverter
-	 */
-	private $head = null;
+    /**
+     * @var LoggerPatternConverter
+     */
+    private $head = null;
 	 
-	/**
-	 * @var LoggerPatternConverter
-	 */
-	private $tail = null;
+    /**
+     * @var LoggerPatternConverter
+     */
+    private $tail = null;
 	
-	/**
-	 * @var LoggerFormattingInfo
-	 */
-	private $formattingInfo;
+    /**
+     * @var LoggerFormattingInfo
+     */
+    private $formattingInfo;
 	
-	/**
-	 * @var string pattern to parse
-	 */
-	private $pattern;
+    /**
+     * @var string pattern to parse
+     */
+    private $pattern;
 
-	/**
-	 * Constructor 
-	 *
-	 * @param string $pattern
-	 */
-	public function __construct($pattern) {
-		$this->pattern = $pattern;
-		$this->patternLength =	strlen($pattern);
-		$this->formattingInfo = new LoggerFormattingInfo();
-		$this->state = self::LITERAL_STATE;
-	}
+    /**
+     * Constructor 
+     *
+     * @param string $pattern
+     */
+    public function __construct($pattern) {
+        $this->pattern = $pattern;
+        $this->patternLength =	strlen($pattern);
+        $this->formattingInfo = new LoggerFormattingInfo();
+        $this->state = self::LITERAL_STATE;
+    }
 
-	/**
-	 * @param LoggerPatternConverter $pc
-	 */
-	public function addToList($pc) {
-		if($this->head == null) {
-			$this->head = $pc;
-			$this->tail = $this->head;
-		} else {
-			$this->tail->next = $pc;
-			$this->tail = $this->tail->next;
-		}
-	}
+    /**
+     * @param LoggerPatternConverter $pc
+     */
+    public function addToList($pc) {
+        if($this->head == null) {
+            $this->head = $pc;
+            $this->tail = $this->head;
+        } else {
+            $this->tail->next = $pc;
+            $this->tail = $this->tail->next;
+        }
+    }
 
-	/**
-	 * @return string
-	 */
-	public function extractOption() {
-		if(($this->i < $this->patternLength) and ($this->pattern{$this->i} == '{')) {
-			$end = strpos($this->pattern, '}' , $this->i);
-			if($end !== false) {
-				$r = substr($this->pattern, ($this->i + 1), ($end - $this->i - 1));
-				$this->i= $end + 1;
-				return $r;
-			}
-		}
-		return null;
-	}
+    /**
+     * @return string
+     */
+    public function extractOption() {
+        if(($this->i < $this->patternLength) and ($this->pattern{$this->i} == '{')) {
+            $end = strpos($this->pattern, '}' , $this->i);
+            if($end !== false) {
+                $r = substr($this->pattern, ($this->i + 1), ($end - $this->i - 1));
+                $this->i= $end + 1;
+                return $r;
+            }
+        }
+        return null;
+    }
 
-	/**
-	 * The option is expected to be in decimal and positive. In case of
-	 * error, zero is returned.	 
-	 */
-	public function extractPrecisionOption() {
-		$opt = $this->extractOption();
-		$r = 0;
-		if($opt !== null) {
-			if(is_numeric($opt)) {
-				$r = (int)$opt;
-				if($r <= 0) {
-					$r = 0;
-				}
-			}
-		}
-		return $r;
-	}
+    /**
+     * The option is expected to be in decimal and positive. In case of
+     * error, zero is returned.	 
+     */
+    public function extractPrecisionOption() {
+        $opt = $this->extractOption();
+        $r = 0;
+        if($opt !== null) {
+            if(is_numeric($opt)) {
+                $r = (int)$opt;
+                if($r <= 0) {
+                    $r = 0;
+                }
+            }
+        }
+        return $r;
+    }
 
 	
-	/** Parser.
-	 * 
-	 * @return LoggerPatternConverter Returns $this->head.
-	 */
-	public function parse() {
-		$c = '';
-		$this->i = 0;
-		$this->currentLiteral = '';
-		while($this->i < $this->patternLength) {
-			$c = $this->pattern{$this->i++};
+    /** Parser.
+     * 
+     * @return LoggerPatternConverter Returns $this->head.
+     */
+    public function parse() {
+        $c = '';
+        $this->i = 0;
+        $this->currentLiteral = '';
+        while($this->i < $this->patternLength) {
+            $c = $this->pattern{$this->i++};
 
-			switch($this->state) {
-				case self::LITERAL_STATE:
-					// In literal state, the last char is always a literal.
-					if($this->i == $this->patternLength) {
-						$this->currentLiteral .= $c;
-						continue;
-					}
-					if($c == self::ESCAPE_CHAR) {
-						// peek at the next char.
-						switch($this->pattern{$this->i}) {
-							case self::ESCAPE_CHAR:
-								$this->currentLiteral .= $c;
-								$this->i++; // move pointer
-								break;
-							case 'n':
-								$this->currentLiteral .= PHP_EOL;
-								$this->i++; // move pointer
-								break;
-							default:
-								if(strlen($this->currentLiteral) != 0) {
-									$this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral));
-								}
-								$this->currentLiteral = $c;
-								$this->state = self::CONVERTER_STATE;
-								$this->formattingInfo->reset();
-						}
-					} else {
-						$this->currentLiteral .= $c;
-					}
-					break;
-				case self::CONVERTER_STATE:
-						$this->currentLiteral .= $c;
-						switch($c) {
-						case '-':
-							$this->formattingInfo->leftAlign = true;
-							break;
-						case '.':
-							$this->state = self::DOT_STATE;
-								break;
-						default:
-							if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
-								$this->formattingInfo->min = ord($c) - ord('0');
-								$this->state = self::MIN_STATE;
-							} else {
-								$this->finalizeConverter($c);
-							}
-						} // switch
-					break;
-				case self::MIN_STATE:
-					$this->currentLiteral .= $c;
-					if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
-						$this->formattingInfo->min = ($this->formattingInfo->min * 10) + (ord($c) - ord('0'));
-					} else if ($c == '.') {
-						$this->state = self::DOT_STATE;
-					} else {
-						$this->finalizeConverter($c);
-					}
-					break;
-				case self::DOT_STATE:
-					$this->currentLiteral .= $c;
-					if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
-						$this->formattingInfo->max = ord($c) - ord('0');
-						$this->state = self::MAX_STATE;
-					} else {
-						$this->state = self::LITERAL_STATE;
-					}
-					break;
-				case self::MAX_STATE:
-					$this->currentLiteral .= $c;
-					if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
-						$this->formattingInfo->max = ($this->formattingInfo->max * 10) + (ord($c) - ord('0'));
-					} else {
-						$this->finalizeConverter($c);
-						$this->state = self::LITERAL_STATE;
-					}
-					break;
-			} // switch
-		} // while
-		if(strlen($this->currentLiteral) != 0) {
-			$this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral));
-		}
-		return $this->head;
-	}
+            switch($this->state) {
+                case self::LITERAL_STATE:
+                    // In literal state, the last char is always a literal.
+                    if($this->i == $this->patternLength) {
+                        $this->currentLiteral .= $c;
+                        continue;
+                    }
+                    if($c == self::ESCAPE_CHAR) {
+                        // peek at the next char.
+                        switch($this->pattern{$this->i}) {
+                            case self::ESCAPE_CHAR:
+                                $this->currentLiteral .= $c;
+                                $this->i++; // move pointer
+                                break;
+                            case 'n':
+                                $this->currentLiteral .= PHP_EOL;
+                                $this->i++; // move pointer
+                                break;
+                            default:
+                                if(strlen($this->currentLiteral) != 0) {
+                                    $this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral));
+                                }
+                                $this->currentLiteral = $c;
+                                $this->state = self::CONVERTER_STATE;
+                                $this->formattingInfo->reset();
+                        }
+                    } else {
+                        $this->currentLiteral .= $c;
+                    }
+                    break;
+                case self::CONVERTER_STATE:
+                        $this->currentLiteral .= $c;
+                        switch($c) {
+                        case '-':
+                            $this->formattingInfo->leftAlign = true;
+                            break;
+                        case '.':
+                            $this->state = self::DOT_STATE;
+                                break;
+                        default:
+                            if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
+                                $this->formattingInfo->min = ord($c) - ord('0');
+                                $this->state = self::MIN_STATE;
+                            } else {
+                                $this->finalizeConverter($c);
+                            }
+                        } // switch
+                    break;
+                case self::MIN_STATE:
+                    $this->currentLiteral .= $c;
+                    if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
+                        $this->formattingInfo->min = ($this->formattingInfo->min * 10) + (ord($c) - ord('0'));
+                    } else if ($c == '.') {
+                        $this->state = self::DOT_STATE;
+                    } else {
+                        $this->finalizeConverter($c);
+                    }
+                    break;
+                case self::DOT_STATE:
+                    $this->currentLiteral .= $c;
+                    if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
+                        $this->formattingInfo->max = ord($c) - ord('0');
+                        $this->state = self::MAX_STATE;
+                    } else {
+                        $this->state = self::LITERAL_STATE;
+                    }
+                    break;
+                case self::MAX_STATE:
+                    $this->currentLiteral .= $c;
+                    if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
+                        $this->formattingInfo->max = ($this->formattingInfo->max * 10) + (ord($c) - ord('0'));
+                    } else {
+                        $this->finalizeConverter($c);
+                        $this->state = self::LITERAL_STATE;
+                    }
+                    break;
+            } // switch
+        } // while
+        if(strlen($this->currentLiteral) != 0) {
+            $this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral));
+        }
+        return $this->head;
+    }
 
-	public function finalizeConverter($c) {
-		$pc = null;
-		switch($c) {
-			case 'c':
-				$pc = new LoggerCategoryPatternConverter($this->formattingInfo, $this->extractPrecisionOption());
-				$this->currentLiteral = '';
-				break;
-			case 'C':
-				$pc = new LoggerClassNamePatternConverter($this->formattingInfo, $this->extractPrecisionOption());
-				$this->currentLiteral = '';
-				break;
-			case 'd':
-				$dateFormatStr = self::DATE_FORMAT_ISO8601; // ISO8601_DATE_FORMAT;
-				$dOpt = $this->extractOption();
+    public function finalizeConverter($c) {
+        $pc = null;
+        switch($c) {
+            case 'c':
+                $pc = new LoggerCategoryPatternConverter($this->formattingInfo, $this->extractPrecisionOption());
+                $this->currentLiteral = '';
+                break;
+            case 'C':
+                $pc = new LoggerClassNamePatternConverter($this->formattingInfo, $this->extractPrecisionOption());
+                $this->currentLiteral = '';
+                break;
+            case 'd':
+                $dateFormatStr = self::DATE_FORMAT_ISO8601; // ISO8601_DATE_FORMAT;
+                $dOpt = $this->extractOption();
 
-				if($dOpt !== null)
-					$dateFormatStr = $dOpt;
+                if($dOpt !== null)
+                    $dateFormatStr = $dOpt;
 					
-				if($dateFormatStr == 'ISO8601') {
-					$df = self::DATE_FORMAT_ISO8601;
-				} else if($dateFormatStr == 'ABSOLUTE') {
-					$df = self::DATE_FORMAT_ABSOLUTE;
-				} else if($dateFormatStr == 'DATE') {
-					$df = self::DATE_FORMAT_DATE;
-				} else {
-					$df = $dateFormatStr;
-					if($df == null) {
-						$df = self::DATE_FORMAT_ISO8601;
-					}
-				}
-				$pc = new LoggerDatePatternConverter($this->formattingInfo, $df);
-				$this->currentLiteral = '';
-				break;
-			case 'F':
-				$pc = new LoggerLocationPatternConverter($this->formattingInfo, self::FILE_LOCATION_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 'l':
-				$pc = new LoggerLocationPatternConverter($this->formattingInfo, self::FULL_LOCATION_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 'L':
-				$pc = new LoggerLocationPatternConverter($this->formattingInfo, self::LINE_LOCATION_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 'm':
-				$pc = new LoggerBasicPatternConverter($this->formattingInfo, self::MESSAGE_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 'M':
-				$pc = new LoggerLocationPatternConverter($this->formattingInfo, self::METHOD_LOCATION_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 'p':
-				$pc = new LoggerBasicPatternConverter($this->formattingInfo, self::LEVEL_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 'r':
-				$pc = new LoggerBasicPatternConverter($this->formattingInfo, self::RELATIVE_TIME_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 't':
-				$pc = new LoggerBasicPatternConverter($this->formattingInfo, self::THREAD_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 'u':
-				if($this->i < $this->patternLength) {
-					$cNext = $this->pattern{$this->i};
-					if(ord($cNext) >= ord('0') and ord($cNext) <= ord('9')) {
-						$pc = new LoggerUserFieldPatternConverter($this->formattingInfo, (string)(ord($cNext) - ord('0')));
-						$this->currentLiteral = '';
-						$this->i++;
-					}
-				}
-				break;
-			case 'x':
-				$pc = new LoggerBasicPatternConverter($this->formattingInfo, self::NDC_CONVERTER);
-				$this->currentLiteral = '';
-				break;
-			case 'X':
-				$xOpt = $this->extractOption();
-				$pc = new LoggerMDCPatternConverter($this->formattingInfo, $xOpt);
-				$this->currentLiteral = '';
-				break;
-			default:
-				$pc = new LoggerLiteralPatternConverter($this->currentLiteral);
-				$this->currentLiteral = '';
-		}
-		$this->addConverter($pc);
-	}
+                if($dateFormatStr == 'ISO8601') {
+                    $df = self::DATE_FORMAT_ISO8601;
+                } else if($dateFormatStr == 'ABSOLUTE') {
+                    $df = self::DATE_FORMAT_ABSOLUTE;
+                } else if($dateFormatStr == 'DATE') {
+                    $df = self::DATE_FORMAT_DATE;
+                } else {
+                    $df = $dateFormatStr;
+                    if($df == null) {
+                        $df = self::DATE_FORMAT_ISO8601;
+                    }
+                }
+                $pc = new LoggerDatePatternConverter($this->formattingInfo, $df);
+                $this->currentLiteral = '';
+                break;
+            case 'F':
+                $pc = new LoggerLocationPatternConverter($this->formattingInfo, self::FILE_LOCATION_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 'l':
+                $pc = new LoggerLocationPatternConverter($this->formattingInfo, self::FULL_LOCATION_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 'L':
+                $pc = new LoggerLocationPatternConverter($this->formattingInfo, self::LINE_LOCATION_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 'm':
+                $pc = new LoggerBasicPatternConverter($this->formattingInfo, self::MESSAGE_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 'M':
+                $pc = new LoggerLocationPatternConverter($this->formattingInfo, self::METHOD_LOCATION_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 'p':
+                $pc = new LoggerBasicPatternConverter($this->formattingInfo, self::LEVEL_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 'r':
+                $pc = new LoggerBasicPatternConverter($this->formattingInfo, self::RELATIVE_TIME_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 't':
+                $pc = new LoggerBasicPatternConverter($this->formattingInfo, self::THREAD_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 'u':
+                if($this->i < $this->patternLength) {
+                    $cNext = $this->pattern{$this->i};
+                    if(ord($cNext) >= ord('0') and ord($cNext) <= ord('9')) {
+                        $pc = new LoggerUserFieldPatternConverter($this->formattingInfo, (string)(ord($cNext) - ord('0')));
+                        $this->currentLiteral = '';
+                        $this->i++;
+                    }
+                }
+                break;
+            case 'x':
+                $pc = new LoggerBasicPatternConverter($this->formattingInfo, self::NDC_CONVERTER);
+                $this->currentLiteral = '';
+                break;
+            case 'X':
+                $xOpt = $this->extractOption();
+                $pc = new LoggerMDCPatternConverter($this->formattingInfo, $xOpt);
+                $this->currentLiteral = '';
+                break;
+            default:
+                $pc = new LoggerLiteralPatternConverter($this->currentLiteral);
+                $this->currentLiteral = '';
+        }
+        $this->addConverter($pc);
+    }
 
-	public function addConverter($pc) {
-		$this->currentLiteral = '';
-		// Add the pattern converter to the list.
-		$this->addToList($pc);
-		// Next pattern is assumed to be a literal.
-		$this->state = self::LITERAL_STATE;
-		// Reset formatting info
-		$this->formattingInfo->reset();
-	}
+    public function addConverter($pc) {
+        $this->currentLiteral = '';
+        // Add the pattern converter to the list.
+        $this->addToList($pc);
+        // Next pattern is assumed to be a literal.
+        $this->state = self::LITERAL_STATE;
+        // Reset formatting info
+        $this->formattingInfo->reset();
+    }
 }
 

Switch Indentation +13 added lines, -13 removed lines

@@ -186,19 +186,19 @@
 				case self::CONVERTER_STATE:
 						$this->currentLiteral .= $c;
 						switch($c) {
-						case '-':
-							$this->formattingInfo->leftAlign = true;
-							break;
-						case '.':
-							$this->state = self::DOT_STATE;
-								break;
-						default:
-							if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
-								$this->formattingInfo->min = ord($c) - ord('0');
-								$this->state = self::MIN_STATE;
-							} else {
-								$this->finalizeConverter($c);
-							}
+						    case '-':
+							    $this->formattingInfo->leftAlign = true;
+							    break;
+						    case '.':
+							    $this->state = self::DOT_STATE;
+								    break;
+						    default:
+							    if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
+								    $this->formattingInfo->min = ord($c) - ord('0');
+								    $this->state = self::MIN_STATE;
+							    } else {
+								    $this->finalizeConverter($c);
+							    }
 						} // switch
 					break;
 				case self::MIN_STATE:

Spacing +31 added lines, -31 removed lines

@@ -90,7 +90,7 @@ 
 	 */
 	public function __construct($pattern) {
 		$this->pattern = $pattern;
-		$this->patternLength =	strlen($pattern);
+		$this->patternLength = strlen($pattern);
 		$this->formattingInfo = new LoggerFormattingInfo();
 		$this->state = self::LITERAL_STATE;
 	}
@@ -99,7 +99,7 @@ 
 	 * @param LoggerPatternConverter $pc
 	 */
 	public function addToList($pc) {
-		if($this->head == null) {
+		if ($this->head == null) {
 			$this->head = $pc;
 			$this->tail = $this->head;
 		} else {
@@ -112,11 +112,11 @@ 
 	 * @return string
 	 */
 	public function extractOption() {
-		if(($this->i < $this->patternLength) and ($this->pattern{$this->i} == '{')) {
-			$end = strpos($this->pattern, '}' , $this->i);
-			if($end !== false) {
+		if (($this->i < $this->patternLength) and ($this->pattern{$this->i} == '{')) {
+			$end = strpos($this->pattern, '}', $this->i);
+			if ($end !== false) {
 				$r = substr($this->pattern, ($this->i + 1), ($end - $this->i - 1));
-				$this->i= $end + 1;
+				$this->i = $end + 1;
 				return $r;
 			}
 		}
@@ -130,10 +130,10 @@ 
 	public function extractPrecisionOption() {
 		$opt = $this->extractOption();
 		$r = 0;
-		if($opt !== null) {
-			if(is_numeric($opt)) {
-				$r = (int)$opt;
-				if($r <= 0) {
+		if ($opt !== null) {
+			if (is_numeric($opt)) {
+				$r = (int) $opt;
+				if ($r <= 0) {
 					$r = 0;
 				}
 			}
@@ -150,19 +150,19 @@ 
 		$c = '';
 		$this->i = 0;
 		$this->currentLiteral = '';
-		while($this->i < $this->patternLength) {
+		while ($this->i < $this->patternLength) {
 			$c = $this->pattern{$this->i++};
 
-			switch($this->state) {
+			switch ($this->state) {
 				case self::LITERAL_STATE:
 					// In literal state, the last char is always a literal.
-					if($this->i == $this->patternLength) {
+					if ($this->i == $this->patternLength) {
 						$this->currentLiteral .= $c;
 						continue;
 					}
-					if($c == self::ESCAPE_CHAR) {
+					if ($c == self::ESCAPE_CHAR) {
 						// peek at the next char.
-						switch($this->pattern{$this->i}) {
+						switch ($this->pattern{$this->i}) {
 							case self::ESCAPE_CHAR:
 								$this->currentLiteral .= $c;
 								$this->i++; // move pointer
@@ -172,7 +172,7 @@ 
 								$this->i++; // move pointer
 								break;
 							default:
-								if(strlen($this->currentLiteral) != 0) {
+								if (strlen($this->currentLiteral) != 0) {
 									$this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral));
 								}
 								$this->currentLiteral = $c;
@@ -185,7 +185,7 @@ 
 					break;
 				case self::CONVERTER_STATE:
 						$this->currentLiteral .= $c;
-						switch($c) {
+						switch ($c) {
 						case '-':
 							$this->formattingInfo->leftAlign = true;
 							break;
@@ -193,7 +193,7 @@ 
 							$this->state = self::DOT_STATE;
 								break;
 						default:
-							if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
+							if (ord($c) >= ord('0') and ord($c) <= ord('9')) {
 								$this->formattingInfo->min = ord($c) - ord('0');
 								$this->state = self::MIN_STATE;
 							} else {
@@ -203,7 +203,7 @@ 
 					break;
 				case self::MIN_STATE:
 					$this->currentLiteral .= $c;
-					if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
+					if (ord($c) >= ord('0') and ord($c) <= ord('9')) {
 						$this->formattingInfo->min = ($this->formattingInfo->min * 10) + (ord($c) - ord('0'));
 					} else if ($c == '.') {
 						$this->state = self::DOT_STATE;
@@ -213,7 +213,7 @@ 
 					break;
 				case self::DOT_STATE:
 					$this->currentLiteral .= $c;
-					if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
+					if (ord($c) >= ord('0') and ord($c) <= ord('9')) {
 						$this->formattingInfo->max = ord($c) - ord('0');
 						$this->state = self::MAX_STATE;
 					} else {
@@ -222,7 +222,7 @@ 
 					break;
 				case self::MAX_STATE:
 					$this->currentLiteral .= $c;
-					if(ord($c) >= ord('0') and ord($c) <= ord('9')) {
+					if (ord($c) >= ord('0') and ord($c) <= ord('9')) {
 						$this->formattingInfo->max = ($this->formattingInfo->max * 10) + (ord($c) - ord('0'));
 					} else {
 						$this->finalizeConverter($c);
@@ -231,7 +231,7 @@ 
 					break;
 			} // switch
 		} // while
-		if(strlen($this->currentLiteral) != 0) {
+		if (strlen($this->currentLiteral) != 0) {
 			$this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral));
 		}
 		return $this->head;
@@ -239,7 +239,7 @@ 
 
 	public function finalizeConverter($c) {
 		$pc = null;
-		switch($c) {
+		switch ($c) {
 			case 'c':
 				$pc = new LoggerCategoryPatternConverter($this->formattingInfo, $this->extractPrecisionOption());
 				$this->currentLiteral = '';
@@ -252,18 +252,18 @@ 
 				$dateFormatStr = self::DATE_FORMAT_ISO8601; // ISO8601_DATE_FORMAT;
 				$dOpt = $this->extractOption();
 
-				if($dOpt !== null)
+				if ($dOpt !== null)
 					$dateFormatStr = $dOpt;
 					
-				if($dateFormatStr == 'ISO8601') {
+				if ($dateFormatStr == 'ISO8601') {
 					$df = self::DATE_FORMAT_ISO8601;
-				} else if($dateFormatStr == 'ABSOLUTE') {
+				} else if ($dateFormatStr == 'ABSOLUTE') {
 					$df = self::DATE_FORMAT_ABSOLUTE;
-				} else if($dateFormatStr == 'DATE') {
+				} else if ($dateFormatStr == 'DATE') {
 					$df = self::DATE_FORMAT_DATE;
 				} else {
 					$df = $dateFormatStr;
-					if($df == null) {
+					if ($df == null) {
 						$df = self::DATE_FORMAT_ISO8601;
 					}
 				}
@@ -303,10 +303,10 @@ 
 				$this->currentLiteral = '';
 				break;
 			case 'u':
-				if($this->i < $this->patternLength) {
+				if ($this->i < $this->patternLength) {
 					$cNext = $this->pattern{$this->i};
-					if(ord($cNext) >= ord('0') and ord($cNext) <= ord('9')) {
-						$pc = new LoggerUserFieldPatternConverter($this->formattingInfo, (string)(ord($cNext) - ord('0')));
+					if (ord($cNext) >= ord('0') and ord($cNext) <= ord('9')) {
+						$pc = new LoggerUserFieldPatternConverter($this->formattingInfo, (string) (ord($cNext) - ord('0')));
 						$this->currentLiteral = '';
 						$this->i++;
 					}

Braces +3 added lines, -2 removed lines

@@ -252,8 +252,9 @@
 				$dateFormatStr = self::DATE_FORMAT_ISO8601; // ISO8601_DATE_FORMAT;
 				$dOpt = $this->extractOption();
 
-				if($dOpt !== null)
-					$dateFormatStr = $dOpt;
+				if($dOpt !== null) {
+									$dateFormatStr = $dOpt;
+				}
 					
 				if($dateFormatStr == 'ISO8601') {
 					$df = self::DATE_FORMAT_ISO8601;

main/inc/lib/phpdocx/lib/log4php/layouts/LoggerLayoutPattern.php

Doc Comments +1 added lines

@@ -169,6 +169,7 @@
 	 * Set the <b>ConversionPattern</b> option. This is the string which
 	 * controls formatting and consists of a mix of literal content and
 	 * conversion specifiers.
+	 * @param string $conversionPattern
 	 */
 	public function setConversionPattern($conversionPattern) {
 		$this->pattern = $conversionPattern;

Spacing +1 added lines, -1 removed lines

@@ -206,7 +206,7 @@
         $results = array();
         $c = $this->head;
         while ($c !== null) {
-            if ( ! $c instanceOf LoggerLiteralPatternConverter) {
+            if (!$c instanceOf LoggerLiteralPatternConverter) {
                 $sbuf = null;
                 $c->format($sbuf, $event);
                 $results[] = $sbuf;

Indentation +48 added lines, -48 removed lines

@@ -136,61 +136,61 @@
  * @since 0.3 
  */
 class LoggerLayoutPattern extends LoggerLayout {
-	/** Default conversion Pattern */
-	const DEFAULT_CONVERSION_PATTERN = '%m%n';
+    /** Default conversion Pattern */
+    const DEFAULT_CONVERSION_PATTERN = '%m%n';
 
-	/** Default conversion TTCC Pattern */
-	const TTCC_CONVERSION_PATTERN = '%r [%t] %p %c %x - %m%n';
+    /** Default conversion TTCC Pattern */
+    const TTCC_CONVERSION_PATTERN = '%r [%t] %p %c %x - %m%n';
 
-	/** The pattern. 
-	 * @var string */
-	private $pattern;
+    /** The pattern. 
+     * @var string */
+    private $pattern;
 
-	/** Head of a chain of Converters.
-	 * @var LoggerPatternConverter */
-	private $head;
+    /** Head of a chain of Converters.
+     * @var LoggerPatternConverter */
+    private $head;
 
-	private $timezone;
+    private $timezone;
 
-	/**
-	 * Constructs a PatternLayout using the 
-	 * {@link DEFAULT_LAYOUT_PATTERN}.
-	 * The default pattern just produces the application supplied message.
-	 */
-	public function __construct($pattern = null) {
-		if ($pattern === null) {
-			$this->pattern = self :: DEFAULT_CONVERSION_PATTERN;
-		} else {
-			$this->pattern = $pattern;
-		}
-	}
+    /**
+     * Constructs a PatternLayout using the 
+     * {@link DEFAULT_LAYOUT_PATTERN}.
+     * The default pattern just produces the application supplied message.
+     */
+    public function __construct($pattern = null) {
+        if ($pattern === null) {
+            $this->pattern = self :: DEFAULT_CONVERSION_PATTERN;
+        } else {
+            $this->pattern = $pattern;
+        }
+    }
 
-	/**
-	 * Set the <b>ConversionPattern</b> option. This is the string which
-	 * controls formatting and consists of a mix of literal content and
-	 * conversion specifiers.
-	 */
-	public function setConversionPattern($conversionPattern) {
-		$this->pattern = $conversionPattern;
-		$patternParser = new LoggerPatternParser($this->pattern);
-		$this->head = $patternParser->parse();
-	}
+    /**
+     * Set the <b>ConversionPattern</b> option. This is the string which
+     * controls formatting and consists of a mix of literal content and
+     * conversion specifiers.
+     */
+    public function setConversionPattern($conversionPattern) {
+        $this->pattern = $conversionPattern;
+        $patternParser = new LoggerPatternParser($this->pattern);
+        $this->head = $patternParser->parse();
+    }
 
-	/**
-	 * Produces a formatted string as specified by the conversion pattern.
-	 *
-	 * @param LoggerLoggingEvent $event
-	 * @return string
-	 */
-	public function format(LoggerLoggingEvent $event) {
-		$sbuf = '';
-		$c = $this->head;
-		while ($c !== null) {
-			$c->format($sbuf, $event);
-			$c = $c->next;
-		}
-		return $sbuf;
-	}
+    /**
+     * Produces a formatted string as specified by the conversion pattern.
+     *
+     * @param LoggerLoggingEvent $event
+     * @return string
+     */
+    public function format(LoggerLoggingEvent $event) {
+        $sbuf = '';
+        $c = $this->head;
+        while ($c !== null) {
+            $c->format($sbuf, $event);
+            $c = $c->next;
+        }
+        return $sbuf;
+    }
 	
     /**
      * Returns an array with the formatted elements.

main/inc/lib/phpdocx/lib/log4php/Logger.php

Doc Comments +9 added lines, -6 removed lines

@@ -240,7 +240,7 @@ 
 	/**
 	 * Log a message object with the ERROR level including the caller.
 	 *
-	 * @param mixed $message message
+	 * @param string $message message
 	 * @param mixed $caller caller object or caller string id
 	 */
 	public function error($message, $caller = null) {
@@ -286,6 +286,7 @@ 
 	 * Check whether this category is enabled for a given Level passed as parameter.
 	 *
 	 * @param LoggerLevel level
+	 * @param LoggerLevel $level
 	 * @return boolean
 	 */
 	public function isEnabledFor($level) {
@@ -326,6 +327,9 @@ 
 		}
 	}
 	 
+	/**
+	 * @param LoggerLevel $level
+	 */
 	private function logLevel($message, $level, $caller = null) {
 		if($level->isGreaterOrEqual($this->getEffectiveLevel())) {
 			$this->forcedLog($this->fqcn, $caller, $level, $message);
@@ -338,7 +342,6 @@ 
 	 * Get a Logger by name (Delegate to {@link Logger})
 	 * 
 	 * @param string $name logger name
-	 * @param LoggerFactory $factory a {@link LoggerFactory} instance or null
 	 * @return Logger
 	 * @static 
 	 */
@@ -474,7 +477,7 @@ 
 	 * Clears all logger definitions
 	 * 
 	 * @static
-	 * @return boolean 
+	 * @return boolean|null 
 	 */
 	public static function clear() {
 		return self::getHierarchy()->clear();	 
@@ -484,7 +487,7 @@ 
 	 * Destroy configurations for logger definitions
 	 * 
 	 * @static
-	 * @return boolean 
+	 * @return boolean|null 
 	 */
 	public static function resetConfiguration() {
 		$result = self::getHierarchy()->resetConfiguration();
@@ -592,7 +595,7 @@ 
 	
 	/**
 	 * Returns the current configurator
-	 * @return the configurator
+	 * @return string configurator
 	 */
 	public static function getConfigurationClass() {
 		return self::$configurationClass;
@@ -600,7 +603,7 @@ 
 	
 	/**
 	 * Returns the current configuration file
-	 * @return the configuration file
+	 * @return null|string configuration file
 	 */
 	public static function getConfigurationFile() {
 		return self::$configurationFile;

Spacing +20 added lines, -20 removed lines

@@ -123,7 +123,7 @@ 
 	 * @param string class name
 	 */
 	public static function autoload($className) {
-		if(isset(self::$_classes[$className])) {
+		if (isset(self::$_classes[$className])) {
 			include LOG4PHP_DIR.self::$_classes[$className];
 		}
 	}
@@ -199,7 +199,7 @@ 
 	 * @return LoggerHierarchy
 	 */
 	public static function getHierarchy() {
-		if(!isset(self::$hierarchy)) {
+		if (!isset(self::$hierarchy)) {
 			self::$hierarchy = new LoggerHierarchy(new LoggerRoot());
 		}
 		return self::$hierarchy;
@@ -289,7 +289,7 @@ 
 	 * @return boolean
 	 */
 	public function isEnabledFor($level) {
-		return (bool)($level->isGreaterOrEqual($this->getEffectiveLevel()));
+		return (bool) ($level->isGreaterOrEqual($this->getEffectiveLevel()));
 	} 
 
 	/**
@@ -309,7 +309,7 @@ 
 	 * @param mixed $caller caller object or caller string id
 	 */
 	public function log($priority, $message, $caller = null) {
-		if($this->isEnabledFor($priority)) {
+		if ($this->isEnabledFor($priority)) {
 			$this->forcedLog($this->fqcn, $caller, $priority, $message);
 		}
 	}
@@ -321,13 +321,13 @@ 
 	 * @param string $msg message to log
 	 */
 	public function assertLog($assertion = true, $msg = '') {
-		if($assertion == false) {
+		if ($assertion == false) {
 			$this->error($msg);
 		}
 	}
 	 
 	private function logLevel($message, $level, $caller = null) {
-		if($level->isGreaterOrEqual($this->getEffectiveLevel())) {
+		if ($level->isGreaterOrEqual($this->getEffectiveLevel())) {
 			$this->forcedLog($this->fqcn, $caller, $level, $message);
 		}
 	} 
@@ -343,7 +343,7 @@ 
 	 * @static 
 	 */
 	public static function getLogger($name) {
-		if(!self::isInitialized()) {
+		if (!self::isInitialized()) {
 			self::initialize();
 		}
 		return self::getHierarchy()->getLogger($name);
@@ -355,7 +355,7 @@ 
 	 * @static 
 	 */	   
 	public static function getRootLogger() {
-		if(!self::isInitialized()) {
+		if (!self::isInitialized()) {
 			self::initialize();
 		}
 		return self::getHierarchy()->getRootLogger();	  
@@ -379,7 +379,7 @@ 
 	public function removeAllAppenders() {
 		$appenderNames = array_keys($this->aai);
 		$enumAppenders = count($appenderNames);
-		for($i = 0; $i < $enumAppenders; $i++) {
+		for ($i = 0; $i < $enumAppenders; $i++) {
 			$this->removeAppender($appenderNames[$i]); 
 		}
 	} 
@@ -390,7 +390,7 @@ 
 	 * @param mixed $appender can be an appender name or a {@link LoggerAppender} object
 	 */
 	public function removeAppender($appender) {
-		if($appender instanceof LoggerAppender) {
+		if ($appender instanceof LoggerAppender) {
 			$appender->close();
 			unset($this->aai[$appender->getName()]);
 		} else if (is_string($appender) and isset($this->aai[$appender])) {
@@ -405,12 +405,12 @@ 
 	 * @param LoggerLoggingEvent $event 
 	 */
 	public function callAppenders($event) {
-		if(count($this->aai) > 0) {
-			foreach(array_keys($this->aai) as $appenderName) {
+		if (count($this->aai) > 0) {
+			foreach (array_keys($this->aai) as $appenderName) {
 				$this->aai[$appenderName]->doAppend($event);
 			}
 		}
-		if($this->parent != null and $this->getAdditivity()) {
+		if ($this->parent != null and $this->getAdditivity()) {
 			$this->parent->callAppenders($event);
 		}
 	}
@@ -445,8 +445,8 @@ 
 	 * @return LoggerLevel or null
 	 */
 	public function getEffectiveLevel() {
-		for($c = $this; $c != null; $c = $c->parent) {
-			if($c->getLevel() !== null) {
+		for ($c = $this; $c != null; $c = $c->parent) {
+			if ($c->getLevel() !== null) {
 				return $c->getLevel();
 			}
 		}
@@ -542,7 +542,7 @@ 
 	 * @param boolean $additive
 	 */
 	public function setAdditivity($additive) {
-		$this->additive = (bool)$additive;
+		$this->additive = (bool) $additive;
 	}
 
 	/**
@@ -569,19 +569,19 @@ 
 	 * @param String $configurationClass the configurator class
 	 */
 	public static function configure($configurationFile = null, 
-									 $configurationClass = null ) {
-		if($configurationClass === null && $configurationFile === null) {
+									 $configurationClass = null) {
+		if ($configurationClass === null && $configurationFile === null) {
 			self::$configurationClass = 'LoggerConfiguratorBasic';
 			return;
 		}
 									 	
-		if($configurationClass !== null) {
+		if ($configurationClass !== null) {
 			self::$configurationFile = $configurationFile;
 			self::$configurationClass = $configurationClass;
 			return;
 		}
 		
-		if (strtolower(substr( $configurationFile, -4 )) == '.xml') {
+		if (strtolower(substr($configurationFile, -4)) == '.xml') {
 			self::$configurationFile = $configurationFile;
 			self::$configurationClass = 'LoggerConfiguratorXml';
 		} else {

Braces +3 added lines, -1 removed lines

@@ -26,7 +26,9 @@
  * 
  * @var string 
  */
-if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__));
+if (!defined('LOG4PHP_DIR')) {
+    define('LOG4PHP_DIR', dirname(__FILE__));
+}
 
 spl_autoload_register(array('Logger', 'autoload'));
 

Indentation +566 added lines, -566 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 /**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * 
- *		http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * @package log4php
- */
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements. See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License. You may obtain a copy of the License at
+     * 
+     *		http://www.apache.org/licenses/LICENSE-2.0
+     * 
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     * 
+     * @package log4php
+     */
 
 /**
  * LOG4PHP_DIR points to the log4php root directory.
@@ -43,7 +43,7 @@ 
  * @version	   SVN: $Id: Logger.php 824193 2009-10-11 22:51:24Z chammers $
  * @link	   http://logging.apache.org/log4php
  */
- /*
+    /*
   * TODO:
   * Localization: setResourceBundle($bundle) : not supported
   * Localization: getResourceBundle: not supported
@@ -51,576 +51,576 @@ 
   * Localization: l7dlog($priority, $key, $params, $t) : not supported
   */
 class Logger {
-	private static $_classes = array(
-		'LoggerException' => '/LoggerException.php',
-		'LoggerHierarchy' => '/LoggerHierarchy.php',
-		'LoggerLayout' => '/LoggerLayout.php',
-		'LoggerLevel' => '/LoggerLevel.php',
-		'LoggerMDC' => '/LoggerMDC.php',
-		'LoggerNDC' => '/LoggerNDC.php',
-		'LoggerReflectionUtils' => '/LoggerReflectionUtils.php',
-		'LoggerConfigurator' => '/LoggerConfigurator.php',
-		'LoggerConfiguratorBasic' => '/configurators/LoggerConfiguratorBasic.php',
-		'LoggerConfiguratorIni' => '/configurators/LoggerConfiguratorIni.php',
-		'LoggerConfiguratorPhp' => '/configurators/LoggerConfiguratorPhp.php',
-		'LoggerConfiguratorXml' => '/configurators/LoggerConfiguratorXml.php',
-		'LoggerRoot' => '/LoggerRoot.php',
-		'LoggerAppender' => '/LoggerAppender.php',
-		'LoggerAppenderPool' => '/LoggerAppenderPool.php',
-		'LoggerAppenderAdodb' => '/appenders/LoggerAppenderAdodb.php',
-		'LoggerAppenderPDO' => '/appenders/LoggerAppenderPDO.php',
-		'LoggerAppenderConsole' => '/appenders/LoggerAppenderConsole.php',
-		'LoggerAppenderDailyFile' => '/appenders/LoggerAppenderDailyFile.php',
-		'LoggerAppenderEcho' => '/appenders/LoggerAppenderEcho.php',
-		'LoggerAppenderFile' => '/appenders/LoggerAppenderFile.php',
-		'LoggerAppenderMail' => '/appenders/LoggerAppenderMail.php',
-		'LoggerAppenderMailEvent' => '/appenders/LoggerAppenderMailEvent.php',
-		'LoggerAppenderNull' => '/appenders/LoggerAppenderNull.php',
-		'LoggerAppenderPhp' => '/appenders/LoggerAppenderPhp.php',
-		'LoggerAppenderRollingFile' => '/appenders/LoggerAppenderRollingFile.php',
-		'LoggerAppenderSocket' => '/appenders/LoggerAppenderSocket.php',
-		'LoggerAppenderSyslog' => '/appenders/LoggerAppenderSyslog.php',
-		'LoggerFormattingInfo' => '/helpers/LoggerFormattingInfo.php',
-		'LoggerOptionConverter' => '/helpers/LoggerOptionConverter.php',
-		'LoggerPatternConverter' => '/helpers/LoggerPatternConverter.php',
-		'LoggerBasicPatternConverter' => '/helpers/LoggerBasicPatternConverter.php',
-		'LoggerCategoryPatternConverter' => '/helpers/LoggerCategoryPatternConverter.php',
-		'LoggerClassNamePatternConverter' => '/helpers/LoggerClassNamePatternConverter.php',
-		'LoggerDatePatternConverter' => '/helpers/LoggerDatePatternConverter.php',
-		'LoggerLiteralPatternConverter' => '/helpers/LoggerLiteralPatternConverter.php',
-		'LoggerLocationPatternConverter' => '/helpers/LoggerLocationPatternConverter.php',
-		'LoggerMDCPatternConverter' => '/helpers/LoggerMDCPatternConverter.php',
-		'LoggerNamedPatternConverter' => '/helpers/LoggerNamedPatternConverter.php',
-		'LoggerBasicPatternConverter' => '/helpers/LoggerBasicPatternConverter.php',
-		'LoggerLiteralPatternConverter' => '/helpers/LoggerLiteralPatternConverter.php',
-		'LoggerDatePatternConverter' => '/helpers/LoggerDatePatternConverter.php',
-		'LoggerMDCPatternConverter' => '/helpers/LoggerMDCPatternConverter.php',
-		'LoggerLocationPatternConverter' => '/helpers/LoggerLocationPatternConverter.php',
-		'LoggerNamedPatternConverter' => '/helpers/LoggerNamedPatternConverter.php',
-		'LoggerClassNamePatternConverter' => '/helpers/LoggerClassNamePatternConverter.php',
-		'LoggerCategoryPatternConverter' => '/helpers/LoggerCategoryPatternConverter.php',
-		'LoggerPatternParser' => '/helpers/LoggerPatternParser.php',
-		'LoggerLayoutHtml' => '/layouts/LoggerLayoutHtml.php',
-		'LoggerLayoutSimple' => '/layouts/LoggerLayoutSimple.php',
-		'LoggerLayoutTTCC' => '/layouts/LoggerLayoutTTCC.php',
-		'LoggerLayoutPattern' => '/layouts/LoggerLayoutPattern.php',
-		'LoggerLayoutXml' => '/layouts/LoggerLayoutXml.php',
-		'LoggerRendererDefault' => '/renderers/LoggerRendererDefault.php',
-		'LoggerRendererObject' => '/renderers/LoggerRendererObject.php',
-		'LoggerRendererMap' => '/renderers/LoggerRendererMap.php',
-		'LoggerLocationInfo' => '/LoggerLocationInfo.php',
-		'LoggerLoggingEvent' => '/LoggerLoggingEvent.php',
-		'LoggerFilter' => '/LoggerFilter.php',
-		'LoggerFilterDenyAll' => '/filters/LoggerFilterDenyAll.php',
-		'LoggerFilterLevelMatch' => '/filters/LoggerFilterLevelMatch.php',
-		'LoggerFilterLevelRange' => '/filters/LoggerFilterLevelRange.php',
-		'LoggerFilterStringMatch' => '/filters/LoggerFilterStringMatch.php',
-	);
+    private static $_classes = array(
+        'LoggerException' => '/LoggerException.php',
+        'LoggerHierarchy' => '/LoggerHierarchy.php',
+        'LoggerLayout' => '/LoggerLayout.php',
+        'LoggerLevel' => '/LoggerLevel.php',
+        'LoggerMDC' => '/LoggerMDC.php',
+        'LoggerNDC' => '/LoggerNDC.php',
+        'LoggerReflectionUtils' => '/LoggerReflectionUtils.php',
+        'LoggerConfigurator' => '/LoggerConfigurator.php',
+        'LoggerConfiguratorBasic' => '/configurators/LoggerConfiguratorBasic.php',
+        'LoggerConfiguratorIni' => '/configurators/LoggerConfiguratorIni.php',
+        'LoggerConfiguratorPhp' => '/configurators/LoggerConfiguratorPhp.php',
+        'LoggerConfiguratorXml' => '/configurators/LoggerConfiguratorXml.php',
+        'LoggerRoot' => '/LoggerRoot.php',
+        'LoggerAppender' => '/LoggerAppender.php',
+        'LoggerAppenderPool' => '/LoggerAppenderPool.php',
+        'LoggerAppenderAdodb' => '/appenders/LoggerAppenderAdodb.php',
+        'LoggerAppenderPDO' => '/appenders/LoggerAppenderPDO.php',
+        'LoggerAppenderConsole' => '/appenders/LoggerAppenderConsole.php',
+        'LoggerAppenderDailyFile' => '/appenders/LoggerAppenderDailyFile.php',
+        'LoggerAppenderEcho' => '/appenders/LoggerAppenderEcho.php',
+        'LoggerAppenderFile' => '/appenders/LoggerAppenderFile.php',
+        'LoggerAppenderMail' => '/appenders/LoggerAppenderMail.php',
+        'LoggerAppenderMailEvent' => '/appenders/LoggerAppenderMailEvent.php',
+        'LoggerAppenderNull' => '/appenders/LoggerAppenderNull.php',
+        'LoggerAppenderPhp' => '/appenders/LoggerAppenderPhp.php',
+        'LoggerAppenderRollingFile' => '/appenders/LoggerAppenderRollingFile.php',
+        'LoggerAppenderSocket' => '/appenders/LoggerAppenderSocket.php',
+        'LoggerAppenderSyslog' => '/appenders/LoggerAppenderSyslog.php',
+        'LoggerFormattingInfo' => '/helpers/LoggerFormattingInfo.php',
+        'LoggerOptionConverter' => '/helpers/LoggerOptionConverter.php',
+        'LoggerPatternConverter' => '/helpers/LoggerPatternConverter.php',
+        'LoggerBasicPatternConverter' => '/helpers/LoggerBasicPatternConverter.php',
+        'LoggerCategoryPatternConverter' => '/helpers/LoggerCategoryPatternConverter.php',
+        'LoggerClassNamePatternConverter' => '/helpers/LoggerClassNamePatternConverter.php',
+        'LoggerDatePatternConverter' => '/helpers/LoggerDatePatternConverter.php',
+        'LoggerLiteralPatternConverter' => '/helpers/LoggerLiteralPatternConverter.php',
+        'LoggerLocationPatternConverter' => '/helpers/LoggerLocationPatternConverter.php',
+        'LoggerMDCPatternConverter' => '/helpers/LoggerMDCPatternConverter.php',
+        'LoggerNamedPatternConverter' => '/helpers/LoggerNamedPatternConverter.php',
+        'LoggerBasicPatternConverter' => '/helpers/LoggerBasicPatternConverter.php',
+        'LoggerLiteralPatternConverter' => '/helpers/LoggerLiteralPatternConverter.php',
+        'LoggerDatePatternConverter' => '/helpers/LoggerDatePatternConverter.php',
+        'LoggerMDCPatternConverter' => '/helpers/LoggerMDCPatternConverter.php',
+        'LoggerLocationPatternConverter' => '/helpers/LoggerLocationPatternConverter.php',
+        'LoggerNamedPatternConverter' => '/helpers/LoggerNamedPatternConverter.php',
+        'LoggerClassNamePatternConverter' => '/helpers/LoggerClassNamePatternConverter.php',
+        'LoggerCategoryPatternConverter' => '/helpers/LoggerCategoryPatternConverter.php',
+        'LoggerPatternParser' => '/helpers/LoggerPatternParser.php',
+        'LoggerLayoutHtml' => '/layouts/LoggerLayoutHtml.php',
+        'LoggerLayoutSimple' => '/layouts/LoggerLayoutSimple.php',
+        'LoggerLayoutTTCC' => '/layouts/LoggerLayoutTTCC.php',
+        'LoggerLayoutPattern' => '/layouts/LoggerLayoutPattern.php',
+        'LoggerLayoutXml' => '/layouts/LoggerLayoutXml.php',
+        'LoggerRendererDefault' => '/renderers/LoggerRendererDefault.php',
+        'LoggerRendererObject' => '/renderers/LoggerRendererObject.php',
+        'LoggerRendererMap' => '/renderers/LoggerRendererMap.php',
+        'LoggerLocationInfo' => '/LoggerLocationInfo.php',
+        'LoggerLoggingEvent' => '/LoggerLoggingEvent.php',
+        'LoggerFilter' => '/LoggerFilter.php',
+        'LoggerFilterDenyAll' => '/filters/LoggerFilterDenyAll.php',
+        'LoggerFilterLevelMatch' => '/filters/LoggerFilterLevelMatch.php',
+        'LoggerFilterLevelRange' => '/filters/LoggerFilterLevelRange.php',
+        'LoggerFilterStringMatch' => '/filters/LoggerFilterStringMatch.php',
+    );
 
-	/**
-	 * Class autoloader
-	 * This method is provided to be invoked within an __autoload() magic method.
-	 * @param string class name
-	 */
-	public static function autoload($className) {
-		if(isset(self::$_classes[$className])) {
-			include LOG4PHP_DIR.self::$_classes[$className];
-		}
-	}
+    /**
+     * Class autoloader
+     * This method is provided to be invoked within an __autoload() magic method.
+     * @param string class name
+     */
+    public static function autoload($className) {
+        if(isset(self::$_classes[$className])) {
+            include LOG4PHP_DIR.self::$_classes[$className];
+        }
+    }
 
-	/**
-	 * Additivity is set to true by default, that is children inherit the 
-	 * appenders of their ancestors by default.
-	 * @var boolean
-	 */
-	private $additive = true;
-	
-	/** @var string fully qualified class name */
-	private $fqcn = 'Logger';
+    /**
+     * Additivity is set to true by default, that is children inherit the 
+     * appenders of their ancestors by default.
+     * @var boolean
+     */
+    private $additive = true;
+	
+    /** @var string fully qualified class name */
+    private $fqcn = 'Logger';
 
-	/** @var LoggerLevel The assigned level of this category. */
-	private $level = null;
+    /** @var LoggerLevel The assigned level of this category. */
+    private $level = null;
 	
-	/** @var string name of this category. */
-	private $name = '';
+    /** @var string name of this category. */
+    private $name = '';
 	
-	/** @var Logger The parent of this category. Null if this is the root logger*/
-	private $parent = null;
+    /** @var Logger The parent of this category. Null if this is the root logger*/
+    private $parent = null;
 	
-	/**
-	 * @var array collection of appenders
-	 * @see LoggerAppender
-	 */
-	private $aai = array();
+    /**
+     * @var array collection of appenders
+     * @see LoggerAppender
+     */
+    private $aai = array();
 
-	/** the hierarchy used by log4php */
-	private static $hierarchy;
-	
-	/** the configurator class name */
-	private static $configurationClass = 'LoggerConfiguratorBasic';
-	
-	/** the path to the configuration file */
-	private static $configurationFile = null;
-	
-	/** inidicates if log4php has already been initialized */
-	private static $initialized = false;
-	
-	/**
-	 * Constructor.
-	 * @param  string  $name  Category name	  
-	 */
-	public function __construct($name) {
-		$this->name = $name;
-	}
-	
-	/**
-	 * Return the category name.
-	 * @return string
-	 */
-	public function getName() {
-		return $this->name;
-	} 
+    /** the hierarchy used by log4php */
+    private static $hierarchy;
+	
+    /** the configurator class name */
+    private static $configurationClass = 'LoggerConfiguratorBasic';
+	
+    /** the path to the configuration file */
+    private static $configurationFile = null;
+	
+    /** inidicates if log4php has already been initialized */
+    private static $initialized = false;
+	
+    /**
+     * Constructor.
+     * @param  string  $name  Category name	  
+     */
+    public function __construct($name) {
+        $this->name = $name;
+    }
+	
+    /**
+     * Return the category name.
+     * @return string
+     */
+    public function getName() {
+        return $this->name;
+    } 
 
-	/**
-	 * Returns the parent of this category.
-	 * @return Logger
-	 */
-	public function getParent() {
-		return $this->parent;
-	}	  
-	
-	/**
-	 * Returns the hierarchy used by this Logger.
-	 * Caution: do not use this hierarchy unless you have called initialize().
-	 * To get Loggers, use the Logger::getLogger and Logger::getRootLogger methods
-	 * instead of operating on on the hierarchy directly.
-	 * 
-	 * @deprecated - will be moved to private
-	 * @return LoggerHierarchy
-	 */
-	public static function getHierarchy() {
-		if(!isset(self::$hierarchy)) {
-			self::$hierarchy = new LoggerHierarchy(new LoggerRoot());
-		}
-		return self::$hierarchy;
-	}
-	
-	/* Logging methods */
-	/**
-	 * Log a message object with the DEBUG level including the caller.
-	 *
-	 * @param mixed $message message
-	 * @param mixed $caller caller object or caller string id
-	 */
-	public function debug($message, $caller = null) {
-		$this->logLevel($message, LoggerLevel::getLevelDebug(), $caller);
-	} 
+    /**
+     * Returns the parent of this category.
+     * @return Logger
+     */
+    public function getParent() {
+        return $this->parent;
+    }	  
+	
+    /**
+     * Returns the hierarchy used by this Logger.
+     * Caution: do not use this hierarchy unless you have called initialize().
+     * To get Loggers, use the Logger::getLogger and Logger::getRootLogger methods
+     * instead of operating on on the hierarchy directly.
+     * 
+     * @deprecated - will be moved to private
+     * @return LoggerHierarchy
+     */
+    public static function getHierarchy() {
+        if(!isset(self::$hierarchy)) {
+            self::$hierarchy = new LoggerHierarchy(new LoggerRoot());
+        }
+        return self::$hierarchy;
+    }
+	
+    /* Logging methods */
+    /**
+     * Log a message object with the DEBUG level including the caller.
+     *
+     * @param mixed $message message
+     * @param mixed $caller caller object or caller string id
+     */
+    public function debug($message, $caller = null) {
+        $this->logLevel($message, LoggerLevel::getLevelDebug(), $caller);
+    } 
 
 
-	/**
-	 * Log a message object with the INFO Level.
-	 *
-	 * @param mixed $message message
-	 * @param mixed $caller caller object or caller string id
-	 */
-	public function info($message, $caller = null) {
-		$this->logLevel($message, LoggerLevel::getLevelInfo(), $caller);
-	}
+    /**
+     * Log a message object with the INFO Level.
+     *
+     * @param mixed $message message
+     * @param mixed $caller caller object or caller string id
+     */
+    public function info($message, $caller = null) {
+        $this->logLevel($message, LoggerLevel::getLevelInfo(), $caller);
+    }
 
-	/**
-	 * Log a message with the WARN level.
-	 *
-	 * @param mixed $message message
-	 * @param mixed $caller caller object or caller string id
-	 */
-	public function warn($message, $caller = null) {
-		$this->logLevel($message, LoggerLevel::getLevelWarn(), $caller);
-	}
-	
-	/**
-	 * Log a message object with the ERROR level including the caller.
-	 *
-	 * @param mixed $message message
-	 * @param mixed $caller caller object or caller string id
-	 */
-	public function error($message, $caller = null) {
-		$this->logLevel($message, LoggerLevel::getLevelError(), $caller);
-	}
-	
-	/**
-	 * Log a message object with the FATAL level including the caller.
-	 *
-	 * @param mixed $message message
-	 * @param mixed $caller caller object or caller string id
-	 */
-	public function fatal($message, $caller = null) {
-		$this->logLevel($message, LoggerLevel::getLevelFatal(), $caller);
-	}
-	
-	/**
-	 * This method creates a new logging event and logs the event without further checks.
-	 *
-	 * It should not be called directly. Use {@link info()}, {@link debug()}, {@link warn()},
-	 * {@link error()} and {@link fatal()} wrappers.
-	 *
-	 * @param string $fqcn Fully Qualified Class Name of the Logger
-	 * @param mixed $caller caller object or caller string id
-	 * @param LoggerLevel $level log level	   
-	 * @param mixed $message message
-	 * @see LoggerLoggingEvent			
-	 */
-	public function forcedLog($fqcn, $caller, $level, $message) {
-		$this->callAppenders(new LoggerLoggingEvent($fqcn, $this, $level, $message));
-	} 
-	
-	
-		/**
-	 * Check whether this category is enabled for the DEBUG Level.
-	 * @return boolean
-	 */
-	public function isDebugEnabled() {
-		return $this->isEnabledFor(LoggerLevel::getLevelDebug());
-	}		
+    /**
+     * Log a message with the WARN level.
+     *
+     * @param mixed $message message
+     * @param mixed $caller caller object or caller string id
+     */
+    public function warn($message, $caller = null) {
+        $this->logLevel($message, LoggerLevel::getLevelWarn(), $caller);
+    }
+	
+    /**
+     * Log a message object with the ERROR level including the caller.
+     *
+     * @param mixed $message message
+     * @param mixed $caller caller object or caller string id
+     */
+    public function error($message, $caller = null) {
+        $this->logLevel($message, LoggerLevel::getLevelError(), $caller);
+    }
+	
+    /**
+     * Log a message object with the FATAL level including the caller.
+     *
+     * @param mixed $message message
+     * @param mixed $caller caller object or caller string id
+     */
+    public function fatal($message, $caller = null) {
+        $this->logLevel($message, LoggerLevel::getLevelFatal(), $caller);
+    }
+	
+    /**
+     * This method creates a new logging event and logs the event without further checks.
+     *
+     * It should not be called directly. Use {@link info()}, {@link debug()}, {@link warn()},
+     * {@link error()} and {@link fatal()} wrappers.
+     *
+     * @param string $fqcn Fully Qualified Class Name of the Logger
+     * @param mixed $caller caller object or caller string id
+     * @param LoggerLevel $level log level	   
+     * @param mixed $message message
+     * @see LoggerLoggingEvent			
+     */
+    public function forcedLog($fqcn, $caller, $level, $message) {
+        $this->callAppenders(new LoggerLoggingEvent($fqcn, $this, $level, $message));
+    } 
+	
+	
+        /**
+         * Check whether this category is enabled for the DEBUG Level.
+         * @return boolean
+         */
+    public function isDebugEnabled() {
+        return $this->isEnabledFor(LoggerLevel::getLevelDebug());
+    }		
 
-	/**
-	 * Check whether this category is enabled for a given Level passed as parameter.
-	 *
-	 * @param LoggerLevel level
-	 * @return boolean
-	 */
-	public function isEnabledFor($level) {
-		return (bool)($level->isGreaterOrEqual($this->getEffectiveLevel()));
-	} 
+    /**
+     * Check whether this category is enabled for a given Level passed as parameter.
+     *
+     * @param LoggerLevel level
+     * @return boolean
+     */
+    public function isEnabledFor($level) {
+        return (bool)($level->isGreaterOrEqual($this->getEffectiveLevel()));
+    } 
 
-	/**
-	 * Check whether this category is enabled for the info Level.
-	 * @return boolean
-	 * @see LoggerLevel
-	 */
-	public function isInfoEnabled() {
-		return $this->isEnabledFor(LoggerLevel::getLevelInfo());
-	} 
+    /**
+     * Check whether this category is enabled for the info Level.
+     * @return boolean
+     * @see LoggerLevel
+     */
+    public function isInfoEnabled() {
+        return $this->isEnabledFor(LoggerLevel::getLevelInfo());
+    } 
 
-	/**
-	 * This generic form is intended to be used by wrappers.
-	 *
-	 * @param LoggerLevel $priority a valid level
-	 * @param mixed $message message
-	 * @param mixed $caller caller object or caller string id
-	 */
-	public function log($priority, $message, $caller = null) {
-		if($this->isEnabledFor($priority)) {
-			$this->forcedLog($this->fqcn, $caller, $priority, $message);
-		}
-	}
-	
-	/**
-	 * If assertion parameter is false, then logs msg as an error statement.
-	 *
-	 * @param bool $assertion
-	 * @param string $msg message to log
-	 */
-	public function assertLog($assertion = true, $msg = '') {
-		if($assertion == false) {
-			$this->error($msg);
-		}
-	}
+    /**
+     * This generic form is intended to be used by wrappers.
+     *
+     * @param LoggerLevel $priority a valid level
+     * @param mixed $message message
+     * @param mixed $caller caller object or caller string id
+     */
+    public function log($priority, $message, $caller = null) {
+        if($this->isEnabledFor($priority)) {
+            $this->forcedLog($this->fqcn, $caller, $priority, $message);
+        }
+    }
+	
+    /**
+     * If assertion parameter is false, then logs msg as an error statement.
+     *
+     * @param bool $assertion
+     * @param string $msg message to log
+     */
+    public function assertLog($assertion = true, $msg = '') {
+        if($assertion == false) {
+            $this->error($msg);
+        }
+    }
 	 
-	private function logLevel($message, $level, $caller = null) {
-		if($level->isGreaterOrEqual($this->getEffectiveLevel())) {
-			$this->forcedLog($this->fqcn, $caller, $level, $message);
-		}
-	} 
-	
-	/* Factory methods */ 
-	
-	/**
-	 * Get a Logger by name (Delegate to {@link Logger})
-	 * 
-	 * @param string $name logger name
-	 * @param LoggerFactory $factory a {@link LoggerFactory} instance or null
-	 * @return Logger
-	 * @static 
-	 */
-	public static function getLogger($name) {
-		if(!self::isInitialized()) {
-			self::initialize();
-		}
-		return self::getHierarchy()->getLogger($name);
-	}
-	
-	/**
-	 * get the Root Logger (Delegate to {@link Logger})
-	 * @return LoggerRoot
-	 * @static 
-	 */	   
-	public static function getRootLogger() {
-		if(!self::isInitialized()) {
-			self::initialize();
-		}
-		return self::getHierarchy()->getRootLogger();	  
-	}
-	
-	/* Configuration methods */
-	
-	/**
-	 * Add a new Appender to the list of appenders of this Category instance.
-	 *
-	 * @param LoggerAppender $newAppender
-	 */
-	public function addAppender($newAppender) {
-		$appenderName = $newAppender->getName();
-		$this->aai[$appenderName] = $newAppender;
-	}
-	
-	/**
-	 * Remove all previously added appenders from this Category instance.
-	 */
-	public function removeAllAppenders() {
-		$appenderNames = array_keys($this->aai);
-		$enumAppenders = count($appenderNames);
-		for($i = 0; $i < $enumAppenders; $i++) {
-			$this->removeAppender($appenderNames[$i]); 
-		}
-	} 
+    private function logLevel($message, $level, $caller = null) {
+        if($level->isGreaterOrEqual($this->getEffectiveLevel())) {
+            $this->forcedLog($this->fqcn, $caller, $level, $message);
+        }
+    } 
+	
+    /* Factory methods */ 
+	
+    /**
+     * Get a Logger by name (Delegate to {@link Logger})
+     * 
+     * @param string $name logger name
+     * @param LoggerFactory $factory a {@link LoggerFactory} instance or null
+     * @return Logger
+     * @static 
+     */
+    public static function getLogger($name) {
+        if(!self::isInitialized()) {
+            self::initialize();
+        }
+        return self::getHierarchy()->getLogger($name);
+    }
+	
+    /**
+     * get the Root Logger (Delegate to {@link Logger})
+     * @return LoggerRoot
+     * @static 
+     */	   
+    public static function getRootLogger() {
+        if(!self::isInitialized()) {
+            self::initialize();
+        }
+        return self::getHierarchy()->getRootLogger();	  
+    }
+	
+    /* Configuration methods */
+	
+    /**
+     * Add a new Appender to the list of appenders of this Category instance.
+     *
+     * @param LoggerAppender $newAppender
+     */
+    public function addAppender($newAppender) {
+        $appenderName = $newAppender->getName();
+        $this->aai[$appenderName] = $newAppender;
+    }
+	
+    /**
+     * Remove all previously added appenders from this Category instance.
+     */
+    public function removeAllAppenders() {
+        $appenderNames = array_keys($this->aai);
+        $enumAppenders = count($appenderNames);
+        for($i = 0; $i < $enumAppenders; $i++) {
+            $this->removeAppender($appenderNames[$i]); 
+        }
+    } 
 			
-	/**
-	 * Remove the appender passed as parameter form the list of appenders.
-	 *
-	 * @param mixed $appender can be an appender name or a {@link LoggerAppender} object
-	 */
-	public function removeAppender($appender) {
-		if($appender instanceof LoggerAppender) {
-			$appender->close();
-			unset($this->aai[$appender->getName()]);
-		} else if (is_string($appender) and isset($this->aai[$appender])) {
-			$this->aai[$appender]->close();
-			unset($this->aai[$appender]);
-		}
-	} 
+    /**
+     * Remove the appender passed as parameter form the list of appenders.
+     *
+     * @param mixed $appender can be an appender name or a {@link LoggerAppender} object
+     */
+    public function removeAppender($appender) {
+        if($appender instanceof LoggerAppender) {
+            $appender->close();
+            unset($this->aai[$appender->getName()]);
+        } else if (is_string($appender) and isset($this->aai[$appender])) {
+            $this->aai[$appender]->close();
+            unset($this->aai[$appender]);
+        }
+    } 
 			
-	/**
-	 * Call the appenders in the hierarchy starting at this.
-	 *
-	 * @param LoggerLoggingEvent $event 
-	 */
-	public function callAppenders($event) {
-		if(count($this->aai) > 0) {
-			foreach(array_keys($this->aai) as $appenderName) {
-				$this->aai[$appenderName]->doAppend($event);
-			}
-		}
-		if($this->parent != null and $this->getAdditivity()) {
-			$this->parent->callAppenders($event);
-		}
-	}
-	
-	/**
-	 * Get the appenders contained in this category as an array.
-	 * @return array collection of appenders
-	 */
-	public function getAllAppenders() {
-		return array_values($this->aai);
-	}
-	
-	/**
-	 * Look for the appender named as name.
-	 * @return LoggerAppender
-	 */
-	public function getAppender($name) {
-		return $this->aai[$name];
-	}
-	
-	/**
-	 * Get the additivity flag for this Category instance.
-	 * @return boolean
-	 */
-	public function getAdditivity() {
-		return $this->additive;
-	}
+    /**
+     * Call the appenders in the hierarchy starting at this.
+     *
+     * @param LoggerLoggingEvent $event 
+     */
+    public function callAppenders($event) {
+        if(count($this->aai) > 0) {
+            foreach(array_keys($this->aai) as $appenderName) {
+                $this->aai[$appenderName]->doAppend($event);
+            }
+        }
+        if($this->parent != null and $this->getAdditivity()) {
+            $this->parent->callAppenders($event);
+        }
+    }
+	
+    /**
+     * Get the appenders contained in this category as an array.
+     * @return array collection of appenders
+     */
+    public function getAllAppenders() {
+        return array_values($this->aai);
+    }
+	
+    /**
+     * Look for the appender named as name.
+     * @return LoggerAppender
+     */
+    public function getAppender($name) {
+        return $this->aai[$name];
+    }
+	
+    /**
+     * Get the additivity flag for this Category instance.
+     * @return boolean
+     */
+    public function getAdditivity() {
+        return $this->additive;
+    }
  
-	/**
-	 * Starting from this category, search the category hierarchy for a non-null level and return it.
-	 * @see LoggerLevel
-	 * @return LoggerLevel or null
-	 */
-	public function getEffectiveLevel() {
-		for($c = $this; $c != null; $c = $c->parent) {
-			if($c->getLevel() !== null) {
-				return $c->getLevel();
-			}
-		}
-		return null;
-	}
+    /**
+     * Starting from this category, search the category hierarchy for a non-null level and return it.
+     * @see LoggerLevel
+     * @return LoggerLevel or null
+     */
+    public function getEffectiveLevel() {
+        for($c = $this; $c != null; $c = $c->parent) {
+            if($c->getLevel() !== null) {
+                return $c->getLevel();
+            }
+        }
+        return null;
+    }
   
-	/**
-	 * Returns the assigned Level, if any, for this Category.
-	 * @return LoggerLevel or null 
-	 */
-	public function getLevel() {
-		return $this->level;
-	}
-	
-	/**
-	 * Set the level of this Category.
-	 *
-	 * @param LoggerLevel $level a level string or a level constant 
-	 */
-	public function setLevel($level) {
-		$this->level = $level;
-	}
-	
-	/**
-	 * Clears all logger definitions
-	 * 
-	 * @static
-	 * @return boolean 
-	 */
-	public static function clear() {
-		return self::getHierarchy()->clear();	 
-	}
-	
-	/**
-	 * Destroy configurations for logger definitions
-	 * 
-	 * @static
-	 * @return boolean 
-	 */
-	public static function resetConfiguration() {
-		$result = self::getHierarchy()->resetConfiguration();
-		self::$initialized = false;
-		self::$configurationClass = 'LoggerConfiguratorBasic';
-		self::$configurationFile = null;
-		return $result;	 
-	}
+    /**
+     * Returns the assigned Level, if any, for this Category.
+     * @return LoggerLevel or null 
+     */
+    public function getLevel() {
+        return $this->level;
+    }
+	
+    /**
+     * Set the level of this Category.
+     *
+     * @param LoggerLevel $level a level string or a level constant 
+     */
+    public function setLevel($level) {
+        $this->level = $level;
+    }
+	
+    /**
+     * Clears all logger definitions
+     * 
+     * @static
+     * @return boolean 
+     */
+    public static function clear() {
+        return self::getHierarchy()->clear();	 
+    }
+	
+    /**
+     * Destroy configurations for logger definitions
+     * 
+     * @static
+     * @return boolean 
+     */
+    public static function resetConfiguration() {
+        $result = self::getHierarchy()->resetConfiguration();
+        self::$initialized = false;
+        self::$configurationClass = 'LoggerConfiguratorBasic';
+        self::$configurationFile = null;
+        return $result;	 
+    }
 
-	/**
-	 * Safely close all appenders.
-	 * This is not longer necessary due the appenders shutdown via
-	 * destructors. 
-	 * @deprecated
-	 * @static
-	 */
-	public static function shutdown() {
-		return self::getHierarchy()->shutdown();	   
-	}
-	
-	/**
-	 * check if a given logger exists.
-	 * 
-	 * @param string $name logger name 
-	 * @static
-	 * @return boolean
-	 */
-	public static function exists($name) {
-		return self::getHierarchy()->exists($name);
-	}
-	
-	/**
-	 * Returns an array this whole Logger instances.
-	 * 
-	 * @static
-	 * @see Logger
-	 * @return array
-	 */
-	public static function getCurrentLoggers() {
-		return self::getHierarchy()->getCurrentLoggers();
-	}
-	
-	/**
-	 * Is the appender passed as parameter attached to this category?
-	 *
-	 * @param LoggerAppender $appender
-	 */
-	public function isAttached($appender) {
-		return isset($this->aai[$appender->getName()]);
-	} 
+    /**
+     * Safely close all appenders.
+     * This is not longer necessary due the appenders shutdown via
+     * destructors. 
+     * @deprecated
+     * @static
+     */
+    public static function shutdown() {
+        return self::getHierarchy()->shutdown();	   
+    }
+	
+    /**
+     * check if a given logger exists.
+     * 
+     * @param string $name logger name 
+     * @static
+     * @return boolean
+     */
+    public static function exists($name) {
+        return self::getHierarchy()->exists($name);
+    }
+	
+    /**
+     * Returns an array this whole Logger instances.
+     * 
+     * @static
+     * @see Logger
+     * @return array
+     */
+    public static function getCurrentLoggers() {
+        return self::getHierarchy()->getCurrentLoggers();
+    }
+	
+    /**
+     * Is the appender passed as parameter attached to this category?
+     *
+     * @param LoggerAppender $appender
+     */
+    public function isAttached($appender) {
+        return isset($this->aai[$appender->getName()]);
+    } 
 		   
-	/**
-	 * Set the additivity flag for this Category instance.
-	 *
-	 * @param boolean $additive
-	 */
-	public function setAdditivity($additive) {
-		$this->additive = (bool)$additive;
-	}
+    /**
+     * Set the additivity flag for this Category instance.
+     *
+     * @param boolean $additive
+     */
+    public function setAdditivity($additive) {
+        $this->additive = (bool)$additive;
+    }
 
-	/**
-	 * Sets the parent logger of this logger
-	 */
-	public function setParent(Logger $logger) {
-		$this->parent = $logger;
-	} 
-	
-	/**
-	 * Configures Log4PHP.
-	 * This method needs to be called before the first logging event
-	 * has occured. If this methode is never called, the standard configuration
-	 * takes place (@see LoggerConfiguratorBasic).
-	 * If only the configuration file is given, the configurator class will
-	 * be the XML Configurator or the INI Configurator, if no .xml ending
-	 * could be determined.
-	 * 
-	 * If a custom configurator should be used, the configuration file
-	 * is either null or the path to file the custom configurator uses.
-	 * Make sure the configurator is already or can be loaded by PHP when necessary.
-	 * 
-	 * @param String $configurationFile the configuration file
-	 * @param String $configurationClass the configurator class
-	 */
-	public static function configure($configurationFile = null, 
-									 $configurationClass = null ) {
-		if($configurationClass === null && $configurationFile === null) {
-			self::$configurationClass = 'LoggerConfiguratorBasic';
-			return;
-		}
+    /**
+     * Sets the parent logger of this logger
+     */
+    public function setParent(Logger $logger) {
+        $this->parent = $logger;
+    } 
+	
+    /**
+     * Configures Log4PHP.
+     * This method needs to be called before the first logging event
+     * has occured. If this methode is never called, the standard configuration
+     * takes place (@see LoggerConfiguratorBasic).
+     * If only the configuration file is given, the configurator class will
+     * be the XML Configurator or the INI Configurator, if no .xml ending
+     * could be determined.
+     * 
+     * If a custom configurator should be used, the configuration file
+     * is either null or the path to file the custom configurator uses.
+     * Make sure the configurator is already or can be loaded by PHP when necessary.
+     * 
+     * @param String $configurationFile the configuration file
+     * @param String $configurationClass the configurator class
+     */
+    public static function configure($configurationFile = null, 
+                                        $configurationClass = null ) {
+        if($configurationClass === null && $configurationFile === null) {
+            self::$configurationClass = 'LoggerConfiguratorBasic';
+            return;
+        }
 									 	
-		if($configurationClass !== null) {
-			self::$configurationFile = $configurationFile;
-			self::$configurationClass = $configurationClass;
-			return;
-		}
+        if($configurationClass !== null) {
+            self::$configurationFile = $configurationFile;
+            self::$configurationClass = $configurationClass;
+            return;
+        }
 		
-		if (strtolower(substr( $configurationFile, -4 )) == '.xml') {
-			self::$configurationFile = $configurationFile;
-			self::$configurationClass = 'LoggerConfiguratorXml';
-		} else {
-			self::$configurationFile = $configurationFile;
-			self::$configurationClass = 'LoggerConfiguratorIni';
-		}
-	}
-	
-	/**
-	 * Returns the current configurator
-	 * @return the configurator
-	 */
-	public static function getConfigurationClass() {
-		return self::$configurationClass;
-	}
-	
-	/**
-	 * Returns the current configuration file
-	 * @return the configuration file
-	 */
-	public static function getConfigurationFile() {
-		return self::$configurationFile;
-	}
-	
-	/**
-	 * Returns, true, if the log4php framework is already initialized
-	 */
-	private static function isInitialized() {
-		return self::$initialized;
-	}
-	
-	/**
-	 * Initializes the log4php framework.
-	 * @return boolean
-	 */
-	public static function initialize() {
-		self::$initialized = true;
-		$instance = LoggerReflectionUtils::createObject(self::$configurationClass);
-		$result = $instance->configure(self::getHierarchy(), self::$configurationFile);
-		return $result;
-	}
+        if (strtolower(substr( $configurationFile, -4 )) == '.xml') {
+            self::$configurationFile = $configurationFile;
+            self::$configurationClass = 'LoggerConfiguratorXml';
+        } else {
+            self::$configurationFile = $configurationFile;
+            self::$configurationClass = 'LoggerConfiguratorIni';
+        }
+    }
+	
+    /**
+     * Returns the current configurator
+     * @return the configurator
+     */
+    public static function getConfigurationClass() {
+        return self::$configurationClass;
+    }
+	
+    /**
+     * Returns the current configuration file
+     * @return the configuration file
+     */
+    public static function getConfigurationFile() {
+        return self::$configurationFile;
+    }
+	
+    /**
+     * Returns, true, if the log4php framework is already initialized
+     */
+    private static function isInitialized() {
+        return self::$initialized;
+    }
+	
+    /**
+     * Initializes the log4php framework.
+     * @return boolean
+     */
+    public static function initialize() {
+        self::$initialized = true;
+        $instance = LoggerReflectionUtils::createObject(self::$configurationClass);
+        $result = $instance->configure(self::getHierarchy(), self::$configurationFile);
+        return $result;
+    }
 }

main/inc/lib/phpdocx/lib/log4php/LoggerAppender.php

Doc Comments +1 added lines, -1 removed lines

@@ -209,7 +209,7 @@
 	/**
 	 * Set the threshold level of this appender.
 	 *
-	 * @param mixed $threshold can be a {@link LoggerLevel} object or a string.
+	 * @param LoggerLevel $threshold can be a {@link LoggerLevel} object or a string.
 	 * @see LoggerOptionConverter::toLevel()
 	 */
 	public function setThreshold($threshold) {

Indentation +223 added lines, -223 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 /**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *	   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @package log4php
- */
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements. See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License. You may obtain a copy of the License at
+     *
+     *	   http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     *
+     * @package log4php
+     */
 
 /**
  * Abstract class that defines output logs strategies.
@@ -26,236 +26,236 @@ 
  */
 abstract class LoggerAppender {
 	
-	/**
-	 * @var boolean closed appender flag
-	 */
-	protected $closed = false;
+    /**
+     * @var boolean closed appender flag
+     */
+    protected $closed = false;
 	
-	/**
-	 * The first filter in the filter chain
-	 * @var LoggerFilter
-	 */
-	protected $filter = null;
+    /**
+     * The first filter in the filter chain
+     * @var LoggerFilter
+     */
+    protected $filter = null;
 			
-	/**
-	 * LoggerLayout for this appender. It can be null if appender has its own layout
-	 * @var LoggerLayout
-	 */
-	protected $layout = null; 
+    /**
+     * LoggerLayout for this appender. It can be null if appender has its own layout
+     * @var LoggerLayout
+     */
+    protected $layout = null; 
 		   
-	/**
-	 * @var string Appender name
-	 */
-	protected $name;
+    /**
+     * @var string Appender name
+     */
+    protected $name;
 		   
-	/**
-	 * @var LoggerLevel There is no level threshold filtering by default.
-	 */
-	protected $threshold = null;
+    /**
+     * @var LoggerLevel There is no level threshold filtering by default.
+     */
+    protected $threshold = null;
 	
-	/**
-	 * @var boolean needs a layout formatting ?
-	 */
-	protected $requiresLayout = false;
+    /**
+     * @var boolean needs a layout formatting ?
+     */
+    protected $requiresLayout = false;
 	
-	/**
-	 * Constructor
-	 *
-	 * @param string $name appender name
-	 */
-	public function __construct($name = '') {
-		$this->name = $name;
-	}
+    /**
+     * Constructor
+     *
+     * @param string $name appender name
+     */
+    public function __construct($name = '') {
+        $this->name = $name;
+    }
 
-	/**
-	 * Add a filter to the end of the filter list.
-	 *
-	 * @param LoggerFilter $newFilter add a new LoggerFilter
-	 */
-	public function addFilter($newFilter) {
-		if($this->filter === null) {
-			$this->filter = $newFilter;
-		} else {
-			$this->filter->addNext($newFilter);
-		}
-	}
+    /**
+     * Add a filter to the end of the filter list.
+     *
+     * @param LoggerFilter $newFilter add a new LoggerFilter
+     */
+    public function addFilter($newFilter) {
+        if($this->filter === null) {
+            $this->filter = $newFilter;
+        } else {
+            $this->filter->addNext($newFilter);
+        }
+    }
 	
-	/**
-	 * Clear the list of filters by removing all the filters in it.
-	 * @abstract
-	 */
-	public function clearFilters() {
-		unset($this->filter);
-		$this->filter = null;
-	}
+    /**
+     * Clear the list of filters by removing all the filters in it.
+     * @abstract
+     */
+    public function clearFilters() {
+        unset($this->filter);
+        $this->filter = null;
+    }
 
-	/**
-	 * Return the first filter in the filter chain for this Appender. 
-	 * The return value may be <i>null</i> if no is filter is set.
-	 * @return LoggerFilter
-	 */
-	public function getFilter() {
-		return $this->filter;
-	} 
+    /**
+     * Return the first filter in the filter chain for this Appender. 
+     * The return value may be <i>null</i> if no is filter is set.
+     * @return LoggerFilter
+     */
+    public function getFilter() {
+        return $this->filter;
+    } 
 	
-	/** 
-	 * Return the first filter in the filter chain for this Appender. 
-	 * The return value may be <i>null</i> if no is filter is set.
-	 * @return LoggerFilter
-	 */
-	public function getFirstFilter() {
-		return $this->filter;
-	}
+    /** 
+     * Return the first filter in the filter chain for this Appender. 
+     * The return value may be <i>null</i> if no is filter is set.
+     * @return LoggerFilter
+     */
+    public function getFirstFilter() {
+        return $this->filter;
+    }
 	
 	
-	/**
-	 * This method performs threshold checks and invokes filters before
-	 * delegating actual logging to the subclasses specific <i>append()</i> method.
-	 * @see LoggerAppender::doAppend()
-	 * @param LoggerLoggingEvent $event
-	 */
-	public function doAppend(LoggerLoggingEvent $event) {
-		if($this->closed) {
-			return;
-		}
+    /**
+     * This method performs threshold checks and invokes filters before
+     * delegating actual logging to the subclasses specific <i>append()</i> method.
+     * @see LoggerAppender::doAppend()
+     * @param LoggerLoggingEvent $event
+     */
+    public function doAppend(LoggerLoggingEvent $event) {
+        if($this->closed) {
+            return;
+        }
 		
-		if(!$this->isAsSevereAsThreshold($event->getLevel())) {
-			return;
-		}
+        if(!$this->isAsSevereAsThreshold($event->getLevel())) {
+            return;
+        }
 
-		$f = $this->getFirstFilter();
-		while($f !== null) {
-			switch ($f->decide($event)) {
-				case LoggerFilter::DENY: return;
-				case LoggerFilter::ACCEPT: return $this->append($event);
-				case LoggerFilter::NEUTRAL: $f = $f->getNext();
-			}
-		}
-		$this->append($event);	  
-	}	 
+        $f = $this->getFirstFilter();
+        while($f !== null) {
+            switch ($f->decide($event)) {
+                case LoggerFilter::DENY: return;
+                case LoggerFilter::ACCEPT: return $this->append($event);
+                case LoggerFilter::NEUTRAL: $f = $f->getNext();
+            }
+        }
+        $this->append($event);	  
+    }	 
 
-	/**
-	 * Set the Layout for this appender.
-	 * @see LoggerAppender::setLayout()
-	 * @param LoggerLayout $layout
-	 */
-	public function setLayout($layout) {
-		if($this->requiresLayout()) {
-			$this->layout = $layout;
-		}
-	} 
+    /**
+     * Set the Layout for this appender.
+     * @see LoggerAppender::setLayout()
+     * @param LoggerLayout $layout
+     */
+    public function setLayout($layout) {
+        if($this->requiresLayout()) {
+            $this->layout = $layout;
+        }
+    } 
 	
-	/**
-	 * Returns this appender layout.
-	 * @see LoggerAppender::getLayout()
-	 * @return LoggerLayout
-	 */
-	public function getLayout() {
-		return $this->layout;
-	}
+    /**
+     * Returns this appender layout.
+     * @see LoggerAppender::getLayout()
+     * @return LoggerLayout
+     */
+    public function getLayout() {
+        return $this->layout;
+    }
 	
-	/**
-	 * Configurators call this method to determine if the appender
-	 * requires a layout. 
-	 *
-	 * <p>If this method returns <i>true</i>, meaning that layout is required, 
-	 * then the configurator will configure a layout using the configuration 
-	 * information at its disposal.	 If this method returns <i>false</i>, 
-	 * meaning that a layout is not required, then layout configuration will be
-	 * skipped even if there is available layout configuration
-	 * information at the disposal of the configurator.</p>
-	 *
-	 * <p>In the rather exceptional case, where the appender
-	 * implementation admits a layout but can also work without it, then
-	 * the appender should return <i>true</i>.</p>
-	 * 
-	 * @see LoggerAppender::requiresLayout()
-	 * @return boolean
-	 */
-	public function requiresLayout() {
-		return $this->requiresLayout;
-	}
+    /**
+     * Configurators call this method to determine if the appender
+     * requires a layout. 
+     *
+     * <p>If this method returns <i>true</i>, meaning that layout is required, 
+     * then the configurator will configure a layout using the configuration 
+     * information at its disposal.	 If this method returns <i>false</i>, 
+     * meaning that a layout is not required, then layout configuration will be
+     * skipped even if there is available layout configuration
+     * information at the disposal of the configurator.</p>
+     *
+     * <p>In the rather exceptional case, where the appender
+     * implementation admits a layout but can also work without it, then
+     * the appender should return <i>true</i>.</p>
+     * 
+     * @see LoggerAppender::requiresLayout()
+     * @return boolean
+     */
+    public function requiresLayout() {
+        return $this->requiresLayout;
+    }
 	
-	/**
-	 * Get the name of this appender.
-	 * @see LoggerAppender::getName()
-	 * @return string
-	 */
-	public function getName() {
-		return $this->name;
-	}
+    /**
+     * Get the name of this appender.
+     * @see LoggerAppender::getName()
+     * @return string
+     */
+    public function getName() {
+        return $this->name;
+    }
 	
 /**
-	 * Set the name of this appender.
-	 *
-	 * The name is used by other components to identify this appender.
-	 *
-	 * 
-	 * @param string $name
-	 */
-	public function setName($name) {
-		$this->name = $name;	
-	}
+ * Set the name of this appender.
+ *
+ * The name is used by other components to identify this appender.
+ *
+ * 
+ * @param string $name
+ */
+    public function setName($name) {
+        $this->name = $name;	
+    }
 	
-	/**
-	 * Returns this appenders threshold level. 
-	 * See the {@link setThreshold()} method for the meaning of this option.
-	 * @return LoggerLevel
-	 */
-	public function getThreshold() { 
-		return $this->threshold;
-	}
+    /**
+     * Returns this appenders threshold level. 
+     * See the {@link setThreshold()} method for the meaning of this option.
+     * @return LoggerLevel
+     */
+    public function getThreshold() { 
+        return $this->threshold;
+    }
 	
-	/**
-	 * Set the threshold level of this appender.
-	 *
-	 * @param mixed $threshold can be a {@link LoggerLevel} object or a string.
-	 * @see LoggerOptionConverter::toLevel()
-	 */
-	public function setThreshold($threshold) {
-		if(is_string($threshold)) {
-		   $this->threshold = LoggerOptionConverter::toLevel($threshold, null);
-		} else if($threshold instanceof LoggerLevel) {
-		   $this->threshold = $threshold;
-		}
-	}
+    /**
+     * Set the threshold level of this appender.
+     *
+     * @param mixed $threshold can be a {@link LoggerLevel} object or a string.
+     * @see LoggerOptionConverter::toLevel()
+     */
+    public function setThreshold($threshold) {
+        if(is_string($threshold)) {
+            $this->threshold = LoggerOptionConverter::toLevel($threshold, null);
+        } else if($threshold instanceof LoggerLevel) {
+            $this->threshold = $threshold;
+        }
+    }
 	
-	/**
-	 * Check whether the message level is below the appender's threshold. 
-	 *
-	 *
-	 * If there is no threshold set, then the return value is always <i>true</i>.
-	 * @param LoggerLevel $level
-	 * @return boolean true if priority is greater or equal than threshold	
-	 */
-	public function isAsSevereAsThreshold($level) {
-		if($this->threshold === null) {
-			return true;
-		}
-		return $level->isGreaterOrEqual($this->getThreshold());
-	}
+    /**
+     * Check whether the message level is below the appender's threshold. 
+     *
+     *
+     * If there is no threshold set, then the return value is always <i>true</i>.
+     * @param LoggerLevel $level
+     * @return boolean true if priority is greater or equal than threshold	
+     */
+    public function isAsSevereAsThreshold($level) {
+        if($this->threshold === null) {
+            return true;
+        }
+        return $level->isGreaterOrEqual($this->getThreshold());
+    }
 
-	/**
-	 * Derived appenders should override this method if option structure
-	 * requires it.
-	 */
-	abstract public function activateOptions();	   
+    /**
+     * Derived appenders should override this method if option structure
+     * requires it.
+     */
+    abstract public function activateOptions();	   
 	
-	/**
-	 * Subclasses of {@link LoggerAppender} should implement 
-	 * this method to perform actual logging.
-	 *
-	 * @param LoggerLoggingEvent $event
-	 * @see doAppend()
-	 * @abstract
-	 */
-	abstract protected function append(LoggerLoggingEvent $event); 
+    /**
+     * Subclasses of {@link LoggerAppender} should implement 
+     * this method to perform actual logging.
+     *
+     * @param LoggerLoggingEvent $event
+     * @see doAppend()
+     * @abstract
+     */
+    abstract protected function append(LoggerLoggingEvent $event); 
 
-	/**
-	 * Release any resources allocated.
-	 * Subclasses of {@link LoggerAppender} should implement 
-	 * this method to perform proper closing procedures.
-	 * @abstract
-	 */
-	abstract public function close();
+    /**
+     * Release any resources allocated.
+     * Subclasses of {@link LoggerAppender} should implement 
+     * this method to perform proper closing procedures.
+     * @abstract
+     */
+    abstract public function close();
 }

Spacing +8 added lines, -8 removed lines

@@ -73,7 +73,7 @@ 
 	 * @param LoggerFilter $newFilter add a new LoggerFilter
 	 */
 	public function addFilter($newFilter) {
-		if($this->filter === null) {
+		if ($this->filter === null) {
 			$this->filter = $newFilter;
 		} else {
 			$this->filter->addNext($newFilter);
@@ -115,16 +115,16 @@ 
 	 * @param LoggerLoggingEvent $event
 	 */
 	public function doAppend(LoggerLoggingEvent $event) {
-		if($this->closed) {
+		if ($this->closed) {
 			return;
 		}
 		
-		if(!$this->isAsSevereAsThreshold($event->getLevel())) {
+		if (!$this->isAsSevereAsThreshold($event->getLevel())) {
 			return;
 		}
 
 		$f = $this->getFirstFilter();
-		while($f !== null) {
+		while ($f !== null) {
 			switch ($f->decide($event)) {
 				case LoggerFilter::DENY: return;
 				case LoggerFilter::ACCEPT: return $this->append($event);
@@ -140,7 +140,7 @@ 
 	 * @param LoggerLayout $layout
 	 */
 	public function setLayout($layout) {
-		if($this->requiresLayout()) {
+		if ($this->requiresLayout()) {
 			$this->layout = $layout;
 		}
 	} 
@@ -213,9 +213,9 @@ 
 	 * @see LoggerOptionConverter::toLevel()
 	 */
 	public function setThreshold($threshold) {
-		if(is_string($threshold)) {
+		if (is_string($threshold)) {
 		   $this->threshold = LoggerOptionConverter::toLevel($threshold, null);
-		} else if($threshold instanceof LoggerLevel) {
+		} else if ($threshold instanceof LoggerLevel) {
 		   $this->threshold = $threshold;
 		}
 	}
@@ -229,7 +229,7 @@ 
 	 * @return boolean true if priority is greater or equal than threshold	
 	 */
 	public function isAsSevereAsThreshold($level) {
-		if($this->threshold === null) {
+		if ($this->threshold === null) {
 			return true;
 		}
 		return $level->isGreaterOrEqual($this->getThreshold());

main/inc/lib/phpdocx/lib/log4php/LoggerHierarchy.php

Doc Comments +1 added lines, -2 removed lines

@@ -71,7 +71,7 @@ 
 	
 	/**
 	 * Create a new logger hierarchy.
-	 * @param object $root the root logger
+	 * @param LoggerRoot $root the root logger
 	 */
 	public function __construct(LoggerRoot $root) {
 		$this->root = $root;
@@ -107,7 +107,6 @@ 
 	 * Return a new logger instance named as the first parameter using the default factory.
 	 * 
 	 * @param string $name logger name
-	 * @param LoggerFactory $factory a {@link LoggerFactory} instance or null	  
 	 * @return Logger
 	 */
 	public function getLogger($name) {

Spacing +11 added lines, -11 removed lines

@@ -111,15 +111,15 @@ 
 	 * @return Logger
 	 */
 	public function getLogger($name) {
-		if(!isset($this->ht[$name])) {
-			$this->ht[$name] = new Logger($name);;
+		if (!isset($this->ht[$name])) {
+			$this->ht[$name] = new Logger($name); ;
 			// TODO: isn't necessary, access via singleton?
 			// $this->ht[$name]->setHierarchy($this);
 			$nodes = explode('.', $name);
 			$firstNode = array_shift($nodes);
 			
 			// if name is not a first node but another first node is their
-			if($firstNode != $name and isset($this->ht[$firstNode])) {
+			if ($firstNode != $name and isset($this->ht[$firstNode])) {
 				$this->ht[$name]->setParent($this->ht[$firstNode]);
 			} else {
 				// if there is no father, set root logger as father
@@ -127,11 +127,11 @@ 
 			} 
 		
 			// if there are more nodes than one
-			if(count($nodes) > 0) {
+			if (count($nodes) > 0) {
 				// find parent node
-				foreach($nodes as $node) {
+				foreach ($nodes as $node) {
 					$parentNode = "$firstNode.$node";
-					if(isset($this->ht[$parentNode]) and $parentNode != $name) {
+					if (isset($this->ht[$parentNode]) and $parentNode != $name) {
 		
 						$this->ht[$name]->setParent($this->ht[$parentNode]);
 					}
@@ -154,7 +154,7 @@ 
 	 * @return LoggerRoot Get the root of this hierarchy.
 	 */ 
 	public function getRootLogger() {
-		if(!isset($this->root) or $this->root == null) {
+		if (!isset($this->root) or $this->root == null) {
 			$this->root = new LoggerRoot();
 		}
 		return $this->root;
@@ -199,7 +199,7 @@ 
 		$this->shutDown();
 		$loggers = $this->getCurrentLoggers();
 		$enumLoggers = count($loggers);
-		for($i = 0; $i < $enumLoggers; $i++) {
+		for ($i = 0; $i < $enumLoggers; $i++) {
 			$loggers[$i]->setLevel(null);
 			$loggers[$i]->setAdditivity(true);
 			$loggers[$i]->removeAllAppenders();
@@ -213,7 +213,7 @@ 
 	 * @param LoggerLevel $l
 	 */
 	public function setThreshold(LoggerLevel $l) {
-		if($l !== null) {
+		if ($l !== null) {
 			$this->threshold = $l;
 		}
 	}
@@ -236,8 +236,8 @@ 
 		$this->root->removeAllAppenders();
 		$cats = $this->getCurrentLoggers();
 		$enumCats = count($cats);		  
-		if($enumCats > 0) {
-			for($i = 0; $i < $enumCats; $i++) {
+		if ($enumCats > 0) {
+			for ($i = 0; $i < $enumCats; $i++) {
 				$cats[$i]->removeAllAppenders();
 			}
 		}

Indentation +168 added lines, -168 removed lines

@@ -47,199 +47,199 @@
  * @version $Revision: 822448 $
  * @package log4php
  */
- /*
+    /*
   * TODO:
   * - addHierarchyEventListener($listener) not supported
   * - emitNoAppenderWarning($cat) not supported
   * - fireAddAppenderEvent not supported
   */
 class LoggerHierarchy {
-	/** Default Factory  */
-	protected $defaultFactory;
+    /** Default Factory  */
+    protected $defaultFactory;
 	
-	/** array hierarchy tree. saves here all loggers */
-	protected $ht = array();
+    /** array hierarchy tree. saves here all loggers */
+    protected $ht = array();
 	
-	/** The root Logger */
-	protected $root = null;
+    /** The root Logger */
+    protected $root = null;
 	
-	/** LoggerRendererMap */
-	protected $rendererMap;
+    /** LoggerRendererMap */
+    protected $rendererMap;
 
-	/** LoggerLevel main level threshold */
-	protected $threshold;
+    /** LoggerLevel main level threshold */
+    protected $threshold;
 	
-	/**
-	 * Create a new logger hierarchy.
-	 * @param object $root the root logger
-	 */
-	public function __construct(LoggerRoot $root) {
-		$this->root = $root;
-		$this->setThreshold(LoggerLevel::getLevelAll());
-		$this->rendererMap = new LoggerRendererMap();
-	}
+    /**
+     * Create a new logger hierarchy.
+     * @param object $root the root logger
+     */
+    public function __construct(LoggerRoot $root) {
+        $this->root = $root;
+        $this->setThreshold(LoggerLevel::getLevelAll());
+        $this->rendererMap = new LoggerRendererMap();
+    }
 	 
-	/**
-	 * This call will clear all logger definitions from the internal hashtable.
-	 */
-	public function clear() {
-		$this->ht = array();
-	}
+    /**
+     * This call will clear all logger definitions from the internal hashtable.
+     */
+    public function clear() {
+        $this->ht = array();
+    }
 	  
-	/**
-	 * Check if the named logger exists in the hierarchy.
-	 * @param string $name
-	 * @return boolean
-	 */
-	public function exists($name) {
-		return isset($this->ht[$name]);
-	}
+    /**
+     * Check if the named logger exists in the hierarchy.
+     * @param string $name
+     * @return boolean
+     */
+    public function exists($name) {
+        return isset($this->ht[$name]);
+    }
 
-	/**
-	 * Returns all the currently defined categories in this hierarchy as an array.
-	 * @return array
-	 */	 
-	public function getCurrentLoggers() {
-		return array_values($this->ht);
-	}
+    /**
+     * Returns all the currently defined categories in this hierarchy as an array.
+     * @return array
+     */	 
+    public function getCurrentLoggers() {
+        return array_values($this->ht);
+    }
 	
-	/**
-	 * Return a new logger instance named as the first parameter using the default factory.
-	 * 
-	 * @param string $name logger name
-	 * @param LoggerFactory $factory a {@link LoggerFactory} instance or null	  
-	 * @return Logger
-	 */
-	public function getLogger($name) {
-		if(!isset($this->ht[$name])) {
-			$this->ht[$name] = new Logger($name);;
-			// TODO: isn't necessary, access via singleton?
-			// $this->ht[$name]->setHierarchy($this);
-			$nodes = explode('.', $name);
-			$firstNode = array_shift($nodes);
+    /**
+     * Return a new logger instance named as the first parameter using the default factory.
+     * 
+     * @param string $name logger name
+     * @param LoggerFactory $factory a {@link LoggerFactory} instance or null	  
+     * @return Logger
+     */
+    public function getLogger($name) {
+        if(!isset($this->ht[$name])) {
+            $this->ht[$name] = new Logger($name);;
+            // TODO: isn't necessary, access via singleton?
+            // $this->ht[$name]->setHierarchy($this);
+            $nodes = explode('.', $name);
+            $firstNode = array_shift($nodes);
 			
-			// if name is not a first node but another first node is their
-			if($firstNode != $name and isset($this->ht[$firstNode])) {
-				$this->ht[$name]->setParent($this->ht[$firstNode]);
-			} else {
-				// if there is no father, set root logger as father
-				$this->ht[$name]->setParent($this->root);
-			} 
+            // if name is not a first node but another first node is their
+            if($firstNode != $name and isset($this->ht[$firstNode])) {
+                $this->ht[$name]->setParent($this->ht[$firstNode]);
+            } else {
+                // if there is no father, set root logger as father
+                $this->ht[$name]->setParent($this->root);
+            } 
 		
-			// if there are more nodes than one
-			if(count($nodes) > 0) {
-				// find parent node
-				foreach($nodes as $node) {
-					$parentNode = "$firstNode.$node";
-					if(isset($this->ht[$parentNode]) and $parentNode != $name) {
+            // if there are more nodes than one
+            if(count($nodes) > 0) {
+                // find parent node
+                foreach($nodes as $node) {
+                    $parentNode = "$firstNode.$node";
+                    if(isset($this->ht[$parentNode]) and $parentNode != $name) {
 		
-						$this->ht[$name]->setParent($this->ht[$parentNode]);
-					}
-					$firstNode .= ".$node";
-				}
-			}
-		}		
+                        $this->ht[$name]->setParent($this->ht[$parentNode]);
+                    }
+                    $firstNode .= ".$node";
+                }
+            }
+        }		
 		
-		return $this->ht[$name];
-	} 
+        return $this->ht[$name];
+    } 
 	
-	/**
-	 * @return LoggerRendererMap Get the renderer map for this hierarchy.
-	 */
-	public function getRendererMap() {
-		return $this->rendererMap;
-	}
+    /**
+     * @return LoggerRendererMap Get the renderer map for this hierarchy.
+     */
+    public function getRendererMap() {
+        return $this->rendererMap;
+    }
 	
-	/**
-	 * @return LoggerRoot Get the root of this hierarchy.
-	 */ 
-	public function getRootLogger() {
-		if(!isset($this->root) or $this->root == null) {
-			$this->root = new LoggerRoot();
-		}
-		return $this->root;
-	}
+    /**
+     * @return LoggerRoot Get the root of this hierarchy.
+     */ 
+    public function getRootLogger() {
+        if(!isset($this->root) or $this->root == null) {
+            $this->root = new LoggerRoot();
+        }
+        return $this->root;
+    }
 	 
-	/**
-	 * @return LoggerLevel Returns the threshold Level.
-	 */
-	public function getThreshold() {
-		return $this->threshold;
-	} 
+    /**
+     * @return LoggerLevel Returns the threshold Level.
+     */
+    public function getThreshold() {
+        return $this->threshold;
+    } 
 
-	/**
-	 * This method will return true if this repository is disabled 
-	 * for level object passed as parameter and false otherwise.
-	 * @return boolean
-	 */
-	public function isDisabled(LoggerLevel $level) {
-		return ($this->threshold->toInt() > $level->toInt());
-	}
+    /**
+     * This method will return true if this repository is disabled 
+     * for level object passed as parameter and false otherwise.
+     * @return boolean
+     */
+    public function isDisabled(LoggerLevel $level) {
+        return ($this->threshold->toInt() > $level->toInt());
+    }
 	
-	/**
-	 * Reset all values contained in this hierarchy instance to their
-	 * default. 
-	 *
-	 * This removes all appenders from all categories, sets
-	 * the level of all non-root categories to <i>null</i>,
-	 * sets their additivity flag to <i>true</i> and sets the level
-	 * of the root logger to {@link LOGGER_LEVEL_DEBUG}.  Moreover,
-	 * message disabling is set its default "off" value.
-	 * 
-	 * <p>Existing categories are not removed. They are just reset.
-	 *
-	 * <p>This method should be used sparingly and with care as it will
-	 * block all logging until it is completed.</p>
-	 */
-	public function resetConfiguration() {
-		$root = $this->getRootLogger();
+    /**
+     * Reset all values contained in this hierarchy instance to their
+     * default. 
+     *
+     * This removes all appenders from all categories, sets
+     * the level of all non-root categories to <i>null</i>,
+     * sets their additivity flag to <i>true</i> and sets the level
+     * of the root logger to {@link LOGGER_LEVEL_DEBUG}.  Moreover,
+     * message disabling is set its default "off" value.
+     * 
+     * <p>Existing categories are not removed. They are just reset.
+     *
+     * <p>This method should be used sparingly and with care as it will
+     * block all logging until it is completed.</p>
+     */
+    public function resetConfiguration() {
+        $root = $this->getRootLogger();
 		
-		$root->setLevel(LoggerLevel::getLevelDebug());
-		$this->setThreshold(LoggerLevel::getLevelAll());
-		$this->shutDown();
-		$loggers = $this->getCurrentLoggers();
-		$enumLoggers = count($loggers);
-		for($i = 0; $i < $enumLoggers; $i++) {
-			$loggers[$i]->setLevel(null);
-			$loggers[$i]->setAdditivity(true);
-			$loggers[$i]->removeAllAppenders();
-		}
-		$this->rendererMap->clear();
-	}
+        $root->setLevel(LoggerLevel::getLevelDebug());
+        $this->setThreshold(LoggerLevel::getLevelAll());
+        $this->shutDown();
+        $loggers = $this->getCurrentLoggers();
+        $enumLoggers = count($loggers);
+        for($i = 0; $i < $enumLoggers; $i++) {
+            $loggers[$i]->setLevel(null);
+            $loggers[$i]->setAdditivity(true);
+            $loggers[$i]->removeAllAppenders();
+        }
+        $this->rendererMap->clear();
+    }
 	
-	/**
-	 * set a new threshold level
-	 *
-	 * @param LoggerLevel $l
-	 */
-	public function setThreshold(LoggerLevel $l) {
-		if($l !== null) {
-			$this->threshold = $l;
-		}
-	}
+    /**
+     * set a new threshold level
+     *
+     * @param LoggerLevel $l
+     */
+    public function setThreshold(LoggerLevel $l) {
+        if($l !== null) {
+            $this->threshold = $l;
+        }
+    }
 	
-	/**
-	 * Shutting down a hierarchy will <i>safely</i> close and remove
-	 * all appenders in all categories including the root logger.
-	 * 
-	 * <p>Some appenders such as {@link LoggerSocketAppender}
-	 * need to be closed before the
-	 * application exists. Otherwise, pending logging events might be
-	 * lost.
-	 * 
-	 * <p>The shutdown method is careful to close nested
-	 * appenders before closing regular appenders. This is allows
-	 * configurations where a regular appender is attached to a logger
-	 * and again to a nested appender.
-	 */
-	public function shutdown() {
-		$this->root->removeAllAppenders();
-		$cats = $this->getCurrentLoggers();
-		$enumCats = count($cats);		  
-		if($enumCats > 0) {
-			for($i = 0; $i < $enumCats; $i++) {
-				$cats[$i]->removeAllAppenders();
-			}
-		}
-	}
+    /**
+     * Shutting down a hierarchy will <i>safely</i> close and remove
+     * all appenders in all categories including the root logger.
+     * 
+     * <p>Some appenders such as {@link LoggerSocketAppender}
+     * need to be closed before the
+     * application exists. Otherwise, pending logging events might be
+     * lost.
+     * 
+     * <p>The shutdown method is careful to close nested
+     * appenders before closing regular appenders. This is allows
+     * configurations where a regular appender is attached to a logger
+     * and again to a nested appender.
+     */
+    public function shutdown() {
+        $this->root->removeAllAppenders();
+        $cats = $this->getCurrentLoggers();
+        $enumCats = count($cats);		  
+        if($enumCats > 0) {
+            for($i = 0; $i < $enumCats; $i++) {
+                $cats[$i]->removeAllAppenders();
+            }
+        }
+    }
 } 

main/inc/lib/phpdocx/lib/log4php/LoggerLevel.php

Doc Comments +4 added lines, -4 removed lines

@@ -78,8 +78,8 @@ 
 	/**
 	 * Two priorities are equal if their level fields are equal.
 	 *
-	 * @param object $o
-	 * @return boolean 
+	 * @param LoggerLevel $o
+	 * @return boolean|null 
 	 */
 	public function equals($o) {
 		if($o instanceof LoggerLevel) {
@@ -220,8 +220,8 @@ 
 	 * Convert the string passed as argument to a level. If the
 	 * conversion fails, then this method returns a DEBUG Level.
 	 *
-	 * @param mixed $arg
-	 * @param LoggerLevel $default
+	 * @param string $arg
+	 * @param LoggerLevel $defaultLevel
 	 * @static 
 	 */
 	public static function toLevel($arg, $defaultLevel = null) {

Spacing +13 added lines, -13 removed lines

@@ -82,8 +82,8 @@ 
 	 * @return boolean 
 	 */
 	public function equals($o) {
-		if($o instanceof LoggerLevel) {
-			if($this->level == $o->level) {
+		if ($o instanceof LoggerLevel) {
+			if ($this->level == $o->level) {
 			    return true;
 			}
 		} else {
@@ -97,7 +97,7 @@ 
 	 * @return LoggerLevel
 	 */
 	public static function getLevelOff() {
-		if(!isset(self::$levelMap[LoggerLevel::OFF])) {
+		if (!isset(self::$levelMap[LoggerLevel::OFF])) {
 			self::$levelMap[LoggerLevel::OFF] = new LoggerLevel(LoggerLevel::OFF, 'OFF', 0);
 		}
 		return self::$levelMap[LoggerLevel::OFF];
@@ -109,7 +109,7 @@ 
 	 * @return LoggerLevel
 	 */
 	public static function getLevelFatal() {
-		if(!isset(self::$levelMap[LoggerLevel::FATAL])) {
+		if (!isset(self::$levelMap[LoggerLevel::FATAL])) {
 			self::$levelMap[LoggerLevel::FATAL] = new LoggerLevel(LoggerLevel::FATAL, 'FATAL', 0);
 		}
 		return self::$levelMap[LoggerLevel::FATAL];
@@ -121,7 +121,7 @@ 
 	 * @return LoggerLevel
 	 */
 	public static function getLevelError() {
-		if(!isset(self::$levelMap[LoggerLevel::ERROR])) {
+		if (!isset(self::$levelMap[LoggerLevel::ERROR])) {
 			self::$levelMap[LoggerLevel::ERROR] = new LoggerLevel(LoggerLevel::ERROR, 'ERROR', 3);
 		}
 		return self::$levelMap[LoggerLevel::ERROR];
@@ -133,7 +133,7 @@ 
 	 * @return LoggerLevel
 	 */
 	public static function getLevelWarn() {
-		if(!isset(self::$levelMap[LoggerLevel::WARN])) {
+		if (!isset(self::$levelMap[LoggerLevel::WARN])) {
 			self::$levelMap[LoggerLevel::WARN] = new LoggerLevel(LoggerLevel::WARN, 'WARN', 4);
 		}
 		return self::$levelMap[LoggerLevel::WARN];
@@ -145,7 +145,7 @@ 
 	 * @return LoggerLevel
 	 */
 	public static function getLevelInfo() {
-		if(!isset(self::$levelMap[LoggerLevel::INFO])) {
+		if (!isset(self::$levelMap[LoggerLevel::INFO])) {
 			self::$levelMap[LoggerLevel::INFO] = new LoggerLevel(LoggerLevel::INFO, 'INFO', 6);
 		}
 		return self::$levelMap[LoggerLevel::INFO];
@@ -157,7 +157,7 @@ 
 	 * @return LoggerLevel
 	 */
 	public static function getLevelDebug() {
-		if(!isset(self::$levelMap[LoggerLevel::DEBUG])) {
+		if (!isset(self::$levelMap[LoggerLevel::DEBUG])) {
 			self::$levelMap[LoggerLevel::DEBUG] = new LoggerLevel(LoggerLevel::DEBUG, 'DEBUG', 7);
 		}
 		return self::$levelMap[LoggerLevel::DEBUG];
@@ -169,7 +169,7 @@ 
 	 * @return LoggerLevel
 	 */
 	public static function getLevelAll() {
-		if(!isset(self::$levelMap[LoggerLevel::ALL])) {
+		if (!isset(self::$levelMap[LoggerLevel::ALL])) {
 			self::$levelMap[LoggerLevel::ALL] = new LoggerLevel(LoggerLevel::ALL, 'ALL', 7);
 		}
 		return self::$levelMap[LoggerLevel::ALL];
@@ -225,11 +225,11 @@ 
 	 * @static 
 	 */
 	public static function toLevel($arg, $defaultLevel = null) {
-		if($defaultLevel === null) {
+		if ($defaultLevel === null) {
 			return self::toLevel($arg, self::getLevelDebug());
 		} else {
-			if(is_int($arg)) {
-				switch($arg) {
+			if (is_int($arg)) {
+				switch ($arg) {
 					case self::ALL:	return self::getLevelAll();
 					case self::DEBUG: return self::getLevelDebug();
 					case self::INFO: return self::getLevelInfo();
@@ -240,7 +240,7 @@ 
 					default: return $defaultLevel;
 				}
 			} else {
-				switch(strtoupper($arg)) {
+				switch (strtoupper($arg)) {
 					case 'ALL':	return self::getLevelAll();
 					case 'DEBUG': return self::getLevelDebug();
 					case 'INFO': return self::getLevelInfo();

Indentation +219 added lines, -219 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 /**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *	   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @package log4php
- */
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements. See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License. You may obtain a copy of the License at
+     *
+     *	   http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     *
+     * @package log4php
+     */
 
 /**
  * Defines the minimum set of levels recognized by the system, that is
@@ -33,224 +33,224 @@ 
  */
 class LoggerLevel {
 	
-	const OFF = 2147483647;
-	const FATAL = 50000;
-	const ERROR = 40000;
-	const WARN = 30000;
-	const INFO = 20000;
-	const DEBUG = 10000;
-	const ALL = -2147483647;
+    const OFF = 2147483647;
+    const FATAL = 50000;
+    const ERROR = 40000;
+    const WARN = 30000;
+    const INFO = 20000;
+    const DEBUG = 10000;
+    const ALL = -2147483647;
 
-	/**
-	 * TODO: check if still necessary or to be refactored 
-	 * @var integer
-	 */
-	private $level;
+    /**
+     * TODO: check if still necessary or to be refactored 
+     * @var integer
+     */
+    private $level;
   
-  	/**
-   	 * Contains a list of instantiated levels 
-   	 */
-  	private static $levelMap;
+        /**
+         * Contains a list of instantiated levels 
+         */
+        private static $levelMap;
   	
-	/**
-	 * @var string
-	 */
-	private $levelStr;
+    /**
+     * @var string
+     */
+    private $levelStr;
   
-	/**
-	 * @var integer
-	 */
-	private $syslogEquivalent;
+    /**
+     * @var integer
+     */
+    private $syslogEquivalent;
 
-	/**
-	 * Constructor
-	 *
-	 * @param integer $level
-	 * @param string $levelStr
-	 * @param integer $syslogEquivalent
-	 */
-	private function __construct($level, $levelStr, $syslogEquivalent) {
-		$this->level = $level;
-		$this->levelStr = $levelStr;
-		$this->syslogEquivalent = $syslogEquivalent;
-	}
+    /**
+     * Constructor
+     *
+     * @param integer $level
+     * @param string $levelStr
+     * @param integer $syslogEquivalent
+     */
+    private function __construct($level, $levelStr, $syslogEquivalent) {
+        $this->level = $level;
+        $this->levelStr = $levelStr;
+        $this->syslogEquivalent = $syslogEquivalent;
+    }
 
-	/**
-	 * Two priorities are equal if their level fields are equal.
-	 *
-	 * @param object $o
-	 * @return boolean 
-	 */
-	public function equals($o) {
-		if($o instanceof LoggerLevel) {
-			if($this->level == $o->level) {
-			    return true;
-			}
-		} else {
-			return false;
-		}
-	}
+    /**
+     * Two priorities are equal if their level fields are equal.
+     *
+     * @param object $o
+     * @return boolean 
+     */
+    public function equals($o) {
+        if($o instanceof LoggerLevel) {
+            if($this->level == $o->level) {
+                return true;
+            }
+        } else {
+            return false;
+        }
+    }
 	
-	/**
-	 * Returns an Off Level
-	 * @static
-	 * @return LoggerLevel
-	 */
-	public static function getLevelOff() {
-		if(!isset(self::$levelMap[LoggerLevel::OFF])) {
-			self::$levelMap[LoggerLevel::OFF] = new LoggerLevel(LoggerLevel::OFF, 'OFF', 0);
-		}
-		return self::$levelMap[LoggerLevel::OFF];
-	}
+    /**
+     * Returns an Off Level
+     * @static
+     * @return LoggerLevel
+     */
+    public static function getLevelOff() {
+        if(!isset(self::$levelMap[LoggerLevel::OFF])) {
+            self::$levelMap[LoggerLevel::OFF] = new LoggerLevel(LoggerLevel::OFF, 'OFF', 0);
+        }
+        return self::$levelMap[LoggerLevel::OFF];
+    }
 
-	/**
-	 * Returns a Fatal Level
-	 * @static
-	 * @return LoggerLevel
-	 */
-	public static function getLevelFatal() {
-		if(!isset(self::$levelMap[LoggerLevel::FATAL])) {
-			self::$levelMap[LoggerLevel::FATAL] = new LoggerLevel(LoggerLevel::FATAL, 'FATAL', 0);
-		}
-		return self::$levelMap[LoggerLevel::FATAL];
-	}
+    /**
+     * Returns a Fatal Level
+     * @static
+     * @return LoggerLevel
+     */
+    public static function getLevelFatal() {
+        if(!isset(self::$levelMap[LoggerLevel::FATAL])) {
+            self::$levelMap[LoggerLevel::FATAL] = new LoggerLevel(LoggerLevel::FATAL, 'FATAL', 0);
+        }
+        return self::$levelMap[LoggerLevel::FATAL];
+    }
 	
-	/**
-	 * Returns an Error Level
-	 * @static
-	 * @return LoggerLevel
-	 */
-	public static function getLevelError() {
-		if(!isset(self::$levelMap[LoggerLevel::ERROR])) {
-			self::$levelMap[LoggerLevel::ERROR] = new LoggerLevel(LoggerLevel::ERROR, 'ERROR', 3);
-		}
-		return self::$levelMap[LoggerLevel::ERROR];
-	}
+    /**
+     * Returns an Error Level
+     * @static
+     * @return LoggerLevel
+     */
+    public static function getLevelError() {
+        if(!isset(self::$levelMap[LoggerLevel::ERROR])) {
+            self::$levelMap[LoggerLevel::ERROR] = new LoggerLevel(LoggerLevel::ERROR, 'ERROR', 3);
+        }
+        return self::$levelMap[LoggerLevel::ERROR];
+    }
 	
-	/**
-	 * Returns a Warn Level
-	 * @static
-	 * @return LoggerLevel
-	 */
-	public static function getLevelWarn() {
-		if(!isset(self::$levelMap[LoggerLevel::WARN])) {
-			self::$levelMap[LoggerLevel::WARN] = new LoggerLevel(LoggerLevel::WARN, 'WARN', 4);
-		}
-		return self::$levelMap[LoggerLevel::WARN];
-	}
+    /**
+     * Returns a Warn Level
+     * @static
+     * @return LoggerLevel
+     */
+    public static function getLevelWarn() {
+        if(!isset(self::$levelMap[LoggerLevel::WARN])) {
+            self::$levelMap[LoggerLevel::WARN] = new LoggerLevel(LoggerLevel::WARN, 'WARN', 4);
+        }
+        return self::$levelMap[LoggerLevel::WARN];
+    }
 
-	/**
-	 * Returns an Info Level
-	 * @static
-	 * @return LoggerLevel
-	 */
-	public static function getLevelInfo() {
-		if(!isset(self::$levelMap[LoggerLevel::INFO])) {
-			self::$levelMap[LoggerLevel::INFO] = new LoggerLevel(LoggerLevel::INFO, 'INFO', 6);
-		}
-		return self::$levelMap[LoggerLevel::INFO];
-	}
+    /**
+     * Returns an Info Level
+     * @static
+     * @return LoggerLevel
+     */
+    public static function getLevelInfo() {
+        if(!isset(self::$levelMap[LoggerLevel::INFO])) {
+            self::$levelMap[LoggerLevel::INFO] = new LoggerLevel(LoggerLevel::INFO, 'INFO', 6);
+        }
+        return self::$levelMap[LoggerLevel::INFO];
+    }
 
-	/**
-	 * Returns a Debug Level
-	 * @static
-	 * @return LoggerLevel
-	 */
-	public static function getLevelDebug() {
-		if(!isset(self::$levelMap[LoggerLevel::DEBUG])) {
-			self::$levelMap[LoggerLevel::DEBUG] = new LoggerLevel(LoggerLevel::DEBUG, 'DEBUG', 7);
-		}
-		return self::$levelMap[LoggerLevel::DEBUG];
-	}
+    /**
+     * Returns a Debug Level
+     * @static
+     * @return LoggerLevel
+     */
+    public static function getLevelDebug() {
+        if(!isset(self::$levelMap[LoggerLevel::DEBUG])) {
+            self::$levelMap[LoggerLevel::DEBUG] = new LoggerLevel(LoggerLevel::DEBUG, 'DEBUG', 7);
+        }
+        return self::$levelMap[LoggerLevel::DEBUG];
+    }
 
-	/**
-	 * Returns an All Level
-	 * @static
-	 * @return LoggerLevel
-	 */
-	public static function getLevelAll() {
-		if(!isset(self::$levelMap[LoggerLevel::ALL])) {
-			self::$levelMap[LoggerLevel::ALL] = new LoggerLevel(LoggerLevel::ALL, 'ALL', 7);
-		}
-		return self::$levelMap[LoggerLevel::ALL];
-	}
+    /**
+     * Returns an All Level
+     * @static
+     * @return LoggerLevel
+     */
+    public static function getLevelAll() {
+        if(!isset(self::$levelMap[LoggerLevel::ALL])) {
+            self::$levelMap[LoggerLevel::ALL] = new LoggerLevel(LoggerLevel::ALL, 'ALL', 7);
+        }
+        return self::$levelMap[LoggerLevel::ALL];
+    }
 	
-	/**
-	 * Return the syslog equivalent of this priority as an integer.
-	 * @final
-	 * @return integer
-	 */
-	public function getSyslogEquivalent() {
-		return $this->syslogEquivalent;
-	}
+    /**
+     * Return the syslog equivalent of this priority as an integer.
+     * @final
+     * @return integer
+     */
+    public function getSyslogEquivalent() {
+        return $this->syslogEquivalent;
+    }
 
-	/**
-	 * Returns <i>true</i> if this level has a higher or equal
-	 * level than the level passed as argument, <i>false</i>
-	 * otherwise.  
-	 * 
-	 * <p>You should think twice before overriding the default
-	 * implementation of <i>isGreaterOrEqual</i> method.
-	 *
-	 * @param LoggerLevel $r
-	 * @return boolean
-	 */
-	public function isGreaterOrEqual($r) {
-		return $this->level >= $r->level;
-	}
+    /**
+     * Returns <i>true</i> if this level has a higher or equal
+     * level than the level passed as argument, <i>false</i>
+     * otherwise.  
+     * 
+     * <p>You should think twice before overriding the default
+     * implementation of <i>isGreaterOrEqual</i> method.
+     *
+     * @param LoggerLevel $r
+     * @return boolean
+     */
+    public function isGreaterOrEqual($r) {
+        return $this->level >= $r->level;
+    }
 
-	/**
-	 * Returns the string representation of this priority.
-	 * @return string
-	 * @final
-	 */
-	public function toString() {
-		return $this->levelStr;
-	}
+    /**
+     * Returns the string representation of this priority.
+     * @return string
+     * @final
+     */
+    public function toString() {
+        return $this->levelStr;
+    }
 
-	/**
-	 * Returns the integer representation of this level.
-	 * @return integer
-	 */
-	public function toInt() {
-		return $this->level;
-	}
+    /**
+     * Returns the integer representation of this level.
+     * @return integer
+     */
+    public function toInt() {
+        return $this->level;
+    }
 
-	/**
-	 * Convert the string passed as argument to a level. If the
-	 * conversion fails, then this method returns a DEBUG Level.
-	 *
-	 * @param mixed $arg
-	 * @param LoggerLevel $default
-	 * @static 
-	 */
-	public static function toLevel($arg, $defaultLevel = null) {
-		if($defaultLevel === null) {
-			return self::toLevel($arg, self::getLevelDebug());
-		} else {
-			if(is_int($arg)) {
-				switch($arg) {
-					case self::ALL:	return self::getLevelAll();
-					case self::DEBUG: return self::getLevelDebug();
-					case self::INFO: return self::getLevelInfo();
-					case self::WARN: return self::getLevelWarn();
-					case self::ERROR: return self::getLevelError();
-					case self::FATAL: return self::getLevelFatal();
-					case self::OFF:	return self::getLevelOff();
-					default: return $defaultLevel;
-				}
-			} else {
-				switch(strtoupper($arg)) {
-					case 'ALL':	return self::getLevelAll();
-					case 'DEBUG': return self::getLevelDebug();
-					case 'INFO': return self::getLevelInfo();
-					case 'WARN': return self::getLevelWarn();
-					case 'ERROR': return self::getLevelError();
-					case 'FATAL': return self::getLevelFatal();
-					case 'OFF':	return self::getLevelOff();
-					default: return $defaultLevel;
-				}
-			}
-		}
-	}
+    /**
+     * Convert the string passed as argument to a level. If the
+     * conversion fails, then this method returns a DEBUG Level.
+     *
+     * @param mixed $arg
+     * @param LoggerLevel $default
+     * @static 
+     */
+    public static function toLevel($arg, $defaultLevel = null) {
+        if($defaultLevel === null) {
+            return self::toLevel($arg, self::getLevelDebug());
+        } else {
+            if(is_int($arg)) {
+                switch($arg) {
+                    case self::ALL:	return self::getLevelAll();
+                    case self::DEBUG: return self::getLevelDebug();
+                    case self::INFO: return self::getLevelInfo();
+                    case self::WARN: return self::getLevelWarn();
+                    case self::ERROR: return self::getLevelError();
+                    case self::FATAL: return self::getLevelFatal();
+                    case self::OFF:	return self::getLevelOff();
+                    default: return $defaultLevel;
+                }
+            } else {
+                switch(strtoupper($arg)) {
+                    case 'ALL':	return self::getLevelAll();
+                    case 'DEBUG': return self::getLevelDebug();
+                    case 'INFO': return self::getLevelInfo();
+                    case 'WARN': return self::getLevelWarn();
+                    case 'ERROR': return self::getLevelError();
+                    case 'FATAL': return self::getLevelFatal();
+                    case 'OFF':	return self::getLevelOff();
+                    default: return $defaultLevel;
+                }
+            }
+        }
+    }
 }

main/inc/lib/phpdocx/lib/log4php/LoggerLocationInfo.php

Doc Comments +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 	 * Instantiate location information based on a {@link PHP_MANUAL#debug_backtrace}.
 	 *
 	 * @param array $trace
-	 * @param mixed $caller
+	 * @param string $fqcn
 	 */
 	public function __construct($trace, $fqcn = null) {
 		$this->lineNumber = isset($trace['line']) ? $trace['line'] : null;

Indentation +86 added lines, -86 removed lines

@@ -1,22 +1,22 @@ 
 <?php
 /**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *	   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @package log4php
- */
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements. See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License. You may obtain a copy of the License at
+     *
+     *	   http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     *
+     * @package log4php
+     */
 
 /**
  * The internal representation of caller location information.
@@ -26,85 +26,85 @@ 
  * @since 0.3
  */
 class LoggerLocationInfo {
-	/**
-	 * When location information is not available the constant
-	 * <i>NA</i> is returned. Current value of this string
-	 * constant is <b>?</b>.  
-	 */
-	const LOCATION_INFO_NA = 'NA';
+    /**
+     * When location information is not available the constant
+     * <i>NA</i> is returned. Current value of this string
+     * constant is <b>?</b>.  
+     */
+    const LOCATION_INFO_NA = 'NA';
 	
-	/**
-	* @var string Caller's line number.
-	*/
-	protected $lineNumber = null;
+    /**
+     * @var string Caller's line number.
+     */
+    protected $lineNumber = null;
 	
-	/**
-	* @var string Caller's file name.
-	*/
-	protected $fileName = null;
+    /**
+     * @var string Caller's file name.
+     */
+    protected $fileName = null;
 	
-	/**
-	* @var string Caller's fully qualified class name.
-	*/
-	protected $className = null;
+    /**
+     * @var string Caller's fully qualified class name.
+     */
+    protected $className = null;
 	
-	/**
-	* @var string Caller's method name.
-	*/
-	protected $methodName = null;
+    /**
+     * @var string Caller's method name.
+     */
+    protected $methodName = null;
 	
-	/**
-	* @var string 
-	*/
-	protected $fullInfo = null;
+    /**
+     * @var string 
+     */
+    protected $fullInfo = null;
 
-	/**
-	 * Instantiate location information based on a {@link PHP_MANUAL#debug_backtrace}.
-	 *
-	 * @param array $trace
-	 * @param mixed $caller
-	 */
-	public function __construct($trace, $fqcn = null) {
-		$this->lineNumber = isset($trace['line']) ? $trace['line'] : null;
-		$this->fileName = isset($trace['file']) ? $trace['file'] : null;
-		$this->className = isset($trace['class']) ? $trace['class'] : null;
-		$this->methodName = isset($trace['function']) ? $trace['function'] : null;
-		$this->fullInfo = $this->getClassName() . '.' . $this->getMethodName() . 
-			'(' . $this->getFileName() . ':' . $this->getLineNumber() . ')';
-	}
+    /**
+     * Instantiate location information based on a {@link PHP_MANUAL#debug_backtrace}.
+     *
+     * @param array $trace
+     * @param mixed $caller
+     */
+    public function __construct($trace, $fqcn = null) {
+        $this->lineNumber = isset($trace['line']) ? $trace['line'] : null;
+        $this->fileName = isset($trace['file']) ? $trace['file'] : null;
+        $this->className = isset($trace['class']) ? $trace['class'] : null;
+        $this->methodName = isset($trace['function']) ? $trace['function'] : null;
+        $this->fullInfo = $this->getClassName() . '.' . $this->getMethodName() . 
+            '(' . $this->getFileName() . ':' . $this->getLineNumber() . ')';
+    }
 
-	public function getClassName() {
-		return ($this->className === null) ? self::LOCATION_INFO_NA : $this->className; 
-	}
+    public function getClassName() {
+        return ($this->className === null) ? self::LOCATION_INFO_NA : $this->className; 
+    }
 
-	/**
-	 *	Return the file name of the caller.
-	 *	<p>This information is not always available.
-	 */
-	public function getFileName() {
-		return ($this->fileName === null) ? self::LOCATION_INFO_NA : $this->fileName; 
-	}
+    /**
+     *	Return the file name of the caller.
+     *	<p>This information is not always available.
+     */
+    public function getFileName() {
+        return ($this->fileName === null) ? self::LOCATION_INFO_NA : $this->fileName; 
+    }
 
-	/**
-	 *	Returns the line number of the caller.
-	 *	<p>This information is not always available.
-	 */
-	public function getLineNumber() {
-		return ($this->lineNumber === null) ? self::LOCATION_INFO_NA : $this->lineNumber; 
-	}
+    /**
+     *	Returns the line number of the caller.
+     *	<p>This information is not always available.
+     */
+    public function getLineNumber() {
+        return ($this->lineNumber === null) ? self::LOCATION_INFO_NA : $this->lineNumber; 
+    }
 
-	/**
-	 *	Returns the method name of the caller.
-	 */
-	public function getMethodName() {
-		return ($this->methodName === null) ? self::LOCATION_INFO_NA : $this->methodName; 
-	}
+    /**
+     *	Returns the method name of the caller.
+     */
+    public function getMethodName() {
+        return ($this->methodName === null) ? self::LOCATION_INFO_NA : $this->methodName; 
+    }
 
-	/**
-	 *	Returns the full information of the caller.
-	 */
-	public function getFullInfo() {
-		return ($this->fullInfo === null) ? self::LOCATION_INFO_NA : $this->fullInfo;
-	}
+    /**
+     *	Returns the full information of the caller.
+     */
+    public function getFullInfo() {
+        return ($this->fullInfo === null) ? self::LOCATION_INFO_NA : $this->fullInfo;
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -69,8 +69,8 @@
 		$this->fileName = isset($trace['file']) ? $trace['file'] : null;
 		$this->className = isset($trace['class']) ? $trace['class'] : null;
 		$this->methodName = isset($trace['function']) ? $trace['function'] : null;
-		$this->fullInfo = $this->getClassName() . '.' . $this->getMethodName() . 
-			'(' . $this->getFileName() . ':' . $this->getLineNumber() . ')';
+		$this->fullInfo = $this->getClassName().'.'.$this->getMethodName(). 
+			'('.$this->getFileName().':'.$this->getLineNumber().')';
 	}
 
 	public function getClassName() {

main/inc/lib/phpdocx/lib/log4php/LoggerLoggingEvent.php

Doc Comments +3 added lines, -2 removed lines

@@ -117,7 +117,7 @@ 
 	* LoggerLoggingEvent are filled when actually needed.
 	*
 	* @param string $fqcn name of the caller class.
-	* @param mixed $logger The {@link Logger} category of this event or the logger name.
+	* @param Logger $logger The {@link Logger} category of this event or the logger name.
 	* @param LoggerLevel $priority The level of this event.
 	* @param mixed $message The message of this event.
 	* @param integer $timeStamp the timestamp of this logging event.
@@ -249,6 +249,7 @@ 
 	/**
 	 * Returns the the context corresponding to the <code>key</code>
 	 * parameter.
+	 * @param string $key
 	 * @return string
 	 */
 	public function getMDC($key) {
@@ -304,7 +305,7 @@ 
 	
 	/**
 	 * Calculates the time of this event.
-	 * @return the time after event starttime when this event has occured
+	 * @return string time after event starttime when this event has occured
 	 */
 	public function getTime() {
         $eventTime = (float)$this->getTimeStamp();

Spacing +18 added lines, -18 removed lines

@@ -124,7 +124,7 @@ 
 	*/
 	public function __construct($fqcn, $logger, $priority, $message, $timeStamp = null) {
 		$this->fqcn = $fqcn;
-		if($logger instanceof Logger) {
+		if ($logger instanceof Logger) {
 			$this->logger = $logger;
 			$this->categoryName = $logger->getName();
 		} else {
@@ -132,10 +132,10 @@ 
 		}
 		$this->level = $priority;
 		$this->message = $message;
-		if($timeStamp !== null && is_float($timeStamp)) {
+		if ($timeStamp !== null && is_float($timeStamp)) {
 			$this->timeStamp = $timeStamp;
 		} else {
-			if(function_exists('microtime')) {
+			if (function_exists('microtime')) {
 				// get microtime as float
 				$this->timeStamp = microtime(true);
 			} else {
@@ -154,20 +154,20 @@ 
 	 * @return LoggerLocationInfo
 	 */
 	public function getLocationInformation() {
-		if($this->locationInfo === null) {
+		if ($this->locationInfo === null) {
 
 			$locationInfo = array();
 
-			if(function_exists('debug_backtrace')) {
+			if (function_exists('debug_backtrace')) {
 				$trace = debug_backtrace();
 				$prevHop = null;
 				// make a downsearch to identify the caller
 				$hop = array_pop($trace);
-				while($hop !== null) {
-					if(isset($hop['class'])) {
+				while ($hop !== null) {
+					if (isset($hop['class'])) {
 						// we are sometimes in functions = no class available: avoid php warning here
 						$className = strtolower($hop['class']);
-						if(!empty($className) and ($className == 'logger' or $className == 'loggercategory' or 
+						if (!empty($className) and ($className == 'logger' or $className == 'loggercategory' or 
 							strtolower(get_parent_class($className)) == 'logger' or
 							strtolower(get_parent_class($className)) == 'loggercategory')) {
 							$locationInfo['line'] = $hop['line'];
@@ -179,7 +179,7 @@ 
 					$hop = array_pop($trace);
 				}
 				$locationInfo['class'] = isset($prevHop['class']) ? $prevHop['class'] : 'main';
-				if(isset($prevHop['function']) and
+				if (isset($prevHop['function']) and
 					$prevHop['function'] !== 'include' and
 					$prevHop['function'] !== 'include_once' and
 					$prevHop['function'] !== 'require' and
@@ -224,7 +224,7 @@ 
 	 * @return mixed
 	 */
 	public function getMessage() {
-		if($this->message !== null) {
+		if ($this->message !== null) {
 			return $this->message;
 		} else {
 			return $this->getRenderedMessage();
@@ -239,7 +239,7 @@ 
 	 * @return string  
 	 */
 	public function getNDC() {
-		if($this->ndcLookupRequired) {
+		if ($this->ndcLookupRequired) {
 			$this->ndcLookupRequired = false;
 			$this->ndc = implode(' ', LoggerNDC::get());
 		}
@@ -260,8 +260,8 @@ 
 	 * @return string
 	 */
 	public function getRenderedMessage() {
-		if($this->renderedMessage === null and $this->message !== null) {
-			if(is_string($this->message)) {
+		if ($this->renderedMessage === null and $this->message !== null) {
+			if (is_string($this->message)) {
 					$this->renderedMessage = $this->message;
 			} else {
 			    // $this->logger might be null or an instance of Logger or RootLogger
@@ -270,7 +270,7 @@ 
 			    // TODO: Logger::getHierarchy() is marked @deprecated!
 				$repository = Logger::getHierarchy();
 				$rendererMap = $repository->getRendererMap();
-				$this->renderedMessage= $rendererMap->findAndRender($this->message);
+				$this->renderedMessage = $rendererMap->findAndRender($this->message);
 			}
 		}
 		return $this->renderedMessage;
@@ -284,7 +284,7 @@ 
 	 * @static
 	 */
 	public static function getStartTime() {
-		if(!isset(self::$startTime)) {
+		if (!isset(self::$startTime)) {
 			if (function_exists('microtime')) {
 				// microtime as float
 				self::$startTime = microtime(true);
@@ -307,8 +307,8 @@ 
 	 * @return the time after event starttime when this event has occured
 	 */
 	public function getTime() {
-        $eventTime = (float)$this->getTimeStamp();
-        $eventStartTime = (float)LoggerLoggingEvent::getStartTime();
+        $eventTime = (float) $this->getTimeStamp();
+        $eventStartTime = (float) LoggerLoggingEvent::getStartTime();
         return number_format(($eventTime - $eventStartTime) * 1000, 0, '', '');
     }
 	
@@ -317,7 +317,7 @@ 
 	 */
 	public function getThreadName() {
 		if ($this->threadName === null) {
-			$this->threadName = (string)getmypid();
+			$this->threadName = (string) getmypid();
 		}
 		return $this->threadName;
 	}

Indentation +293 added lines, -293 removed lines

@@ -26,334 +26,334 @@
  */
 class LoggerLoggingEvent {
 
-	private static $startTime;
+    private static $startTime;
 
-	/** 
-	* @var string Fully Qualified Class Name of the calling category class.
-	*/
-	private $fqcn;
+    /** 
+     * @var string Fully Qualified Class Name of the calling category class.
+     */
+    private $fqcn;
 	
-	/**
-	* @var Logger reference
-	*/
-	private $logger = null;
+    /**
+     * @var Logger reference
+     */
+    private $logger = null;
 	
-	/** 
-	* The category (logger) name.
-	* This field will be marked as private in future
-	* releases. Please do not access it directly. 
-	* Use the {@link getLoggerName()} method instead.
-	* @deprecated 
-	*/
-	private $categoryName;
+    /** 
+     * The category (logger) name.
+     * This field will be marked as private in future
+     * releases. Please do not access it directly. 
+     * Use the {@link getLoggerName()} method instead.
+     * @deprecated 
+     */
+    private $categoryName;
 	
-	/** 
-	* Level of logging event.
-	* <p> This field should not be accessed directly. You shoud use the
-	* {@link getLevel()} method instead.
-	*
-	* @deprecated
-	* @var LoggerLevel
-	*/
-	protected $level;
+    /** 
+     * Level of logging event.
+     * <p> This field should not be accessed directly. You shoud use the
+     * {@link getLevel()} method instead.
+     *
+     * @deprecated
+     * @var LoggerLevel
+     */
+    protected $level;
 	
-	/** 
-	 * @var string The nested diagnostic context (NDC) of logging event. 
-	 */
-	private $ndc;
+    /** 
+     * @var string The nested diagnostic context (NDC) of logging event. 
+     */
+    private $ndc;
 	
-	/** 
-	 * Have we tried to do an NDC lookup? If we did, there is no need
-	 * to do it again.	Note that its value is always false when
-	 * serialized. Thus, a receiving SocketNode will never use it's own
-	 * (incorrect) NDC. See also writeObject method.
-	 * @var boolean
-	 */
-	private $ndcLookupRequired = true;
+    /** 
+     * Have we tried to do an NDC lookup? If we did, there is no need
+     * to do it again.	Note that its value is always false when
+     * serialized. Thus, a receiving SocketNode will never use it's own
+     * (incorrect) NDC. See also writeObject method.
+     * @var boolean
+     */
+    private $ndcLookupRequired = true;
 	
-	/** 
-	 * Have we tried to do an MDC lookup? If we did, there is no need
-	 * to do it again.	Note that its value is always false when
-	 * serialized. See also the getMDC and getMDCCopy methods.
-	 * @var boolean	 
-	 */
-	private $mdcCopyLookupRequired = true;
+    /** 
+     * Have we tried to do an MDC lookup? If we did, there is no need
+     * to do it again.	Note that its value is always false when
+     * serialized. See also the getMDC and getMDCCopy methods.
+     * @var boolean	 
+     */
+    private $mdcCopyLookupRequired = true;
 	
-	/** 
-	 * @var mixed The application supplied message of logging event. 
-	 */
-	private $message;
+    /** 
+     * @var mixed The application supplied message of logging event. 
+     */
+    private $message;
 	
-	/** 
-	 * The application supplied message rendered through the log4php
-	 * objet rendering mechanism. At present renderedMessage == message.
-	 * @var string
-	 */
-	private $renderedMessage = null;
+    /** 
+     * The application supplied message rendered through the log4php
+     * objet rendering mechanism. At present renderedMessage == message.
+     * @var string
+     */
+    private $renderedMessage = null;
 	
-	/** 
-	 * The name of thread in which this logging event was generated.
-	 * log4php saves here the process id via {@link PHP_MANUAL#getmypid getmypid()} 
-	 * @var mixed
-	 */
-	private $threadName = null;
+    /** 
+     * The name of thread in which this logging event was generated.
+     * log4php saves here the process id via {@link PHP_MANUAL#getmypid getmypid()} 
+     * @var mixed
+     */
+    private $threadName = null;
 	
-	/** 
-	* The number of seconds elapsed from 1/1/1970 until logging event
-	* was created plus microseconds if available.
-	* @var float
-	*/
-	public $timeStamp;
+    /** 
+     * The number of seconds elapsed from 1/1/1970 until logging event
+     * was created plus microseconds if available.
+     * @var float
+     */
+    public $timeStamp;
 	
-	/** 
-	* @var LoggerLocationInfo Location information for the caller. 
-	*/
-	private $locationInfo = null;
+    /** 
+     * @var LoggerLocationInfo Location information for the caller. 
+     */
+    private $locationInfo = null;
 	
-	/**
-	* Instantiate a LoggingEvent from the supplied parameters.
-	*
-	* <p>Except {@link $timeStamp} all the other fields of
-	* LoggerLoggingEvent are filled when actually needed.
-	*
-	* @param string $fqcn name of the caller class.
-	* @param mixed $logger The {@link Logger} category of this event or the logger name.
-	* @param LoggerLevel $priority The level of this event.
-	* @param mixed $message The message of this event.
-	* @param integer $timeStamp the timestamp of this logging event.
-	*/
-	public function __construct($fqcn, $logger, $priority, $message, $timeStamp = null) {
-		$this->fqcn = $fqcn;
-		if($logger instanceof Logger) {
-			$this->logger = $logger;
-			$this->categoryName = $logger->getName();
-		} else {
-			$this->categoryName = strval($logger);
-		}
-		$this->level = $priority;
-		$this->message = $message;
-		if($timeStamp !== null && is_float($timeStamp)) {
-			$this->timeStamp = $timeStamp;
-		} else {
-			if(function_exists('microtime')) {
-				// get microtime as float
-				$this->timeStamp = microtime(true);
-			} else {
-				$this->timeStamp = floatval(time());
-			}
-		}
-	}
+    /**
+     * Instantiate a LoggingEvent from the supplied parameters.
+     *
+     * <p>Except {@link $timeStamp} all the other fields of
+     * LoggerLoggingEvent are filled when actually needed.
+     *
+     * @param string $fqcn name of the caller class.
+     * @param mixed $logger The {@link Logger} category of this event or the logger name.
+     * @param LoggerLevel $priority The level of this event.
+     * @param mixed $message The message of this event.
+     * @param integer $timeStamp the timestamp of this logging event.
+     */
+    public function __construct($fqcn, $logger, $priority, $message, $timeStamp = null) {
+        $this->fqcn = $fqcn;
+        if($logger instanceof Logger) {
+            $this->logger = $logger;
+            $this->categoryName = $logger->getName();
+        } else {
+            $this->categoryName = strval($logger);
+        }
+        $this->level = $priority;
+        $this->message = $message;
+        if($timeStamp !== null && is_float($timeStamp)) {
+            $this->timeStamp = $timeStamp;
+        } else {
+            if(function_exists('microtime')) {
+                // get microtime as float
+                $this->timeStamp = microtime(true);
+            } else {
+                $this->timeStamp = floatval(time());
+            }
+        }
+    }
 
-	/**
-	 * Set the location information for this logging event. The collected
-	 * information is cached for future use.
-	 *
-	 * <p>This method uses {@link PHP_MANUAL#debug_backtrace debug_backtrace()} function (if exists)
-	 * to collect informations about caller.</p>
-	 * <p>It only recognize informations generated by {@link Logger} and its subclasses.</p>
-	 * @return LoggerLocationInfo
-	 */
-	public function getLocationInformation() {
-		if($this->locationInfo === null) {
+    /**
+     * Set the location information for this logging event. The collected
+     * information is cached for future use.
+     *
+     * <p>This method uses {@link PHP_MANUAL#debug_backtrace debug_backtrace()} function (if exists)
+     * to collect informations about caller.</p>
+     * <p>It only recognize informations generated by {@link Logger} and its subclasses.</p>
+     * @return LoggerLocationInfo
+     */
+    public function getLocationInformation() {
+        if($this->locationInfo === null) {
 
-			$locationInfo = array();
+            $locationInfo = array();
 
-			if(function_exists('debug_backtrace')) {
-				$trace = debug_backtrace();
-				$prevHop = null;
-				// make a downsearch to identify the caller
-				$hop = array_pop($trace);
-				while($hop !== null) {
-					if(isset($hop['class'])) {
-						// we are sometimes in functions = no class available: avoid php warning here
-						$className = strtolower($hop['class']);
-						if(!empty($className) and ($className == 'logger' or $className == 'loggercategory' or 
-							strtolower(get_parent_class($className)) == 'logger' or
-							strtolower(get_parent_class($className)) == 'loggercategory')) {
-							$locationInfo['line'] = $hop['line'];
-							$locationInfo['file'] = $hop['file'];
-							break;
-						}
-					}
-					$prevHop = $hop;
-					$hop = array_pop($trace);
-				}
-				$locationInfo['class'] = isset($prevHop['class']) ? $prevHop['class'] : 'main';
-				if(isset($prevHop['function']) and
-					$prevHop['function'] !== 'include' and
-					$prevHop['function'] !== 'include_once' and
-					$prevHop['function'] !== 'require' and
-					$prevHop['function'] !== 'require_once') {
+            if(function_exists('debug_backtrace')) {
+                $trace = debug_backtrace();
+                $prevHop = null;
+                // make a downsearch to identify the caller
+                $hop = array_pop($trace);
+                while($hop !== null) {
+                    if(isset($hop['class'])) {
+                        // we are sometimes in functions = no class available: avoid php warning here
+                        $className = strtolower($hop['class']);
+                        if(!empty($className) and ($className == 'logger' or $className == 'loggercategory' or 
+                            strtolower(get_parent_class($className)) == 'logger' or
+                            strtolower(get_parent_class($className)) == 'loggercategory')) {
+                            $locationInfo['line'] = $hop['line'];
+                            $locationInfo['file'] = $hop['file'];
+                            break;
+                        }
+                    }
+                    $prevHop = $hop;
+                    $hop = array_pop($trace);
+                }
+                $locationInfo['class'] = isset($prevHop['class']) ? $prevHop['class'] : 'main';
+                if(isset($prevHop['function']) and
+                    $prevHop['function'] !== 'include' and
+                    $prevHop['function'] !== 'include_once' and
+                    $prevHop['function'] !== 'require' and
+                    $prevHop['function'] !== 'require_once') {
 	
-					$locationInfo['function'] = $prevHop['function'];
-				} else {
-					$locationInfo['function'] = 'main';
-				}
-			}
+                    $locationInfo['function'] = $prevHop['function'];
+                } else {
+                    $locationInfo['function'] = 'main';
+                }
+            }
 					 
-			$this->locationInfo = new LoggerLocationInfo($locationInfo, $this->fqcn);
-		}
-		return $this->locationInfo;
-	}
+            $this->locationInfo = new LoggerLocationInfo($locationInfo, $this->fqcn);
+        }
+        return $this->locationInfo;
+    }
 
-	/**
-	 * Return the level of this event. Use this form instead of directly
-	 * accessing the {@link $level} field.
-	 * @return LoggerLevel	
-	 */
-	public function getLevel() {
-		return $this->level;
-	}
+    /**
+     * Return the level of this event. Use this form instead of directly
+     * accessing the {@link $level} field.
+     * @return LoggerLevel	
+     */
+    public function getLevel() {
+        return $this->level;
+    }
 
-	/**
-	 * Return the name of the logger. Use this form instead of directly
-	 * accessing the {@link $categoryName} field.
-	 * @return string  
-	 */
-	public function getLoggerName() {
-		return $this->categoryName;
-	}
+    /**
+     * Return the name of the logger. Use this form instead of directly
+     * accessing the {@link $categoryName} field.
+     * @return string  
+     */
+    public function getLoggerName() {
+        return $this->categoryName;
+    }
 
-	/**
-	 * Return the message for this logging event.
-	 *
-	 * <p>Before serialization, the returned object is the message
-	 * passed by the user to generate the logging event. After
-	 * serialization, the returned value equals the String form of the
-	 * message possibly after object rendering.
-	 * @return mixed
-	 */
-	public function getMessage() {
-		if($this->message !== null) {
-			return $this->message;
-		} else {
-			return $this->getRenderedMessage();
-		}
-	}
+    /**
+     * Return the message for this logging event.
+     *
+     * <p>Before serialization, the returned object is the message
+     * passed by the user to generate the logging event. After
+     * serialization, the returned value equals the String form of the
+     * message possibly after object rendering.
+     * @return mixed
+     */
+    public function getMessage() {
+        if($this->message !== null) {
+            return $this->message;
+        } else {
+            return $this->getRenderedMessage();
+        }
+    }
 
-	/**
-	 * This method returns the NDC for this event. It will return the
-	 * correct content even if the event was generated in a different
-	 * thread or even on a different machine. The {@link LoggerNDC::get()} method
-	 * should <b>never</b> be called directly.
-	 * @return string  
-	 */
-	public function getNDC() {
-		if($this->ndcLookupRequired) {
-			$this->ndcLookupRequired = false;
-			$this->ndc = implode(' ', LoggerNDC::get());
-		}
-		return $this->ndc;
-	}
+    /**
+     * This method returns the NDC for this event. It will return the
+     * correct content even if the event was generated in a different
+     * thread or even on a different machine. The {@link LoggerNDC::get()} method
+     * should <b>never</b> be called directly.
+     * @return string  
+     */
+    public function getNDC() {
+        if($this->ndcLookupRequired) {
+            $this->ndcLookupRequired = false;
+            $this->ndc = implode(' ', LoggerNDC::get());
+        }
+        return $this->ndc;
+    }
 
-	/**
-	 * Returns the the context corresponding to the <code>key</code>
-	 * parameter.
-	 * @return string
-	 */
-	public function getMDC($key) {
-		return LoggerMDC::get($key);
-	}
+    /**
+     * Returns the the context corresponding to the <code>key</code>
+     * parameter.
+     * @return string
+     */
+    public function getMDC($key) {
+        return LoggerMDC::get($key);
+    }
 
-	/**
-	 * Render message.
-	 * @return string
-	 */
-	public function getRenderedMessage() {
-		if($this->renderedMessage === null and $this->message !== null) {
-			if(is_string($this->message)) {
-					$this->renderedMessage = $this->message;
-			} else {
-			    // $this->logger might be null or an instance of Logger or RootLogger
-			    // But in contrast to log4j, in log4php there is only have one LoggerHierarchy so there is
-			    // no need figure out which one is $this->logger part of.
-			    // TODO: Logger::getHierarchy() is marked @deprecated!
-				$repository = Logger::getHierarchy();
-				$rendererMap = $repository->getRendererMap();
-				$this->renderedMessage= $rendererMap->findAndRender($this->message);
-			}
-		}
-		return $this->renderedMessage;
-	}
+    /**
+     * Render message.
+     * @return string
+     */
+    public function getRenderedMessage() {
+        if($this->renderedMessage === null and $this->message !== null) {
+            if(is_string($this->message)) {
+                    $this->renderedMessage = $this->message;
+            } else {
+                // $this->logger might be null or an instance of Logger or RootLogger
+                // But in contrast to log4j, in log4php there is only have one LoggerHierarchy so there is
+                // no need figure out which one is $this->logger part of.
+                // TODO: Logger::getHierarchy() is marked @deprecated!
+                $repository = Logger::getHierarchy();
+                $rendererMap = $repository->getRendererMap();
+                $this->renderedMessage= $rendererMap->findAndRender($this->message);
+            }
+        }
+        return $this->renderedMessage;
+    }
 
-	/**
-	 * Returns the time when the application started, in seconds
-	 * elapsed since 01.01.1970 plus microseconds if available.
-	 *
-	 * @return float
-	 * @static
-	 */
-	public static function getStartTime() {
-		if(!isset(self::$startTime)) {
-			if (function_exists('microtime')) {
-				// microtime as float
-				self::$startTime = microtime(true);
-			} else {
-				self::$startTime = floatval(time());
-			}
-		}
-		return self::$startTime; 
-	}
+    /**
+     * Returns the time when the application started, in seconds
+     * elapsed since 01.01.1970 plus microseconds if available.
+     *
+     * @return float
+     * @static
+     */
+    public static function getStartTime() {
+        if(!isset(self::$startTime)) {
+            if (function_exists('microtime')) {
+                // microtime as float
+                self::$startTime = microtime(true);
+            } else {
+                self::$startTime = floatval(time());
+            }
+        }
+        return self::$startTime; 
+    }
 
-	/**
-	 * @return float
-	 */
-	public function getTimeStamp() {
-		return $this->timeStamp;
-	}
+    /**
+     * @return float
+     */
+    public function getTimeStamp() {
+        return $this->timeStamp;
+    }
 	
-	/**
-	 * Calculates the time of this event.
-	 * @return the time after event starttime when this event has occured
-	 */
-	public function getTime() {
+    /**
+     * Calculates the time of this event.
+     * @return the time after event starttime when this event has occured
+     */
+    public function getTime() {
         $eventTime = (float)$this->getTimeStamp();
         $eventStartTime = (float)LoggerLoggingEvent::getStartTime();
         return number_format(($eventTime - $eventStartTime) * 1000, 0, '', '');
     }
 	
-	/**
-	 * @return mixed
-	 */
-	public function getThreadName() {
-		if ($this->threadName === null) {
-			$this->threadName = (string)getmypid();
-		}
-		return $this->threadName;
-	}
+    /**
+     * @return mixed
+     */
+    public function getThreadName() {
+        if ($this->threadName === null) {
+            $this->threadName = (string)getmypid();
+        }
+        return $this->threadName;
+    }
 
-	/**
-	 * @return mixed null
-	 */
-	public function getThrowableInformation() {
-		return null;
-	}
+    /**
+     * @return mixed null
+     */
+    public function getThrowableInformation() {
+        return null;
+    }
 	
-	/**
-	 * Serialize this object
-	 * @return string
-	 */
-	public function toString() {
-		serialize($this);
-	}
+    /**
+     * Serialize this object
+     * @return string
+     */
+    public function toString() {
+        serialize($this);
+    }
 	
-	/**
-	 * Avoid serialization of the {@link $logger} object
-	 */
-	public function __sleep() {
-		return array(
-			'fqcn',
-			'categoryName',
-			'level',
-			'ndc',
-			'ndcLookupRequired',
-			'message',
-			'renderedMessage',
-			'threadName',
-			'timeStamp',
-			'locationInfo',
-		);
-	}
+    /**
+     * Avoid serialization of the {@link $logger} object
+     */
+    public function __sleep() {
+        return array(
+            'fqcn',
+            'categoryName',
+            'level',
+            'ndc',
+            'ndcLookupRequired',
+            'message',
+            'renderedMessage',
+            'threadName',
+            'timeStamp',
+            'locationInfo',
+        );
+    }
 
 }
 

main/inc/lib/phpdocx/lib/log4php/LoggerReflectionUtils.php

Doc Comments +5 added lines, -1 removed lines

@@ -47,6 +47,10 @@ 
 	 * @static
 	 */
 	 // TODO: check, if this is really useful
+
+	/**
+	 * @param string $prefix
+	 */
 	public static function setPropertiesByObject($obj, $properties, $prefix) {
 		$pSetter = new LoggerReflectionUtils($obj);
 		return $pSetter->setProperties($properties, $prefix);
@@ -123,7 +127,7 @@ 
 	/**
 	 * Creates an instances from the given class name.
 	 *
-	 * @param string $classname
+	 * @param string $class
 	 * @return an object from the class with the given classname
 	 */
 	public static function createObject($class) {

Spacing +9 added lines, -9 removed lines

@@ -69,14 +69,14 @@ 
 	 // TODO: check, if this is really useful
 	public function setProperties($properties, $prefix) {
 		$len = strlen($prefix);
-		while(list($key,) = each($properties)) {
-			if(strpos($key, $prefix) === 0) {
-				if(strpos($key, '.', ($len + 1)) > 0) {
+		while (list($key,) = each($properties)) {
+			if (strpos($key, $prefix) === 0) {
+				if (strpos($key, '.', ($len + 1)) > 0) {
 					continue;
 				}
 				$value = LoggerOptionConverter::findAndSubst($key, $properties);
 				$key = substr($key, $len);
-				if($key == 'layout' and ($this->obj instanceof LoggerAppender)) {
+				if ($key == 'layout' and ($this->obj instanceof LoggerAppender)) {
 					continue;
 				}
 				$this->setProperty($key, $value);
@@ -101,13 +101,13 @@ 
 	 * @param string $value	  String value of the property
 	 */
 	public function setProperty($name, $value) {
-		if($value === null) {
+		if ($value === null) {
 			return;
 		}
 		
-		$method = "set" . ucfirst($name);
+		$method = "set".ucfirst($name);
 		
-		if(!method_exists($this->obj, $method)) {
+		if (!method_exists($this->obj, $method)) {
 			throw new Exception("Error setting log4php property $name to $value: no method $method in class ".get_class($this->obj)."!");
 		} else {
 			return call_user_func(array($this->obj, $method), $value);
@@ -115,7 +115,7 @@ 
 	}
   
 	public function activate() {
-		if(method_exists($this->obj, 'activateoptions')) {
+		if (method_exists($this->obj, 'activateoptions')) {
 			return call_user_func(array($this->obj, 'activateoptions'));
 		} 
 	}
@@ -127,7 +127,7 @@ 
 	 * @return an object from the class with the given classname
 	 */
 	public static function createObject($class) {
-		if(!empty($class)) {
+		if (!empty($class)) {
 			$class = basename($class);
 			return new $class();
 		}

Indentation +123 added lines, -123 removed lines

@@ -1,140 +1,140 @@
 <?php
 /**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *	   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * @package log4php
- */
+     * Licensed to the Apache Software Foundation (ASF) under one or more
+     * contributor license agreements. See the NOTICE file distributed with
+     * this work for additional information regarding copyright ownership.
+     * The ASF licenses this file to You under the Apache License, Version 2.0
+     * (the "License"); you may not use this file except in compliance with
+     * the License. You may obtain a copy of the License at
+     *
+     *	   http://www.apache.org/licenses/LICENSE-2.0
+     *
+     * Unless required by applicable law or agreed to in writing, software
+     * distributed under the License is distributed on an "AS IS" BASIS,
+     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     * See the License for the specific language governing permissions and
+     * limitations under the License.
+     * 
+     * @package log4php
+     */
  
- /**
-  * Provides methods for reflective use on php objects
-  * @package log4php
-  */
+    /**
+     * Provides methods for reflective use on php objects
+     * @package log4php
+     */
 class LoggerReflectionUtils {
-		/** the target object */
-	private $obj;
+        /** the target object */
+    private $obj;
   
-	/**
-	 * Create a new LoggerReflectionUtils for the specified Object. 
-	 * This is done in prepartion for invoking {@link setProperty()} 
-	 * one or more times.
-	 * @param object &$obj the object for which to set properties
-	 */
-	public function __construct($obj) {
-		$this->obj = $obj;
-	}
+    /**
+     * Create a new LoggerReflectionUtils for the specified Object. 
+     * This is done in prepartion for invoking {@link setProperty()} 
+     * one or more times.
+     * @param object &$obj the object for which to set properties
+     */
+    public function __construct($obj) {
+        $this->obj = $obj;
+    }
   
-	/**
-	 * Set the properties of an object passed as a parameter in one
-	 * go. The <code>properties</code> are parsed relative to a
-	 * <code>prefix</code>.
-	 *
-	 * @param object $obj The object to configure.
-	 * @param array $properties An array containing keys and values.
-	 * @param string $prefix Only keys having the specified prefix will be set.
-	 * @static
-	 */
-	 // TODO: check, if this is really useful
-	public static function setPropertiesByObject($obj, $properties, $prefix) {
-		$pSetter = new LoggerReflectionUtils($obj);
-		return $pSetter->setProperties($properties, $prefix);
-	}
+    /**
+     * Set the properties of an object passed as a parameter in one
+     * go. The <code>properties</code> are parsed relative to a
+     * <code>prefix</code>.
+     *
+     * @param object $obj The object to configure.
+     * @param array $properties An array containing keys and values.
+     * @param string $prefix Only keys having the specified prefix will be set.
+     * @static
+     */
+        // TODO: check, if this is really useful
+    public static function setPropertiesByObject($obj, $properties, $prefix) {
+        $pSetter = new LoggerReflectionUtils($obj);
+        return $pSetter->setProperties($properties, $prefix);
+    }
   
 
-	/**
-	 * Set the properites for the object that match the
-	 * <code>prefix</code> passed as parameter.
-	 * 
-	 * Example:
-	 * 
-	 * $arr['xxxname'] = 'Joe';
- 	 * $arr['xxxmale'] = true;
-	 * and prefix xxx causes setName and setMale.	
-	 *
-	 * @param array $properties An array containing keys and values.
-	 * @param string $prefix Only keys having the specified prefix will be set.
-	 */
-	 // TODO: check, if this is really useful
-	public function setProperties($properties, $prefix) {
-		$len = strlen($prefix);
-		while(list($key,) = each($properties)) {
-			if(strpos($key, $prefix) === 0) {
-				if(strpos($key, '.', ($len + 1)) > 0) {
-					continue;
-				}
-				$value = LoggerOptionConverter::findAndSubst($key, $properties);
-				$key = substr($key, $len);
-				if($key == 'layout' and ($this->obj instanceof LoggerAppender)) {
-					continue;
-				}
-				$this->setProperty($key, $value);
-			}
-		}
-		$this->activate();
-	}
+    /**
+     * Set the properites for the object that match the
+     * <code>prefix</code> passed as parameter.
+     * 
+     * Example:
+     * 
+     * $arr['xxxname'] = 'Joe';
+     * $arr['xxxmale'] = true;
+     * and prefix xxx causes setName and setMale.	
+     *
+     * @param array $properties An array containing keys and values.
+     * @param string $prefix Only keys having the specified prefix will be set.
+     */
+        // TODO: check, if this is really useful
+    public function setProperties($properties, $prefix) {
+        $len = strlen($prefix);
+        while(list($key,) = each($properties)) {
+            if(strpos($key, $prefix) === 0) {
+                if(strpos($key, '.', ($len + 1)) > 0) {
+                    continue;
+                }
+                $value = LoggerOptionConverter::findAndSubst($key, $properties);
+                $key = substr($key, $len);
+                if($key == 'layout' and ($this->obj instanceof LoggerAppender)) {
+                    continue;
+                }
+                $this->setProperty($key, $value);
+            }
+        }
+        $this->activate();
+    }
 	
-	/**
-	 * Set a property on this PropertySetter's Object. If successful, this
-	 * method will invoke a setter method on the underlying Object. The
-	 * setter is the one for the specified property name and the value is
-	 * determined partly from the setter argument type and partly from the
-	 * value specified in the call to this method.
-	 *
-	 * <p>If the setter expects a String no conversion is necessary.
-	 * If it expects an int, then an attempt is made to convert 'value'
-	 * to an int using new Integer(value). If the setter expects a boolean,
-	 * the conversion is by new Boolean(value).
-	 *
-	 * @param string $name	  name of the property
-	 * @param string $value	  String value of the property
-	 */
-	public function setProperty($name, $value) {
-		if($value === null) {
-			return;
-		}
+    /**
+     * Set a property on this PropertySetter's Object. If successful, this
+     * method will invoke a setter method on the underlying Object. The
+     * setter is the one for the specified property name and the value is
+     * determined partly from the setter argument type and partly from the
+     * value specified in the call to this method.
+     *
+     * <p>If the setter expects a String no conversion is necessary.
+     * If it expects an int, then an attempt is made to convert 'value'
+     * to an int using new Integer(value). If the setter expects a boolean,
+     * the conversion is by new Boolean(value).
+     *
+     * @param string $name	  name of the property
+     * @param string $value	  String value of the property
+     */
+    public function setProperty($name, $value) {
+        if($value === null) {
+            return;
+        }
 		
-		$method = "set" . ucfirst($name);
+        $method = "set" . ucfirst($name);
 		
-		if(!method_exists($this->obj, $method)) {
-			throw new Exception("Error setting log4php property $name to $value: no method $method in class ".get_class($this->obj)."!");
-		} else {
-			return call_user_func(array($this->obj, $method), $value);
-		} 
-	}
+        if(!method_exists($this->obj, $method)) {
+            throw new Exception("Error setting log4php property $name to $value: no method $method in class ".get_class($this->obj)."!");
+        } else {
+            return call_user_func(array($this->obj, $method), $value);
+        } 
+    }
   
-	public function activate() {
-		if(method_exists($this->obj, 'activateoptions')) {
-			return call_user_func(array($this->obj, 'activateoptions'));
-		} 
-	}
+    public function activate() {
+        if(method_exists($this->obj, 'activateoptions')) {
+            return call_user_func(array($this->obj, 'activateoptions'));
+        } 
+    }
 	
-	/**
-	 * Creates an instances from the given class name.
-	 *
-	 * @param string $classname
-	 * @return an object from the class with the given classname
-	 */
-	public static function createObject($class) {
-		if(!empty($class)) {
-			$class = basename($class);
-			return new $class();
-		}
-		return null;
-	}
+    /**
+     * Creates an instances from the given class name.
+     *
+     * @param string $classname
+     * @return an object from the class with the given classname
+     */
+    public static function createObject($class) {
+        if(!empty($class)) {
+            $class = basename($class);
+            return new $class();
+        }
+        return null;
+    }
 	
-	/**
+    /**
      * @param object $object
      * @param string $name
      * @param mixed $value