fjbender / magento-1

lib/Payone/Log4php/Logger.php

Doc Comments +3 added lines, -3 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;
@@ -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();

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

lib/Payone/Log4php/LoggerConfigurationAdapterXML.php

Doc Comments +5 added lines

@@ -69,6 +69,7 @@ 
 	/**
 	 * Loads and validates the XML.
 	 * @param string $url Input XML.
+	 * @return SimpleXMLElement
 	 */
 	private function loadXML($url) {
 		if (!file_exists($url)) {
@@ -213,6 +214,7 @@ 
 	
 	/** 
 	 * Parses a <logger> node for appender references and returns them in an array.
+	 * @param string $name
 	 */
 	private function parseAppenderReferences(SimpleXMLElement $node, $name) {
 		$refs = array();
@@ -247,6 +249,9 @@ 
 	// ** Helper methods                       **
 	// ******************************************
 	
+	/**
+	 * @param string $name
+	 */
 	private function getAttributeValue(SimpleXMLElement $node, $name) {
 		return isset($node[$name]) ? (string) $node[$name] : null;
 	}

Indentation +174 added lines, -174 removed lines

@@ -29,231 +29,231 @@
  */
 class LoggerConfigurationAdapterXML implements LoggerConfigurationAdapter
 {
-	/** Path to the XML schema used for validation. */
-	const SCHEMA_PATH = '/../xml/log4php.xsd';
+    /** Path to the XML schema used for validation. */
+    const SCHEMA_PATH = '/../xml/log4php.xsd';
 	
-	private $config = array(
-		'appenders' => array(),
-		'loggers' => array(),
-		'renderers' => array(),
-	);
+    private $config = array(
+        'appenders' => array(),
+        'loggers' => array(),
+        'renderers' => array(),
+    );
 	
-	public function convert($url)
-	{
-		$xml = $this->loadXML($url);
+    public function convert($url)
+    {
+        $xml = $this->loadXML($url);
 		
-		$this->parseConfiguration($xml);
+        $this->parseConfiguration($xml);
 
-		// Parse the <root> node
-		if (isset($xml->root)) {		
-			$this->parseRootLogger($xml->root);
-		}
+        // Parse the <root> node
+        if (isset($xml->root)) {		
+            $this->parseRootLogger($xml->root);
+        }
 		
-		// Process <logger> nodes
-		foreach($xml->logger as $logger) {
-			$this->parseLogger($logger);
-		} 
+        // Process <logger> nodes
+        foreach($xml->logger as $logger) {
+            $this->parseLogger($logger);
+        } 
 		
-		// Process <appender> nodes
-		foreach($xml->appender as $appender) {
-			$this->parseAppender($appender);
-		}
+        // Process <appender> nodes
+        foreach($xml->appender as $appender) {
+            $this->parseAppender($appender);
+        }
 		
-		// Process <renderer> nodes
-		foreach($xml->renderer as $rendererNode) {
-			$this->parseRenderer($rendererNode);
-		}
-		return $this->config;
-	}
+        // Process <renderer> nodes
+        foreach($xml->renderer as $rendererNode) {
+            $this->parseRenderer($rendererNode);
+        }
+        return $this->config;
+    }
 	
-	/**
-	 * Loads and validates the XML.
-	 * @param string $url Input XML.
-	 */
-	private function loadXML($url) {
-		if (!file_exists($url)) {
-			throw new Payone_Log4php_LoggerException("File [$url] does not exist.");
-		}
+    /**
+     * Loads and validates the XML.
+     * @param string $url Input XML.
+     */
+    private function loadXML($url) {
+        if (!file_exists($url)) {
+            throw new Payone_Log4php_LoggerException("File [$url] does not exist.");
+        }
 
-		libxml_clear_errors();
-		$oldValue = libxml_use_internal_errors(true);
+        libxml_clear_errors();
+        $oldValue = libxml_use_internal_errors(true);
 		
-		// Load XML
-		$xml = @simplexml_load_file($url);
-		if ($xml === false) {
+        // Load XML
+        $xml = @simplexml_load_file($url);
+        if ($xml === false) {
 			
-			$errorStr = "";
-			foreach(libxml_get_errors() as $error) {
-				$errorStr .= $error->message;
-			}
+            $errorStr = "";
+            foreach(libxml_get_errors() as $error) {
+                $errorStr .= $error->message;
+            }
 			
-			throw new Payone_Log4php_LoggerException("Error loading configuration file: " . trim($errorStr));
-		}
+            throw new Payone_Log4php_LoggerException("Error loading configuration file: " . trim($errorStr));
+        }
 		
-		libxml_clear_errors();
-		libxml_use_internal_errors($oldValue);
+        libxml_clear_errors();
+        libxml_use_internal_errors($oldValue);
 		
-		return $xml;
-	}
+        return $xml;
+    }
 	
-	/**
-	 * Parses the <configuration> node.
-	 */
-	private function parseConfiguration(SimpleXMLElement $xml) {
-		$attributes = $xml->attributes();
-		if (isset($attributes['threshold'])) {
-			$this->config['threshold'] = (string) $attributes['threshold'];
-		}
-	}
+    /**
+     * Parses the <configuration> node.
+     */
+    private function parseConfiguration(SimpleXMLElement $xml) {
+        $attributes = $xml->attributes();
+        if (isset($attributes['threshold'])) {
+            $this->config['threshold'] = (string) $attributes['threshold'];
+        }
+    }
 	
-	/** Parses an <appender> node. */
-	private function parseAppender(SimpleXMLElement $node) {
-		$name = $this->getAttributeValue($node, 'name');
-		if (empty($name)) {
-			$this->warn("An <appender> node is missing the required 'name' attribute. Skipping appender definition.");
-			return;
-		}
+    /** Parses an <appender> node. */
+    private function parseAppender(SimpleXMLElement $node) {
+        $name = $this->getAttributeValue($node, 'name');
+        if (empty($name)) {
+            $this->warn("An <appender> node is missing the required 'name' attribute. Skipping appender definition.");
+            return;
+        }
 		
-		$appender = array();
-		$appender['class'] = $this->getAttributeValue($node, 'class');
+        $appender = array();
+        $appender['class'] = $this->getAttributeValue($node, 'class');
 		
-		if (isset($node['threshold'])) {
-			$appender['threshold'] = $this->getAttributeValue($node, 'threshold');
-		}
+        if (isset($node['threshold'])) {
+            $appender['threshold'] = $this->getAttributeValue($node, 'threshold');
+        }
 		
-		if (isset($node->layout)) {
-			$appender['layout']= $this->parseLayout($node->layout, $name);
-		}
+        if (isset($node->layout)) {
+            $appender['layout']= $this->parseLayout($node->layout, $name);
+        }
 		
-		if (count($node->param) > 0) {
-			$appender['params'] = $this->parseParameters($node);
-		}
+        if (count($node->param) > 0) {
+            $appender['params'] = $this->parseParameters($node);
+        }
 		
-		foreach($node->filter as $filterNode) {
-			$appender['filters'][] = $this->parseFilter($filterNode);
-		}
+        foreach($node->filter as $filterNode) {
+            $appender['filters'][] = $this->parseFilter($filterNode);
+        }
 		
-		$this->config['appenders'][$name] = $appender;
-	}
+        $this->config['appenders'][$name] = $appender;
+    }
 	
-	/** Parses a <layout> node. */
-	private function parseLayout(SimpleXMLElement $node, $appenderName) {
-		$layout = array();
-		$layout['class'] = $this->getAttributeValue($node, 'class');
+    /** Parses a <layout> node. */
+    private function parseLayout(SimpleXMLElement $node, $appenderName) {
+        $layout = array();
+        $layout['class'] = $this->getAttributeValue($node, 'class');
 		
-		if (count($node->param) > 0) {
-			$layout['params'] = $this->parseParameters($node);
-		}
+        if (count($node->param) > 0) {
+            $layout['params'] = $this->parseParameters($node);
+        }
 		
-		return $layout;
-	}
+        return $layout;
+    }
 
-	/** Parses any <param> child nodes returning them in an array. */
-	private function parseParameters($paramsNode) {
-		$params = array();
+    /** Parses any <param> child nodes returning them in an array. */
+    private function parseParameters($paramsNode) {
+        $params = array();
 
-		foreach($paramsNode->param as $paramNode) {
-			if (empty($paramNode['name'])) {
-				$this->warn("A <param> node is missing the required 'name' attribute. Skipping parameter.");
-				continue;
-			}
+        foreach($paramsNode->param as $paramNode) {
+            if (empty($paramNode['name'])) {
+                $this->warn("A <param> node is missing the required 'name' attribute. Skipping parameter.");
+                continue;
+            }
 			
-			$name = $this->getAttributeValue($paramNode, 'name');
-			$value = $this->getAttributeValue($paramNode, 'value');
+            $name = $this->getAttributeValue($paramNode, 'name');
+            $value = $this->getAttributeValue($paramNode, 'value');
 			
-			$params[$name] = $value;
-		}
+            $params[$name] = $value;
+        }
 
-		return $params;
-	}
+        return $params;
+    }
 	
-	/** Parses a <root> node. */
-	private function parseRootLogger(SimpleXMLElement $node) {
-		$logger = array();
+    /** Parses a <root> node. */
+    private function parseRootLogger(SimpleXMLElement $node) {
+        $logger = array();
 		
-		if (isset($node->level)) {
-			$logger['level'] = $this->getAttributeValue($node->level, 'value');
-		}
+        if (isset($node->level)) {
+            $logger['level'] = $this->getAttributeValue($node->level, 'value');
+        }
 		
-		$logger['appenders'] = array();
-		foreach($node->appender_ref as $appender) {
-			$logger['appenders'][] = $this->getAttributeValue($appender, 'ref');
-		}
+        $logger['appenders'] = array();
+        foreach($node->appender_ref as $appender) {
+            $logger['appenders'][] = $this->getAttributeValue($appender, 'ref');
+        }
 		
-		$this->config['rootLogger'] = $logger;
-	}
+        $this->config['rootLogger'] = $logger;
+    }
 	
-	/** Parses a <logger> node. */
-	private function parseLogger(SimpleXMLElement $node) {
-		$logger = array();
+    /** Parses a <logger> node. */
+    private function parseLogger(SimpleXMLElement $node) {
+        $logger = array();
 		
-		$name = $this->getAttributeValue($node, 'name');
-		if (empty($name)) {
-			$this->warn("A <logger> node is missing the required 'name' attribute. Skipping logger definition.");
-			return;
-		}
+        $name = $this->getAttributeValue($node, 'name');
+        if (empty($name)) {
+            $this->warn("A <logger> node is missing the required 'name' attribute. Skipping logger definition.");
+            return;
+        }
 		
-		if (isset($node->level)) {
-			$logger['level'] = $this->getAttributeValue($node->level, 'value');
-		}
+        if (isset($node->level)) {
+            $logger['level'] = $this->getAttributeValue($node->level, 'value');
+        }
 		
-		if (isset($node['additivity'])) {
-			$logger['additivity'] = $this->getAttributeValue($node, 'additivity');
-		}
+        if (isset($node['additivity'])) {
+            $logger['additivity'] = $this->getAttributeValue($node, 'additivity');
+        }
 		
-		$logger['appenders'] = $this->parseAppenderReferences($node, $name);
+        $logger['appenders'] = $this->parseAppenderReferences($node, $name);
 
-		// Check for duplicate loggers
-		if (isset($this->config['loggers'][$name])) {
-			$this->warn("Duplicate logger definition [$name]. Overwriting.");
-		}
+        // Check for duplicate loggers
+        if (isset($this->config['loggers'][$name])) {
+            $this->warn("Duplicate logger definition [$name]. Overwriting.");
+        }
 		
-		$this->config['loggers'][$name] = $logger;
-	}
+        $this->config['loggers'][$name] = $logger;
+    }
 	
-	/** 
-	 * Parses a <logger> node for appender references and returns them in an array.
-	 */
-	private function parseAppenderReferences(SimpleXMLElement $node, $name) {
-		$refs = array();
-		foreach($node->appender_ref as $ref) {
-			$refs[] = $this->getAttributeValue($ref, 'ref');
-		}
+    /** 
+     * Parses a <logger> node for appender references and returns them in an array.
+     */
+    private function parseAppenderReferences(SimpleXMLElement $node, $name) {
+        $refs = array();
+        foreach($node->appender_ref as $ref) {
+            $refs[] = $this->getAttributeValue($ref, 'ref');
+        }
 		
-		return $refs;
-	}
+        return $refs;
+    }
 	
-	/** Parses a <filter> node. */
-	private function parseFilter($filterNode) {
-		$filter = array();
-		$filter['class'] = $this->getAttributeValue($filterNode, 'class');
+    /** Parses a <filter> node. */
+    private function parseFilter($filterNode) {
+        $filter = array();
+        $filter['class'] = $this->getAttributeValue($filterNode, 'class');
 		
-		if (count($filterNode->param) > 0) {
-			$filter['params'] = $this->parseParameters($filterNode);
-		}
+        if (count($filterNode->param) > 0) {
+            $filter['params'] = $this->parseParameters($filterNode);
+        }
 		
-		return $filter;
-	}
+        return $filter;
+    }
 	
-	/** Parses a <renderer> node. */
-	private function parseRenderer(SimpleXMLElement $node) {
-		$renderedClass = $this->getAttributeValue($node, 'renderedClass');
-		$renderingClass = $this->getAttributeValue($node, 'renderingClass');
+    /** Parses a <renderer> node. */
+    private function parseRenderer(SimpleXMLElement $node) {
+        $renderedClass = $this->getAttributeValue($node, 'renderedClass');
+        $renderingClass = $this->getAttributeValue($node, 'renderingClass');
 		
-		$this->config['renderers'][] = compact('renderedClass', 'renderingClass');
-	}
+        $this->config['renderers'][] = compact('renderedClass', 'renderingClass');
+    }
 	
-	// ******************************************
-	// ** Helper methods                       **
-	// ******************************************
+    // ******************************************
+    // ** Helper methods                       **
+    // ******************************************
 	
-	private function getAttributeValue(SimpleXMLElement $node, $name) {
-		return isset($node[$name]) ? (string) $node[$name] : null;
-	}
+    private function getAttributeValue(SimpleXMLElement $node, $name) {
+        return isset($node[$name]) ? (string) $node[$name] : null;
+    }
 	
-	private function warn($message) {
-		trigger_error("log4php: " . $message, E_USER_WARNING);
-	}
+    private function warn($message) {
+        trigger_error("log4php: " . $message, E_USER_WARNING);
+    }
 }
 
 ?>
\ No newline at end of file

Spacing +11 added lines, -11 removed lines

@@ -50,17 +50,17 @@ 
 		}
 		
 		// Process <logger> nodes
-		foreach($xml->logger as $logger) {
+		foreach ($xml->logger as $logger) {
 			$this->parseLogger($logger);
 		} 
 		
 		// Process <appender> nodes
-		foreach($xml->appender as $appender) {
+		foreach ($xml->appender as $appender) {
 			$this->parseAppender($appender);
 		}
 		
 		// Process <renderer> nodes
-		foreach($xml->renderer as $rendererNode) {
+		foreach ($xml->renderer as $rendererNode) {
 			$this->parseRenderer($rendererNode);
 		}
 		return $this->config;
@@ -83,7 +83,7 @@ 
 		if ($xml === false) {
 			
 			$errorStr = "";
-			foreach(libxml_get_errors() as $error) {
+			foreach (libxml_get_errors() as $error) {
 				$errorStr .= $error->message;
 			}
 			
@@ -102,7 +102,7 @@ 
 	private function parseConfiguration(SimpleXMLElement $xml) {
 		$attributes = $xml->attributes();
 		if (isset($attributes['threshold'])) {
-			$this->config['threshold'] = (string) $attributes['threshold'];
+			$this->config['threshold'] = (string)$attributes['threshold'];
 		}
 	}
 	
@@ -122,14 +122,14 @@ 
 		}
 		
 		if (isset($node->layout)) {
-			$appender['layout']= $this->parseLayout($node->layout, $name);
+			$appender['layout'] = $this->parseLayout($node->layout, $name);
 		}
 		
 		if (count($node->param) > 0) {
 			$appender['params'] = $this->parseParameters($node);
 		}
 		
-		foreach($node->filter as $filterNode) {
+		foreach ($node->filter as $filterNode) {
 			$appender['filters'][] = $this->parseFilter($filterNode);
 		}
 		
@@ -152,7 +152,7 @@ 
 	private function parseParameters($paramsNode) {
 		$params = array();
 
-		foreach($paramsNode->param as $paramNode) {
+		foreach ($paramsNode->param as $paramNode) {
 			if (empty($paramNode['name'])) {
 				$this->warn("A <param> node is missing the required 'name' attribute. Skipping parameter.");
 				continue;
@@ -176,7 +176,7 @@ 
 		}
 		
 		$logger['appenders'] = array();
-		foreach($node->appender_ref as $appender) {
+		foreach ($node->appender_ref as $appender) {
 			$logger['appenders'][] = $this->getAttributeValue($appender, 'ref');
 		}
 		
@@ -216,7 +216,7 @@ 
 	 */
 	private function parseAppenderReferences(SimpleXMLElement $node, $name) {
 		$refs = array();
-		foreach($node->appender_ref as $ref) {
+		foreach ($node->appender_ref as $ref) {
 			$refs[] = $this->getAttributeValue($ref, 'ref');
 		}
 		
@@ -248,7 +248,7 @@ 
 	// ******************************************
 	
 	private function getAttributeValue(SimpleXMLElement $node, $name) {
-		return isset($node[$name]) ? (string) $node[$name] : null;
+		return isset($node[$name]) ? (string)$node[$name] : null;
 	}
 	
 	private function warn($message) {

lib/Payone/Log4php/LoggerConfiguratorDefault.php

Doc Comments +1 added lines, -1 removed lines

@@ -404,7 +404,7 @@
 	/**
 	 * Configures a logger. 
 	 * 
-	 * @param Logger $logger The logger to configure
+	 * @param Payone_Log4php_Logger $logger The logger to configure
 	 * @param array $config Logger configuration options.
 	 */
 	private function configureLogger(Payone_Log4php_Logger $logger, $config) {

Indentation +382 added lines, -382 removed lines

@@ -30,24 +30,24 @@ 
  */
 class Payone_Log4php_LoggerConfiguratorDefault implements Payone_Log4php_LoggerConfigurator
 {
-	/** XML configuration file format. */
-	const FORMAT_XML = 'xml';
+    /** XML configuration file format. */
+    const FORMAT_XML = 'xml';
 	
-	/** PHP configuration file format. */
-	const FORMAT_PHP = 'php';
+    /** PHP configuration file format. */
+    const FORMAT_PHP = 'php';
 	
-	/** INI (properties) configuration file format. */
-	const FORMAT_INI = 'ini';
+    /** INI (properties) configuration file format. */
+    const FORMAT_INI = 'ini';
 
-	/** Defines which adapter should be used for parsing which format. */
-	private $adapters = array(
-		self::FORMAT_XML => 'Payone_Log4php_LoggerConfigurationAdapterXML',
-		self::FORMAT_INI => 'Payone_Log4php_LoggerConfigurationAdapterINI',
-		self::FORMAT_PHP => 'Payone_Log4php_LoggerConfigurationAdapterPHP',
-	);
+    /** Defines which adapter should be used for parsing which format. */
+    private $adapters = array(
+        self::FORMAT_XML => 'Payone_Log4php_LoggerConfigurationAdapterXML',
+        self::FORMAT_INI => 'Payone_Log4php_LoggerConfigurationAdapterINI',
+        self::FORMAT_PHP => 'Payone_Log4php_LoggerConfigurationAdapterPHP',
+    );
 	
-	/** Default configuration; used if no configuration file is provided. */
-	private static $defaultConfiguration = array(
+    /** Default configuration; used if no configuration file is provided. */
+    private static $defaultConfiguration = array(
         'threshold' => 'ALL',
         'rootLogger' => array(
             'level' => 'DEBUG',
@@ -61,425 +61,425 @@ 
                 ),
             ),
         ),
-	);
+    );
 	
-	/** Holds the appenders before they are linked to loggers. */
-	private $appenders = array();
+    /** Holds the appenders before they are linked to loggers. */
+    private $appenders = array();
 	
-	/**
-	 * Configures log4php based on the given configuration. The input can 
-	 * either be a path to the config file, or a PHP array holding the 
-	 * configuration. 
-	 * 
-	 * If no configuration is given, or if the given configuration cannot be
-	 * parsed for whatever reason, a warning will be issued, and log4php
-	 * will use the default configuration contained in 
-	 * {@link $defaultConfiguration}.
-	 * 
-	 * @param Payone_Log4php_LoggerHierarchy $hierarchy The hierarchy on which to perform
-	 * 		the configuration. 
-	 * @param string|array $input Either path to the config file or the 
-	 * 		configuration as an array. If not set, default configuration 
-	 * 		will be used.
-	 */
-	public function configure(Payone_Log4php_LoggerHierarchy $hierarchy, $input = null) {
-		$config = $this->parse($input);
-		$this->doConfigure($hierarchy, $config);
-	}
+    /**
+     * Configures log4php based on the given configuration. The input can 
+     * either be a path to the config file, or a PHP array holding the 
+     * configuration. 
+     * 
+     * If no configuration is given, or if the given configuration cannot be
+     * parsed for whatever reason, a warning will be issued, and log4php
+     * will use the default configuration contained in 
+     * {@link $defaultConfiguration}.
+     * 
+     * @param Payone_Log4php_LoggerHierarchy $hierarchy The hierarchy on which to perform
+     * 		the configuration. 
+     * @param string|array $input Either path to the config file or the 
+     * 		configuration as an array. If not set, default configuration 
+     * 		will be used.
+     */
+    public function configure(Payone_Log4php_LoggerHierarchy $hierarchy, $input = null) {
+        $config = $this->parse($input);
+        $this->doConfigure($hierarchy, $config);
+    }
 	
-	/**
-	 * Parses the given configuration and returns the parsed configuration
-	 * as a PHP array. Does not perform any configuration. 
-	 * 
-	 * If no configuration is given, or if the given configuration cannot be
-	 * parsed for whatever reason, a warning will be issued, and the default 
-	 * configuration will be returned ({@link $defaultConfiguration}).
-	 * 
-	 * @param string|array $input Either path to the config file or the 
-	 * 		configuration as an array. If not set, default configuration 
-	 * 		will be used.
-	 * @return array The parsed configuration.
-	 */
-	public function parse($input)
-	{
-		// No input - use default configuration
-		if (!isset($input)) {
-			$config = self::$defaultConfiguration;
-		}
+    /**
+     * Parses the given configuration and returns the parsed configuration
+     * as a PHP array. Does not perform any configuration. 
+     * 
+     * If no configuration is given, or if the given configuration cannot be
+     * parsed for whatever reason, a warning will be issued, and the default 
+     * configuration will be returned ({@link $defaultConfiguration}).
+     * 
+     * @param string|array $input Either path to the config file or the 
+     * 		configuration as an array. If not set, default configuration 
+     * 		will be used.
+     * @return array The parsed configuration.
+     */
+    public function parse($input)
+    {
+        // No input - use default configuration
+        if (!isset($input)) {
+            $config = self::$defaultConfiguration;
+        }
 		
-		// Array input - contains configuration within the array
-		else if (is_array($input)) {
-			$config = $input;
-		}
+        // Array input - contains configuration within the array
+        else if (is_array($input)) {
+            $config = $input;
+        }
 		
-		// String input - contains path to configuration file
-		else if (is_string($input)) {
-			try {
-				$config = $this->parseFile($input);
-			} catch (Payone_Log4php_LoggerException $e) {
-				$this->warn("Configuration failed. " . $e->getMessage() . " Using default configuration.");
-				$config = self::$defaultConfiguration;
-			}
-		}
+        // String input - contains path to configuration file
+        else if (is_string($input)) {
+            try {
+                $config = $this->parseFile($input);
+            } catch (Payone_Log4php_LoggerException $e) {
+                $this->warn("Configuration failed. " . $e->getMessage() . " Using default configuration.");
+                $config = self::$defaultConfiguration;
+            }
+        }
 		
-		// Anything else is an error
-		else {
-			$this->warn("Invalid configuration param given. Reverting to default configuration.");
-			$config = self::$defaultConfiguration;
-		}
+        // Anything else is an error
+        else {
+            $this->warn("Invalid configuration param given. Reverting to default configuration.");
+            $config = self::$defaultConfiguration;
+        }
 		
-		return $config;
-	}
+        return $config;
+    }
 
-	/** 
-	 * Returns the default log4php configuration.
-	 * @return array
-	 */
-	public static function getDefaultConfiguration() {
-		return self::$defaultConfiguration;
-	} 
+    /** 
+     * Returns the default log4php configuration.
+     * @return array
+     */
+    public static function getDefaultConfiguration() {
+        return self::$defaultConfiguration;
+    } 
 	
-	/**
-	 * Loads the configuration file from the given URL, determines which
-	 * adapter to use, converts the configuration to a PHP array and
-	 * returns it.
-	 *
-	 * @param string $url Path to the config file.
-	 * @return The configuration from the config file, as a PHP array.
-	 * @throws LoggerException If the configuration file cannot be loaded, or
-	 * 		if the parsing fails.
-	 */
-	private function parseFile($url) {
+    /**
+     * Loads the configuration file from the given URL, determines which
+     * adapter to use, converts the configuration to a PHP array and
+     * returns it.
+     *
+     * @param string $url Path to the config file.
+     * @return The configuration from the config file, as a PHP array.
+     * @throws LoggerException If the configuration file cannot be loaded, or
+     * 		if the parsing fails.
+     */
+    private function parseFile($url) {
 		
-		if (!file_exists($url)) {
-			throw new Payone_Log4php_LoggerException("File not found at [$url].");
-		}
+        if (!file_exists($url)) {
+            throw new Payone_Log4php_LoggerException("File not found at [$url].");
+        }
 		
-		$type = $this->getConfigType($url);
-		$adapterClass = $this->adapters[$type];
+        $type = $this->getConfigType($url);
+        $adapterClass = $this->adapters[$type];
 
-		$adapter = new $adapterClass();
-		return $adapter->convert($url);
-	}
+        $adapter = new $adapterClass();
+        return $adapter->convert($url);
+    }
 	
-	/** Determines configuration file type based on the file extension. */
-	private function getConfigType($url) {
-		$info = pathinfo($url);
-		$ext = strtolower($info['extension']);
+    /** Determines configuration file type based on the file extension. */
+    private function getConfigType($url) {
+        $info = pathinfo($url);
+        $ext = strtolower($info['extension']);
 		
-		switch($ext) {
-			case 'xml':
-				return self::FORMAT_XML;
+        switch($ext) {
+            case 'xml':
+                return self::FORMAT_XML;
 			
-			case 'ini':
-			case 'properties':
-				return self::FORMAT_INI;
+            case 'ini':
+            case 'properties':
+                return self::FORMAT_INI;
 			
-			case 'php':
-				return self::FORMAT_PHP;
+            case 'php':
+                return self::FORMAT_PHP;
 				
-			default:
-				throw new Payone_Log4php_LoggerException("Unsupported configuration file extension: $ext");
-		}
-	}
+            default:
+                throw new Payone_Log4php_LoggerException("Unsupported configuration file extension: $ext");
+        }
+    }
 	
-	/**
-	 * Constructs the logger hierarchy based on configuration.
-	 * 
-	 * @param Payone_Log4php_LoggerHierarchy $hierarchy
-	 * @param array $config
-	 */
-	private function doConfigure(Payone_Log4php_LoggerHierarchy $hierarchy, $config) {
-		if (isset($config['threshold'])) {
-			$threshold = Payone_Log4php_LoggerLevel::toLevel($config['threshold']);
-			if (isset($threshold)) {
-				$hierarchy->setThreshold($threshold);
-			} else {
-				$this->warn("Invalid threshold value [{$config['threshold']}] specified. Ignoring threshold definition.");
-			}
-		}
+    /**
+     * Constructs the logger hierarchy based on configuration.
+     * 
+     * @param Payone_Log4php_LoggerHierarchy $hierarchy
+     * @param array $config
+     */
+    private function doConfigure(Payone_Log4php_LoggerHierarchy $hierarchy, $config) {
+        if (isset($config['threshold'])) {
+            $threshold = Payone_Log4php_LoggerLevel::toLevel($config['threshold']);
+            if (isset($threshold)) {
+                $hierarchy->setThreshold($threshold);
+            } else {
+                $this->warn("Invalid threshold value [{$config['threshold']}] specified. Ignoring threshold definition.");
+            }
+        }
 		
-		// Configure appenders and add them to the appender pool
-		if (isset($config['appenders']) && is_array($config['appenders'])) {
-			foreach($config['appenders'] as $name => $appenderConfig) {
-				$this->configureAppender($name, $appenderConfig);
-			}
-		}
+        // Configure appenders and add them to the appender pool
+        if (isset($config['appenders']) && is_array($config['appenders'])) {
+            foreach($config['appenders'] as $name => $appenderConfig) {
+                $this->configureAppender($name, $appenderConfig);
+            }
+        }
 		
-		// Configure root logger 
-		if (isset($config['rootLogger'])) {
-			$this->configureRootLogger($hierarchy, $config['rootLogger']);
-		}
+        // Configure root logger 
+        if (isset($config['rootLogger'])) {
+            $this->configureRootLogger($hierarchy, $config['rootLogger']);
+        }
 		
-		// Configure loggers
-		if (isset($config['loggers']) && is_array($config['loggers'])) {
-			foreach($config['loggers'] as $loggerName => $loggerConfig) {
-				$this->configureOtherLogger($hierarchy, $loggerName, $loggerConfig);
-			}
-		}
+        // Configure loggers
+        if (isset($config['loggers']) && is_array($config['loggers'])) {
+            foreach($config['loggers'] as $loggerName => $loggerConfig) {
+                $this->configureOtherLogger($hierarchy, $loggerName, $loggerConfig);
+            }
+        }
 
-		// Configure renderers
-		if (isset($config['renderers']) && is_array($config['renderers'])) {
-			foreach($config['renderers'] as $rendererConfig) {
-				$this->configureRenderer($hierarchy, $rendererConfig);
-			}
-		}
-	}
+        // Configure renderers
+        if (isset($config['renderers']) && is_array($config['renderers'])) {
+            foreach($config['renderers'] as $rendererConfig) {
+                $this->configureRenderer($hierarchy, $rendererConfig);
+            }
+        }
+    }
 	
-	private function configureRenderer(Payone_Log4php_LoggerHierarchy $hierarchy, $config) {
-		if (!isset($config['renderingClass'])) {
-			$this->warn("Rendering class not specified. Skipping renderers definition.");
-			return;			
-		}
+    private function configureRenderer(Payone_Log4php_LoggerHierarchy $hierarchy, $config) {
+        if (!isset($config['renderingClass'])) {
+            $this->warn("Rendering class not specified. Skipping renderers definition.");
+            return;			
+        }
 		
-		$renderingClass = $config['renderingClass'];
-		if (!class_exists($renderingClass)) {
-			$this->warn("Nonexistant rendering class [$renderingClass] specified. Skipping renderers definition.");
-			return;
-		}
+        $renderingClass = $config['renderingClass'];
+        if (!class_exists($renderingClass)) {
+            $this->warn("Nonexistant rendering class [$renderingClass] specified. Skipping renderers definition.");
+            return;
+        }
 		
-		$renderingClassInstance = new $renderingClass();
-		if (!$renderingClassInstance instanceof Payone_Log4php_LoggerRendererObject) {
-			$this->warn("Invalid class [$renderingClass] given. Not a valid Payone_Log4php_LoggerRenderer class. Skipping renderers definition.");
-			return;			
-		}
+        $renderingClassInstance = new $renderingClass();
+        if (!$renderingClassInstance instanceof Payone_Log4php_LoggerRendererObject) {
+            $this->warn("Invalid class [$renderingClass] given. Not a valid Payone_Log4php_LoggerRenderer class. Skipping renderers definition.");
+            return;			
+        }
 	
-		if (!isset($config['renderedClass'])) {
-			$this->warn("Rendered class not specified for rendering Class [$renderingClass]. Skipping renderers definition.");
-			return;			
-		}
+        if (!isset($config['renderedClass'])) {
+            $this->warn("Rendered class not specified for rendering Class [$renderingClass]. Skipping renderers definition.");
+            return;			
+        }
 		
-		$renderedClass = $config['renderedClass'];
-		if (!class_exists($renderedClass)) {
-			$this->warn("Nonexistant rendered class [$renderedClass] specified for renderer [$renderingClass]. Skipping renderers definition.");
-			return;
-		}		
+        $renderedClass = $config['renderedClass'];
+        if (!class_exists($renderedClass)) {
+            $this->warn("Nonexistant rendered class [$renderedClass] specified for renderer [$renderingClass]. Skipping renderers definition.");
+            return;
+        }		
 
-		$hierarchy->getRendererMap()->addRenderer($renderedClass, $renderingClassInstance);
-	}
+        $hierarchy->getRendererMap()->addRenderer($renderedClass, $renderingClassInstance);
+    }
 	
-	/** 
-	 * Configures an appender based on given config and saves it to 
-	 * {@link $appenders} array so it can be later linked to loggers. 
-	 * @param string $name Appender name. 
-	 * @param array $config Appender configuration options.
-	 */
-	private function configureAppender($name, $config) {
+    /** 
+     * Configures an appender based on given config and saves it to 
+     * {@link $appenders} array so it can be later linked to loggers. 
+     * @param string $name Appender name. 
+     * @param array $config Appender configuration options.
+     */
+    private function configureAppender($name, $config) {
 
-		// TODO: add this check to other places where it might be useful
-		if (!is_array($config)) {
-			$type = gettype($config);
-			$this->warn("Invalid configuration provided for appender [$name]. Expected an array, found <$type>. Skipping appender definition.");
-			return;
-		}
+        // TODO: add this check to other places where it might be useful
+        if (!is_array($config)) {
+            $type = gettype($config);
+            $this->warn("Invalid configuration provided for appender [$name]. Expected an array, found <$type>. Skipping appender definition.");
+            return;
+        }
 		
-		// Parse appender class
-		$class = $config['class'];
-		if (empty($class)) {
-			$this->warn("No class given for appender [$name]. Skipping appender definition.");
-			return;
-		}
-		if (!class_exists($class)) {
-			$this->warn("Invalid class [$class] given for appender [$name]. Class does not exist. Skipping appender definition.");
-			return;
-		}
+        // Parse appender class
+        $class = $config['class'];
+        if (empty($class)) {
+            $this->warn("No class given for appender [$name]. Skipping appender definition.");
+            return;
+        }
+        if (!class_exists($class)) {
+            $this->warn("Invalid class [$class] given for appender [$name]. Class does not exist. Skipping appender definition.");
+            return;
+        }
 		
-		// Instantiate the appender
-		$appender = new $class($name);
-		if (!($appender instanceof Payone_Log4php_LoggerAppender)) {
-			$this->warn("Invalid class [$class] given for appender [$name]. Not a valid Payone_Log4php_LoggerAppender class. Skipping appender definition.");
-			return;
-		}
+        // Instantiate the appender
+        $appender = new $class($name);
+        if (!($appender instanceof Payone_Log4php_LoggerAppender)) {
+            $this->warn("Invalid class [$class] given for appender [$name]. Not a valid Payone_Log4php_LoggerAppender class. Skipping appender definition.");
+            return;
+        }
 		
-		// Parse the appender threshold
-		if (isset($config['threshold'])) {
-			$threshold = Payone_Log4php_LoggerLevel::toLevel($config['threshold']);
-			if ($threshold instanceof Payone_Log4php_LoggerLevel) {
-				$appender->setThreshold($threshold);
-			} else {
-				$this->warn("Invalid threshold value [{$config['threshold']}] specified for appender [$name]. Ignoring threshold definition.");
-			}
-		}
+        // Parse the appender threshold
+        if (isset($config['threshold'])) {
+            $threshold = Payone_Log4php_LoggerLevel::toLevel($config['threshold']);
+            if ($threshold instanceof Payone_Log4php_LoggerLevel) {
+                $appender->setThreshold($threshold);
+            } else {
+                $this->warn("Invalid threshold value [{$config['threshold']}] specified for appender [$name]. Ignoring threshold definition.");
+            }
+        }
 		
-		// Parse the appender layout
-		if ($appender->requiresLayout() && isset($config['layout'])) {
-			$this->createAppenderLayout($appender, $config['layout']);
-		}
+        // Parse the appender layout
+        if ($appender->requiresLayout() && isset($config['layout'])) {
+            $this->createAppenderLayout($appender, $config['layout']);
+        }
 		
-		// Parse filters
-		if (isset($config['filters']) && is_array($config['filters'])) {
-			foreach($config['filters'] as $filterConfig) {
-				$this->createAppenderFilter($appender, $filterConfig);
-			}
-		}
+        // Parse filters
+        if (isset($config['filters']) && is_array($config['filters'])) {
+            foreach($config['filters'] as $filterConfig) {
+                $this->createAppenderFilter($appender, $filterConfig);
+            }
+        }
 		
-		// Set options if any
-		if (isset($config['params'])) {
-			$this->setOptions($appender, $config['params']);
-		}
+        // Set options if any
+        if (isset($config['params'])) {
+            $this->setOptions($appender, $config['params']);
+        }
 
-		// Activate and save for later linking to loggers
-		$appender->activateOptions();
-		$this->appenders[$name] = $appender;
-	}
+        // Activate and save for later linking to loggers
+        $appender->activateOptions();
+        $this->appenders[$name] = $appender;
+    }
 	
-	/**
-	 * Parses layout config, creates the layout and links it to the appender.
-	 * @param Payone_Log4php_LoggerAppender $appender
-	 * @param array $config Layout configuration.
-	 */
-	private function createAppenderLayout(Payone_Log4php_LoggerAppender $appender, $config) {
-		$name = $appender->getName();
-		$class = $config['class'];
-		if (empty($class)) {
-			$this->warn("Layout class not specified for appender [$name]. Reverting to default layout.");
-			return;
-		}
-		if (!class_exists($class)) {
-			$this->warn("Nonexistant layout class [$class] specified for appender [$name]. Reverting to default layout.");
-			return;
-		}
+    /**
+     * Parses layout config, creates the layout and links it to the appender.
+     * @param Payone_Log4php_LoggerAppender $appender
+     * @param array $config Layout configuration.
+     */
+    private function createAppenderLayout(Payone_Log4php_LoggerAppender $appender, $config) {
+        $name = $appender->getName();
+        $class = $config['class'];
+        if (empty($class)) {
+            $this->warn("Layout class not specified for appender [$name]. Reverting to default layout.");
+            return;
+        }
+        if (!class_exists($class)) {
+            $this->warn("Nonexistant layout class [$class] specified for appender [$name]. Reverting to default layout.");
+            return;
+        }
 		
-		$layout = new $class();
-		if (!($layout instanceof Payone_Log4php_LoggerLayout)) {
-			$this->warn("Invalid layout class [$class] sepcified for appender [$name]. Reverting to default layout.");
-			return;
-		}
+        $layout = new $class();
+        if (!($layout instanceof Payone_Log4php_LoggerLayout)) {
+            $this->warn("Invalid layout class [$class] sepcified for appender [$name]. Reverting to default layout.");
+            return;
+        }
 		
-		if (isset($config['params'])) {
-			$this->setOptions($layout, $config['params']);
-		}
+        if (isset($config['params'])) {
+            $this->setOptions($layout, $config['params']);
+        }
 		
-		$layout->activateOptions();
-		$appender->setLayout($layout);
-	}
+        $layout->activateOptions();
+        $appender->setLayout($layout);
+    }
 	
-	/**
-	 * Parses filter config, creates the filter and adds it to the appender's 
-	 * filter chain.
-	 * @param Payone_Log4php_LoggerAppender $appender
-	 * @param array $config Filter configuration.
-	 */
-	private function createAppenderFilter(Payone_Log4php_LoggerAppender $appender, $config) {
-		$name = $appender->getName();
-		$class = $config['class'];
-		if (!class_exists($class)) {
-			$this->warn("Nonexistant filter class [$class] specified on appender [$name]. Skipping filter definition.");
-			return;
-		}
+    /**
+     * Parses filter config, creates the filter and adds it to the appender's 
+     * filter chain.
+     * @param Payone_Log4php_LoggerAppender $appender
+     * @param array $config Filter configuration.
+     */
+    private function createAppenderFilter(Payone_Log4php_LoggerAppender $appender, $config) {
+        $name = $appender->getName();
+        $class = $config['class'];
+        if (!class_exists($class)) {
+            $this->warn("Nonexistant filter class [$class] specified on appender [$name]. Skipping filter definition.");
+            return;
+        }
 	
-		$filter = new $class();
-		if (!($filter instanceof Payone_Log4php_LoggerFilter)) {
-			$this->warn("Invalid filter class [$class] sepcified on appender [$name]. Skipping filter definition.");
-			return;
-		}
+        $filter = new $class();
+        if (!($filter instanceof Payone_Log4php_LoggerFilter)) {
+            $this->warn("Invalid filter class [$class] sepcified on appender [$name]. Skipping filter definition.");
+            return;
+        }
 	
-		if (isset($config['params'])) {
-			$this->setOptions($filter, $config['params']);
-		}
+        if (isset($config['params'])) {
+            $this->setOptions($filter, $config['params']);
+        }
 	
-		$filter->activateOptions();
-		$appender->addFilter($filter);
-	}
+        $filter->activateOptions();
+        $appender->addFilter($filter);
+    }
 	
-	/** 
-	 * Configures the root logger
-	 * @see configureLogger() 
-	 */
-	private function configureRootLogger(Payone_Log4php_LoggerHierarchy $hierarchy, $config) {
-		$logger = $hierarchy->getRootLogger();
-		$this->configureLogger($logger, $config);
-	}
+    /** 
+     * Configures the root logger
+     * @see configureLogger() 
+     */
+    private function configureRootLogger(Payone_Log4php_LoggerHierarchy $hierarchy, $config) {
+        $logger = $hierarchy->getRootLogger();
+        $this->configureLogger($logger, $config);
+    }
 
-	/**
-	 * Configures a logger which is not root.
-	 * @see configureLogger()
-	 */
-	private function configureOtherLogger(Payone_Log4php_LoggerHierarchy $hierarchy, $name, $config) {
-		// Get logger from hierarchy (this creates it if it doesn't already exist)
-		$logger = $hierarchy->getLogger($name);
-		$this->configureLogger($logger, $config);
-	}
+    /**
+     * Configures a logger which is not root.
+     * @see configureLogger()
+     */
+    private function configureOtherLogger(Payone_Log4php_LoggerHierarchy $hierarchy, $name, $config) {
+        // Get logger from hierarchy (this creates it if it doesn't already exist)
+        $logger = $hierarchy->getLogger($name);
+        $this->configureLogger($logger, $config);
+    }
 	
-	/**
-	 * Configures a logger. 
-	 * 
-	 * @param Logger $logger The logger to configure
-	 * @param array $config Logger configuration options.
-	 */
-	private function configureLogger(Payone_Log4php_Logger $logger, $config) {
-		$loggerName = $logger->getName();
+    /**
+     * Configures a logger. 
+     * 
+     * @param Logger $logger The logger to configure
+     * @param array $config Logger configuration options.
+     */
+    private function configureLogger(Payone_Log4php_Logger $logger, $config) {
+        $loggerName = $logger->getName();
 		
-		// Set logger level
-		if (isset($config['level'])) {
-			$level = Payone_Log4php_LoggerLevel::toLevel($config['level']);
-			if (isset($level)) {
-				$logger->setLevel($level);
-			} else {
-				$default = $logger->getLevel();
-				$this->warn("Invalid level value [{$config['level']}] specified for logger [$loggerName]. Ignoring level definition.");
-			}
-		}
+        // Set logger level
+        if (isset($config['level'])) {
+            $level = Payone_Log4php_LoggerLevel::toLevel($config['level']);
+            if (isset($level)) {
+                $logger->setLevel($level);
+            } else {
+                $default = $logger->getLevel();
+                $this->warn("Invalid level value [{$config['level']}] specified for logger [$loggerName]. Ignoring level definition.");
+            }
+        }
 		
-		// Link appenders to logger
-		if (isset($config['appenders'])) {
-			foreach($config['appenders'] as $appenderName) {
-				if (isset($this->appenders[$appenderName])) {
-					$logger->addAppender($this->appenders[$appenderName]);
-				} else {
-					$this->warn("Nonexistnant appender [$appenderName] linked to logger [$loggerName].");
-				}
-			}
-		}
+        // Link appenders to logger
+        if (isset($config['appenders'])) {
+            foreach($config['appenders'] as $appenderName) {
+                if (isset($this->appenders[$appenderName])) {
+                    $logger->addAppender($this->appenders[$appenderName]);
+                } else {
+                    $this->warn("Nonexistnant appender [$appenderName] linked to logger [$loggerName].");
+                }
+            }
+        }
 		
-		// Set logger additivity
-		if (isset($config['additivity'])) {
-			$additivity = Payone_Log4php_LoggerOptionConverter::toBoolean($config['additivity'], null);
-			if (is_bool($additivity)) {
-				$logger->setAdditivity($additivity);
-			} else {
-				$this->warn("Invalid additivity value [{$config['additivity']}] specified for logger [$loggerName]. Ignoring additivity setting.");
-			}
-		}
-	}
+        // Set logger additivity
+        if (isset($config['additivity'])) {
+            $additivity = Payone_Log4php_LoggerOptionConverter::toBoolean($config['additivity'], null);
+            if (is_bool($additivity)) {
+                $logger->setAdditivity($additivity);
+            } else {
+                $this->warn("Invalid additivity value [{$config['additivity']}] specified for logger [$loggerName]. Ignoring additivity setting.");
+            }
+        }
+    }
 
-	/**
-	 * Helper method which applies given options to an object which has setters
-	 * for these options (such as appenders, layouts, etc.).
-	 * 
-	 * For example, if options are:
-	 * <code>
-	 * array(
-	 * 	'file' => '/tmp/myfile.log',
-	 * 	'append' => true
-	 * )
-	 * </code>
-	 * 
-	 * This method will call:
-	 * <code>
-	 * $object->setFile('/tmp/myfile.log')
-	 * $object->setAppend(true)
-	 * </code>
-	 * 
-	 * If required setters do not exist, it will produce a warning. 
-	 * 
-	 * @param mixed $object The object to configure.
-	 * @param unknown_type $options
-	 */
-	private function setOptions($object, $options) {
-		foreach($options as $name => $value) {
-			$setter = "set$name";
-			if (method_exists($object, $setter)) {
-				$object->$setter($value);
-			} else {
-				$class = get_class($object);
-				$this->warn("Nonexistant option [$name] specified on [$class]. Skipping.");
-			}
-		}
-	}
+    /**
+     * Helper method which applies given options to an object which has setters
+     * for these options (such as appenders, layouts, etc.).
+     * 
+     * For example, if options are:
+     * <code>
+     * array(
+     * 	'file' => '/tmp/myfile.log',
+     * 	'append' => true
+     * )
+     * </code>
+     * 
+     * This method will call:
+     * <code>
+     * $object->setFile('/tmp/myfile.log')
+     * $object->setAppend(true)
+     * </code>
+     * 
+     * If required setters do not exist, it will produce a warning. 
+     * 
+     * @param mixed $object The object to configure.
+     * @param unknown_type $options
+     */
+    private function setOptions($object, $options) {
+        foreach($options as $name => $value) {
+            $setter = "set$name";
+            if (method_exists($object, $setter)) {
+                $object->$setter($value);
+            } else {
+                $class = get_class($object);
+                $this->warn("Nonexistant option [$name] specified on [$class]. Skipping.");
+            }
+        }
+    }
 	
-	/** Helper method to simplify error reporting. */
-	private function warn($message) {
-		trigger_error("log4php: $message", E_USER_WARNING);
-	}
+    /** Helper method to simplify error reporting. */
+    private function warn($message) {
+        trigger_error("log4php: $message", E_USER_WARNING);
+    }
 }
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -167,7 +167,7 @@ 
 		$info = pathinfo($url);
 		$ext = strtolower($info['extension']);
 		
-		switch($ext) {
+		switch ($ext) {
 			case 'xml':
 				return self::FORMAT_XML;
 			
@@ -201,7 +201,7 @@ 
 		
 		// Configure appenders and add them to the appender pool
 		if (isset($config['appenders']) && is_array($config['appenders'])) {
-			foreach($config['appenders'] as $name => $appenderConfig) {
+			foreach ($config['appenders'] as $name => $appenderConfig) {
 				$this->configureAppender($name, $appenderConfig);
 			}
 		}
@@ -213,14 +213,14 @@ 
 		
 		// Configure loggers
 		if (isset($config['loggers']) && is_array($config['loggers'])) {
-			foreach($config['loggers'] as $loggerName => $loggerConfig) {
+			foreach ($config['loggers'] as $loggerName => $loggerConfig) {
 				$this->configureOtherLogger($hierarchy, $loggerName, $loggerConfig);
 			}
 		}
 
 		// Configure renderers
 		if (isset($config['renderers']) && is_array($config['renderers'])) {
-			foreach($config['renderers'] as $rendererConfig) {
+			foreach ($config['renderers'] as $rendererConfig) {
 				$this->configureRenderer($hierarchy, $rendererConfig);
 			}
 		}
@@ -308,7 +308,7 @@ 
 		
 		// Parse filters
 		if (isset($config['filters']) && is_array($config['filters'])) {
-			foreach($config['filters'] as $filterConfig) {
+			foreach ($config['filters'] as $filterConfig) {
 				$this->createAppenderFilter($appender, $filterConfig);
 			}
 		}
@@ -423,7 +423,7 @@ 
 		
 		// Link appenders to logger
 		if (isset($config['appenders'])) {
-			foreach($config['appenders'] as $appenderName) {
+			foreach ($config['appenders'] as $appenderName) {
 				if (isset($this->appenders[$appenderName])) {
 					$logger->addAppender($this->appenders[$appenderName]);
 				} else {
@@ -467,7 +467,7 @@ 
 	 * @param unknown_type $options
 	 */
 	private function setOptions($object, $options) {
-		foreach($options as $name => $value) {
+		foreach ($options as $name => $value) {
 			$setter = "set$name";
 			if (method_exists($object, $setter)) {
 				$object->$setter($value);

lib/Payone/Log4php/LoggerFilterLevelMatch.php

Doc Comments -1 removed lines

@@ -67,7 +67,6 @@
 	}
 	
 	/**
-	 * @param string $l the level to match
 	 */
 	public function setLevelToMatch($level) {
 		$this->setLevel('levelToMatch', $level);

Indentation +45 added lines, -45 removed lines

@@ -47,54 +47,54 @@
  */
 class Payone_Log4php_LoggerFilterLevelMatch extends Payone_Log4php_LoggerFilter {
   
-	/** 
-	 * Indicates if this event should be accepted or denied on match
-	 * @var boolean
-	 */
-	protected $acceptOnMatch = true;
+    /** 
+     * Indicates if this event should be accepted or denied on match
+     * @var boolean
+     */
+    protected $acceptOnMatch = true;
 
-	/**
-	 * The level, when to match
-	 * @var Payone_Log4php_LoggerLevel
-	 */
-	protected $levelToMatch;
+    /**
+     * The level, when to match
+     * @var Payone_Log4php_LoggerLevel
+     */
+    protected $levelToMatch;
   
-	/**
-	 * @param boolean $acceptOnMatch
-	 */
-	public function setAcceptOnMatch($acceptOnMatch) {
-		$this->setBoolean('acceptOnMatch', $acceptOnMatch);
-	}
+    /**
+     * @param boolean $acceptOnMatch
+     */
+    public function setAcceptOnMatch($acceptOnMatch) {
+        $this->setBoolean('acceptOnMatch', $acceptOnMatch);
+    }
 	
-	/**
-	 * @param string $l the level to match
-	 */
-	public function setLevelToMatch($level) {
-		$this->setLevel('levelToMatch', $level);
-	}
+    /**
+     * @param string $l the level to match
+     */
+    public function setLevelToMatch($level) {
+        $this->setLevel('levelToMatch', $level);
+    }
 
-	/**
-	 * Return the decision of this filter.
-	 * 
-	 * Returns {@link LoggerFilter::NEUTRAL} if the <b><var>LevelToMatch</var></b>
-	 * option is not set or if there is not match.	Otherwise, if there is a
-	 * match, then the returned decision is {@link LoggerFilter::ACCEPT} if the
-	 * <b><var>AcceptOnMatch</var></b> property is set to <i>true</i>. The
-	 * returned decision is {@link LoggerFilter::DENY} if the
-	 * <b><var>AcceptOnMatch</var></b> property is set to <i>false</i>.
-	 *
-	 * @param Payone_Log4php_LoggerLoggingEvent $event
-	 * @return integer
-	 */
-	public function decide(Payone_Log4php_LoggerLoggingEvent $event) {
-		if($this->levelToMatch === null) {
-			return Payone_Log4php_LoggerFilter::NEUTRAL;
-		}
+    /**
+     * Return the decision of this filter.
+     * 
+     * Returns {@link LoggerFilter::NEUTRAL} if the <b><var>LevelToMatch</var></b>
+     * option is not set or if there is not match.	Otherwise, if there is a
+     * match, then the returned decision is {@link LoggerFilter::ACCEPT} if the
+     * <b><var>AcceptOnMatch</var></b> property is set to <i>true</i>. The
+     * returned decision is {@link LoggerFilter::DENY} if the
+     * <b><var>AcceptOnMatch</var></b> property is set to <i>false</i>.
+     *
+     * @param Payone_Log4php_LoggerLoggingEvent $event
+     * @return integer
+     */
+    public function decide(Payone_Log4php_LoggerLoggingEvent $event) {
+        if($this->levelToMatch === null) {
+            return Payone_Log4php_LoggerFilter::NEUTRAL;
+        }
 		
-		if($this->levelToMatch->equals($event->getLevel())) {	
-			return $this->acceptOnMatch ? Payone_Log4php_LoggerFilter::ACCEPT : Payone_Log4php_LoggerFilter::DENY;
-		} else {
-			return Payone_Log4php_LoggerFilter::NEUTRAL;
-		}
-	}
+        if($this->levelToMatch->equals($event->getLevel())) {	
+            return $this->acceptOnMatch ? Payone_Log4php_LoggerFilter::ACCEPT : Payone_Log4php_LoggerFilter::DENY;
+        } else {
+            return Payone_Log4php_LoggerFilter::NEUTRAL;
+        }
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -87,11 +87,11 @@
 	 * @return integer
 	 */
 	public function decide(Payone_Log4php_LoggerLoggingEvent $event) {
-		if($this->levelToMatch === null) {
+		if ($this->levelToMatch === null) {
 			return Payone_Log4php_LoggerFilter::NEUTRAL;
 		}
 		
-		if($this->levelToMatch->equals($event->getLevel())) {	
+		if ($this->levelToMatch->equals($event->getLevel())) {	
 			return $this->acceptOnMatch ? Payone_Log4php_LoggerFilter::ACCEPT : Payone_Log4php_LoggerFilter::DENY;
 		} else {
 			return Payone_Log4php_LoggerFilter::NEUTRAL;

lib/Payone/Log4php/LoggerFilterLevelRange.php

Doc Comments -2 removed lines

@@ -87,14 +87,12 @@
 	}
 	
 	/**
-	 * @param string $l the level min to match
 	 */
 	public function setLevelMin($level) {
 		$this->setLevel('levelMin', $level);
 	}
 
 	/**
-	 * @param string $l the level max to match
 	 */
 	public function setLevelMax($level) {
 		$this->setLevel('levelMax', $level);

Indentation +62 added lines, -62 removed lines

@@ -64,75 +64,75 @@
  */
 class Payone_Log4php_LoggerFilterLevelRange extends Payone_Log4php_LoggerFilter {
 
-	/**
-	 * @var boolean
-	 */
-	protected $acceptOnMatch = true;
+    /**
+     * @var boolean
+     */
+    protected $acceptOnMatch = true;
 
-	/**
-	 * @var Payone_Log4php_LoggerLevel
-	 */
-	protected $levelMin;
+    /**
+     * @var Payone_Log4php_LoggerLevel
+     */
+    protected $levelMin;
   
-	/**
-	 * @var Payone_Log4php_LoggerLevel
-	 */
-	protected $levelMax;
+    /**
+     * @var Payone_Log4php_LoggerLevel
+     */
+    protected $levelMax;
 
-	/**
-	 * @param boolean $acceptOnMatch
-	 */
-	public function setAcceptOnMatch($acceptOnMatch) {
-		$this->setBoolean('acceptOnMatch', $acceptOnMatch); 
-	}
+    /**
+     * @param boolean $acceptOnMatch
+     */
+    public function setAcceptOnMatch($acceptOnMatch) {
+        $this->setBoolean('acceptOnMatch', $acceptOnMatch); 
+    }
 	
-	/**
-	 * @param string $l the level min to match
-	 */
-	public function setLevelMin($level) {
-		$this->setLevel('levelMin', $level);
-	}
+    /**
+     * @param string $l the level min to match
+     */
+    public function setLevelMin($level) {
+        $this->setLevel('levelMin', $level);
+    }
 
-	/**
-	 * @param string $l the level max to match
-	 */
-	public function setLevelMax($level) {
-		$this->setLevel('levelMax', $level);
-	}
+    /**
+     * @param string $l the level max to match
+     */
+    public function setLevelMax($level) {
+        $this->setLevel('levelMax', $level);
+    }
 
-	/**
-	 * Return the decision of this filter.
-	 *
-	 * @param Payone_Log4php_LoggerLoggingEvent $event
-	 * @return integer
-	 */
-	public function decide(Payone_Log4php_LoggerLoggingEvent $event) {
-		$level = $event->getLevel();
+    /**
+     * Return the decision of this filter.
+     *
+     * @param Payone_Log4php_LoggerLoggingEvent $event
+     * @return integer
+     */
+    public function decide(Payone_Log4php_LoggerLoggingEvent $event) {
+        $level = $event->getLevel();
 		
-		if($this->levelMin !== null) {
-			if($level->isGreaterOrEqual($this->levelMin) == false) {
-				// level of event is less than minimum
-				return Payone_Log4php_LoggerFilter::DENY;
-			}
-		}
+        if($this->levelMin !== null) {
+            if($level->isGreaterOrEqual($this->levelMin) == false) {
+                // level of event is less than minimum
+                return Payone_Log4php_LoggerFilter::DENY;
+            }
+        }
 
-		if($this->levelMax !== null) {
-			if($level->toInt() > $this->levelMax->toInt()) {
-				// level of event is greater than maximum
-				// Alas, there is no Level.isGreater method. and using
-				// a combo of isGreaterOrEqual && !Equal seems worse than
-				// checking the int values of the level objects..
-				return Payone_Log4php_LoggerFilter::DENY;
-			}
-		}
+        if($this->levelMax !== null) {
+            if($level->toInt() > $this->levelMax->toInt()) {
+                // level of event is greater than maximum
+                // Alas, there is no Level.isGreater method. and using
+                // a combo of isGreaterOrEqual && !Equal seems worse than
+                // checking the int values of the level objects..
+                return Payone_Log4php_LoggerFilter::DENY;
+            }
+        }
 
-		if($this->acceptOnMatch) {
-			// this filter set up to bypass later filters and always return
-			// accept if level in range
-			return Payone_Log4php_LoggerFilter::ACCEPT;
-		} else {
-			// event is ok for this filter; allow later filters to have a look..
-			return Payone_Log4php_LoggerFilter::NEUTRAL;
-		}
-	}
+        if($this->acceptOnMatch) {
+            // this filter set up to bypass later filters and always return
+            // accept if level in range
+            return Payone_Log4php_LoggerFilter::ACCEPT;
+        } else {
+            // event is ok for this filter; allow later filters to have a look..
+            return Payone_Log4php_LoggerFilter::NEUTRAL;
+        }
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -109,15 +109,15 @@ 
 	public function decide(Payone_Log4php_LoggerLoggingEvent $event) {
 		$level = $event->getLevel();
 		
-		if($this->levelMin !== null) {
-			if($level->isGreaterOrEqual($this->levelMin) == false) {
+		if ($this->levelMin !== null) {
+			if ($level->isGreaterOrEqual($this->levelMin) == false) {
 				// level of event is less than minimum
 				return Payone_Log4php_LoggerFilter::DENY;
 			}
 		}
 
-		if($this->levelMax !== null) {
-			if($level->toInt() > $this->levelMax->toInt()) {
+		if ($this->levelMax !== null) {
+			if ($level->toInt() > $this->levelMax->toInt()) {
 				// level of event is greater than maximum
 				// Alas, there is no Level.isGreater method. and using
 				// a combo of isGreaterOrEqual && !Equal seems worse than
@@ -126,7 +126,7 @@ 
 			}
 		}
 
-		if($this->acceptOnMatch) {
+		if ($this->acceptOnMatch) {
 			// this filter set up to bypass later filters and always return
 			// accept if level in range
 			return Payone_Log4php_LoggerFilter::ACCEPT;

lib/Payone/Log4php/LoggerFilterStringMatch.php

Doc Comments -1 removed lines

@@ -65,7 +65,6 @@
 	}
 	
 	/**
-	 * @param string $s the string to match
 	 */
 	public function setStringToMatch($string) {
 		$this->setString('stringToMatch', $string);

Indentation +33 added lines, -33 removed lines

@@ -47,43 +47,43 @@
  */
 class Payone_Log4php_LoggerFilterStringMatch extends Payone_Log4php_LoggerFilter {
 
-	/**
-	 * @var boolean
-	 */
-	protected $acceptOnMatch = true;
+    /**
+     * @var boolean
+     */
+    protected $acceptOnMatch = true;
 
-	/**
-	 * @var string
-	 */
-	protected $stringToMatch;
+    /**
+     * @var string
+     */
+    protected $stringToMatch;
 
-	/**
-	 * @param mixed $acceptOnMatch a boolean or a string ('true' or 'false')
-	 */
-	public function setAcceptOnMatch($acceptOnMatch) {
-		$this->setBoolean('acceptOnMatch', $acceptOnMatch);
-	}
+    /**
+     * @param mixed $acceptOnMatch a boolean or a string ('true' or 'false')
+     */
+    public function setAcceptOnMatch($acceptOnMatch) {
+        $this->setBoolean('acceptOnMatch', $acceptOnMatch);
+    }
 	
-	/**
-	 * @param string $s the string to match
-	 */
-	public function setStringToMatch($string) {
-		$this->setString('stringToMatch', $string);
-	}
+    /**
+     * @param string $s the string to match
+     */
+    public function setStringToMatch($string) {
+        $this->setString('stringToMatch', $string);
+    }
 
-	/**
-	 * @return integer a {@link LOGGER_FILTER_NEUTRAL} is there is no string match.
-	 */
-	public function decide(Payone_Log4php_LoggerLoggingEvent $event) {
-		$msg = $event->getRenderedMessage();
+    /**
+     * @return integer a {@link LOGGER_FILTER_NEUTRAL} is there is no string match.
+     */
+    public function decide(Payone_Log4php_LoggerLoggingEvent $event) {
+        $msg = $event->getRenderedMessage();
 		
-		if($msg === null or $this->stringToMatch === null) {
-			return Payone_Log4php_LoggerFilter::NEUTRAL;
-		}
+        if($msg === null or $this->stringToMatch === null) {
+            return Payone_Log4php_LoggerFilter::NEUTRAL;
+        }
 		
-		if(strpos($msg, $this->stringToMatch) !== false ) {
-			return ($this->acceptOnMatch) ? Payone_Log4php_LoggerFilter::ACCEPT : Payone_Log4php_LoggerFilter::DENY;
-		}
-		return Payone_Log4php_LoggerFilter::NEUTRAL;
-	}
+        if(strpos($msg, $this->stringToMatch) !== false ) {
+            return ($this->acceptOnMatch) ? Payone_Log4php_LoggerFilter::ACCEPT : Payone_Log4php_LoggerFilter::DENY;
+        }
+        return Payone_Log4php_LoggerFilter::NEUTRAL;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -77,11 +77,11 @@
 	public function decide(Payone_Log4php_LoggerLoggingEvent $event) {
 		$msg = $event->getRenderedMessage();
 		
-		if($msg === null or $this->stringToMatch === null) {
+		if ($msg === null or $this->stringToMatch === null) {
 			return Payone_Log4php_LoggerFilter::NEUTRAL;
 		}
 		
-		if(strpos($msg, $this->stringToMatch) !== false ) {
+		if (strpos($msg, $this->stringToMatch) !== false) {
 			return ($this->acceptOnMatch) ? Payone_Log4php_LoggerFilter::ACCEPT : Payone_Log4php_LoggerFilter::DENY;
 		}
 		return Payone_Log4php_LoggerFilter::NEUTRAL;

lib/Payone/Log4php/LoggerHierarchy.php

Doc Comments -1 removed lines

@@ -213,7 +213,6 @@
 	
 	/**
 	 * Sets the main threshold level.
-	 * @param Payone_Log4php_LoggerLevel $l
 	 */
 	public function setThreshold(Payone_Log4php_LoggerLevel $threshold) {
 		$this->threshold = $threshold;

Indentation +164 added lines, -164 removed lines

@@ -49,192 +49,192 @@
  */
 class Payone_Log4php_LoggerHierarchy {
 	
-	/** Array holding all Logger instances. */
-	protected $loggers = array();
+    /** Array holding all Logger instances. */
+    protected $loggers = array();
 	
-	/** 
-	 * The root logger.
-	 * @var RootLogger 
-	 */
-	protected $root = null;
+    /** 
+     * The root logger.
+     * @var RootLogger 
+     */
+    protected $root = null;
 	
-	/** 
-	 * The logger renderer map.
-	 * @var Payone_Log4php_LoggerRendererMap
-	 */
-	protected $rendererMap;
+    /** 
+     * The logger renderer map.
+     * @var Payone_Log4php_LoggerRendererMap
+     */
+    protected $rendererMap;
 
-	/** 
-	 * Main level threshold. Events with lower level will not be logged by any 
-	 * logger, regardless of it's configuration.
-	 * @var Payone_Log4php_LoggerLevel
-	 */
-	protected $threshold;
+    /** 
+     * Main level threshold. Events with lower level will not be logged by any 
+     * logger, regardless of it's configuration.
+     * @var Payone_Log4php_LoggerLevel
+     */
+    protected $threshold;
 	
-	/**
-	 * Creates a new logger hierarchy.
-	 * @param Payone_Log4php_LoggerRoot $root The root logger.
-	 */
-	public function __construct(Payone_Log4php_LoggerRoot $root) {
-		$this->root = $root;
-		$this->setThreshold(Payone_Log4php_LoggerLevel::getLevelAll());
-		$this->rendererMap = new Payone_Log4php_LoggerRendererMap();
-	}
+    /**
+     * Creates a new logger hierarchy.
+     * @param Payone_Log4php_LoggerRoot $root The root logger.
+     */
+    public function __construct(Payone_Log4php_LoggerRoot $root) {
+        $this->root = $root;
+        $this->setThreshold(Payone_Log4php_LoggerLevel::getLevelAll());
+        $this->rendererMap = new Payone_Log4php_LoggerRendererMap();
+    }
 	 
-	/**
-	 * Clears all loggers.
-	 */
-	public function clear() {
-		$this->loggers = array();
-	}
+    /**
+     * Clears all loggers.
+     */
+    public function clear() {
+        $this->loggers = array();
+    }
 	
-	/**
-	 * Check if the named logger exists in the hierarchy.
-	 * @param string $name
-	 * @return boolean
-	 */
-	public function exists($name) {
-		return isset($this->loggers[$name]);
-	}
+    /**
+     * Check if the named logger exists in the hierarchy.
+     * @param string $name
+     * @return boolean
+     */
+    public function exists($name) {
+        return isset($this->loggers[$name]);
+    }
 
-	/**
-	 * Returns all the currently defined loggers in this hierarchy as an array.
-	 * @return array
-	 */	 
-	public function getCurrentLoggers() {
-		return array_values($this->loggers);
-	}
+    /**
+     * Returns all the currently defined loggers in this hierarchy as an array.
+     * @return array
+     */	 
+    public function getCurrentLoggers() {
+        return array_values($this->loggers);
+    }
 	
-	/**
-	 * Returns a named logger instance logger. If it doesn't exist, one is created.
-	 * 
-	 * @param string $name Logger name
-	 * @return Logger Logger instance.
-	 */
-	public function getLogger($name) {
-		if(!isset($this->loggers[$name])) {
-			$logger = new Payone_Log4php_Logger($name);
+    /**
+     * Returns a named logger instance logger. If it doesn't exist, one is created.
+     * 
+     * @param string $name Logger name
+     * @return Logger Logger instance.
+     */
+    public function getLogger($name) {
+        if(!isset($this->loggers[$name])) {
+            $logger = new Payone_Log4php_Logger($name);
 
-			$nodes = explode('.', $name);
-			$firstNode = array_shift($nodes);
+            $nodes = explode('.', $name);
+            $firstNode = array_shift($nodes);
 			
-			// if name is not a first node but another first node is their
-			if($firstNode != $name and isset($this->loggers[$firstNode])) {
-				$logger->setParent($this->loggers[$firstNode]);
-			} else {
-				// if there is no father, set root logger as father
-				$logger->setParent($this->root);
-			} 
+            // if name is not a first node but another first node is their
+            if($firstNode != $name and isset($this->loggers[$firstNode])) {
+                $logger->setParent($this->loggers[$firstNode]);
+            } else {
+                // if there is no father, set root logger as father
+                $logger->setParent($this->root);
+            } 
 		
-			// if there are more nodes than one
-			if(count($nodes) > 0) {
-				// find parent node
-				foreach($nodes as $node) {
-					$parentNode = "$firstNode.$node";
-					if(isset($this->loggers[$parentNode]) and $parentNode != $name) {
-						$logger->setParent($this->loggers[$parentNode]);
-					}
-					$firstNode .= ".$node";
-				}
-			}
+            // if there are more nodes than one
+            if(count($nodes) > 0) {
+                // find parent node
+                foreach($nodes as $node) {
+                    $parentNode = "$firstNode.$node";
+                    if(isset($this->loggers[$parentNode]) and $parentNode != $name) {
+                        $logger->setParent($this->loggers[$parentNode]);
+                    }
+                    $firstNode .= ".$node";
+                }
+            }
 			
-			$this->loggers[$name] = $logger;
-		}		
+            $this->loggers[$name] = $logger;
+        }		
 		
-		return $this->loggers[$name];
-	} 
+        return $this->loggers[$name];
+    } 
 	
-	/**
-	 * Returns the logger renderer map.
-	 * @return Payone_Log4php_LoggerRendererMap
-	 */
-	public function getRendererMap() {
-		return $this->rendererMap;
-	}
+    /**
+     * Returns the logger renderer map.
+     * @return Payone_Log4php_LoggerRendererMap
+     */
+    public function getRendererMap() {
+        return $this->rendererMap;
+    }
 	
-	/**
-	 * Returns the root logger.
-	 * @return Payone_Log4php_LoggerRoot
-	 */ 
-	public function getRootLogger() {
-		if(!isset($this->root) or $this->root == null) {
-			$this->root = new Payone_Log4php_LoggerRoot();
-		}
-		return $this->root;
-	}
+    /**
+     * Returns the root logger.
+     * @return Payone_Log4php_LoggerRoot
+     */ 
+    public function getRootLogger() {
+        if(!isset($this->root) or $this->root == null) {
+            $this->root = new Payone_Log4php_LoggerRoot();
+        }
+        return $this->root;
+    }
 	 
-	/**
-	 * Returns the main threshold level.
-	 * @return Payone_Log4php_LoggerLevel
-	 */
-	public function getThreshold() {
-		return $this->threshold;
-	} 
+    /**
+     * Returns the main threshold level.
+     * @return Payone_Log4php_LoggerLevel
+     */
+    public function getThreshold() {
+        return $this->threshold;
+    } 
 
-	/**
-	 * Returns true if the hierarchy is disabled for given log level and false
-	 * otherwise.
-	 * @return boolean
-	 */
-	public function isDisabled(Payone_Log4php_LoggerLevel $level) {
-		return ($this->threshold->toInt() > $level->toInt());
-	}
+    /**
+     * Returns true if the hierarchy is disabled for given log level and false
+     * otherwise.
+     * @return boolean
+     */
+    public function isDisabled(Payone_Log4php_LoggerLevel $level) {
+        return ($this->threshold->toInt() > $level->toInt());
+    }
 	
-	/**
-	 * Reset all values contained in this hierarchy instance to their
-	 * default. 
-	 *
-	 * This removes all appenders from all loggers, sets
-	 * the level of all non-root loggers to <i>null</i>,
-	 * sets their additivity flag to <i>true</i> and sets the level
-	 * of the root logger to {@link LOGGER_LEVEL_DEBUG}.
-	 * 
-	 * <p>Existing loggers are not removed. They are just reset.
-	 *
-	 * <p>This method should be used sparingly and with care as it will
-	 * block all logging until it is completed.</p>
-	 */
-	public function resetConfiguration() {
-		$root = $this->getRootLogger();
+    /**
+     * Reset all values contained in this hierarchy instance to their
+     * default. 
+     *
+     * This removes all appenders from all loggers, sets
+     * the level of all non-root loggers to <i>null</i>,
+     * sets their additivity flag to <i>true</i> and sets the level
+     * of the root logger to {@link LOGGER_LEVEL_DEBUG}.
+     * 
+     * <p>Existing loggers are not removed. They are just reset.
+     *
+     * <p>This method should be used sparingly and with care as it will
+     * block all logging until it is completed.</p>
+     */
+    public function resetConfiguration() {
+        $root = $this->getRootLogger();
 		
-		$root->setLevel(Payone_Log4php_LoggerLevel::getLevelDebug());
-		$this->setThreshold(Payone_Log4php_LoggerLevel::getLevelAll());
-		$this->shutDown();
+        $root->setLevel(Payone_Log4php_LoggerLevel::getLevelDebug());
+        $this->setThreshold(Payone_Log4php_LoggerLevel::getLevelAll());
+        $this->shutDown();
 		
-		foreach($this->loggers as $logger) {
-			$logger->setLevel(null);
-			$logger->setAdditivity(true);
-			$logger->removeAllAppenders();
-		}
+        foreach($this->loggers as $logger) {
+            $logger->setLevel(null);
+            $logger->setAdditivity(true);
+            $logger->removeAllAppenders();
+        }
 		
-		$this->rendererMap->clear();
-		Payone_Log4php_LoggerAppenderPool::clear();
-	}
+        $this->rendererMap->clear();
+        Payone_Log4php_LoggerAppenderPool::clear();
+    }
 	
-	/**
-	 * Sets the main threshold level.
-	 * @param Payone_Log4php_LoggerLevel $l
-	 */
-	public function setThreshold(Payone_Log4php_LoggerLevel $threshold) {
-		$this->threshold = $threshold;
-	}
+    /**
+     * Sets the main threshold level.
+     * @param Payone_Log4php_LoggerLevel $l
+     */
+    public function setThreshold(Payone_Log4php_LoggerLevel $threshold) {
+        $this->threshold = $threshold;
+    }
 	
-	/**
-	 * Shutting down a hierarchy will <i>safely</i> close and remove
-	 * all appenders in all loggers including the root logger.
-	 * 
-	 * The shutdown method is careful to close nested
-	 * appenders before closing regular appenders. This is allows
-	 * configurations where a regular appender is attached to a logger
-	 * and again to a nested appender.
-	 * 
-	 * @todo Check if the last paragraph is correct.
-	 */
-	public function shutdown() {
-		$this->root->removeAllAppenders();
+    /**
+     * Shutting down a hierarchy will <i>safely</i> close and remove
+     * all appenders in all loggers including the root logger.
+     * 
+     * The shutdown method is careful to close nested
+     * appenders before closing regular appenders. This is allows
+     * configurations where a regular appender is attached to a logger
+     * and again to a nested appender.
+     * 
+     * @todo Check if the last paragraph is correct.
+     */
+    public function shutdown() {
+        $this->root->removeAllAppenders();
 		
-		foreach($this->loggers as $logger) {
-			$logger->removeAllAppenders();
-		}
-	}
+        foreach($this->loggers as $logger) {
+            $logger->removeAllAppenders();
+        }
+    }
 } 

Spacing +8 added lines, -8 removed lines

@@ -112,14 +112,14 @@ 
 	 * @return Logger Logger instance.
 	 */
 	public function getLogger($name) {
-		if(!isset($this->loggers[$name])) {
+		if (!isset($this->loggers[$name])) {
 			$logger = new Payone_Log4php_Logger($name);
 
 			$nodes = explode('.', $name);
 			$firstNode = array_shift($nodes);
 			
 			// if name is not a first node but another first node is their
-			if($firstNode != $name and isset($this->loggers[$firstNode])) {
+			if ($firstNode != $name and isset($this->loggers[$firstNode])) {
 				$logger->setParent($this->loggers[$firstNode]);
 			} else {
 				// if there is no father, set root logger as father
@@ -127,11 +127,11 @@ 
 			} 
 		
 			// if there are more nodes than one
-			if(count($nodes) > 0) {
+			if (count($nodes) > 0) {
 				// find parent node
-				foreach($nodes as $node) {
+				foreach ($nodes as $node) {
 					$parentNode = "$firstNode.$node";
-					if(isset($this->loggers[$parentNode]) and $parentNode != $name) {
+					if (isset($this->loggers[$parentNode]) and $parentNode != $name) {
 						$logger->setParent($this->loggers[$parentNode]);
 					}
 					$firstNode .= ".$node";
@@ -157,7 +157,7 @@ 
 	 * @return Payone_Log4php_LoggerRoot
 	 */ 
 	public function getRootLogger() {
-		if(!isset($this->root) or $this->root == null) {
+		if (!isset($this->root) or $this->root == null) {
 			$this->root = new Payone_Log4php_LoggerRoot();
 		}
 		return $this->root;
@@ -201,7 +201,7 @@ 
 		$this->setThreshold(Payone_Log4php_LoggerLevel::getLevelAll());
 		$this->shutDown();
 		
-		foreach($this->loggers as $logger) {
+		foreach ($this->loggers as $logger) {
 			$logger->setLevel(null);
 			$logger->setAdditivity(true);
 			$logger->removeAllAppenders();
@@ -233,7 +233,7 @@ 
 	public function shutdown() {
 		$this->root->removeAllAppenders();
 		
-		foreach($this->loggers as $logger) {
+		foreach ($this->loggers as $logger) {
 			$logger->removeAllAppenders();
 		}
 	}

lib/Payone/Log4php/LoggerLevel.php

Doc Comments +3 added lines, -3 removed lines

@@ -73,8 +73,8 @@ 
 	/**
 	 * Compares two logger levels.
 	 *
-	 * @param LoggerLevels $other
-	 * @return boolean 
+	 * @param Payone_Log4php_LoggerLevel $other
+	 * @return boolean|null 
 	 */
 	public function equals($other) {
 		if($other instanceof Payone_Log4php_LoggerLevel) {
@@ -223,7 +223,7 @@ 
 	 * this method returns the provided default level.
 	 *
 	 * @param mixed $arg The value to convert to level.
-	 * @param Payone_Log4php_LoggerLevel $default Value to return if conversion is not possible.
+	 * @param Payone_Log4php_LoggerLevel $defaultLevel Value to return if conversion is not possible.
 	 * @return Payone_Log4php_LoggerLevel
 	 */
 	public static function toLevel($arg, $defaultLevel = null) {

Indentation +200 added lines, -200 removed lines

@@ -33,224 +33,224 @@
  */
 class Payone_Log4php_LoggerLevel {
 	
-	const OFF = 2147483647;
-	const FATAL = 50000;
-	const ERROR = 40000;
-	const WARN = 30000;
-	const INFO = 20000;
-	const DEBUG = 10000;
-	const TRACE = 5000;
-	const ALL = -2147483647;
+    const OFF = 2147483647;
+    const FATAL = 50000;
+    const ERROR = 40000;
+    const WARN = 30000;
+    const INFO = 20000;
+    const DEBUG = 10000;
+    const TRACE = 5000;
+    const ALL = -2147483647;
 
-	/** Integer level value. */
-	private $level;
+    /** Integer level value. */
+    private $level;
 	
-	/** Contains a list of instantiated levels. */
-	private static $levelMap;
+    /** Contains a list of instantiated levels. */
+    private static $levelMap;
 
-	/** String representation of the level. */
-	private $levelStr;
+    /** String representation of the level. */
+    private $levelStr;
 
-	/** 
-	 * Equivalent syslog level.
-	 * @var integer
-	 */
-	private $syslogEquivalent;
+    /** 
+     * Equivalent syslog level.
+     * @var integer
+     */
+    private $syslogEquivalent;
 
-	/**
-	 * Constructor
-	 *
-	 * @param integer $level
-	 * @param string $levelStr
-	 * @param integer $syslogEquivalent
-	 */
-	private function __construct($level, $levelStr, $syslogEquivalent) {
-		$this->level = $level;
-		$this->levelStr = $levelStr;
-		$this->syslogEquivalent = $syslogEquivalent;
-	}
+    /**
+     * Constructor
+     *
+     * @param integer $level
+     * @param string $levelStr
+     * @param integer $syslogEquivalent
+     */
+    private function __construct($level, $levelStr, $syslogEquivalent) {
+        $this->level = $level;
+        $this->levelStr = $levelStr;
+        $this->syslogEquivalent = $syslogEquivalent;
+    }
 
-	/**
-	 * Compares two logger levels.
-	 *
-	 * @param LoggerLevels $other
-	 * @return boolean 
-	 */
-	public function equals($other) {
-		if($other instanceof Payone_Log4php_LoggerLevel) {
-			if($this->level == $other->level) {
-				return true;
-			}
-		} else {
-			return false;
-		}
-	}
+    /**
+     * Compares two logger levels.
+     *
+     * @param LoggerLevels $other
+     * @return boolean 
+     */
+    public function equals($other) {
+        if($other instanceof Payone_Log4php_LoggerLevel) {
+            if($this->level == $other->level) {
+                return true;
+            }
+        } else {
+            return false;
+        }
+    }
 	
-	/**
-	 * Returns an Off Level
-	 * @return Payone_Log4php_LoggerLevel
-	 */
-	public static function getLevelOff() {
-		if(!isset(self::$levelMap[Payone_Log4php_LoggerLevel::OFF])) {
-			self::$levelMap[Payone_Log4php_LoggerLevel::OFF] = new Payone_Log4php_LoggerLevel(Payone_Log4php_LoggerLevel::OFF, 'OFF', LOG_ALERT);
-		}
-		return self::$levelMap[Payone_Log4php_LoggerLevel::OFF];
-	}
+    /**
+     * Returns an Off Level
+     * @return Payone_Log4php_LoggerLevel
+     */
+    public static function getLevelOff() {
+        if(!isset(self::$levelMap[Payone_Log4php_LoggerLevel::OFF])) {
+            self::$levelMap[Payone_Log4php_LoggerLevel::OFF] = new Payone_Log4php_LoggerLevel(Payone_Log4php_LoggerLevel::OFF, 'OFF', LOG_ALERT);
+        }
+        return self::$levelMap[Payone_Log4php_LoggerLevel::OFF];
+    }
 
-	/**
-	 * Returns a Fatal Level
-	 * @return Payone_Log4php_LoggerLevel
-	 */
-	public static function getLevelFatal() {
-		if(!isset(self::$levelMap[Payone_Log4php_LoggerLevel::FATAL])) {
-			self::$levelMap[Payone_Log4php_LoggerLevel::FATAL] = new Payone_Log4php_LoggerLevel(Payone_Log4php_LoggerLevel::FATAL, 'FATAL', LOG_ALERT);
-		}
-		return self::$levelMap[Payone_Log4php_LoggerLevel::FATAL];
-	}
+    /**
+     * Returns a Fatal Level
+     * @return Payone_Log4php_LoggerLevel
+     */
+    public static function getLevelFatal() {
+        if(!isset(self::$levelMap[Payone_Log4php_LoggerLevel::FATAL])) {
+            self::$levelMap[Payone_Log4php_LoggerLevel::FATAL] = new Payone_Log4php_LoggerLevel(Payone_Log4php_LoggerLevel::FATAL, 'FATAL', LOG_ALERT);
+        }
+        return self::$levelMap[Payone_Log4php_LoggerLevel::FATAL];
+    }
 	
-	/**
-	 * Returns an Error Level
-	 * @return Payone_Log4php_LoggerLevel
-	 */
-	public static function getLevelError() {
-		if(!isset(self::$levelMap[Payone_Log4php_LoggerLevel::ERROR])) {
-			self::$levelMap[Payone_Log4php_LoggerLevel::ERROR] = new Payone_Log4php_LoggerLevel(Payone_Log4php_LoggerLevel::ERROR, 'ERROR', LOG_ERR);
-		}
-		return self::$levelMap[Payone_Log4php_LoggerLevel::ERROR];
-	}
+    /**
+     * Returns an Error Level
+     * @return Payone_Log4php_LoggerLevel
+     */
+    public static function getLevelError() {
+        if(!isset(self::$levelMap[Payone_Log4php_LoggerLevel::ERROR])) {
+            self::$levelMap[Payone_Log4php_LoggerLevel::ERROR] = new Payone_Log4php_LoggerLevel(Payone_Log4php_LoggerLevel::ERROR, 'ERROR', LOG_ERR);
+        }
+        return self::$levelMap[Payone_Log4php_LoggerLevel::ERROR];
+    }
 	
-	/**
-	 * Returns a Warn Level
-	 * @return Payone_Log4php_LoggerLevel
-	 */
-	public static function getLevelWarn() {
-		if(!isset(self::$levelMap[Payone_Log4php_LoggerLevel::WARN])) {
-			self::$levelMap[Payone_Log4php_LoggerLevel::WARN] = new Payone_Log4php_LoggerLevel(Payone_Log4php_LoggerLevel::WARN, 'WARN', LOG_WARNING);
-		}
-		return self::$levelMap[Payone_Log4php_LoggerLevel::WARN];
-	}
+    /**
+     * Returns a Warn Level
+     * @return Payone_Log4php_LoggerLevel
+     */
+    public static function getLevelWarn() {
+        if(!isset(self::$levelMap[Payone_Log4php_LoggerLevel::WARN])) {
+            self::$levelMap[Payone_Log4php_LoggerLevel::WARN] = new Payone_Log4php_LoggerLevel(Payone_Log4php_LoggerLevel::WARN, 'WARN', LOG_WARNING);
+        }
+        return self::$levelMap[Payone_Log4php_LoggerLevel::WARN];
+    }
 
-	/**
-	 * Returns an Info Level
-	 * @return Payone_Log4php_LoggerLevel
-	 */
-	public static function getLevelInfo() {
-		if(!isset(self::$levelMap[Payone_Log4php_LoggerLevel::INFO])) {
-			self::$levelMap[Payone_Log4php_LoggerLevel::INFO] = new Payone_Log4php_LoggerLevel(Payone_Log4php_LoggerLevel::INFO, 'INFO', LOG_INFO);
-		}
-		return self::$levelMap[Payone_Log4php_LoggerLevel::INFO];
-	}
+    /**
+     * Returns an Info Level
+     * @return Payone_Log4php_LoggerLevel
+     */
+    public static function getLevelInfo() {
+        if(!isset(self::$levelMap[Payone_Log4php_LoggerLevel::INFO])) {
+            self::$levelMap[Payone_Log4php_LoggerLevel::INFO] = new Payone_Log4php_LoggerLevel(Payone_Log4php_LoggerLevel::INFO, 'INFO', LOG_INFO);
+        }
+        return self::$levelMap[Payone_Log4php_LoggerLevel::INFO];
+    }
 
-	/**
-	 * Returns a Debug Level
-	 * @return Payone_Log4php_LoggerLevel
-	 */
-	public static function getLevelDebug() {
-		if(!isset(self::$levelMap[Payone_Log4php_LoggerLevel::DEBUG])) {
-			self::$levelMap[Payone_Log4php_LoggerLevel::DEBUG] = new Payone_Log4php_LoggerLevel(Payone_Log4php_LoggerLevel::DEBUG, 'DEBUG', LOG_DEBUG);
-		}
-		return self::$levelMap[Payone_Log4php_LoggerLevel::DEBUG];
-	}
+    /**
+     * Returns a Debug Level
+     * @return Payone_Log4php_LoggerLevel
+     */
+    public static function getLevelDebug() {
+        if(!isset(self::$levelMap[Payone_Log4php_LoggerLevel::DEBUG])) {
+            self::$levelMap[Payone_Log4php_LoggerLevel::DEBUG] = new Payone_Log4php_LoggerLevel(Payone_Log4php_LoggerLevel::DEBUG, 'DEBUG', LOG_DEBUG);
+        }
+        return self::$levelMap[Payone_Log4php_LoggerLevel::DEBUG];
+    }
 	
-	/**
-	 * Returns a Trace Level
-	 * @return Payone_Log4php_LoggerLevel
-	 */
-	public static function getLevelTrace() {
-		if(!isset(self::$levelMap[Payone_Log4php_LoggerLevel::TRACE])) {
-			self::$levelMap[Payone_Log4php_LoggerLevel::TRACE] = new Payone_Log4php_LoggerLevel(Payone_Log4php_LoggerLevel::TRACE, 'TRACE', LOG_DEBUG);
-		}
-		return self::$levelMap[Payone_Log4php_LoggerLevel::TRACE];
-	}	
+    /**
+     * Returns a Trace Level
+     * @return Payone_Log4php_LoggerLevel
+     */
+    public static function getLevelTrace() {
+        if(!isset(self::$levelMap[Payone_Log4php_LoggerLevel::TRACE])) {
+            self::$levelMap[Payone_Log4php_LoggerLevel::TRACE] = new Payone_Log4php_LoggerLevel(Payone_Log4php_LoggerLevel::TRACE, 'TRACE', LOG_DEBUG);
+        }
+        return self::$levelMap[Payone_Log4php_LoggerLevel::TRACE];
+    }	
 
-	/**
-	 * Returns an All Level
-	 * @return Payone_Log4php_LoggerLevel
-	 */
-	public static function getLevelAll() {
-		if(!isset(self::$levelMap[Payone_Log4php_LoggerLevel::ALL])) {
-			self::$levelMap[Payone_Log4php_LoggerLevel::ALL] = new Payone_Log4php_LoggerLevel(Payone_Log4php_LoggerLevel::ALL, 'ALL', LOG_DEBUG);
-		}
-		return self::$levelMap[Payone_Log4php_LoggerLevel::ALL];
-	}
+    /**
+     * Returns an All Level
+     * @return Payone_Log4php_LoggerLevel
+     */
+    public static function getLevelAll() {
+        if(!isset(self::$levelMap[Payone_Log4php_LoggerLevel::ALL])) {
+            self::$levelMap[Payone_Log4php_LoggerLevel::ALL] = new Payone_Log4php_LoggerLevel(Payone_Log4php_LoggerLevel::ALL, 'ALL', LOG_DEBUG);
+        }
+        return self::$levelMap[Payone_Log4php_LoggerLevel::ALL];
+    }
 	
-	/**
-	 * Return the syslog equivalent of this priority as an integer.
-	 * @return integer
-	 */
-	public function getSyslogEquivalent() {
-		return $this->syslogEquivalent;
-	}
+    /**
+     * Return the syslog equivalent of this priority as an integer.
+     * @return integer
+     */
+    public function getSyslogEquivalent() {
+        return $this->syslogEquivalent;
+    }
 
-	/**
-	 * Returns <i>true</i> if this level has a higher or equal
-	 * level than the level passed as argument, <i>false</i>
-	 * otherwise.
-	 *
-	 * @param Payone_Log4php_LoggerLevel $other
-	 * @return boolean
-	 */
-	public function isGreaterOrEqual($other) {
-		return $this->level >= $other->level;
-	}
+    /**
+     * Returns <i>true</i> if this level has a higher or equal
+     * level than the level passed as argument, <i>false</i>
+     * otherwise.
+     *
+     * @param Payone_Log4php_LoggerLevel $other
+     * @return boolean
+     */
+    public function isGreaterOrEqual($other) {
+        return $this->level >= $other->level;
+    }
 
-	/**
-	 * Returns the string representation of this level.
-	 * @return string
-	 */
-	public function toString() {
-		return $this->levelStr;
-	}
+    /**
+     * Returns the string representation of this level.
+     * @return string
+     */
+    public function toString() {
+        return $this->levelStr;
+    }
 	
-	/**
-	 * Returns the string representation of this level.
-	 * @return string
-	 */
-	public function __toString() {
-		return $this->toString();
-	}
+    /**
+     * Returns the string representation of this level.
+     * @return string
+     */
+    public function __toString() {
+        return $this->toString();
+    }
 
-	/**
-	 * Returns the integer representation of this level.
-	 * @return integer
-	 */
-	public function toInt() {
-		return $this->level;
-	}
+    /**
+     * Returns the integer representation of this level.
+     * @return integer
+     */
+    public function toInt() {
+        return $this->level;
+    }
 
-	/**
-	 * Convert the input argument to a level. If the conversion fails, then 
-	 * this method returns the provided default level.
-	 *
-	 * @param mixed $arg The value to convert to level.
-	 * @param Payone_Log4php_LoggerLevel $default Value to return if conversion is not possible.
-	 * @return Payone_Log4php_LoggerLevel
-	 */
-	public static function toLevel($arg, $defaultLevel = null) {
-		if(is_int($arg)) {
-			switch($arg) {
-				case self::ALL:	return self::getLevelAll();
-				case self::TRACE: return self::getLevelTrace();
-				case self::DEBUG: return self::getLevelDebug();
-				case self::INFO: return self::getLevelInfo();
-				case self::WARN: return self::getLevelWarn();
-				case self::ERROR: return self::getLevelError();
-				case self::FATAL: return self::getLevelFatal();
-				case self::OFF:	return self::getLevelOff();
-				default: return $defaultLevel;
-			}
-		} else {
-			switch(strtoupper($arg)) {
-				case 'ALL':	return self::getLevelAll();
-				case 'TRACE': return self::getLevelTrace();
-				case 'DEBUG': return self::getLevelDebug();
-				case 'INFO': return self::getLevelInfo();
-				case 'WARN': return self::getLevelWarn();
-				case 'ERROR': return self::getLevelError();
-				case 'FATAL': return self::getLevelFatal();
-				case 'OFF':	return self::getLevelOff();
-				default: return $defaultLevel;
-			}
-		}
-	}
+    /**
+     * Convert the input argument to a level. If the conversion fails, then 
+     * this method returns the provided default level.
+     *
+     * @param mixed $arg The value to convert to level.
+     * @param Payone_Log4php_LoggerLevel $default Value to return if conversion is not possible.
+     * @return Payone_Log4php_LoggerLevel
+     */
+    public static function toLevel($arg, $defaultLevel = null) {
+        if(is_int($arg)) {
+            switch($arg) {
+                case self::ALL:	return self::getLevelAll();
+                case self::TRACE: return self::getLevelTrace();
+                case self::DEBUG: return self::getLevelDebug();
+                case self::INFO: return self::getLevelInfo();
+                case self::WARN: return self::getLevelWarn();
+                case self::ERROR: return self::getLevelError();
+                case self::FATAL: return self::getLevelFatal();
+                case self::OFF:	return self::getLevelOff();
+                default: return $defaultLevel;
+            }
+        } else {
+            switch(strtoupper($arg)) {
+                case 'ALL':	return self::getLevelAll();
+                case 'TRACE': return self::getLevelTrace();
+                case 'DEBUG': return self::getLevelDebug();
+                case 'INFO': return self::getLevelInfo();
+                case 'WARN': return self::getLevelWarn();
+                case 'ERROR': return self::getLevelError();
+                case 'FATAL': return self::getLevelFatal();
+                case 'OFF':	return self::getLevelOff();
+                default: return $defaultLevel;
+            }
+        }
+    }
 }

Spacing +13 added lines, -13 removed lines

@@ -77,8 +77,8 @@ 
 	 * @return boolean 
 	 */
 	public function equals($other) {
-		if($other instanceof Payone_Log4php_LoggerLevel) {
-			if($this->level == $other->level) {
+		if ($other instanceof Payone_Log4php_LoggerLevel) {
+			if ($this->level == $other->level) {
 				return true;
 			}
 		} else {
@@ -91,7 +91,7 @@ 
 	 * @return Payone_Log4php_LoggerLevel
 	 */
 	public static function getLevelOff() {
-		if(!isset(self::$levelMap[Payone_Log4php_LoggerLevel::OFF])) {
+		if (!isset(self::$levelMap[Payone_Log4php_LoggerLevel::OFF])) {
 			self::$levelMap[Payone_Log4php_LoggerLevel::OFF] = new Payone_Log4php_LoggerLevel(Payone_Log4php_LoggerLevel::OFF, 'OFF', LOG_ALERT);
 		}
 		return self::$levelMap[Payone_Log4php_LoggerLevel::OFF];
@@ -102,7 +102,7 @@ 
 	 * @return Payone_Log4php_LoggerLevel
 	 */
 	public static function getLevelFatal() {
-		if(!isset(self::$levelMap[Payone_Log4php_LoggerLevel::FATAL])) {
+		if (!isset(self::$levelMap[Payone_Log4php_LoggerLevel::FATAL])) {
 			self::$levelMap[Payone_Log4php_LoggerLevel::FATAL] = new Payone_Log4php_LoggerLevel(Payone_Log4php_LoggerLevel::FATAL, 'FATAL', LOG_ALERT);
 		}
 		return self::$levelMap[Payone_Log4php_LoggerLevel::FATAL];
@@ -113,7 +113,7 @@ 
 	 * @return Payone_Log4php_LoggerLevel
 	 */
 	public static function getLevelError() {
-		if(!isset(self::$levelMap[Payone_Log4php_LoggerLevel::ERROR])) {
+		if (!isset(self::$levelMap[Payone_Log4php_LoggerLevel::ERROR])) {
 			self::$levelMap[Payone_Log4php_LoggerLevel::ERROR] = new Payone_Log4php_LoggerLevel(Payone_Log4php_LoggerLevel::ERROR, 'ERROR', LOG_ERR);
 		}
 		return self::$levelMap[Payone_Log4php_LoggerLevel::ERROR];
@@ -124,7 +124,7 @@ 
 	 * @return Payone_Log4php_LoggerLevel
 	 */
 	public static function getLevelWarn() {
-		if(!isset(self::$levelMap[Payone_Log4php_LoggerLevel::WARN])) {
+		if (!isset(self::$levelMap[Payone_Log4php_LoggerLevel::WARN])) {
 			self::$levelMap[Payone_Log4php_LoggerLevel::WARN] = new Payone_Log4php_LoggerLevel(Payone_Log4php_LoggerLevel::WARN, 'WARN', LOG_WARNING);
 		}
 		return self::$levelMap[Payone_Log4php_LoggerLevel::WARN];
@@ -135,7 +135,7 @@ 
 	 * @return Payone_Log4php_LoggerLevel
 	 */
 	public static function getLevelInfo() {
-		if(!isset(self::$levelMap[Payone_Log4php_LoggerLevel::INFO])) {
+		if (!isset(self::$levelMap[Payone_Log4php_LoggerLevel::INFO])) {
 			self::$levelMap[Payone_Log4php_LoggerLevel::INFO] = new Payone_Log4php_LoggerLevel(Payone_Log4php_LoggerLevel::INFO, 'INFO', LOG_INFO);
 		}
 		return self::$levelMap[Payone_Log4php_LoggerLevel::INFO];
@@ -146,7 +146,7 @@ 
 	 * @return Payone_Log4php_LoggerLevel
 	 */
 	public static function getLevelDebug() {
-		if(!isset(self::$levelMap[Payone_Log4php_LoggerLevel::DEBUG])) {
+		if (!isset(self::$levelMap[Payone_Log4php_LoggerLevel::DEBUG])) {
 			self::$levelMap[Payone_Log4php_LoggerLevel::DEBUG] = new Payone_Log4php_LoggerLevel(Payone_Log4php_LoggerLevel::DEBUG, 'DEBUG', LOG_DEBUG);
 		}
 		return self::$levelMap[Payone_Log4php_LoggerLevel::DEBUG];
@@ -157,7 +157,7 @@ 
 	 * @return Payone_Log4php_LoggerLevel
 	 */
 	public static function getLevelTrace() {
-		if(!isset(self::$levelMap[Payone_Log4php_LoggerLevel::TRACE])) {
+		if (!isset(self::$levelMap[Payone_Log4php_LoggerLevel::TRACE])) {
 			self::$levelMap[Payone_Log4php_LoggerLevel::TRACE] = new Payone_Log4php_LoggerLevel(Payone_Log4php_LoggerLevel::TRACE, 'TRACE', LOG_DEBUG);
 		}
 		return self::$levelMap[Payone_Log4php_LoggerLevel::TRACE];
@@ -168,7 +168,7 @@ 
 	 * @return Payone_Log4php_LoggerLevel
 	 */
 	public static function getLevelAll() {
-		if(!isset(self::$levelMap[Payone_Log4php_LoggerLevel::ALL])) {
+		if (!isset(self::$levelMap[Payone_Log4php_LoggerLevel::ALL])) {
 			self::$levelMap[Payone_Log4php_LoggerLevel::ALL] = new Payone_Log4php_LoggerLevel(Payone_Log4php_LoggerLevel::ALL, 'ALL', LOG_DEBUG);
 		}
 		return self::$levelMap[Payone_Log4php_LoggerLevel::ALL];
@@ -227,8 +227,8 @@ 
 	 * @return Payone_Log4php_LoggerLevel
 	 */
 	public static function toLevel($arg, $defaultLevel = null) {
-		if(is_int($arg)) {
-			switch($arg) {
+		if (is_int($arg)) {
+			switch ($arg) {
 				case self::ALL:	return self::getLevelAll();
 				case self::TRACE: return self::getLevelTrace();
 				case self::DEBUG: return self::getLevelDebug();
@@ -240,7 +240,7 @@ 
 				default: return $defaultLevel;
 			}
 		} else {
-			switch(strtoupper($arg)) {
+			switch (strtoupper($arg)) {
 				case 'ALL':	return self::getLevelAll();
 				case 'TRACE': return self::getLevelTrace();
 				case 'DEBUG': return self::getLevelDebug();

lib/Payone/Log4php/LoggerLocationInfo.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +69 added lines, -69 removed lines

@@ -26,85 +26,85 @@
  * @since 0.3
  */
 class Payone_Log4php_LoggerLocationInfo {
-	/**
-	 * When location information is not available the constant
-	 * <i>NA</i> is returned. Current value of this string
-	 * constant is <b>?</b>.  
-	 */
-	const LOCATION_INFO_NA = 'NA';
+    /**
+     * When location information is not available the constant
+     * <i>NA</i> is returned. Current value of this string
+     * constant is <b>?</b>.  
+     */
+    const LOCATION_INFO_NA = 'NA';
 	
-	/**
-	* @var string Caller's line number.
-	*/
-	protected $lineNumber = null;
+    /**
+     * @var string Caller's line number.
+     */
+    protected $lineNumber = null;
 	
-	/**
-	* @var string Caller's file name.
-	*/
-	protected $fileName = null;
+    /**
+     * @var string Caller's file name.
+     */
+    protected $fileName = null;
 	
-	/**
-	* @var string Caller's fully qualified class name.
-	*/
-	protected $className = null;
+    /**
+     * @var string Caller's fully qualified class name.
+     */
+    protected $className = null;
 	
-	/**
-	* @var string Caller's method name.
-	*/
-	protected $methodName = null;
+    /**
+     * @var string Caller's method name.
+     */
+    protected $methodName = null;
 	
-	/**
-	* @var string 
-	*/
-	protected $fullInfo = null;
+    /**
+     * @var string 
+     */
+    protected $fullInfo = null;
 
-	/**
-	 * Instantiate location information based on a {@link PHP_MANUAL#debug_backtrace}.
-	 *
-	 * @param array $trace
-	 * @param mixed $caller
-	 */
-	public function __construct($trace, $fqcn = null) {
-		$this->lineNumber = isset($trace['line']) ? $trace['line'] : null;
-		$this->fileName = isset($trace['file']) ? $trace['file'] : null;
-		$this->className = isset($trace['class']) ? $trace['class'] : null;
-		$this->methodName = isset($trace['function']) ? $trace['function'] : null;
-		$this->fullInfo = $this->getClassName() . '.' . $this->getMethodName() . 
-			'(' . $this->getFileName() . ':' . $this->getLineNumber() . ')';
-	}
+    /**
+     * Instantiate location information based on a {@link PHP_MANUAL#debug_backtrace}.
+     *
+     * @param array $trace
+     * @param mixed $caller
+     */
+    public function __construct($trace, $fqcn = null) {
+        $this->lineNumber = isset($trace['line']) ? $trace['line'] : null;
+        $this->fileName = isset($trace['file']) ? $trace['file'] : null;
+        $this->className = isset($trace['class']) ? $trace['class'] : null;
+        $this->methodName = isset($trace['function']) ? $trace['function'] : null;
+        $this->fullInfo = $this->getClassName() . '.' . $this->getMethodName() . 
+            '(' . $this->getFileName() . ':' . $this->getLineNumber() . ')';
+    }
 
-	public function getClassName() {
-		return ($this->className === null) ? self::LOCATION_INFO_NA : $this->className; 
-	}
+    public function getClassName() {
+        return ($this->className === null) ? self::LOCATION_INFO_NA : $this->className; 
+    }
 
-	/**
-	 *	Return the file name of the caller.
-	 *	<p>This information is not always available.
-	 */
-	public function getFileName() {
-		return ($this->fileName === null) ? self::LOCATION_INFO_NA : $this->fileName; 
-	}
+    /**
+     *	Return the file name of the caller.
+     *	<p>This information is not always available.
+     */
+    public function getFileName() {
+        return ($this->fileName === null) ? self::LOCATION_INFO_NA : $this->fileName; 
+    }
 
-	/**
-	 *	Returns the line number of the caller.
-	 *	<p>This information is not always available.
-	 */
-	public function getLineNumber() {
-		return ($this->lineNumber === null) ? self::LOCATION_INFO_NA : $this->lineNumber; 
-	}
+    /**
+     *	Returns the line number of the caller.
+     *	<p>This information is not always available.
+     */
+    public function getLineNumber() {
+        return ($this->lineNumber === null) ? self::LOCATION_INFO_NA : $this->lineNumber; 
+    }
 
-	/**
-	 *	Returns the method name of the caller.
-	 */
-	public function getMethodName() {
-		return ($this->methodName === null) ? self::LOCATION_INFO_NA : $this->methodName; 
-	}
+    /**
+     *	Returns the method name of the caller.
+     */
+    public function getMethodName() {
+        return ($this->methodName === null) ? self::LOCATION_INFO_NA : $this->methodName; 
+    }
 
-	/**
-	 *	Returns the full information of the caller.
-	 */
-	public function getFullInfo() {
-		return ($this->fullInfo === null) ? self::LOCATION_INFO_NA : $this->fullInfo;
-	}
+    /**
+     *	Returns the full information of the caller.
+     */
+    public function getFullInfo() {
+        return ($this->fullInfo === null) ? self::LOCATION_INFO_NA : $this->fullInfo;
+    }
 
 }