fjbender / magento-1

lib/Payone/Log4php/LoggerAppenderNull.php

Indentation +11 added lines, -11 removed lines

@@ -35,17 +35,17 @@
  */
 class Payone_Log4php_LoggerAppenderNull extends Payone_Log4php_LoggerAppender {
 
-	/** 
-	 * This appender does not require a layout. 
-	 */
-	protected $requiresLayout = false;
+    /** 
+     * This appender does not require a layout. 
+     */
+    protected $requiresLayout = false;
 	
-	/**
-	 * Do nothing. 
-	 * 
-	 * @param Payone_Log4php_LoggerLoggingEvent $event
-	 */
-	public function append(Payone_Log4php_LoggerLoggingEvent $event) {
-	}
+    /**
+     * Do nothing. 
+     * 
+     * @param Payone_Log4php_LoggerLoggingEvent $event
+     */
+    public function append(Payone_Log4php_LoggerLoggingEvent $event) {
+    }
 }
 

lib/Payone/Log4php/LoggerMDC.php

Indentation +61 added lines, -61 removed lines

@@ -49,70 +49,70 @@
  */
 class Payone_Log4php_LoggerMDC {
 	
-	/** Holds the context map. */
-	private static $map = array();
+    /** Holds the context map. */
+    private static $map = array();
 		
-	/**
-	 * Stores a context value as identified with the key parameter into the 
-	 * context map.
-	 *
-	 * @param string $key the key
-	 * @param string $value the value
-	 */
-	public static function put($key, $value) {
-		self::$map[$key] = $value;
-	}
+    /**
+     * Stores a context value as identified with the key parameter into the 
+     * context map.
+     *
+     * @param string $key the key
+     * @param string $value the value
+     */
+    public static function put($key, $value) {
+        self::$map[$key] = $value;
+    }
   
-	/**
-	 * Returns the context value identified by the key parameter.
-	 *
-	 * Special key identifiers can be used to map values in the global $_SERVER
-	 * and $_ENV vars. To access them, use 'server.' or 'env.' followed by the 
-	 * desired var name as the key.
-	 *
-	 * @param string $key The key.
-	 * @return string The context or an empty string if no context found
-	 * 	for given key.
-	 */
-	public static function get($key) {
-		if(!empty($key)) {
-			if(strpos($key, 'server.') === 0) {
-				$varName = substr($key, 7);
-				return isset($_SERVER[$varName]) ? $_SERVER[$varName] : '';
-			} else if(strpos($key, 'env.') === 0) {
-				$varName = substr($key, 4);
-				$value = getenv($varName);
-				return ($value !== false) ? $value : '';
-			} else {
-				return isset(self::$map[$key]) ? self::$map[$key] : '';
-			}
-		}
-		return '';
-	}
+    /**
+     * Returns the context value identified by the key parameter.
+     *
+     * Special key identifiers can be used to map values in the global $_SERVER
+     * and $_ENV vars. To access them, use 'server.' or 'env.' followed by the 
+     * desired var name as the key.
+     *
+     * @param string $key The key.
+     * @return string The context or an empty string if no context found
+     * 	for given key.
+     */
+    public static function get($key) {
+        if(!empty($key)) {
+            if(strpos($key, 'server.') === 0) {
+                $varName = substr($key, 7);
+                return isset($_SERVER[$varName]) ? $_SERVER[$varName] : '';
+            } else if(strpos($key, 'env.') === 0) {
+                $varName = substr($key, 4);
+                $value = getenv($varName);
+                return ($value !== false) ? $value : '';
+            } else {
+                return isset(self::$map[$key]) ? self::$map[$key] : '';
+            }
+        }
+        return '';
+    }
 
-	/**
-	 * Returns the contex map as an array.
-	 * @return array The MDC context map.
-	 */
-	public static function getMap() {
-		return self::$map;
-	}
+    /**
+     * Returns the contex map as an array.
+     * @return array The MDC context map.
+     */
+    public static function getMap() {
+        return self::$map;
+    }
 
-	/**
-	 * Removes the the context identified by the key parameter. 
-	 *
-	 * Only affects user mappings, not $_ENV or $_SERVER.
-	 *
-	 * @param string $key The key to be removed.
-	 */
-	public static function remove($key) {
-		unset(self::$map[$key]);
-	}
+    /**
+     * Removes the the context identified by the key parameter. 
+     *
+     * Only affects user mappings, not $_ENV or $_SERVER.
+     *
+     * @param string $key The key to be removed.
+     */
+    public static function remove($key) {
+        unset(self::$map[$key]);
+    }
 	
-	/**
-	 * Clears the mapped diagnostic context.
-	 */
-	public static function clear() {
-		self::$map = array();
-	}
+    /**
+     * Clears the mapped diagnostic context.
+     */
+    public static function clear() {
+        self::$map = array();
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -75,11 +75,11 @@
 	 * 	for given key.
 	 */
 	public static function get($key) {
-		if(!empty($key)) {
-			if(strpos($key, 'server.') === 0) {
+		if (!empty($key)) {
+			if (strpos($key, 'server.') === 0) {
 				$varName = substr($key, 7);
 				return isset($_SERVER[$varName]) ? $_SERVER[$varName] : '';
-			} else if(strpos($key, 'env.') === 0) {
+			} else if (strpos($key, 'env.') === 0) {
 				$varName = substr($key, 4);
 				$value = getenv($varName);
 				return ($value !== false) ? $value : '';

lib/Payone/Log4php/LoggerPatternConverterProcess.php

Indentation +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@
  */
 class Payone_Log4php_LoggerPatternConverterProcess extends Payone_Log4php_LoggerPatternConverter {
 
-	public function convert(Payone_Log4php_LoggerLoggingEvent $event) {
-		return getmypid();
-	}
+    public function convert(Payone_Log4php_LoggerLoggingEvent $event) {
+        return getmypid();
+    }
 }

lib/Payone/Log4php/LoggerLayoutPattern.php

Indentation +95 added lines, -95 removed lines

@@ -27,128 +27,128 @@
  */
 class Payone_Log4php_LoggerLayoutPattern extends Payone_Log4php_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 = '%d [%t] %p %c %x - %m%n';
+    /** Default conversion TTCC Pattern */
+    const TTCC_CONVERSION_PATTERN = '%d [%t] %p %c %x - %m%n';
 
-	/** The conversion pattern. */ 
-	protected $pattern = self::DEFAULT_CONVERSION_PATTERN;
+    /** The conversion pattern. */ 
+    protected $pattern = self::DEFAULT_CONVERSION_PATTERN;
 	
-	/** Maps conversion keywords to the relevant converter. */
-	protected static $defaultConverterMap = array(
-		'c' => 'LoggerPatternConverterLogger',
-		'lo' => 'LoggerPatternConverterLogger',
-		'logger' => 'LoggerPatternConverterLogger',
+    /** Maps conversion keywords to the relevant converter. */
+    protected static $defaultConverterMap = array(
+        'c' => 'LoggerPatternConverterLogger',
+        'lo' => 'LoggerPatternConverterLogger',
+        'logger' => 'LoggerPatternConverterLogger',
 		
-		'C' => 'LoggerPatternConverterClass',
-		'class' => 'LoggerPatternConverterClass',
+        'C' => 'LoggerPatternConverterClass',
+        'class' => 'LoggerPatternConverterClass',
 		
-		'cookie' => 'LoggerPatternConverterCookie',
+        'cookie' => 'LoggerPatternConverterCookie',
 		
-		'd' => 'LoggerPatternConverterDate',
-		'date' => 'LoggerPatternConverterDate',
+        'd' => 'LoggerPatternConverterDate',
+        'date' => 'LoggerPatternConverterDate',
 		
-		'e' => 'LoggerPatternConverterEnvironment',
-		'env' => 'LoggerPatternConverterEnvironment',
+        'e' => 'LoggerPatternConverterEnvironment',
+        'env' => 'LoggerPatternConverterEnvironment',
 		
-		'ex' => 'LoggerPatternConverterThrowable',
-		'throwable' => 'LoggerPatternConverterThrowable',
+        'ex' => 'LoggerPatternConverterThrowable',
+        'throwable' => 'LoggerPatternConverterThrowable',
 		
-		'F' => 'LoggerPatternConverterFile',
-		'file' => 'LoggerPatternConverterFile',
+        'F' => 'LoggerPatternConverterFile',
+        'file' => 'LoggerPatternConverterFile',
 		
-		'L' => 'LoggerPatternConverterLine',
-		'line' => 'LoggerPatternConverterLine',
+        'L' => 'LoggerPatternConverterLine',
+        'line' => 'LoggerPatternConverterLine',
 		
-		'm' => 'LoggerPatternConverterMessage',
-		'msg' => 'LoggerPatternConverterMessage',
-		'message' => 'LoggerPatternConverterMessage',
+        'm' => 'LoggerPatternConverterMessage',
+        'msg' => 'LoggerPatternConverterMessage',
+        'message' => 'LoggerPatternConverterMessage',
 		
-		'M' => 'LoggerPatternConverterMethod',
-		'method' => 'LoggerPatternConverterMethod',
+        'M' => 'LoggerPatternConverterMethod',
+        'method' => 'LoggerPatternConverterMethod',
 		
-		'n' => 'LoggerPatternConverterNewLine',
-		'newline' => 'LoggerPatternConverterNewLine',
+        'n' => 'LoggerPatternConverterNewLine',
+        'newline' => 'LoggerPatternConverterNewLine',
 		
-		'p' => 'LoggerPatternConverterLevel',
-		'le' => 'LoggerPatternConverterLevel',
-		'level' => 'LoggerPatternConverterLevel',
+        'p' => 'LoggerPatternConverterLevel',
+        'le' => 'LoggerPatternConverterLevel',
+        'level' => 'LoggerPatternConverterLevel',
 	
-		'r' => 'LoggerPatternConverterRelative',
-		'relative' => 'LoggerPatternConverterRelative',
+        'r' => 'LoggerPatternConverterRelative',
+        'relative' => 'LoggerPatternConverterRelative',
 		
-		'req' => 'LoggerPatternConverterRequest',
-		'request' => 'LoggerPatternConverterRequest',
+        'req' => 'LoggerPatternConverterRequest',
+        'request' => 'LoggerPatternConverterRequest',
 		
-		's' => 'LoggerPatternConverterServer',
-		'server' => 'LoggerPatternConverterServer',
+        's' => 'LoggerPatternConverterServer',
+        'server' => 'LoggerPatternConverterServer',
 		
-		'ses' => 'LoggerPatternConverterSession',
-		'session' => 'LoggerPatternConverterSession',
+        'ses' => 'LoggerPatternConverterSession',
+        'session' => 'LoggerPatternConverterSession',
 		
-		'sid' => 'LoggerPatternConverterSessionID',
-		'sessionid' => 'LoggerPatternConverterSessionID',
+        'sid' => 'LoggerPatternConverterSessionID',
+        'sessionid' => 'LoggerPatternConverterSessionID',
 	
-		't' => 'LoggerPatternConverterProcess',
-		'pid' => 'LoggerPatternConverterProcess',
-		'process' => 'LoggerPatternConverterProcess',
+        't' => 'LoggerPatternConverterProcess',
+        'pid' => 'LoggerPatternConverterProcess',
+        'process' => 'LoggerPatternConverterProcess',
 		
-		'x' => 'LoggerPatternConverterNDC',
-		'ndc' => 'LoggerPatternConverterNDC',
+        'x' => 'LoggerPatternConverterNDC',
+        'ndc' => 'LoggerPatternConverterNDC',
 			
-		'X' => 'LoggerPatternConverterMDC',
-		'mdc' => 'LoggerPatternConverterMDC',
-	);
+        'X' => 'LoggerPatternConverterMDC',
+        'mdc' => 'LoggerPatternConverterMDC',
+    );
 
-	protected $converterMap = array();
+    protected $converterMap = array();
 	
-	/** 
-	 * Head of a chain of Converters.
-	 * @var Payone_Log4php_LoggerPatternConverter
-	 */
-	private $head;
+    /** 
+     * Head of a chain of Converters.
+     * @var Payone_Log4php_LoggerPatternConverter
+     */
+    private $head;
 
-	public static function getDefaultConverterMap() {
-		return self::$defaultConverterMap;
-	}
+    public static function getDefaultConverterMap() {
+        return self::$defaultConverterMap;
+    }
 	
-	public function __construct() {
-		$this->converterMap = self::$defaultConverterMap;
-	}
+    public function __construct() {
+        $this->converterMap = self::$defaultConverterMap;
+    }
 	
-	/**
-	 * 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;
-	}
+    /**
+     * 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;
+    }
 	
-	public function activateOptions() {
-		if (!isset($this->pattern)) {
-			throw new Payone_Log4php_LoggerException("Mandatory parameter 'conversionPattern' is not set.");
-		}
-		
-		$parser = new Payone_Log4php_LoggerPatternParser($this->pattern, $this->converterMap);
-		$this->head = $parser->parse();
-	}
+    public function activateOptions() {
+        if (!isset($this->pattern)) {
+            throw new Payone_Log4php_LoggerException("Mandatory parameter 'conversionPattern' is not set.");
+        }
+		
+        $parser = new Payone_Log4php_LoggerPatternParser($this->pattern, $this->converterMap);
+        $this->head = $parser->parse();
+    }
 	
-	/**
-	 * Produces a formatted string as specified by the conversion pattern.
-	 *
-	 * @param Payone_Log4php_LoggerLoggingEvent $event
-	 * @return string
-	 */
-	public function format(Payone_Log4php_LoggerLoggingEvent $event) {
-		$sbuf = '';
-		$converter = $this->head;
-		while ($converter !== null) {
-			$converter->format($sbuf, $event);
-			$converter = $converter->next;
-		}
-		return $sbuf;
-	}
+    /**
+     * Produces a formatted string as specified by the conversion pattern.
+     *
+     * @param Payone_Log4php_LoggerLoggingEvent $event
+     * @return string
+     */
+    public function format(Payone_Log4php_LoggerLoggingEvent $event) {
+        $sbuf = '';
+        $converter = $this->head;
+        while ($converter !== null) {
+            $converter->format($sbuf, $event);
+            $converter = $converter->next;
+        }
+        return $sbuf;
+    }
 }
\ No newline at end of file

lib/Payone/Log4php/LoggerAppender.php

Indentation +229 added lines, -229 removed lines

@@ -26,262 +26,262 @@
  */
 abstract class Payone_Log4php_LoggerAppender extends Payone_Log4php_LoggerConfigurable {
 	
-	/**
-	 * Set to true when the appender is closed. A closed appender will not 
-	 * accept any logging requests. 
-	 * @var boolean 
-	 */
-	protected $closed = false;
+    /**
+     * Set to true when the appender is closed. A closed appender will not 
+     * accept any logging requests. 
+     * @var boolean 
+     */
+    protected $closed = false;
 	
-	/**
-	 * The first filter in the filter chain.
-	 * @var LoggerFilter
-	 */
-	protected $filter;
+    /**
+     * The first filter in the filter chain.
+     * @var LoggerFilter
+     */
+    protected $filter;
 			
-	/**
-	 * The appender's layout. Can be null if the appender does not use 
-	 * a layout.
-	 * @var Payone_Log4php_LoggerLayout
-	 */
-	protected $layout; 
+    /**
+     * The appender's layout. Can be null if the appender does not use 
+     * a layout.
+     * @var Payone_Log4php_LoggerLayout
+     */
+    protected $layout; 
 	
-	/**
-	 * Appender name. Used by other components to identify this appender.
-	 * @var string
-	 */
-	protected $name;
+    /**
+     * Appender name. Used by other components to identify this appender.
+     * @var string
+     */
+    protected $name;
 	
-	/**
-	 * Appender threshold level. Events whose level is below the threshold 
-	 * will not be logged.
-	 * @var Payone_Log4php_LoggerLevel
-	 */
-	protected $threshold;
+    /**
+     * Appender threshold level. Events whose level is below the threshold 
+     * will not be logged.
+     * @var Payone_Log4php_LoggerLevel
+     */
+    protected $threshold;
 	
-	/**
-	 * Set to true if the appender requires a layout.
-	 * 
-	 * True by default, appenders which do not use a layout should override 
-	 * this property to false.
-	 * 
-	 * @var boolean
-	 */
-	protected $requiresLayout = true;
+    /**
+     * Set to true if the appender requires a layout.
+     * 
+     * True by default, appenders which do not use a layout should override 
+     * this property to false.
+     * 
+     * @var boolean
+     */
+    protected $requiresLayout = true;
 	
-	/**
-	 * Default constructor.
-	 * @param string $name Appender name
-	 */
-	public function __construct($name = '') {
-		$this->name = $name;
+    /**
+     * Default constructor.
+     * @param string $name Appender name
+     */
+    public function __construct($name = '') {
+        $this->name = $name;
 		
-		// Closes the appender on shutdown. Better than a destructor because
-		// it will be called even if a fatal error occurs (destructor won't).
-		register_shutdown_function(array($this, 'close'));
+        // Closes the appender on shutdown. Better than a destructor because
+        // it will be called even if a fatal error occurs (destructor won't).
+        register_shutdown_function(array($this, 'close'));
 		
-		if ($this->requiresLayout) {
-			$this->layout = $this->getDefaultLayout();
-		}
-	}
+        if ($this->requiresLayout) {
+            $this->layout = $this->getDefaultLayout();
+        }
+    }
 	
-	/**
-	 * Returns the default layout for this appender. Can be overriden by 
-	 * derived appenders.
-	 * 
-	 * @return Payone_Log4php_LoggerLayout
-	 */
-	public function getDefaultLayout()
-	{
-		return new Payone_Log4php_LoggerLayoutSimple();
-	}
+    /**
+     * Returns the default layout for this appender. Can be overriden by 
+     * derived appenders.
+     * 
+     * @return Payone_Log4php_LoggerLayout
+     */
+    public function getDefaultLayout()
+    {
+        return new Payone_Log4php_LoggerLayoutSimple();
+    }
 	
-	/**
-	 * Adds a filter to the end of the filter chain.
-	 * @param LoggerFilter $filter add a new LoggerFilter
-	 */
-	public function addFilter($filter) {
-		if($this->filter === null) {
-			$this->filter = $filter;
-		} else {
-			$this->filter->addNext($filter);
-		}
-	}
+    /**
+     * Adds a filter to the end of the filter chain.
+     * @param LoggerFilter $filter add a new LoggerFilter
+     */
+    public function addFilter($filter) {
+        if($this->filter === null) {
+            $this->filter = $filter;
+        } else {
+            $this->filter->addNext($filter);
+        }
+    }
 	
-	/**
-	 * Clears the filter chain by removing all the filters in it.
-	 */
-	public function clearFilters() {
-		$this->filter = null;
-	}
+    /**
+     * Clears the filter chain by removing all the filters in it.
+     */
+    public function clearFilters() {
+        $this->filter = null;
+    }
 
-	/**
-	 * Returns the first filter in the filter chain. 
-	 * The return value may be <i>null</i> if no is filter is set.
-	 * @return LoggerFilter
-	 */
-	public function getFilter() {
-		return $this->filter;
-	} 
+    /**
+     * Returns the first filter in the filter chain. 
+     * The return value may be <i>null</i> if no is filter is set.
+     * @return LoggerFilter
+     */
+    public function getFilter() {
+        return $this->filter;
+    } 
 	
-	/** 
-	 * Returns the first filter in the filter chain. 
-	 * The return value may be <i>null</i> if no is filter is set.
-	 * @return LoggerFilter
-	 */
-	public function getFirstFilter() {
-		return $this->filter;
-	}
+    /** 
+     * Returns the first filter in the filter chain. 
+     * The return value may be <i>null</i> if no is filter is set.
+     * @return LoggerFilter
+     */
+    public function getFirstFilter() {
+        return $this->filter;
+    }
 	
-	/**
-	 * Performs threshold checks and invokes filters before delegating logging 
-	 * to the subclass' specific <i>append()</i> method.
-	 * @see Payone_Log4php_LoggerAppender::append()
-	 * @param Payone_Log4php_LoggerLoggingEvent $event
-	 */
-	public function doAppend(Payone_Log4php_LoggerLoggingEvent $event) {
-		if($this->closed) {
-			return;
-		}
+    /**
+     * Performs threshold checks and invokes filters before delegating logging 
+     * to the subclass' specific <i>append()</i> method.
+     * @see Payone_Log4php_LoggerAppender::append()
+     * @param Payone_Log4php_LoggerLoggingEvent $event
+     */
+    public function doAppend(Payone_Log4php_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 Payone_Log4php_LoggerFilter::DENY: return;
-				case Payone_Log4php_LoggerFilter::ACCEPT: return $this->append($event);
-				case Payone_Log4php_LoggerFilter::NEUTRAL: $f = $f->getNext();
-			}
-		}
-		$this->append($event);
-	}	 
+        $f = $this->getFirstFilter();
+        while($f !== null) {
+            switch ($f->decide($event)) {
+                case Payone_Log4php_LoggerFilter::DENY: return;
+                case Payone_Log4php_LoggerFilter::ACCEPT: return $this->append($event);
+                case Payone_Log4php_LoggerFilter::NEUTRAL: $f = $f->getNext();
+            }
+        }
+        $this->append($event);
+    }	 
 
-	/**
-	 * Sets the appender layout.
-	 * @param Payone_Log4php_LoggerLayout $layout
-	 */
-	public function setLayout($layout) {
-		if($this->requiresLayout()) {
-			$this->layout = $layout;
-		}
-	} 
+    /**
+     * Sets the appender layout.
+     * @param Payone_Log4php_LoggerLayout $layout
+     */
+    public function setLayout($layout) {
+        if($this->requiresLayout()) {
+            $this->layout = $layout;
+        }
+    } 
 	
-	/**
-	 * Returns the appender layout.
-	 * @return Payone_Log4php_LoggerLayout
-	 */
-	public function getLayout() {
-		return $this->layout;
-	}
+    /**
+     * Returns the appender layout.
+     * @return Payone_Log4php_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>
-	 * 
-	 * @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>
+     * 
+     * @return boolean
+     */
+    public function requiresLayout() {
+        return $this->requiresLayout;
+    }
 	
-	/**
-	 * Retruns the appender name.
-	 * @return string
-	 */
-	public function getName() {
-		return $this->name;
-	}
+    /**
+     * Retruns the appender name.
+     * @return string
+     */
+    public function getName() {
+        return $this->name;
+    }
 	
-	/**
-	 * Sets the appender name.
-	 * @param string $name
-	 */
-	public function setName($name) {
-		$this->name = $name;	
-	}
+    /**
+     * Sets the appender name.
+     * @param string $name
+     */
+    public function setName($name) {
+        $this->name = $name;	
+    }
 	
-	/**
-	 * Returns the appender's threshold level. 
-	 * @return Payone_Log4php_LoggerLevel
-	 */
-	public function getThreshold() { 
-		return $this->threshold;
-	}
+    /**
+     * Returns the appender's threshold level. 
+     * @return Payone_Log4php_LoggerLevel
+     */
+    public function getThreshold() { 
+        return $this->threshold;
+    }
 	
-	/**
-	 * Sets the appender threshold.
-	 * 
-	 * @param Payone_Log4php_LoggerLevel|string $threshold Either a {@link LoggerLevel}
-	 *   object or a string equivalent.
-	 * @see LoggerOptionConverter::toLevel()
-	 */
-	public function setThreshold($threshold) {
-		$this->setLevel('threshold', $threshold);
-	}
+    /**
+     * Sets the appender threshold.
+     * 
+     * @param Payone_Log4php_LoggerLevel|string $threshold Either a {@link LoggerLevel}
+     *   object or a string equivalent.
+     * @see LoggerOptionConverter::toLevel()
+     */
+    public function setThreshold($threshold) {
+        $this->setLevel('threshold', $threshold);
+    }
 	
-	/**
-	 * Checks 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 Payone_Log4php_LoggerLevel $level
-	 * @return boolean Returns true if level is greater or equal than 
-	 *   threshold, or if the threshold is not set. Otherwise returns false.
-	 */
-	public function isAsSevereAsThreshold($level) {
-		if($this->threshold === null) {
-			return true;
-		}
-		return $level->isGreaterOrEqual($this->getThreshold());
-	}
+    /**
+     * Checks 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 Payone_Log4php_LoggerLevel $level
+     * @return boolean Returns true if level is greater or equal than 
+     *   threshold, or if the threshold is not set. Otherwise returns false.
+     */
+    public function isAsSevereAsThreshold($level) {
+        if($this->threshold === null) {
+            return true;
+        }
+        return $level->isGreaterOrEqual($this->getThreshold());
+    }
 
-	/**
-	 * Prepares the appender for logging.
-	 * 
-	 * Derived appenders should override this method if option structure
-	 * requires it.
-	 */
-	public function activateOptions() {
-		$this->closed = false;
-	}
+    /**
+     * Prepares the appender for logging.
+     * 
+     * Derived appenders should override this method if option structure
+     * requires it.
+     */
+    public function activateOptions() {
+        $this->closed = false;
+    }
 	
-	/**
-	 * Forwards the logging event to the destination.
-	 * 
-	 * Derived appenders should implement this method to perform actual logging.
-	 * 
-	 * @param Payone_Log4php_LoggerLoggingEvent $event
-	 */
-	abstract protected function append(Payone_Log4php_LoggerLoggingEvent $event);
+    /**
+     * Forwards the logging event to the destination.
+     * 
+     * Derived appenders should implement this method to perform actual logging.
+     * 
+     * @param Payone_Log4php_LoggerLoggingEvent $event
+     */
+    abstract protected function append(Payone_Log4php_LoggerLoggingEvent $event);
 
-	/**
-	 * Releases any resources allocated by the appender.
-	 * 
-	 * Derived appenders should override this method to perform proper closing
-	 * procedures.
-	 */
-	public function close() {
-		$this->closed = true;
-	}
+    /**
+     * Releases any resources allocated by the appender.
+     * 
+     * Derived appenders should override this method to perform proper closing
+     * procedures.
+     */
+    public function close() {
+        $this->closed = true;
+    }
 	
-	/** Triggers a warning for this logger with the given message. */
-	protected function warn($message) {
-		$id = get_class($this) . (empty($this->name) ? '' : ":{$this->name}");
-		trigger_error("log4php: [$id]: $message", E_USER_WARNING);
-	}
+    /** Triggers a warning for this logger with the given message. */
+    protected function warn($message) {
+        $id = get_class($this) . (empty($this->name) ? '' : ":{$this->name}");
+        trigger_error("log4php: [$id]: $message", E_USER_WARNING);
+    }
 	
 }

Spacing +6 added lines, -6 removed lines

@@ -101,7 +101,7 @@ 
 	 * @param LoggerFilter $filter add a new LoggerFilter
 	 */
 	public function addFilter($filter) {
-		if($this->filter === null) {
+		if ($this->filter === null) {
 			$this->filter = $filter;
 		} else {
 			$this->filter->addNext($filter);
@@ -140,16 +140,16 @@ 
 	 * @param Payone_Log4php_LoggerLoggingEvent $event
 	 */
 	public function doAppend(Payone_Log4php_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 Payone_Log4php_LoggerFilter::DENY: return;
 				case Payone_Log4php_LoggerFilter::ACCEPT: return $this->append($event);
@@ -164,7 +164,7 @@ 
 	 * @param Payone_Log4php_LoggerLayout $layout
 	 */
 	public function setLayout($layout) {
-		if($this->requiresLayout()) {
+		if ($this->requiresLayout()) {
 			$this->layout = $layout;
 		}
 	} 
@@ -243,7 +243,7 @@ 
 	 *   threshold, or if the threshold is not set. Otherwise returns false.
 	 */
 	public function isAsSevereAsThreshold($level) {
-		if($this->threshold === null) {
+		if ($this->threshold === null) {
 			return true;
 		}
 		return $level->isGreaterOrEqual($this->getThreshold());

lib/Payone/Log4php/LoggerAppenderFile.php

Indentation +101 added lines, -101 removed lines

@@ -42,121 +42,121 @@
  */
 class Payone_Log4php_LoggerAppenderFile extends Payone_Log4php_LoggerAppender {
 
-	/**
-	 * @var boolean if {@link $file} exists, appends events.
-	 */
-	protected $append = true;
+    /**
+     * @var boolean if {@link $file} exists, appends events.
+     */
+    protected $append = true;
 	
-	/**
-	 * @var string the file name used to append events
-	 */
-	protected $file;
+    /**
+     * @var string the file name used to append events
+     */
+    protected $file;
 
-	/**
-	 * @var mixed file resource
-	 */
-	protected $fp = false;
+    /**
+     * @var mixed file resource
+     */
+    protected $fp = false;
 	
-	public function activateOptions() {
-		$fileName = $this->getFile();
+    public function activateOptions() {
+        $fileName = $this->getFile();
 
-		if (empty($fileName)) {
-			$this->warn("Required parameter 'fileName' not set. Closing appender.");
-			$this->closed = true;
-			return;
-		}
+        if (empty($fileName)) {
+            $this->warn("Required parameter 'fileName' not set. Closing appender.");
+            $this->closed = true;
+            return;
+        }
 		
-		if(!is_file($fileName)) {
-			$dir = dirname($fileName);
-			if(!is_dir($dir)) {
-				mkdir($dir, 0777, true);
-			}
-		}
+        if(!is_file($fileName)) {
+            $dir = dirname($fileName);
+            if(!is_dir($dir)) {
+                mkdir($dir, 0777, true);
+            }
+        }
 
-		$this->fp = fopen($fileName, ($this->getAppend()? 'a':'w'));
-		if($this->fp) {
-			if(flock($this->fp, LOCK_EX)) {
-				if($this->getAppend()) {
-					fseek($this->fp, 0, SEEK_END);
-				}
-				fwrite($this->fp, $this->layout->getHeader());
-				flock($this->fp, LOCK_UN);
-				$this->closed = false;
-			} else {
-				// TODO: should we take some action in this case?
-				$this->closed = true;
-			}		 
-		} else {
-			$this->closed = true;
-		}
-	}
+        $this->fp = fopen($fileName, ($this->getAppend()? 'a':'w'));
+        if($this->fp) {
+            if(flock($this->fp, LOCK_EX)) {
+                if($this->getAppend()) {
+                    fseek($this->fp, 0, SEEK_END);
+                }
+                fwrite($this->fp, $this->layout->getHeader());
+                flock($this->fp, LOCK_UN);
+                $this->closed = false;
+            } else {
+                // TODO: should we take some action in this case?
+                $this->closed = true;
+            }		 
+        } else {
+            $this->closed = true;
+        }
+    }
 	
-	public function close() {
-		if($this->closed != true) {
-			if($this->fp and $this->layout !== null) {
-				if(flock($this->fp, LOCK_EX)) {
-					fwrite($this->fp, $this->layout->getFooter());
-					flock($this->fp, LOCK_UN);
-				}
-				fclose($this->fp);
-			}
-			$this->closed = true;
-		}
-	}
+    public function close() {
+        if($this->closed != true) {
+            if($this->fp and $this->layout !== null) {
+                if(flock($this->fp, LOCK_EX)) {
+                    fwrite($this->fp, $this->layout->getFooter());
+                    flock($this->fp, LOCK_UN);
+                }
+                fclose($this->fp);
+            }
+            $this->closed = true;
+        }
+    }
 
-	public function append(Payone_Log4php_LoggerLoggingEvent $event) {
-		if($this->fp and $this->layout !== null) {
-			if(flock($this->fp, LOCK_EX)) {
-				fwrite($this->fp, $this->layout->format($event));
-				flock($this->fp, LOCK_UN);
-			} else {
-				$this->closed = true;
-			}
-		} 
-	}
+    public function append(Payone_Log4php_LoggerLoggingEvent $event) {
+        if($this->fp and $this->layout !== null) {
+            if(flock($this->fp, LOCK_EX)) {
+                fwrite($this->fp, $this->layout->format($event));
+                flock($this->fp, LOCK_UN);
+            } else {
+                $this->closed = true;
+            }
+        } 
+    }
 	
-	/**
-	 * Sets the file where the log output will go.
-	 * @param string $file
-	 */
-	public function setFile($file) {
-		$this->setString('file', $file);
-	}
+    /**
+     * Sets the file where the log output will go.
+     * @param string $file
+     */
+    public function setFile($file) {
+        $this->setString('file', $file);
+    }
 	
-	/**
-	 * @return string
-	 */
-	public function getFile() {
-		return $this->file;
-	}
+    /**
+     * @return string
+     */
+    public function getFile() {
+        return $this->file;
+    }
 	
-	/**
-	 * @return boolean
-	 */
-	public function getAppend() {
-		return $this->append;
-	}
+    /**
+     * @return boolean
+     */
+    public function getAppend() {
+        return $this->append;
+    }
 
-	public function setAppend($append) {
-		$this->setBoolean('append', $append);
-	}
+    public function setAppend($append) {
+        $this->setBoolean('append', $append);
+    }
 
-	/**
-	 * Sets the file where the log output will go.
-	 * @param string $fileName
-	 * @deprecated Use setFile() instead.
-	 */
-	public function setFileName($fileName) {
-		$this->setFile($fileName);
-	}
+    /**
+     * Sets the file where the log output will go.
+     * @param string $fileName
+     * @deprecated Use setFile() instead.
+     */
+    public function setFileName($fileName) {
+        $this->setFile($fileName);
+    }
 	
-	/**
-	 * @return string
-	 * @deprecated Use getFile() instead.
-	 */
-	public function getFileName() {
-		return $this->getFile();
-	}
+    /**
+     * @return string
+     * @deprecated Use getFile() instead.
+     */
+    public function getFileName() {
+        return $this->getFile();
+    }
 	
 	 
 }

Spacing +11 added lines, -11 removed lines

@@ -66,17 +66,17 @@ 
 			return;
 		}
 		
-		if(!is_file($fileName)) {
+		if (!is_file($fileName)) {
 			$dir = dirname($fileName);
-			if(!is_dir($dir)) {
+			if (!is_dir($dir)) {
 				mkdir($dir, 0777, true);
 			}
 		}
 
-		$this->fp = fopen($fileName, ($this->getAppend()? 'a':'w'));
-		if($this->fp) {
-			if(flock($this->fp, LOCK_EX)) {
-				if($this->getAppend()) {
+		$this->fp = fopen($fileName, ($this->getAppend() ? 'a' : 'w'));
+		if ($this->fp) {
+			if (flock($this->fp, LOCK_EX)) {
+				if ($this->getAppend()) {
 					fseek($this->fp, 0, SEEK_END);
 				}
 				fwrite($this->fp, $this->layout->getHeader());
@@ -92,9 +92,9 @@ 
 	}
 	
 	public function close() {
-		if($this->closed != true) {
-			if($this->fp and $this->layout !== null) {
-				if(flock($this->fp, LOCK_EX)) {
+		if ($this->closed != true) {
+			if ($this->fp and $this->layout !== null) {
+				if (flock($this->fp, LOCK_EX)) {
 					fwrite($this->fp, $this->layout->getFooter());
 					flock($this->fp, LOCK_UN);
 				}
@@ -105,8 +105,8 @@ 
 	}
 
 	public function append(Payone_Log4php_LoggerLoggingEvent $event) {
-		if($this->fp and $this->layout !== null) {
-			if(flock($this->fp, LOCK_EX)) {
+		if ($this->fp and $this->layout !== null) {
+			if (flock($this->fp, LOCK_EX)) {
 				fwrite($this->fp, $this->layout->format($event));
 				flock($this->fp, LOCK_UN);
 			} else {

lib/Payone/Log4php/LoggerPatternConverterFile.php

Indentation +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@
  */
 class Payone_Log4php_LoggerPatternConverterFile extends Payone_Log4php_LoggerPatternConverter {
 
-	public function convert(Payone_Log4php_LoggerLoggingEvent $event) {
-		return $event->getLocationInformation()->getFileName();
-	}
+    public function convert(Payone_Log4php_LoggerLoggingEvent $event) {
+        return $event->getLocationInformation()->getFileName();
+    }
 }

lib/Payone/Log4php/Logger.php

Indentation +503 added lines, -503 removed lines

@@ -41,531 +41,531 @@
  */
 class Payone_Log4php_Logger {
 	
-	/**
-	 * Logger additivity. If set to true then child loggers will inherit
-	 * the appenders of their ancestors by default.
-	 * @var boolean
-	 */
-	private $additive = true;
-	
-	/** 
-	 * The Logger's fully qualified class name.
-	 * TODO: Determine if this is useful. 
-	 */
-	private $fqcn = 'Logger';
+    /**
+     * Logger additivity. If set to true then child loggers will inherit
+     * the appenders of their ancestors by default.
+     * @var boolean
+     */
+    private $additive = true;
+	
+    /** 
+     * The Logger's fully qualified class name.
+     * TODO: Determine if this is useful. 
+     */
+    private $fqcn = 'Logger';
 
-	/** The assigned Logger level. */
-	private $level;
+    /** The assigned Logger level. */
+    private $level;
 	
-	/** The name of this Logger instance. */
-	private $name;
+    /** The name of this Logger instance. */
+    private $name;
 	
-	/** The parent logger. Set to null if this is the root logger. */
-	private $parent;
+    /** The parent logger. Set to null if this is the root logger. */
+    private $parent;
 	
-	/** A collection of appenders linked to this logger. */
-	private $appenders = array();
+    /** A collection of appenders linked to this logger. */
+    private $appenders = array();
 
-	/**
-	 * Constructor.
-	 * @param string $name Name of the logger.	  
-	 */
-	public function __construct($name) {
-		$this->name = $name;
-	}
-	
-	/**
-	 * Returns the logger name.
-	 * @return string
-	 */
-	public function getName() {
-		return $this->name;
-	} 
+    /**
+     * Constructor.
+     * @param string $name Name of the logger.	  
+     */
+    public function __construct($name) {
+        $this->name = $name;
+    }
+	
+    /**
+     * Returns the logger name.
+     * @return string
+     */
+    public function getName() {
+        return $this->name;
+    } 
 
-	/**
-	 * Returns the parent Logger. Can be null if this is the root logger.
-	 * @return Logger
-	 */
-	public function getParent() {
-		return $this->parent;
-	}
-	
-	// ******************************************
-	// *** Logging methods                    ***
-	// ******************************************
-	
-	/**
-	 * Log a message object with the TRACE level.
-	 *
-	 * @param mixed $message message
- 	 * @param Exception $throwable Optional throwable information to include 
-	 *   in the logging event.
-	 */
-	public function trace($message, $throwable = null) {
-		$this->log(Payone_Log4php_LoggerLevel::getLevelTrace(), $message, $throwable);
-	} 		
-	
-	/**
-	 * Log a message object with the DEBUG level.
-	 *
-	 * @param mixed $message message
- 	 * @param Exception $throwable Optional throwable information to include 
-	 *   in the logging event.
-	 */
-	public function debug($message, $throwable = null) {
-		$this->log(Payone_Log4php_LoggerLevel::getLevelDebug(), $message, $throwable);
-	} 
+    /**
+     * Returns the parent Logger. Can be null if this is the root logger.
+     * @return Logger
+     */
+    public function getParent() {
+        return $this->parent;
+    }
+	
+    // ******************************************
+    // *** Logging methods                    ***
+    // ******************************************
+	
+    /**
+     * Log a message object with the TRACE level.
+     *
+     * @param mixed $message message
+     * @param Exception $throwable Optional throwable information to include 
+     *   in the logging event.
+     */
+    public function trace($message, $throwable = null) {
+        $this->log(Payone_Log4php_LoggerLevel::getLevelTrace(), $message, $throwable);
+    } 		
+	
+    /**
+     * Log a message object with the DEBUG level.
+     *
+     * @param mixed $message message
+     * @param Exception $throwable Optional throwable information to include 
+     *   in the logging event.
+     */
+    public function debug($message, $throwable = null) {
+        $this->log(Payone_Log4php_LoggerLevel::getLevelDebug(), $message, $throwable);
+    } 
 
-	/**
-	 * Log a message object with the INFO Level.
-	 *
-	 * @param mixed $message message
- 	 * @param Exception $throwable Optional throwable information to include 
-	 *   in the logging event.
-	 */
-	public function info($message, $throwable = null) {
-		$this->log(Payone_Log4php_LoggerLevel::getLevelInfo(), $message, $throwable);
-	}
+    /**
+     * Log a message object with the INFO Level.
+     *
+     * @param mixed $message message
+     * @param Exception $throwable Optional throwable information to include 
+     *   in the logging event.
+     */
+    public function info($message, $throwable = null) {
+        $this->log(Payone_Log4php_LoggerLevel::getLevelInfo(), $message, $throwable);
+    }
 
-	/**
-	 * Log a message with the WARN level.
-	 *
-	 * @param mixed $message message
-  	 * @param Exception $throwable Optional throwable information to include 
-	 *   in the logging event.
-	 */
-	public function warn($message, $throwable = null) {
-		$this->log(Payone_Log4php_LoggerLevel::getLevelWarn(), $message, $throwable);
-	}
-	
-	/**
-	 * Log a message object with the ERROR level.
-	 *
-	 * @param mixed $message message
-	 * @param Exception $throwable Optional throwable information to include 
-	 *   in the logging event.
-	 */
-	public function error($message, $throwable = null) {
-		$this->log(Payone_Log4php_LoggerLevel::getLevelError(), $message, $throwable);
-	}
-	
-	/**
-	 * Log a message object with the FATAL level.
-	 *
-	 * @param mixed $message message
-	 * @param Exception $throwable Optional throwable information to include 
-	 *   in the logging event.
-	 */
-	public function fatal($message, $throwable = null) {
-		$this->log(Payone_Log4php_LoggerLevel::getLevelFatal(), $message, $throwable);
-	}
+    /**
+     * Log a message with the WARN level.
+     *
+     * @param mixed $message message
+     * @param Exception $throwable Optional throwable information to include 
+     *   in the logging event.
+     */
+    public function warn($message, $throwable = null) {
+        $this->log(Payone_Log4php_LoggerLevel::getLevelWarn(), $message, $throwable);
+    }
+	
+    /**
+     * Log a message object with the ERROR level.
+     *
+     * @param mixed $message message
+     * @param Exception $throwable Optional throwable information to include 
+     *   in the logging event.
+     */
+    public function error($message, $throwable = null) {
+        $this->log(Payone_Log4php_LoggerLevel::getLevelError(), $message, $throwable);
+    }
+	
+    /**
+     * Log a message object with the FATAL level.
+     *
+     * @param mixed $message message
+     * @param Exception $throwable Optional throwable information to include 
+     *   in the logging event.
+     */
+    public function fatal($message, $throwable = null) {
+        $this->log(Payone_Log4php_LoggerLevel::getLevelFatal(), $message, $throwable);
+    }
 
-	/**
-	 * Log a message using the provided logging level.
-	 *
-	 * @param Payone_Log4php_LoggerLevel $level The logging level.
-	 * @param mixed $message Message to log.
- 	 * @param Exception $throwable Optional throwable information to include 
-	 *   in the logging event.
-	 */
-	public function log(Payone_Log4php_LoggerLevel $level, $message, $throwable = null) {
-		if($this->isEnabledFor($level)) {
-			$this->forcedLog($this->fqcn, $throwable, $level, $message);
-		}
-	}
-	
-	/**
-	 * If assertion parameter evaluates as false, then logs the message 
-	 * using the ERROR level.
-	 *
-	 * @param bool $assertion
-	 * @param string $msg message to log
-	 */
-	public function assertLog($assertion = true, $msg = '') {
-		if($assertion == false) {
-			$this->error($msg);
-		}
-	}
-	
-	/**
-	 * This method creates a new logging event and logs the event without 
-	 * further checks.
-	 *
-	 * It should not be called directly. Use {@link trace()}, {@link debug()},
-	 * {@link info()}, {@link warn()}, {@link error()} and {@link fatal()} 
-	 * wrappers.
-	 *
-	 * @param string $fqcn Fully qualified class name of the Logger
-	 * @param Exception $throwable Optional throwable information to include 
-	 *   in the logging event.
-	 * @param Payone_Log4php_LoggerLevel $level log level
-	 * @param mixed $message message to log
-	 */
-	public function forcedLog($fqcn, $throwable, Payone_Log4php_LoggerLevel $level, $message) {
-		if (!($throwable instanceof Exception)) {
-			$throwable = null;
-		}
-		$this->callAppenders(new Payone_Log4php_LoggerLoggingEvent($fqcn, $this, $level, $message, null, $throwable));
-	} 
-	
-	// ******************************************
-	// *** Checker methods                    ***
-	// ******************************************
-	
-	/**
-	 * Check whether this Logger is enabled for a given Level passed as parameter.
-	 *
-	 * @param LoggerLevel level
-	 * @return boolean
-	 */
-	public function isEnabledFor(Payone_Log4php_LoggerLevel $level) {
-		return $level->isGreaterOrEqual($this->getEffectiveLevel());
-	}
-	
-	/**
-	 * Check whether this Logger is enabled for the TRACE Level.
-	 * @return boolean
-	 */
-	public function isTraceEnabled() {
-		return $this->isEnabledFor(Payone_Log4php_LoggerLevel::getLevelTrace());
-	}
-	
-	/**
-	 * Check whether this Logger is enabled for the DEBUG Level.
-	 * @return boolean
-	 */
-	public function isDebugEnabled() {
-		return $this->isEnabledFor(Payone_Log4php_LoggerLevel::getLevelDebug());
-	}
+    /**
+     * Log a message using the provided logging level.
+     *
+     * @param Payone_Log4php_LoggerLevel $level The logging level.
+     * @param mixed $message Message to log.
+     * @param Exception $throwable Optional throwable information to include 
+     *   in the logging event.
+     */
+    public function log(Payone_Log4php_LoggerLevel $level, $message, $throwable = null) {
+        if($this->isEnabledFor($level)) {
+            $this->forcedLog($this->fqcn, $throwable, $level, $message);
+        }
+    }
+	
+    /**
+     * If assertion parameter evaluates as false, then logs the message 
+     * using the ERROR level.
+     *
+     * @param bool $assertion
+     * @param string $msg message to log
+     */
+    public function assertLog($assertion = true, $msg = '') {
+        if($assertion == false) {
+            $this->error($msg);
+        }
+    }
+	
+    /**
+     * This method creates a new logging event and logs the event without 
+     * further checks.
+     *
+     * It should not be called directly. Use {@link trace()}, {@link debug()},
+     * {@link info()}, {@link warn()}, {@link error()} and {@link fatal()} 
+     * wrappers.
+     *
+     * @param string $fqcn Fully qualified class name of the Logger
+     * @param Exception $throwable Optional throwable information to include 
+     *   in the logging event.
+     * @param Payone_Log4php_LoggerLevel $level log level
+     * @param mixed $message message to log
+     */
+    public function forcedLog($fqcn, $throwable, Payone_Log4php_LoggerLevel $level, $message) {
+        if (!($throwable instanceof Exception)) {
+            $throwable = null;
+        }
+        $this->callAppenders(new Payone_Log4php_LoggerLoggingEvent($fqcn, $this, $level, $message, null, $throwable));
+    } 
+	
+    // ******************************************
+    // *** Checker methods                    ***
+    // ******************************************
+	
+    /**
+     * Check whether this Logger is enabled for a given Level passed as parameter.
+     *
+     * @param LoggerLevel level
+     * @return boolean
+     */
+    public function isEnabledFor(Payone_Log4php_LoggerLevel $level) {
+        return $level->isGreaterOrEqual($this->getEffectiveLevel());
+    }
+	
+    /**
+     * Check whether this Logger is enabled for the TRACE Level.
+     * @return boolean
+     */
+    public function isTraceEnabled() {
+        return $this->isEnabledFor(Payone_Log4php_LoggerLevel::getLevelTrace());
+    }
+	
+    /**
+     * Check whether this Logger is enabled for the DEBUG Level.
+     * @return boolean
+     */
+    public function isDebugEnabled() {
+        return $this->isEnabledFor(Payone_Log4php_LoggerLevel::getLevelDebug());
+    }
 
-	/**
-	 * Check whether this Logger is enabled for the INFO Level.
-	 * @return boolean
-	 */
-	public function isInfoEnabled() {
-		return $this->isEnabledFor(Payone_Log4php_LoggerLevel::getLevelInfo());
-	}
-	
-	/**
-	 * Check whether this Logger is enabled for the WARN Level.
-	 * @return boolean
-	 */
-	public function isWarnEnabled() {
-		return $this->isEnabledFor(Payone_Log4php_LoggerLevel::getLevelWarn());
-	}
-	
-	/**
-	 * Check whether this Logger is enabled for the ERROR Level.
-	 * @return boolean
-	 */
-	public function isErrorEnabled() {
-		return $this->isEnabledFor(Payone_Log4php_LoggerLevel::getLevelError());
-	}
-	
-	/**
-	 * Check whether this Logger is enabled for the FATAL Level.
-	 * @return boolean
-	 */
-	public function isFatalEnabled() {
-		return $this->isEnabledFor(Payone_Log4php_LoggerLevel::getLevelFatal());
-	}
-	
-	// ******************************************
-	// *** Configuration methods              ***
-	// ******************************************
-	
-	/**
-	 * Adds a new appender to the Logger.
-	 * @param Payone_Log4php_LoggerAppender $appender The appender to add.
-	 */
-	public function addAppender($appender) {
-		$appenderName = $appender->getName();
-		$this->appenders[$appenderName] = $appender;
-	}
-	
-	/** Removes all appenders from the Logger. */
-	public function removeAllAppenders() {
-		foreach($this->appenders as $name => $appender) {
-			$this->removeAppender($name);
-		}
-	} 
+    /**
+     * Check whether this Logger is enabled for the INFO Level.
+     * @return boolean
+     */
+    public function isInfoEnabled() {
+        return $this->isEnabledFor(Payone_Log4php_LoggerLevel::getLevelInfo());
+    }
+	
+    /**
+     * Check whether this Logger is enabled for the WARN Level.
+     * @return boolean
+     */
+    public function isWarnEnabled() {
+        return $this->isEnabledFor(Payone_Log4php_LoggerLevel::getLevelWarn());
+    }
+	
+    /**
+     * Check whether this Logger is enabled for the ERROR Level.
+     * @return boolean
+     */
+    public function isErrorEnabled() {
+        return $this->isEnabledFor(Payone_Log4php_LoggerLevel::getLevelError());
+    }
+	
+    /**
+     * Check whether this Logger is enabled for the FATAL Level.
+     * @return boolean
+     */
+    public function isFatalEnabled() {
+        return $this->isEnabledFor(Payone_Log4php_LoggerLevel::getLevelFatal());
+    }
+	
+    // ******************************************
+    // *** Configuration methods              ***
+    // ******************************************
+	
+    /**
+     * Adds a new appender to the Logger.
+     * @param Payone_Log4php_LoggerAppender $appender The appender to add.
+     */
+    public function addAppender($appender) {
+        $appenderName = $appender->getName();
+        $this->appenders[$appenderName] = $appender;
+    }
+	
+    /** Removes all appenders from the Logger. */
+    public function removeAllAppenders() {
+        foreach($this->appenders as $name => $appender) {
+            $this->removeAppender($name);
+        }
+    } 
 			
-	/**
-	 * Remove the appender passed as parameter form the Logger.
-	 * @param mixed $appender an appender name or a {@link Payone_Log4php_LoggerAppender} instance.
-	 */
-	public function removeAppender($appender) {
-		if($appender instanceof Payone_Log4php_LoggerAppender) {
-			$appender->close();
-			unset($this->appenders[$appender->getName()]);
-		} else if (is_string($appender) and isset($this->appenders[$appender])) {
-			$this->appenders[$appender]->close();
-			unset($this->appenders[$appender]);
-		}
-	}
-	
-	/**
-	 * Forwards the given logging event to all linked appenders.
-	 * @param Payone_Log4php_LoggerLoggingEvent $event
-	 */
-	public function callAppenders($event) {
-		// Forward the event to each linked appender
-		foreach($this->appenders as $appender) {
-			$appender->doAppend($event);
-		}
+    /**
+     * Remove the appender passed as parameter form the Logger.
+     * @param mixed $appender an appender name or a {@link Payone_Log4php_LoggerAppender} instance.
+     */
+    public function removeAppender($appender) {
+        if($appender instanceof Payone_Log4php_LoggerAppender) {
+            $appender->close();
+            unset($this->appenders[$appender->getName()]);
+        } else if (is_string($appender) and isset($this->appenders[$appender])) {
+            $this->appenders[$appender]->close();
+            unset($this->appenders[$appender]);
+        }
+    }
+	
+    /**
+     * Forwards the given logging event to all linked appenders.
+     * @param Payone_Log4php_LoggerLoggingEvent $event
+     */
+    public function callAppenders($event) {
+        // Forward the event to each linked appender
+        foreach($this->appenders as $appender) {
+            $appender->doAppend($event);
+        }
 		
-		// Forward the event upstream if additivity is turned on
-		if(isset($this->parent) && $this->getAdditivity()) {
-			$this->parent->callAppenders($event);
-		}
-	}
-	
-	/**
-	 * Returns the appenders linked to this logger as an array.
-	 * @return array collection of appender names
-	 */
-	public function getAllAppenders() {
-		return $this->appenders;
-	}
-	
-	/**
-	 * Returns a linked appender by name.
-	 * @return Payone_Log4php_LoggerAppender
-	 */
-	public function getAppender($name) {
-		return $this->appenders[$name];
-	}
+        // Forward the event upstream if additivity is turned on
+        if(isset($this->parent) && $this->getAdditivity()) {
+            $this->parent->callAppenders($event);
+        }
+    }
+	
+    /**
+     * Returns the appenders linked to this logger as an array.
+     * @return array collection of appender names
+     */
+    public function getAllAppenders() {
+        return $this->appenders;
+    }
+	
+    /**
+     * Returns a linked appender by name.
+     * @return Payone_Log4php_LoggerAppender
+     */
+    public function getAppender($name) {
+        return $this->appenders[$name];
+    }
 
-	/**
-	 * Sets the additivity flag.
-	 * @param boolean $additive
-	 */
-	public function setAdditivity($additive) {
-		$this->additive = (bool)$additive;
-	}
-	
-	/**
-	 * Returns the additivity flag.
-	 * @return boolean
-	 */
-	public function getAdditivity() {
-		return $this->additive;
-	}
+    /**
+     * Sets the additivity flag.
+     * @param boolean $additive
+     */
+    public function setAdditivity($additive) {
+        $this->additive = (bool)$additive;
+    }
+	
+    /**
+     * Returns the additivity flag.
+     * @return boolean
+     */
+    public function getAdditivity() {
+        return $this->additive;
+    }
  
-	/**
-	 * Starting from this Logger, search the Logger hierarchy for a non-null level and return it.
-	 * @see LoggerLevel
-	 * @return Payone_Log4php_LoggerLevel or null
-	 */
-	public function getEffectiveLevel() {
-		for($logger = $this; $logger !== null; $logger = $logger->getParent()) {
-			if($logger->getLevel() !== null) {
-				return $logger->getLevel();
-			}
-		}
-	}
+    /**
+     * Starting from this Logger, search the Logger hierarchy for a non-null level and return it.
+     * @see LoggerLevel
+     * @return Payone_Log4php_LoggerLevel or null
+     */
+    public function getEffectiveLevel() {
+        for($logger = $this; $logger !== null; $logger = $logger->getParent()) {
+            if($logger->getLevel() !== null) {
+                return $logger->getLevel();
+            }
+        }
+    }
   
-	/**
-	 * Get the assigned Logger level.
-	 * @return Payone_Log4php_LoggerLevel The assigned level or null if none is assigned.
-	 */
-	public function getLevel() {
-		return $this->level;
-	}
-	
-	/**
-	 * Set the Logger level.
-	 *
-	 * @param Payone_Log4php_LoggerLevel $level the level to set
-	 */
-	public function setLevel($level) {
-		$this->level = $level;
-	}
-	
-	/**
-	 * Checks whether an appender is attached to this logger instance.
-	 *
-	 * @param Payone_Log4php_LoggerAppender $appender
-	 * @return boolean
-	 */
-	public function isAttached(Payone_Log4php_LoggerAppender $appender) {
-		return isset($this->appenders[$appender->getName()]);
-	} 
+    /**
+     * Get the assigned Logger level.
+     * @return Payone_Log4php_LoggerLevel The assigned level or null if none is assigned.
+     */
+    public function getLevel() {
+        return $this->level;
+    }
+	
+    /**
+     * Set the Logger level.
+     *
+     * @param Payone_Log4php_LoggerLevel $level the level to set
+     */
+    public function setLevel($level) {
+        $this->level = $level;
+    }
+	
+    /**
+     * Checks whether an appender is attached to this logger instance.
+     *
+     * @param Payone_Log4php_LoggerAppender $appender
+     * @return boolean
+     */
+    public function isAttached(Payone_Log4php_LoggerAppender $appender) {
+        return isset($this->appenders[$appender->getName()]);
+    } 
 		   
 
-	/**
-	 * Sets the parent logger.
-	 * @param Logger $logger
-	 */
-	public function setParent(Payone_Log4php_Logger $logger) {
-		$this->parent = $logger;
-	} 
-	
-	// ******************************************
-	// *** Static methods and properties      ***
-	// ******************************************
-	
-	/** The logger hierarchy used by log4php. */
-	private static $hierarchy;
-	
-	/** Inidicates if log4php has been initialized */
-	private static $initialized = false;
-	
-	/**
-	 * 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.
-	 *
-	 * @return Payone_Log4php_LoggerHierarchy
-	 */
-	public static function getHierarchy() {
-		if(!isset(self::$hierarchy)) {
-			self::$hierarchy = new Payone_Log4php_LoggerHierarchy(new Payone_Log4php_LoggerRoot());
-		}
-		return self::$hierarchy;
-	}
-	
-	/**
-	 * Returns a Logger by name. If it does not exist, it will be created.
-	 *
-	 * @param string $name The logger name
-	 * @return Logger
-	 */
-	public static function getLogger($name) {
-		if(!self::isInitialized()) {
-			self::configure();
-		}
-		return self::getHierarchy()->getLogger($name);
-	}
-	
-	/**
-	 * Returns the Root Logger.
-	 * @return Payone_Log4php_LoggerRoot
-	 */
-	public static function getRootLogger() {
-		if(!self::isInitialized()) {
-			self::configure();
-		}
-		return self::getHierarchy()->getRootLogger();
-	}
-	
-	/**
-	 * Clears all Logger definitions from the logger hierarchy.
-	 * @return boolean
-	 */
-	public static function clear() {
-		return self::getHierarchy()->clear();
-	}
-	
-	/**
-	 * Destroy configurations for logger definitions
-	 */
-	public static function resetConfiguration() {
-		self::getHierarchy()->resetConfiguration();
-		self::getHierarchy()->clear(); // TODO: clear or not?
-		self::$initialized = false;
-	}
-	
-	/**
-	 * Safely close all appenders.
-	 * @deprecated This is no longer necessary due the appenders shutdown via
-	 * destructors.
-	 */
-	public static function shutdown() {
-		return self::getHierarchy()->shutdown();
-	}
-	
-	/**
-	 * check if a given logger exists.
-	 *
-	 * @param string $name logger name
-	 * @return boolean
-	 */
-	public static function exists($name) {
-		return self::getHierarchy()->exists($name);
-	}
-	
-	/**
-	 * Returns an array this whole Logger instances.
-	 * @see Logger
-	 * @return array
-	 */
-	public static function getCurrentLoggers() {
-		return self::getHierarchy()->getCurrentLoggers();
-	}
-	
-	/**
-	 * Configures log4php.
-	 * 
-	 * This method needs to be called before the first logging event has 
-	 * occured. If this method is not called before then the default
-	 * configuration will be used.
-	 *
-	 * @param string|array $configuration Either a path to the configuration
-	 *   file, or a configuration array.
-	 *   
-	 * @param string|LoggerConfigurator $configurator A custom 
-	 * configurator class: either a class name (string), or an object which 
-	 * implements the LoggerConfigurator interface. If left empty, the default
-	 * configurator implementation will be used. 
-	 */
-	public static function configure($configuration = null, $configurator = null) {
-		self::resetConfiguration();
-		$configurator = self::getConfigurator($configurator);
-		$configurator->configure(self::getHierarchy(), $configuration);
-		self::$initialized = true;
-	}
-	
-	/**
-	 * Creates a logger configurator instance based on the provided 
-	 * configurator class. If no class is given, returns an instance of
-	 * the default configurator.
-	 * 
-	 * @param string|LoggerConfigurator $configurator The configurator class 
-	 * or LoggerConfigurator instance.
-	 */
-	private static function getConfigurator($configurator = null) {
-		if ($configurator === null) {
-			return new Payone_Log4php_LoggerConfiguratorDefault();
-		}
+    /**
+     * Sets the parent logger.
+     * @param Logger $logger
+     */
+    public function setParent(Payone_Log4php_Logger $logger) {
+        $this->parent = $logger;
+    } 
+	
+    // ******************************************
+    // *** Static methods and properties      ***
+    // ******************************************
+	
+    /** The logger hierarchy used by log4php. */
+    private static $hierarchy;
+	
+    /** Inidicates if log4php has been initialized */
+    private static $initialized = false;
+	
+    /**
+     * 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.
+     *
+     * @return Payone_Log4php_LoggerHierarchy
+     */
+    public static function getHierarchy() {
+        if(!isset(self::$hierarchy)) {
+            self::$hierarchy = new Payone_Log4php_LoggerHierarchy(new Payone_Log4php_LoggerRoot());
+        }
+        return self::$hierarchy;
+    }
+	
+    /**
+     * Returns a Logger by name. If it does not exist, it will be created.
+     *
+     * @param string $name The logger name
+     * @return Logger
+     */
+    public static function getLogger($name) {
+        if(!self::isInitialized()) {
+            self::configure();
+        }
+        return self::getHierarchy()->getLogger($name);
+    }
+	
+    /**
+     * Returns the Root Logger.
+     * @return Payone_Log4php_LoggerRoot
+     */
+    public static function getRootLogger() {
+        if(!self::isInitialized()) {
+            self::configure();
+        }
+        return self::getHierarchy()->getRootLogger();
+    }
+	
+    /**
+     * Clears all Logger definitions from the logger hierarchy.
+     * @return boolean
+     */
+    public static function clear() {
+        return self::getHierarchy()->clear();
+    }
+	
+    /**
+     * Destroy configurations for logger definitions
+     */
+    public static function resetConfiguration() {
+        self::getHierarchy()->resetConfiguration();
+        self::getHierarchy()->clear(); // TODO: clear or not?
+        self::$initialized = false;
+    }
+	
+    /**
+     * Safely close all appenders.
+     * @deprecated This is no longer necessary due the appenders shutdown via
+     * destructors.
+     */
+    public static function shutdown() {
+        return self::getHierarchy()->shutdown();
+    }
+	
+    /**
+     * check if a given logger exists.
+     *
+     * @param string $name logger name
+     * @return boolean
+     */
+    public static function exists($name) {
+        return self::getHierarchy()->exists($name);
+    }
+	
+    /**
+     * Returns an array this whole Logger instances.
+     * @see Logger
+     * @return array
+     */
+    public static function getCurrentLoggers() {
+        return self::getHierarchy()->getCurrentLoggers();
+    }
+	
+    /**
+     * Configures log4php.
+     * 
+     * This method needs to be called before the first logging event has 
+     * occured. If this method is not called before then the default
+     * configuration will be used.
+     *
+     * @param string|array $configuration Either a path to the configuration
+     *   file, or a configuration array.
+     *   
+     * @param string|LoggerConfigurator $configurator A custom 
+     * configurator class: either a class name (string), or an object which 
+     * implements the LoggerConfigurator interface. If left empty, the default
+     * configurator implementation will be used. 
+     */
+    public static function configure($configuration = null, $configurator = null) {
+        self::resetConfiguration();
+        $configurator = self::getConfigurator($configurator);
+        $configurator->configure(self::getHierarchy(), $configuration);
+        self::$initialized = true;
+    }
+	
+    /**
+     * Creates a logger configurator instance based on the provided 
+     * configurator class. If no class is given, returns an instance of
+     * the default configurator.
+     * 
+     * @param string|LoggerConfigurator $configurator The configurator class 
+     * or LoggerConfigurator instance.
+     */
+    private static function getConfigurator($configurator = null) {
+        if ($configurator === null) {
+            return new Payone_Log4php_LoggerConfiguratorDefault();
+        }
 		
-		if (is_object($configurator)) {
-			if ($configurator instanceof Payone_Log4php_LoggerConfigurator) {
-				return $configurator;
-			} else {
-				trigger_error("log4php: Given configurator object [$configurator] does not implement the LoggerConfigurator interface. Reverting to default configurator.", E_USER_WARNING);
-				return new Payone_Log4php_LoggerConfiguratorDefault();
-			}
-		}
+        if (is_object($configurator)) {
+            if ($configurator instanceof Payone_Log4php_LoggerConfigurator) {
+                return $configurator;
+            } else {
+                trigger_error("log4php: Given configurator object [$configurator] does not implement the LoggerConfigurator interface. Reverting to default configurator.", E_USER_WARNING);
+                return new Payone_Log4php_LoggerConfiguratorDefault();
+            }
+        }
 		
-		if (is_string($configurator)) {
-			if (!class_exists($configurator)) {
-				trigger_error("log4php: Specified configurator class [$configurator] does not exist. Reverting to default configurator.", E_USER_WARNING);
-				return new Payone_Log4php_LoggerConfiguratorDefault();
-			}
+        if (is_string($configurator)) {
+            if (!class_exists($configurator)) {
+                trigger_error("log4php: Specified configurator class [$configurator] does not exist. Reverting to default configurator.", E_USER_WARNING);
+                return new Payone_Log4php_LoggerConfiguratorDefault();
+            }
 			
-			$instance = new $configurator();
+            $instance = new $configurator();
 				
-			if (!($instance instanceof Payone_Log4php_LoggerConfigurator)) {
-				trigger_error("log4php: Specified configurator class [$configurator] does not implement the LoggerConfigurator interface. Reverting to default configurator.", E_USER_WARNING);
-				return new Payone_Log4php_LoggerConfiguratorDefault();
-			}
+            if (!($instance instanceof Payone_Log4php_LoggerConfigurator)) {
+                trigger_error("log4php: Specified configurator class [$configurator] does not implement the LoggerConfigurator interface. Reverting to default configurator.", E_USER_WARNING);
+                return new Payone_Log4php_LoggerConfiguratorDefault();
+            }
 			
-			return $instance;
-		}
+            return $instance;
+        }
 		
-		trigger_error("log4php: Invalid configurator specified. Expected either a string or a LoggerConfigurator instance. Reverting to default configurator.", E_USER_WARNING);
-		return new Payone_Log4php_LoggerConfiguratorDefault();
-	}
-	
-	/**
-	 * Returns true if the log4php framework has been initialized.
-	 * @return boolean 
-	 */
-	private static function isInitialized() {
-		return self::$initialized;
-	}
+        trigger_error("log4php: Invalid configurator specified. Expected either a string or a LoggerConfigurator instance. Reverting to default configurator.", E_USER_WARNING);
+        return new Payone_Log4php_LoggerConfiguratorDefault();
+    }
+	
+    /**
+     * Returns true if the log4php framework has been initialized.
+     * @return boolean 
+     */
+    private static function isInitialized() {
+        return self::$initialized;
+    }
 	
 }

Spacing +11 added lines, -11 removed lines

@@ -169,7 +169,7 @@ 
 	 *   in the logging event.
 	 */
 	public function log(Payone_Log4php_LoggerLevel $level, $message, $throwable = null) {
-		if($this->isEnabledFor($level)) {
+		if ($this->isEnabledFor($level)) {
 			$this->forcedLog($this->fqcn, $throwable, $level, $message);
 		}
 	}
@@ -182,7 +182,7 @@ 
 	 * @param string $msg message to log
 	 */
 	public function assertLog($assertion = true, $msg = '') {
-		if($assertion == false) {
+		if ($assertion == false) {
 			$this->error($msg);
 		}
 	}
@@ -285,7 +285,7 @@ 
 	
 	/** Removes all appenders from the Logger. */
 	public function removeAllAppenders() {
-		foreach($this->appenders as $name => $appender) {
+		foreach ($this->appenders as $name => $appender) {
 			$this->removeAppender($name);
 		}
 	} 
@@ -295,7 +295,7 @@ 
 	 * @param mixed $appender an appender name or a {@link Payone_Log4php_LoggerAppender} instance.
 	 */
 	public function removeAppender($appender) {
-		if($appender instanceof Payone_Log4php_LoggerAppender) {
+		if ($appender instanceof Payone_Log4php_LoggerAppender) {
 			$appender->close();
 			unset($this->appenders[$appender->getName()]);
 		} else if (is_string($appender) and isset($this->appenders[$appender])) {
@@ -310,12 +310,12 @@ 
 	 */
 	public function callAppenders($event) {
 		// Forward the event to each linked appender
-		foreach($this->appenders as $appender) {
+		foreach ($this->appenders as $appender) {
 			$appender->doAppend($event);
 		}
 		
 		// Forward the event upstream if additivity is turned on
-		if(isset($this->parent) && $this->getAdditivity()) {
+		if (isset($this->parent) && $this->getAdditivity()) {
 			$this->parent->callAppenders($event);
 		}
 	}
@@ -358,8 +358,8 @@ 
 	 * @return Payone_Log4php_LoggerLevel or null
 	 */
 	public function getEffectiveLevel() {
-		for($logger = $this; $logger !== null; $logger = $logger->getParent()) {
-			if($logger->getLevel() !== null) {
+		for ($logger = $this; $logger !== null; $logger = $logger->getParent()) {
+			if ($logger->getLevel() !== null) {
 				return $logger->getLevel();
 			}
 		}
@@ -421,7 +421,7 @@ 
 	 * @return Payone_Log4php_LoggerHierarchy
 	 */
 	public static function getHierarchy() {
-		if(!isset(self::$hierarchy)) {
+		if (!isset(self::$hierarchy)) {
 			self::$hierarchy = new Payone_Log4php_LoggerHierarchy(new Payone_Log4php_LoggerRoot());
 		}
 		return self::$hierarchy;
@@ -434,7 +434,7 @@ 
 	 * @return Logger
 	 */
 	public static function getLogger($name) {
-		if(!self::isInitialized()) {
+		if (!self::isInitialized()) {
 			self::configure();
 		}
 		return self::getHierarchy()->getLogger($name);
@@ -445,7 +445,7 @@ 
 	 * @return Payone_Log4php_LoggerRoot
 	 */
 	public static function getRootLogger() {
-		if(!self::isInitialized()) {
+		if (!self::isInitialized()) {
 			self::configure();
 		}
 		return self::getHierarchy()->getRootLogger();

Doc Comments +4 added lines, -4 removed lines

@@ -84,7 +84,7 @@ 
 
 	/**
 	 * Returns the parent Logger. Can be null if this is the root logger.
-	 * @return Logger
+	 * @return Payone_Log4php_Logger
 	 */
 	public function getParent() {
 		return $this->parent;
@@ -141,7 +141,7 @@ 
 	/**
 	 * Log a message object with the ERROR level.
 	 *
-	 * @param mixed $message message
+	 * @param string $message message
 	 * @param Exception $throwable Optional throwable information to include 
 	 *   in the logging event.
 	 */
@@ -395,7 +395,7 @@ 
 
 	/**
 	 * Sets the parent logger.
-	 * @param Logger $logger
+	 * @param Payone_Log4php_Logger $logger
 	 */
 	public function setParent(Payone_Log4php_Logger $logger) {
 		$this->parent = $logger;
@@ -453,7 +453,7 @@ 
 	
 	/**
 	 * Clears all Logger definitions from the logger hierarchy.
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	public static function clear() {
 		return self::getHierarchy()->clear();

lib/Payone/Log4php/LoggerAppenderMongoDB.php

Indentation +229 added lines, -229 removed lines

@@ -33,282 +33,282 @@
  */
 class Payone_Log4php_LoggerAppenderMongoDB extends Payone_Log4php_LoggerAppender {
 	
-	// ******************************************
-	// ** Constants                            **
-	// ******************************************
+    // ******************************************
+    // ** Constants                            **
+    // ******************************************
 	
-	/** Default prefix for the {@link $host}. */	
-	const DEFAULT_MONGO_URL_PREFIX = 'mongodb://';
+    /** Default prefix for the {@link $host}. */	
+    const DEFAULT_MONGO_URL_PREFIX = 'mongodb://';
 	
-	/** Default value for {@link $host}, without a prefix. */
-	const DEFAULT_MONGO_HOST = 'localhost';
+    /** Default value for {@link $host}, without a prefix. */
+    const DEFAULT_MONGO_HOST = 'localhost';
 	
-	/** Default value for {@link $port} */
-	const DEFAULT_MONGO_PORT = 27017;
+    /** Default value for {@link $port} */
+    const DEFAULT_MONGO_PORT = 27017;
 	
-	/** Default value for {@link $databaseName} */
-	const DEFAULT_DB_NAME = 'log4php_mongodb';
+    /** Default value for {@link $databaseName} */
+    const DEFAULT_DB_NAME = 'log4php_mongodb';
 	
-	/** Default value for {@link $collectionName} */
-	const DEFAULT_COLLECTION_NAME = 'logs';
+    /** Default value for {@link $collectionName} */
+    const DEFAULT_COLLECTION_NAME = 'logs';
 	
-	/** Default value for {@link $timeout} */
-	const DEFAULT_TIMEOUT_VALUE = 3000;
+    /** Default value for {@link $timeout} */
+    const DEFAULT_TIMEOUT_VALUE = 3000;
 	
-	// ******************************************
-	// ** Configurable parameters              **
-	// ******************************************
+    // ******************************************
+    // ** Configurable parameters              **
+    // ******************************************
 	
-	/** Server on which mongodb instance is located. */
-	protected $host;
+    /** Server on which mongodb instance is located. */
+    protected $host;
 	
-	/** Port on which the instance is bound. */
-	protected $port;
+    /** Port on which the instance is bound. */
+    protected $port;
 	
-	/** Name of the database to which to log. */
-	protected $databaseName;
+    /** Name of the database to which to log. */
+    protected $databaseName;
 	
-	/** Name of the collection within the given database. */
-	protected $collectionName;
+    /** Name of the collection within the given database. */
+    protected $collectionName;
 			
-	/** Username used to connect to the database. */
-	protected $userName;
+    /** Username used to connect to the database. */
+    protected $userName;
 	
-	/** Password used to connect to the database. */
-	protected $password;
+    /** Password used to connect to the database. */
+    protected $password;
 	
-	/** Timeout value used when connecting to the database (in milliseconds). */
-	protected $timeout;
+    /** Timeout value used when connecting to the database (in milliseconds). */
+    protected $timeout;
 	
-	// ******************************************
-	// ** Member variables                     **
-	// ******************************************
+    // ******************************************
+    // ** Member variables                     **
+    // ******************************************
 
-	/** 
-	 * Connection to the MongoDB instance.
-	 * @var Mongo
-	 */
-	protected $connection;
+    /** 
+     * Connection to the MongoDB instance.
+     * @var Mongo
+     */
+    protected $connection;
 	
-	/** 
-	 * The collection to which log is written. 
-	 * @var MongoCollection
-	 */
-	protected $collection;
+    /** 
+     * The collection to which log is written. 
+     * @var MongoCollection
+     */
+    protected $collection;
 
-	/** 
-	 * Set to true if the appender can append. 
-	 * @todo Maybe we should use $closed here instead? 
-	 */
-	protected $canAppend = false;
+    /** 
+     * Set to true if the appender can append. 
+     * @todo Maybe we should use $closed here instead? 
+     */
+    protected $canAppend = false;
 	
-	/** Appender does not require a layout. */
-	protected $requiresLayout = false;
+    /** Appender does not require a layout. */
+    protected $requiresLayout = false;
 		
-	public function __construct($name = '') {
-		parent::__construct($name);
-		$this->host = self::DEFAULT_MONGO_URL_PREFIX . self::DEFAULT_MONGO_HOST;
-		$this->port = self::DEFAULT_MONGO_PORT;
-		$this->databaseName = self::DEFAULT_DB_NAME;
-		$this->collectionName = self::DEFAULT_COLLECTION_NAME;
-		$this->timeout = self::DEFAULT_TIMEOUT_VALUE;
-	}
+    public function __construct($name = '') {
+        parent::__construct($name);
+        $this->host = self::DEFAULT_MONGO_URL_PREFIX . self::DEFAULT_MONGO_HOST;
+        $this->port = self::DEFAULT_MONGO_PORT;
+        $this->databaseName = self::DEFAULT_DB_NAME;
+        $this->collectionName = self::DEFAULT_COLLECTION_NAME;
+        $this->timeout = self::DEFAULT_TIMEOUT_VALUE;
+    }
 	
-	/**
-	 * Setup db connection.
-	 * Based on defined options, this method connects to the database and 
-	 * creates a {@link $collection}. 
-	 *  
-	 * @throws Exception if the attempt to connect to the requested database fails.
-	 */
-	public function activateOptions() {
-		try {
-			$this->connection = new Mongo(sprintf('%s:%d', $this->host, $this->port), array("timeout" => $this->timeout));
-			$db	= $this->connection->selectDB($this->databaseName);
-			if ($this->userName !== null && $this->password !== null) {
-				$authResult = $db->authenticate($this->userName, $this->password);
-				if ($authResult['ok'] == floatval(0)) {
-					throw new Exception($authResult['errmsg'], $authResult['ok']);
-				}
-			}
+    /**
+     * Setup db connection.
+     * Based on defined options, this method connects to the database and 
+     * creates a {@link $collection}. 
+     *  
+     * @throws Exception if the attempt to connect to the requested database fails.
+     */
+    public function activateOptions() {
+        try {
+            $this->connection = new Mongo(sprintf('%s:%d', $this->host, $this->port), array("timeout" => $this->timeout));
+            $db	= $this->connection->selectDB($this->databaseName);
+            if ($this->userName !== null && $this->password !== null) {
+                $authResult = $db->authenticate($this->userName, $this->password);
+                if ($authResult['ok'] == floatval(0)) {
+                    throw new Exception($authResult['errmsg'], $authResult['ok']);
+                }
+            }
 			
-			$this->collection = $db->selectCollection($this->collectionName);												 
-		} catch (Exception $ex) {
-			$this->canAppend = false;
-			throw new Payone_Log4php_LoggerException($ex);
-		} 
+            $this->collection = $db->selectCollection($this->collectionName);												 
+        } catch (Exception $ex) {
+            $this->canAppend = false;
+            throw new Payone_Log4php_LoggerException($ex);
+        } 
 			
-		$this->canAppend = true;
-	}		 
+        $this->canAppend = true;
+    }		 
 	
-	/**
-	 * Appends a new event to the mongo database.
-	 * 
-	 * @throws LoggerException If the pattern conversion or the INSERT statement fails.
-	 */
-	public function append(Payone_Log4php_LoggerLoggingEvent $event) {
-		if ($this->canAppend == true && $this->collection != null) {
-			$document = $this->format($event);
-			$this->collection->insert($document);			
-		}
-	}
+    /**
+     * Appends a new event to the mongo database.
+     * 
+     * @throws LoggerException If the pattern conversion or the INSERT statement fails.
+     */
+    public function append(Payone_Log4php_LoggerLoggingEvent $event) {
+        if ($this->canAppend == true && $this->collection != null) {
+            $document = $this->format($event);
+            $this->collection->insert($document);			
+        }
+    }
 	
-	/**
-	 * Converts the logging event into an array which can be logged to mongodb.
-	 * 
-	 * @param Payone_Log4php_LoggerLoggingEvent $event
-	 * @return array The array representation of the logging event.
-	 */
-	protected function format(Payone_Log4php_LoggerLoggingEvent $event) {
-		$timestampSec  = (int) $event->getTimestamp();
-		$timestampUsec = (int) (($event->getTimestamp() - $timestampSec) * 1000000);
+    /**
+     * Converts the logging event into an array which can be logged to mongodb.
+     * 
+     * @param Payone_Log4php_LoggerLoggingEvent $event
+     * @return array The array representation of the logging event.
+     */
+    protected function format(Payone_Log4php_LoggerLoggingEvent $event) {
+        $timestampSec  = (int) $event->getTimestamp();
+        $timestampUsec = (int) (($event->getTimestamp() - $timestampSec) * 1000000);
 
-		$document = array(
-			'timestamp'  => new MongoDate($timestampSec, $timestampUsec),
-			'level'      => $event->getLevel()->toString(),
-			'thread'     => (int) $event->getThreadName(),
-			'message'    => $event->getMessage(),
-			'loggerName' => $event->getLoggerName() 
-		);	
+        $document = array(
+            'timestamp'  => new MongoDate($timestampSec, $timestampUsec),
+            'level'      => $event->getLevel()->toString(),
+            'thread'     => (int) $event->getThreadName(),
+            'message'    => $event->getMessage(),
+            'loggerName' => $event->getLoggerName() 
+        );	
 
-		$locationInfo = $event->getLocationInformation();
-		if ($locationInfo != null) {
-			$document['fileName']   = $locationInfo->getFileName();
-			$document['method']     = $locationInfo->getMethodName();
-			$document['lineNumber'] = ($locationInfo->getLineNumber() == 'NA') ? 'NA' : (int) $locationInfo->getLineNumber();
-			$document['className']  = $locationInfo->getClassName();
-		}	
+        $locationInfo = $event->getLocationInformation();
+        if ($locationInfo != null) {
+            $document['fileName']   = $locationInfo->getFileName();
+            $document['method']     = $locationInfo->getMethodName();
+            $document['lineNumber'] = ($locationInfo->getLineNumber() == 'NA') ? 'NA' : (int) $locationInfo->getLineNumber();
+            $document['className']  = $locationInfo->getClassName();
+        }	
 
-		$throwableInfo = $event->getThrowableInformation();
-		if ($throwableInfo != null) {
-			$document['exception'] = $this->formatThrowable($throwableInfo->getThrowable());
-		}
+        $throwableInfo = $event->getThrowableInformation();
+        if ($throwableInfo != null) {
+            $document['exception'] = $this->formatThrowable($throwableInfo->getThrowable());
+        }
 		
-		return $document;
-	}
+        return $document;
+    }
 	
-	/**
-	 * Converts an Exception into an array which can be logged to mongodb.
-	 * 
-	 * Supports innner exceptions (PHP >= 5.3)
-	 * 
-	 * @param Exception $ex
-	 * @return array
-	 */
-	protected function formatThrowable(Exception $ex) {
-		$array = array(				
-			'message'    => $ex->getMessage(),
-			'code'       => $ex->getCode(),
-			'stackTrace' => $ex->getTraceAsString(),
-		);
+    /**
+     * Converts an Exception into an array which can be logged to mongodb.
+     * 
+     * Supports innner exceptions (PHP >= 5.3)
+     * 
+     * @param Exception $ex
+     * @return array
+     */
+    protected function formatThrowable(Exception $ex) {
+        $array = array(				
+            'message'    => $ex->getMessage(),
+            'code'       => $ex->getCode(),
+            'stackTrace' => $ex->getTraceAsString(),
+        );
                         
-		if (method_exists($ex, 'getPrevious') && $ex->getPrevious() !== null) {
-			$array['innerException'] = $this->formatThrowable($ex->getPrevious());
-		}
+        if (method_exists($ex, 'getPrevious') && $ex->getPrevious() !== null) {
+            $array['innerException'] = $this->formatThrowable($ex->getPrevious());
+        }
 			
-		return $array;
-	}
+        return $array;
+    }
 		
-	/**
-	 * Closes the connection to the logging database
-	 */
-	public function close() {
-		if($this->closed != true) {
-			$this->collection = null;
-			if ($this->connection !== null) {
-				$this->connection->close();
-				$this->connection = null;	
-			}					
-			$this->closed = true;
-		}
-	}
+    /**
+     * Closes the connection to the logging database
+     */
+    public function close() {
+        if($this->closed != true) {
+            $this->collection = null;
+            if ($this->connection !== null) {
+                $this->connection->close();
+                $this->connection = null;	
+            }					
+            $this->closed = true;
+        }
+    }
 	
-	/** Sets the value of {@link $host} parameter. */
-	public function setHost($host) {
-		if (!preg_match('/^mongodb\:\/\//', $host)) {
-			$host = self::DEFAULT_MONGO_URL_PREFIX . $host;
-		}
-		$this->host = $host;
-	}
+    /** Sets the value of {@link $host} parameter. */
+    public function setHost($host) {
+        if (!preg_match('/^mongodb\:\/\//', $host)) {
+            $host = self::DEFAULT_MONGO_URL_PREFIX . $host;
+        }
+        $this->host = $host;
+    }
 		
-	/** Returns the value of {@link $host} parameter. */
-	public function getHost() {
-		return $this->host;
-	}
+    /** Returns the value of {@link $host} parameter. */
+    public function getHost() {
+        return $this->host;
+    }
 		
-	/** Sets the value of {@link $port} parameter. */
-	public function setPort($port) {
-		$this->setPositiveInteger('port', $port);
-	}
+    /** Sets the value of {@link $port} parameter. */
+    public function setPort($port) {
+        $this->setPositiveInteger('port', $port);
+    }
 		
-	/** Returns the value of {@link $port} parameter. */
-	public function getPort() {
-		return $this->port;
-	}
+    /** Returns the value of {@link $port} parameter. */
+    public function getPort() {
+        return $this->port;
+    }
 		
-	/** Sets the value of {@link $databaseName} parameter. */
-	public function setDatabaseName($databaseName) {
-		$this->setString('databaseName', $databaseName);
-	}
+    /** Sets the value of {@link $databaseName} parameter. */
+    public function setDatabaseName($databaseName) {
+        $this->setString('databaseName', $databaseName);
+    }
 		
-	/** Returns the value of {@link $databaseName} parameter. */
-	public function getDatabaseName() {
-		return $this->databaseName;
-	}
+    /** Returns the value of {@link $databaseName} parameter. */
+    public function getDatabaseName() {
+        return $this->databaseName;
+    }
 	
-	/** Sets the value of {@link $collectionName} parameter. */
-	public function setCollectionName($collectionName) {
-		$this->setString('collectionName', $collectionName);
-	}
+    /** Sets the value of {@link $collectionName} parameter. */
+    public function setCollectionName($collectionName) {
+        $this->setString('collectionName', $collectionName);
+    }
 		
-	/** Returns the value of {@link $collectionName} parameter. */
-	public function getCollectionName() {
-		return $this->collectionName;
-	}
+    /** Returns the value of {@link $collectionName} parameter. */
+    public function getCollectionName() {
+        return $this->collectionName;
+    }
 		
-	/** Sets the value of {@link $userName} parameter. */
-	public function setUserName($userName) {
-		$this->setString('userName', $userName, true);
-	}
+    /** Sets the value of {@link $userName} parameter. */
+    public function setUserName($userName) {
+        $this->setString('userName', $userName, true);
+    }
 	
-	/** Returns the value of {@link $userName} parameter. */
-	public function getUserName() {
-		return $this->userName;
-	}
+    /** Returns the value of {@link $userName} parameter. */
+    public function getUserName() {
+        return $this->userName;
+    }
 		
-	/** Sets the value of {@link $password} parameter. */
-	public function setPassword($password) {
-		$this->setString('password', $password, true);
-	}
+    /** Sets the value of {@link $password} parameter. */
+    public function setPassword($password) {
+        $this->setString('password', $password, true);
+    }
 		
-	/** Returns the value of {@link $password} parameter. */
-	public function getPassword() {
-		return $this->password;
-	}
+    /** Returns the value of {@link $password} parameter. */
+    public function getPassword() {
+        return $this->password;
+    }
 	
-	/** Sets the value of {@link $timeout} parameter. */
-	public function setTimeout($timeout) {
-		$this->setPositiveInteger('timeout', $timeout);
-	}
+    /** Sets the value of {@link $timeout} parameter. */
+    public function setTimeout($timeout) {
+        $this->setPositiveInteger('timeout', $timeout);
+    }
 
-	/** Returns the value of {@link $timeout} parameter. */
-	public function getTimeout() {
-		return $this->timeout;
-	}
-	/** 
-	 * Returns the mongodb connection.
-	 * @return Mongo
-	 */
-	public function getConnection() {
-		return $this->connection;
-	}
+    /** Returns the value of {@link $timeout} parameter. */
+    public function getTimeout() {
+        return $this->timeout;
+    }
+    /** 
+     * Returns the mongodb connection.
+     * @return Mongo
+     */
+    public function getConnection() {
+        return $this->connection;
+    }
 	
-	/** 
-	 * Returns the active mongodb collection.
-	 * @return MongoCollection
-	 */
-	public function getCollection() {
-		return $this->collection;
-	}
+    /** 
+     * Returns the active mongodb collection.
+     * @return MongoCollection
+     */
+    public function getCollection() {
+        return $this->collection;
+    }
 }
 ?>
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -124,7 +124,7 @@ 
 	public function activateOptions() {
 		try {
 			$this->connection = new Mongo(sprintf('%s:%d', $this->host, $this->port), array("timeout" => $this->timeout));
-			$db	= $this->connection->selectDB($this->databaseName);
+			$db = $this->connection->selectDB($this->databaseName);
 			if ($this->userName !== null && $this->password !== null) {
 				$authResult = $db->authenticate($this->userName, $this->password);
 				if ($authResult['ok'] == floatval(0)) {
@@ -160,13 +160,13 @@ 
 	 * @return array The array representation of the logging event.
 	 */
 	protected function format(Payone_Log4php_LoggerLoggingEvent $event) {
-		$timestampSec  = (int) $event->getTimestamp();
-		$timestampUsec = (int) (($event->getTimestamp() - $timestampSec) * 1000000);
+		$timestampSec  = (int)$event->getTimestamp();
+		$timestampUsec = (int)(($event->getTimestamp() - $timestampSec) * 1000000);
 
 		$document = array(
 			'timestamp'  => new MongoDate($timestampSec, $timestampUsec),
 			'level'      => $event->getLevel()->toString(),
-			'thread'     => (int) $event->getThreadName(),
+			'thread'     => (int)$event->getThreadName(),
 			'message'    => $event->getMessage(),
 			'loggerName' => $event->getLoggerName() 
 		);	
@@ -175,7 +175,7 @@ 
 		if ($locationInfo != null) {
 			$document['fileName']   = $locationInfo->getFileName();
 			$document['method']     = $locationInfo->getMethodName();
-			$document['lineNumber'] = ($locationInfo->getLineNumber() == 'NA') ? 'NA' : (int) $locationInfo->getLineNumber();
+			$document['lineNumber'] = ($locationInfo->getLineNumber() == 'NA') ? 'NA' : (int)$locationInfo->getLineNumber();
 			$document['className']  = $locationInfo->getClassName();
 		}	
 
@@ -213,7 +213,7 @@ 
 	 * Closes the connection to the logging database
 	 */
 	public function close() {
-		if($this->closed != true) {
+		if ($this->closed != true) {
 			$this->collection = null;
 			if ($this->connection !== null) {
 				$this->connection->close();