chamilo / chamilo-lms

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

Indentation +106 added lines, -106 removed lines

@@ -18,123 +18,123 @@
  * @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

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

Indentation +38 added lines, -38 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
+     */
 
 /**
  * @package log4php
@@ -24,27 +24,27 @@ 
  */
 class LoggerMDCPatternConverter extends LoggerPatternConverter {
 
-	/**
-	 * @var string
-	 */
-	private $key;
+    /**
+     * @var string
+     */
+    private $key;
 
-	/**
-	 * Constructor
-	 *
-	 * @param string $formattingInfo
-	 * @param string $key
-	 */
-	public function __construct($formattingInfo, $key) {
-		parent::__construct($formattingInfo);
-		$this->key = $key;
-	}
+    /**
+     * Constructor
+     *
+     * @param string $formattingInfo
+     * @param string $key
+     */
+    public function __construct($formattingInfo, $key) {
+        parent::__construct($formattingInfo);
+        $this->key = $key;
+    }
 
-	/**
-	 * @param LoggerLoggingEvent $event
-	 * @return string
-	 */
-	public function convert($event) {
-		return $event->getMDC($this->key);
-	}
+    /**
+     * @param LoggerLoggingEvent $event
+     * @return string
+     */
+    public function convert($event) {
+        return $event->getMDC($this->key);
+    }
 }

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

Indentation +98 added lines, -98 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
+     */
 
 /**
  * Array for fast space padding
@@ -26,12 +26,12 @@ 
  * @subpackage helpers
  */
 $GLOBALS['log4php.LoggerPatternConverter.spaces'] = array(
-	" ", // 1 space
-	"  ", // 2 spaces
-	"    ", // 4 spaces
-	"        ", // 8 spaces
-	"                ", // 16 spaces
-	"                                " ); // 32 spaces
+    " ", // 1 space
+    "  ", // 2 spaces
+    "    ", // 4 spaces
+    "        ", // 8 spaces
+    "                ", // 16 spaces
+    "                                " ); // 32 spaces
 
 
 /**
@@ -50,89 +50,89 @@ 
  */
 class LoggerPatternConverter {
 
-	/**
-	 * @var LoggerPatternConverter next converter in converter chain
-	 */
-	public $next = null;
+    /**
+     * @var LoggerPatternConverter next converter in converter chain
+     */
+    public $next = null;
 	
-	public $min = -1;
-	public $max = 0x7FFFFFFF;
-	public $leftAlign = false;
+    public $min = -1;
+    public $max = 0x7FFFFFFF;
+    public $leftAlign = false;
 
-	/**
-	 * Constructor 
-	 *
-	 * @param LoggerFormattingInfo $fi
-	 */
-	public function __construct($fi = null) {  
-		if($fi !== null) {
-			$this->min = $fi->min;
-			$this->max = $fi->max;
-			$this->leftAlign = $fi->leftAlign;
-		}
-	}
+    /**
+     * Constructor 
+     *
+     * @param LoggerFormattingInfo $fi
+     */
+    public function __construct($fi = null) {  
+        if($fi !== null) {
+            $this->min = $fi->min;
+            $this->max = $fi->max;
+            $this->leftAlign = $fi->leftAlign;
+        }
+    }
   
-	/**
-	 * Derived pattern converters must override this method in order to
-	 * convert conversion specifiers in the correct way.
-	 *
-	 * @param LoggerLoggingEvent $event
-	 */
-	public function convert($event) {}
+    /**
+     * Derived pattern converters must override this method in order to
+     * convert conversion specifiers in the correct way.
+     *
+     * @param LoggerLoggingEvent $event
+     */
+    public function convert($event) {}
 
-	/**
-	 * A template method for formatting in a converter specific way.
-	 *
-	 * @param string &$sbuf string buffer
-	 * @param LoggerLoggingEvent $e
-	 */
-	public function format(&$sbuf, $e) {
-		$s = $this->convert($e);
+    /**
+     * A template method for formatting in a converter specific way.
+     *
+     * @param string &$sbuf string buffer
+     * @param LoggerLoggingEvent $e
+     */
+    public function format(&$sbuf, $e) {
+        $s = $this->convert($e);
 		
-		if($s == null or empty($s)) {
-			if(0 < $this->min) {
-				$this->spacePad($sbuf, $this->min);
-			}
-			return;
-		}
+        if($s == null or empty($s)) {
+            if(0 < $this->min) {
+                $this->spacePad($sbuf, $this->min);
+            }
+            return;
+        }
 		
-		$len = strlen($s);
+        $len = strlen($s);
 	
-		if($len > $this->max) {
-			$sbuf .= substr($s , 0, ($len - $this->max));
-		} else if($len < $this->min) {
-			if($this->leftAlign) {		
-				$sbuf .= $s;
-				$this->spacePad($sbuf, ($this->min - $len));
-			} else {
-				$this->spacePad($sbuf, ($this->min - $len));
-				$sbuf .= $s;
-			}
-		} else {
-			$sbuf .= $s;
-		}
-	}	
+        if($len > $this->max) {
+            $sbuf .= substr($s , 0, ($len - $this->max));
+        } else if($len < $this->min) {
+            if($this->leftAlign) {		
+                $sbuf .= $s;
+                $this->spacePad($sbuf, ($this->min - $len));
+            } else {
+                $this->spacePad($sbuf, ($this->min - $len));
+                $sbuf .= $s;
+            }
+        } else {
+            $sbuf .= $s;
+        }
+    }	
 
-	/**
-	 * Fast space padding method.
-	 *
-	 * @param string	$sbuf	   string buffer
-	 * @param integer	$length	   pad length
-	 *
-	 * @todo reimplement using PHP string functions
-	 */
-	public function spacePad($sbuf, $length) {
-		while($length >= 32) {
-		  $sbuf .= $GLOBALS['log4php.LoggerPatternConverter.spaces'][5];
-		  $length -= 32;
-		}
+    /**
+     * Fast space padding method.
+     *
+     * @param string	$sbuf	   string buffer
+     * @param integer	$length	   pad length
+     *
+     * @todo reimplement using PHP string functions
+     */
+    public function spacePad($sbuf, $length) {
+        while($length >= 32) {
+            $sbuf .= $GLOBALS['log4php.LoggerPatternConverter.spaces'][5];
+            $length -= 32;
+        }
 		
-		for($i = 4; $i >= 0; $i--) {	
-			if(($length & (1<<$i)) != 0) {
-				$sbuf .= $GLOBALS['log4php.LoggerPatternConverter.spaces'][$i];
-			}
-		}
+        for($i = 4; $i >= 0; $i--) {	
+            if(($length & (1<<$i)) != 0) {
+                $sbuf .= $GLOBALS['log4php.LoggerPatternConverter.spaces'][$i];
+            }
+        }
 
-		// $sbuf = str_pad($sbuf, $length);
-	}
+        // $sbuf = str_pad($sbuf, $length);
+    }
 }

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

Indentation +33 added lines, -33 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
+     */
 
 /**
  * @package log4php
@@ -24,22 +24,22 @@ 
  */
 class LoggerClassNamePatternConverter extends LoggerNamedPatternConverter {
 
-	/**
-	 * Constructor
-	 *
-	 * @param string $formattingInfo
-	 * @param integer $precision
-	 */
-	public function __construct($formattingInfo, $precision) {
-		parent::__construct($formattingInfo, $precision);
-	}
+    /**
+     * Constructor
+     *
+     * @param string $formattingInfo
+     * @param integer $precision
+     */
+    public function __construct($formattingInfo, $precision) {
+        parent::__construct($formattingInfo, $precision);
+    }
 
-	/**
-	 * @param LoggerLoggingEvent $event
-	 * @return string
-	 */
-	public function getFullyQualifiedName($event) {
-		return $event->fqcn;
-	}
+    /**
+     * @param LoggerLoggingEvent $event
+     * @return string
+     */
+    public function getFullyQualifiedName($event) {
+        return $event->fqcn;
+    }
 }
 

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

Indentation +24 added lines, -24 removed lines

@@ -24,30 +24,30 @@
  */
 class LoggerDatePatternConverter extends LoggerPatternConverter {
 
-	/**
-	 * @var string
-	 */
-	private $df;
+    /**
+     * @var string
+     */
+    private $df;
 	
-	/**
-	 * Constructor
-	 *
-	 * @param string $formattingInfo
-	 * @param string $df
-	 */
-	public function __construct($formattingInfo, $df) {
-		parent::__construct($formattingInfo);
-		$this->df = $df;
-	}
+    /**
+     * Constructor
+     *
+     * @param string $formattingInfo
+     * @param string $df
+     */
+    public function __construct($formattingInfo, $df) {
+        parent::__construct($formattingInfo);
+        $this->df = $df;
+    }
 
-	/**
-	 * @param LoggerLoggingEvent $event
-	 * @return string
-	 */
-	public function convert($event) {
-		$timeStamp = $event->getTimeStamp();
-		$usecs = round(($timeStamp - (int)$timeStamp) * 1000);
-		$this->df = preg_replace('/((?<!\\\\)(?:\\\\{2})*)u/', '${1}' . sprintf('%03d', $usecs), $this->df);
-		return date($this->df, $event->getTimeStamp());
-	}
+    /**
+     * @param LoggerLoggingEvent $event
+     * @return string
+     */
+    public function convert($event) {
+        $timeStamp = $event->getTimeStamp();
+        $usecs = round(($timeStamp - (int)$timeStamp) * 1000);
+        $this->df = preg_replace('/((?<!\\\\)(?:\\\\{2})*)u/', '${1}' . sprintf('%03d', $usecs), $this->df);
+        return date($this->df, $event->getTimeStamp());
+    }
 }

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

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();
+    }
 }
 

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

Indentation +37 added lines, -37 removed lines

@@ -24,48 +24,48 @@
  */
 class LoggerBasicPatternConverter extends LoggerPatternConverter {
 
-	/**
-	 * @var integer
-	 */
-	private $type;
+    /**
+     * @var integer
+     */
+    private $type;
 
-	/**
-	 * Constructor
-	 *
-	 * @param string $formattingInfo
-	 * @param integer $type
-	 */
-	public function __construct($formattingInfo, $type) {
-	  parent::__construct($formattingInfo);
-	  $this->type = $type;
-	}
+    /**
+     * Constructor
+     *
+     * @param string $formattingInfo
+     * @param integer $type
+     */
+    public function __construct($formattingInfo, $type) {
+        parent::__construct($formattingInfo);
+        $this->type = $type;
+    }
 
-	/**
-	 * @param LoggerLoggingEvent $event
-	 * @return string
-	 */
-	public function convert($event) {
-		switch($this->type) {
-			case LoggerPatternParser::RELATIVE_TIME_CONVERTER:
-				$timeStamp = $event->getTimeStamp();
-				$startTime = LoggerLoggingEvent::getStartTime();
-				return (string)(int)($timeStamp * 1000 - $startTime * 1000);
+    /**
+     * @param LoggerLoggingEvent $event
+     * @return string
+     */
+    public function convert($event) {
+        switch($this->type) {
+            case LoggerPatternParser::RELATIVE_TIME_CONVERTER:
+                $timeStamp = $event->getTimeStamp();
+                $startTime = LoggerLoggingEvent::getStartTime();
+                return (string)(int)($timeStamp * 1000 - $startTime * 1000);
 				
-			case LoggerPatternParser::THREAD_CONVERTER:
-				return $event->getThreadName();
+            case LoggerPatternParser::THREAD_CONVERTER:
+                return $event->getThreadName();
 
-			case LoggerPatternParser::LEVEL_CONVERTER:
-				$level = $event->getLevel();
-				return $level->toString();
+            case LoggerPatternParser::LEVEL_CONVERTER:
+                $level = $event->getLevel();
+                return $level->toString();
 
-			case LoggerPatternParser::NDC_CONVERTER:
-				return $event->getNDC();
+            case LoggerPatternParser::NDC_CONVERTER:
+                return $event->getNDC();
 
-			case LoggerPatternParser::MESSAGE_CONVERTER:
-				return $event->getRenderedMessage();
+            case LoggerPatternParser::MESSAGE_CONVERTER:
+                return $event->getRenderedMessage();
 				
-			default: 
-				return '';
-		}
-	}
+            default: 
+                return '';
+        }
+    }
 }

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

Indentation +33 added lines, -33 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
+     */
 
 /**
  * This class encapsulates the information obtained when parsing
@@ -28,23 +28,23 @@ 
  */
 class LoggerFormattingInfo {
 
-	public $min = -1;
-	public $max = 0x7FFFFFFF;
-	public $leftAlign = false;
+    public $min = -1;
+    public $max = 0x7FFFFFFF;
+    public $leftAlign = false;
 
-	/**
-	 * Constructor
-	 */
-	public function __construct() {}
+    /**
+     * Constructor
+     */
+    public function __construct() {}
 	
-	public function reset() {
-		$this->min = -1;
-		$this->max = 0x7FFFFFFF;
-		$this->leftAlign = false;	  
-	}
+    public function reset() {
+        $this->min = -1;
+        $this->max = 0x7FFFFFFF;
+        $this->leftAlign = false;	  
+    }
 
-	public function dump() {
-		// TODO: other option to dump?
-		// LoggerLog::debug("LoggerFormattingInfo::dump() min={$this->min}, max={$this->max}, leftAlign={$this->leftAlign}");
-	}
+    public function dump() {
+        // TODO: other option to dump?
+        // LoggerLog::debug("LoggerFormattingInfo::dump() min={$this->min}, max={$this->max}, leftAlign={$this->leftAlign}");
+    }
 }

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

Indentation +33 added lines, -33 removed lines

@@ -24,40 +24,40 @@
  */
 class LoggerLocationPatternConverter extends LoggerPatternConverter {
 	
-	/**
-	 * @var integer
-	 */
-	private $type;
+    /**
+     * @var integer
+     */
+    private $type;
 
-	/**
-	 * Constructor
-	 *
-	 * @param string $formattingInfo
-	 * @param integer $type
-	 */
-	public function __construct($formattingInfo, $type) {
-	  parent::__construct($formattingInfo);
-	  $this->type = $type;
-	}
+    /**
+     * Constructor
+     *
+     * @param string $formattingInfo
+     * @param integer $type
+     */
+    public function __construct($formattingInfo, $type) {
+        parent::__construct($formattingInfo);
+        $this->type = $type;
+    }
 
-	/**
-	 * @param LoggerLoggingEvent $event
-	 * @return string
-	 */
-	public function convert($event) {
-		$locationInfo = $event->getLocationInformation();
-		switch($this->type) {
-			case LoggerPatternParser::FULL_LOCATION_CONVERTER:
-				return $locationInfo->getFullInfo();
-			case LoggerPatternParser::METHOD_LOCATION_CONVERTER:
-				return $locationInfo->getMethodName();
-			case LoggerPatternParser::LINE_LOCATION_CONVERTER:
-				return $locationInfo->getLineNumber();
-			case LoggerPatternParser::FILE_LOCATION_CONVERTER:
-				return $locationInfo->getFileName();
-			default: 
-				return '';
-		}
-	}
+    /**
+     * @param LoggerLoggingEvent $event
+     * @return string
+     */
+    public function convert($event) {
+        $locationInfo = $event->getLocationInformation();
+        switch($this->type) {
+            case LoggerPatternParser::FULL_LOCATION_CONVERTER:
+                return $locationInfo->getFullInfo();
+            case LoggerPatternParser::METHOD_LOCATION_CONVERTER:
+                return $locationInfo->getMethodName();
+            case LoggerPatternParser::LINE_LOCATION_CONVERTER:
+                return $locationInfo->getLineNumber();
+            case LoggerPatternParser::FILE_LOCATION_CONVERTER:
+                return $locationInfo->getFileName();
+            default: 
+                return '';
+        }
+    }
 }