fjbender / magento-1

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

lib/Payone/Log4php/LoggerLoggingEvent.php

Doc Comments +3 added lines, -3 removed lines

@@ -119,7 +119,7 @@ 
 	* LoggerLoggingEvent are filled when actually needed.
 	*
 	* @param string $fqcn name of the caller class.
-	* @param mixed $logger The {@link Logger} category of this event or the logger name.
+	* @param Payone_Log4php_Logger $logger The {@link Logger} category of this event or the logger name.
 	* @param Payone_Log4php_LoggerLevel $priority The level of this event.
 	* @param mixed $message The message of this event.
 	* @param integer $timeStamp the timestamp of this logging event.
@@ -314,7 +314,7 @@ 
 	
 	/**
 	 * Calculates the time of this event.
-	 * @return the time after event starttime when this event has occured
+	 * @return string time after event starttime when this event has occured
 	 */
 	public function getTime() {
 		$eventTime = $this->getTimeStamp();
@@ -333,7 +333,7 @@ 
 	}
 
 	/**
-	 * @return mixed LoggerThrowableInformation
+	 * @return Payone_Log4php_LoggerThrowableInformation LoggerThrowableInformation
 	 */
 	public function getThrowableInformation() {
 		return $this->throwableInfo;

Indentation +303 added lines, -303 removed lines

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

Spacing +14 added lines, -14 removed lines

@@ -127,7 +127,7 @@ 
 	*/
 	public function __construct($fqcn, $logger, $priority, $message, $timeStamp = null, Exception $throwable = null) {
 		$this->fqcn = $fqcn;
-		if($logger instanceof Payone_Log4php_Logger) {
+		if ($logger instanceof Payone_Log4php_Logger) {
 			$this->logger = $logger;
 			$this->categoryName = $logger->getName();
 		} else {
@@ -135,7 +135,7 @@ 
 		}
 		$this->level = $priority;
 		$this->message = $message;
-		if($timeStamp !== null && is_float($timeStamp)) {
+		if ($timeStamp !== null && is_float($timeStamp)) {
 			$this->timeStamp = $timeStamp;
 		} else {
 			$this->timeStamp = microtime(true);
@@ -164,18 +164,18 @@ 
 	 * @return Payone_Log4php_LoggerLocationInfo
 	 */
 	public function getLocationInformation() {
-		if($this->locationInfo === null) {
+		if ($this->locationInfo === null) {
 
 			$locationInfo = array();
 			$trace = debug_backtrace();
 			$prevHop = null;
 			// make a downsearch to identify the caller
 			$hop = array_pop($trace);
-			while($hop !== null) {
-				if(isset($hop['class'])) {
+			while ($hop !== null) {
+				if (isset($hop['class'])) {
 					// we are sometimes in functions = no class available: avoid php warning here
 					$className = strtolower($hop['class']);
-					if(!empty($className) and ($className == 'logger' or 
+					if (!empty($className) and ($className == 'logger' or 
 						strtolower(get_parent_class($className)) == 'logger')) {
 						$locationInfo['line'] = $hop['line'];
 						$locationInfo['file'] = $hop['file'];
@@ -186,7 +186,7 @@ 
 				$hop = array_pop($trace);
 			}
 			$locationInfo['class'] = isset($prevHop['class']) ? $prevHop['class'] : 'main';
-			if(isset($prevHop['function']) and
+			if (isset($prevHop['function']) and
 				$prevHop['function'] !== 'include' and
 				$prevHop['function'] !== 'include_once' and
 				$prevHop['function'] !== 'require' and
@@ -238,7 +238,7 @@ 
 	 * @return mixed
 	 */
 	public function getMessage() {
-		if($this->message !== null) {
+		if ($this->message !== null) {
 			return $this->message;
 		} else {
 			return $this->getRenderedMessage();
@@ -253,7 +253,7 @@ 
 	 * @return string  
 	 */
 	public function getNDC() {
-		if($this->ndcLookupRequired) {
+		if ($this->ndcLookupRequired) {
 			$this->ndcLookupRequired = false;
 			$this->ndc = Payone_Log4php_LoggerNDC::get();
 		}
@@ -273,7 +273,7 @@ 
 	 * Returns the entire MDC context.
 	 * @return array
 	 */
-	public function getMDCMap () {
+	public function getMDCMap() {
 		return Payone_Log4php_LoggerMDC::getMap();
 	}
 
@@ -282,12 +282,12 @@ 
 	 * @return string
 	 */
 	public function getRenderedMessage() {
-		if($this->renderedMessage === null and $this->message !== null) {
-			if(is_string($this->message)) {
+		if ($this->renderedMessage === null and $this->message !== null) {
+			if (is_string($this->message)) {
 				$this->renderedMessage = $this->message;
 			} else {
 				$rendererMap = Payone_Log4php_Logger::getHierarchy()->getRendererMap();
-				$this->renderedMessage= $rendererMap->findAndRender($this->message);
+				$this->renderedMessage = $rendererMap->findAndRender($this->message);
 			}
 		}
 		return $this->renderedMessage;
@@ -299,7 +299,7 @@ 
 	 * @return float
 	 */
 	public static function getStartTime() {
-		if(!isset(self::$startTime)) {
+		if (!isset(self::$startTime)) {
 			self::$startTime = microtime(true);
 		}
 		return self::$startTime; 

lib/Payone/Log4php/LoggerPatternConverter.php

Doc Comments +1 added lines

@@ -73,6 +73,7 @@
 	 * converters must implement this method.
 	 *
 	 * @param Payone_Log4php_LoggerLoggingEvent $event
+	 * @return string
 	 */
 	abstract public function convert(Payone_Log4php_LoggerLoggingEvent $event);
 

Indentation +82 added lines, -82 removed lines

@@ -33,99 +33,99 @@
  */
 abstract class Payone_Log4php_LoggerPatternConverter {
 	
-	/**
-	 * Next converter in the converter chain.
-	 * @var Payone_Log4php_LoggerPatternConverter
-	 */
-	public $next = null;
+    /**
+     * Next converter in the converter chain.
+     * @var Payone_Log4php_LoggerPatternConverter
+     */
+    public $next = null;
 	
-	/**
-	 * Formatting information, parsed from pattern modifiers. 
-	 * @var Payone_Log4php_LoggerFormattingInfo
-	 */
-	protected $formattingInfo;
+    /**
+     * Formatting information, parsed from pattern modifiers. 
+     * @var Payone_Log4php_LoggerFormattingInfo
+     */
+    protected $formattingInfo;
 	
-	/**
-	 * Converter-specific formatting options.
-	 * @var array
-	 */
-	protected $option;
+    /**
+     * Converter-specific formatting options.
+     * @var array
+     */
+    protected $option;
 
-	/**
-	 * Constructor 
-	 * @param Payone_Log4php_LoggerFormattingInfo $formattingInfo
-	 * @param array $option
-	 */
-	public function __construct(Payone_Log4php_LoggerFormattingInfo $formattingInfo = null, $option = null) {
-		$this->formattingInfo = $formattingInfo;
-		$this->option = $option;
-		$this->activateOptions();
-	}
+    /**
+     * Constructor 
+     * @param Payone_Log4php_LoggerFormattingInfo $formattingInfo
+     * @param array $option
+     */
+    public function __construct(Payone_Log4php_LoggerFormattingInfo $formattingInfo = null, $option = null) {
+        $this->formattingInfo = $formattingInfo;
+        $this->option = $option;
+        $this->activateOptions();
+    }
 	
-	/**
-	 * Called in constructor. Converters which need to process the options 
-	 * can override this method. 
-	 */
-	public function activateOptions() { }
+    /**
+     * Called in constructor. Converters which need to process the options 
+     * can override this method. 
+     */
+    public function activateOptions() { }
   
-	/**
-	 * Converts the logging event to the desired format. Derived pattern 
-	 * converters must implement this method.
-	 *
-	 * @param Payone_Log4php_LoggerLoggingEvent $event
-	 */
-	abstract public function convert(Payone_Log4php_LoggerLoggingEvent $event);
+    /**
+     * Converts the logging event to the desired format. Derived pattern 
+     * converters must implement this method.
+     *
+     * @param Payone_Log4php_LoggerLoggingEvent $event
+     */
+    abstract public function convert(Payone_Log4php_LoggerLoggingEvent $event);
 
-	/**
-	 * Converts the event and formats it according to setting in the 
-	 * Formatting information object.
-	 *
-	 * @param string &$sbuf string buffer to write to
-	 * @param Payone_Log4php_LoggerLoggingEvent $event Event to be formatted.
-	 */
-	public function format(&$sbuf, $event) {
-		$string = $this->convert($event);
+    /**
+     * Converts the event and formats it according to setting in the 
+     * Formatting information object.
+     *
+     * @param string &$sbuf string buffer to write to
+     * @param Payone_Log4php_LoggerLoggingEvent $event Event to be formatted.
+     */
+    public function format(&$sbuf, $event) {
+        $string = $this->convert($event);
 		
-		if (!isset($this->formattingInfo)) {
-			$sbuf .= $string;
-			return;	
-		}
+        if (!isset($this->formattingInfo)) {
+            $sbuf .= $string;
+            return;	
+        }
 		
-		$fi = $this->formattingInfo;
+        $fi = $this->formattingInfo;
 		
-		// Empty string
-		if($string === '' || is_null($string)) {
-			if($fi->min > 0) {
-				$sbuf .= str_repeat(' ', $fi->min);
-			}
-			return;
-		}
+        // Empty string
+        if($string === '' || is_null($string)) {
+            if($fi->min > 0) {
+                $sbuf .= str_repeat(' ', $fi->min);
+            }
+            return;
+        }
 		
-		$len = strlen($string);
+        $len = strlen($string);
 	
-		// Trim the string if needed
-		if($len > $fi->max) {
-			if ($fi->trimLeft) {
-				$sbuf .= substr($string, $len - $fi->max, $fi->max);
-			} else {
-				$sbuf .= substr($string , 0, $fi->max);
-			}
-		}
+        // Trim the string if needed
+        if($len > $fi->max) {
+            if ($fi->trimLeft) {
+                $sbuf .= substr($string, $len - $fi->max, $fi->max);
+            } else {
+                $sbuf .= substr($string , 0, $fi->max);
+            }
+        }
 		
-		// Add padding if needed
-		else if($len < $fi->min) {
-			if($fi->padLeft) {
-				$sbuf .= str_repeat(' ', $fi->min - $len);
-				$sbuf .= $string;
-			} else {
-				$sbuf .= $string;
-				$sbuf .= str_repeat(' ', $fi->min - $len);
-			}
-		}
+        // Add padding if needed
+        else if($len < $fi->min) {
+            if($fi->padLeft) {
+                $sbuf .= str_repeat(' ', $fi->min - $len);
+                $sbuf .= $string;
+            } else {
+                $sbuf .= $string;
+                $sbuf .= str_repeat(' ', $fi->min - $len);
+            }
+        }
 		
-		// No action needed
-		else {
-			$sbuf .= $string;
-		}
-	}
+        // No action needed
+        else {
+            $sbuf .= $string;
+        }
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -94,8 +94,8 @@ 
 		$fi = $this->formattingInfo;
 		
 		// Empty string
-		if($string === '' || is_null($string)) {
-			if($fi->min > 0) {
+		if ($string === '' || is_null($string)) {
+			if ($fi->min > 0) {
 				$sbuf .= str_repeat(' ', $fi->min);
 			}
 			return;
@@ -104,17 +104,17 @@ 
 		$len = strlen($string);
 	
 		// Trim the string if needed
-		if($len > $fi->max) {
+		if ($len > $fi->max) {
 			if ($fi->trimLeft) {
 				$sbuf .= substr($string, $len - $fi->max, $fi->max);
 			} else {
-				$sbuf .= substr($string , 0, $fi->max);
+				$sbuf .= substr($string, 0, $fi->max);
 			}
 		}
 		
 		// Add padding if needed
-		else if($len < $fi->min) {
-			if($fi->padLeft) {
+		else if ($len < $fi->min) {
+			if ($fi->padLeft) {
 				$sbuf .= str_repeat(' ', $fi->min - $len);
 				$sbuf .= $string;
 			} else {

lib/Payone/Log4php/LoggerPatternParser.php

Doc Comments +1 added lines, -1 removed lines

@@ -199,7 +199,7 @@
 	 * Parses the formatting modifiers and produces the corresponding 
 	 * LoggerFormattingInfo object.
 	 * 
-	 * @param string $modifier
+	 * @param string $modifiers
 	 * @return Payone_Log4php_LoggerFormattingInfo
 	 * @throws LoggerException
 	 */

Indentation +179 added lines, -179 removed lines

@@ -33,206 +33,206 @@
  */
 class Payone_Log4php_LoggerPatternParser {
 
-	/** Escape character for conversion words in the conversion pattern. */
-	const ESCAPE_CHAR = '%';
+    /** Escape character for conversion words in the conversion pattern. */
+    const ESCAPE_CHAR = '%';
 	
-	/** Maps conversion words to relevant converters. */
-	private $converterMap;
+    /** Maps conversion words to relevant converters. */
+    private $converterMap;
 	
-	/** Conversion pattern used in layout. */
-	private $pattern;
+    /** Conversion pattern used in layout. */
+    private $pattern;
 	
-	/** Regex pattern used for parsing the conversion pattern. */
-	private $regex;
+    /** Regex pattern used for parsing the conversion pattern. */
+    private $regex;
 	
-	/** 
-	 * First converter in the chain. 
-	 * @var Payone_Log4php_LoggerPatternConverter
-	 */
-	private $head;
+    /** 
+     * First converter in the chain. 
+     * @var Payone_Log4php_LoggerPatternConverter
+     */
+    private $head;
 	
-	/** Last converter in the chain. */
-	private $tail;
+    /** Last converter in the chain. */
+    private $tail;
 	
-	public function __construct($pattern, $converterMap) {
-		$this->pattern = $pattern;
-		$this->converterMap = $converterMap;
+    public function __construct($pattern, $converterMap) {
+        $this->pattern = $pattern;
+        $this->converterMap = $converterMap;
 		
-		// Construct the regex pattern
-		$this->regex = 
-			'/' .                       // Starting regex pattern delimiter
-			self::ESCAPE_CHAR .         // Character which marks the start of the conversion pattern
-			'(?P<modifiers>[0-9.-]*)' . // Format modifiers (optional)
-			'(?P<word>[a-zA-Z]+)' .     // The conversion word
-			'(?P<option>{[^}]*})?' .   // Conversion option in braces (optional)
-			'/';                        // Ending regex pattern delimiter
-	}
-	
-	/** 
-	 * Parses the conversion pattern string, converts it to a chain of pattern
-	 * converters and returns the first converter in the chain.
-	 * 
-	 * @return Payone_Log4php_LoggerPatternConverter
-	 */
-	public function parse() {
+        // Construct the regex pattern
+        $this->regex = 
+            '/' .                       // Starting regex pattern delimiter
+            self::ESCAPE_CHAR .         // Character which marks the start of the conversion pattern
+            '(?P<modifiers>[0-9.-]*)' . // Format modifiers (optional)
+            '(?P<word>[a-zA-Z]+)' .     // The conversion word
+            '(?P<option>{[^}]*})?' .   // Conversion option in braces (optional)
+            '/';                        // Ending regex pattern delimiter
+    }
+	
+    /** 
+     * Parses the conversion pattern string, converts it to a chain of pattern
+     * converters and returns the first converter in the chain.
+     * 
+     * @return Payone_Log4php_LoggerPatternConverter
+     */
+    public function parse() {
 		
-		// Skip parsing if the pattern is empty
-		if (empty($this->pattern)) {
-			$this->addLiteral('');
-			return $this->head;
-		}
+        // Skip parsing if the pattern is empty
+        if (empty($this->pattern)) {
+            $this->addLiteral('');
+            return $this->head;
+        }
 		
-		// Find all conversion words in the conversion pattern
-		$count = preg_match_all($this->regex, $this->pattern, $matches, PREG_OFFSET_CAPTURE);
-		if ($count === false) {
-			$error = error_get_last();
-			throw new Payone_Log4php_LoggerException("Failed parsing layotut pattern: {$error['message']}");
-		}
+        // Find all conversion words in the conversion pattern
+        $count = preg_match_all($this->regex, $this->pattern, $matches, PREG_OFFSET_CAPTURE);
+        if ($count === false) {
+            $error = error_get_last();
+            throw new Payone_Log4php_LoggerException("Failed parsing layotut pattern: {$error['message']}");
+        }
 		
-		$prevEnd = 0;
+        $prevEnd = 0;
 		
-		foreach($matches[0] as $key => $item) {
+        foreach($matches[0] as $key => $item) {
 			
-			// Locate where the conversion command starts and ends
-			$length = strlen($item[0]);
-			$start = $item[1];
-			$end = $item[1] + $length;
+            // Locate where the conversion command starts and ends
+            $length = strlen($item[0]);
+            $start = $item[1];
+            $end = $item[1] + $length;
 		
-			// Find any literal expressions between matched commands
-			if ($start > $prevEnd) {
-				$literal = substr($this->pattern, $prevEnd, $start - $prevEnd);
-				$this->addLiteral($literal);
-			}
+            // Find any literal expressions between matched commands
+            if ($start > $prevEnd) {
+                $literal = substr($this->pattern, $prevEnd, $start - $prevEnd);
+                $this->addLiteral($literal);
+            }
 			
-			// Extract the data from the matched command
-			$word = !empty($matches['word'][$key]) ? $matches['word'][$key][0] : null;
-			$modifiers = !empty($matches['modifiers'][$key]) ? $matches['modifiers'][$key][0] : null;
-			$option = !empty($matches['option'][$key]) ? $matches['option'][$key][0] : null;
+            // Extract the data from the matched command
+            $word = !empty($matches['word'][$key]) ? $matches['word'][$key][0] : null;
+            $modifiers = !empty($matches['modifiers'][$key]) ? $matches['modifiers'][$key][0] : null;
+            $option = !empty($matches['option'][$key]) ? $matches['option'][$key][0] : null;
 			
-			// Create a converter and add it to the chain
-			$this->addConverter($word, $modifiers, $option);
+            // Create a converter and add it to the chain
+            $this->addConverter($word, $modifiers, $option);
 			
-			$prevEnd = $end;
-		}
+            $prevEnd = $end;
+        }
 
-		// Add any trailing literals
-		if ($end < strlen($this->pattern)) {
-			$literal = substr($this->pattern, $end);
-			$this->addLiteral($literal);
-		}
+        // Add any trailing literals
+        if ($end < strlen($this->pattern)) {
+            $literal = substr($this->pattern, $end);
+            $this->addLiteral($literal);
+        }
 		
-		return $this->head;
-	}
-	
-	/** 
-	 * Adds a literal converter to the converter chain. 
-	 * @param string $string The string for the literal converter.
-	 */
-	private function addLiteral($string) {
-		$converter = new Payone_Log4php_LoggerPatternConverterLiteral($string);
-		$this->addToChain($converter);
-	}
-	
-	/**
-	 * Adds a non-literal converter to the converter chain.
-	 * 
-	 * @param string $word The conversion word, used to determine which 
-	 *  converter will be used.
-	 * @param string $modifiers Formatting modifiers.
-	 * @param string $option Option to pass to the converter.
-	 */
-	private function addConverter($word, $modifiers, $option) {
- 		$formattingInfo = $this->parseModifiers($modifiers);
-		$option = trim($option, "{} ");
+        return $this->head;
+    }
+	
+    /** 
+     * Adds a literal converter to the converter chain. 
+     * @param string $string The string for the literal converter.
+     */
+    private function addLiteral($string) {
+        $converter = new Payone_Log4php_LoggerPatternConverterLiteral($string);
+        $this->addToChain($converter);
+    }
+	
+    /**
+     * Adds a non-literal converter to the converter chain.
+     * 
+     * @param string $word The conversion word, used to determine which 
+     *  converter will be used.
+     * @param string $modifiers Formatting modifiers.
+     * @param string $option Option to pass to the converter.
+     */
+    private function addConverter($word, $modifiers, $option) {
+            $formattingInfo = $this->parseModifiers($modifiers);
+        $option = trim($option, "{} ");
 		
-		if (isset($this->converterMap[$word])) {
-			$converter = $this->getConverter($word, $formattingInfo, $option);
-			$this->addToChain($converter);	
-		} else {
-			trigger_error("log4php: Invalid keyword '%$word' in converison pattern. Ignoring keyword.", E_USER_WARNING);
-		}
-	}
-	
-	/**
-	 * Determines which converter to use based on the conversion word. Creates 
-	 * an instance of the converter using the provided formatting info and 
-	 * option and returns it.
-	 * 
-	 * @param string $word The conversion word.
-	 * @param Payone_Log4php_LoggerFormattingInfo $info Formatting info.
-	 * @param string $option Converter option.
-	 * 
-	 * @throws LoggerException 
-	 * 
-	 * @return Payone_Log4php_LoggerPatternConverter
-	 */
-	private function getConverter($word, $info, $option) {
-		if (!isset($this->converterMap[$word])) {
-			throw new Payone_Log4php_LoggerException("Invalid keyword '%$word' in converison pattern. Ignoring keyword.");
-		}
+        if (isset($this->converterMap[$word])) {
+            $converter = $this->getConverter($word, $formattingInfo, $option);
+            $this->addToChain($converter);	
+        } else {
+            trigger_error("log4php: Invalid keyword '%$word' in converison pattern. Ignoring keyword.", E_USER_WARNING);
+        }
+    }
+	
+    /**
+     * Determines which converter to use based on the conversion word. Creates 
+     * an instance of the converter using the provided formatting info and 
+     * option and returns it.
+     * 
+     * @param string $word The conversion word.
+     * @param Payone_Log4php_LoggerFormattingInfo $info Formatting info.
+     * @param string $option Converter option.
+     * 
+     * @throws LoggerException 
+     * 
+     * @return Payone_Log4php_LoggerPatternConverter
+     */
+    private function getConverter($word, $info, $option) {
+        if (!isset($this->converterMap[$word])) {
+            throw new Payone_Log4php_LoggerException("Invalid keyword '%$word' in converison pattern. Ignoring keyword.");
+        }
 		
-		$converterClass = $this->converterMap[$word];
-		if(!class_exists($converterClass)) {
-			throw new Payone_Log4php_LoggerException("Class '$converterClass' does not exist.");
-		}
+        $converterClass = $this->converterMap[$word];
+        if(!class_exists($converterClass)) {
+            throw new Payone_Log4php_LoggerException("Class '$converterClass' does not exist.");
+        }
 		
-		$converter = new $converterClass($info, $option);
-		if(!($converter instanceof Payone_Log4php_LoggerPatternConverter)) {
-			throw new Payone_Log4php_LoggerException("Class '$converterClass' is not an instance of Payone_Log4php_LoggerPatternConverter.");
-		}
+        $converter = new $converterClass($info, $option);
+        if(!($converter instanceof Payone_Log4php_LoggerPatternConverter)) {
+            throw new Payone_Log4php_LoggerException("Class '$converterClass' is not an instance of Payone_Log4php_LoggerPatternConverter.");
+        }
 		
-		return $converter;
-	}
-	
-	/** Adds a converter to the chain and updates $head and $tail pointers. */
-	private function addToChain(LoggerPatternConverter $converter) {
-		if (!isset($this->head)) {
-			$this->head = $converter;
-			$this->tail = $this->head;
-		} else {
-			$this->tail->next = $converter;
-			$this->tail = $this->tail->next;
-		}
-	}
-	
-	/**
-	 * Parses the formatting modifiers and produces the corresponding 
-	 * LoggerFormattingInfo object.
-	 * 
-	 * @param string $modifier
-	 * @return Payone_Log4php_LoggerFormattingInfo
-	 * @throws LoggerException
-	 */
-	private function parseModifiers($modifiers) {
-		$info = new Payone_Log4php_LoggerFormattingInfo();
-	
-		// If no modifiers are given, return default values
-		if (empty($modifiers)) {
-			return $info;
-		}
-	
-		// Validate
-		$pattern = '/^(-?[0-9]+)?\.?-?[0-9]+$/';
-		if (!preg_match($pattern, $modifiers)) {
-			trigger_error("log4php: Invalid modifier in conversion pattern: [$modifiers]. Ignoring modifier.", E_USER_WARNING);
-			return $info;
-		}
-	
-		$parts = explode('.', $modifiers);
-	
-		if (!empty($parts[0])) {
-			$minPart = (integer) $parts[0];
-			$info->min = abs($minPart);
-			$info->padLeft = ($minPart > 0);
-		}
-	
-		if (!empty($parts[1])) {
-			$maxPart = (integer) $parts[1];
-			$info->max = abs($maxPart);
-			$info->trimLeft = ($maxPart > 0);
-		}
-	
-		return $info;
-	}
+        return $converter;
+    }
+	
+    /** Adds a converter to the chain and updates $head and $tail pointers. */
+    private function addToChain(LoggerPatternConverter $converter) {
+        if (!isset($this->head)) {
+            $this->head = $converter;
+            $this->tail = $this->head;
+        } else {
+            $this->tail->next = $converter;
+            $this->tail = $this->tail->next;
+        }
+    }
+	
+    /**
+     * Parses the formatting modifiers and produces the corresponding 
+     * LoggerFormattingInfo object.
+     * 
+     * @param string $modifier
+     * @return Payone_Log4php_LoggerFormattingInfo
+     * @throws LoggerException
+     */
+    private function parseModifiers($modifiers) {
+        $info = new Payone_Log4php_LoggerFormattingInfo();
+	
+        // If no modifiers are given, return default values
+        if (empty($modifiers)) {
+            return $info;
+        }
+	
+        // Validate
+        $pattern = '/^(-?[0-9]+)?\.?-?[0-9]+$/';
+        if (!preg_match($pattern, $modifiers)) {
+            trigger_error("log4php: Invalid modifier in conversion pattern: [$modifiers]. Ignoring modifier.", E_USER_WARNING);
+            return $info;
+        }
+	
+        $parts = explode('.', $modifiers);
+	
+        if (!empty($parts[0])) {
+            $minPart = (integer) $parts[0];
+            $info->min = abs($minPart);
+            $info->padLeft = ($minPart > 0);
+        }
+	
+        if (!empty($parts[1])) {
+            $maxPart = (integer) $parts[1];
+            $info->max = abs($maxPart);
+            $info->trimLeft = ($maxPart > 0);
+        }
+	
+        return $info;
+    }
 }
 

Spacing +10 added lines, -10 removed lines

@@ -60,12 +60,12 @@ 
 		
 		// Construct the regex pattern
 		$this->regex = 
-			'/' .                       // Starting regex pattern delimiter
-			self::ESCAPE_CHAR .         // Character which marks the start of the conversion pattern
+			'/' . // Starting regex pattern delimiter
+			self::ESCAPE_CHAR . // Character which marks the start of the conversion pattern
 			'(?P<modifiers>[0-9.-]*)' . // Format modifiers (optional)
-			'(?P<word>[a-zA-Z]+)' .     // The conversion word
-			'(?P<option>{[^}]*})?' .   // Conversion option in braces (optional)
-			'/';                        // Ending regex pattern delimiter
+			'(?P<word>[a-zA-Z]+)' . // The conversion word
+			'(?P<option>{[^}]*})?' . // Conversion option in braces (optional)
+			'/'; // Ending regex pattern delimiter
 	}
 	
 	/** 
@@ -91,7 +91,7 @@ 
 		
 		$prevEnd = 0;
 		
-		foreach($matches[0] as $key => $item) {
+		foreach ($matches[0] as $key => $item) {
 			
 			// Locate where the conversion command starts and ends
 			$length = strlen($item[0]);
@@ -172,12 +172,12 @@ 
 		}
 		
 		$converterClass = $this->converterMap[$word];
-		if(!class_exists($converterClass)) {
+		if (!class_exists($converterClass)) {
 			throw new Payone_Log4php_LoggerException("Class '$converterClass' does not exist.");
 		}
 		
 		$converter = new $converterClass($info, $option);
-		if(!($converter instanceof Payone_Log4php_LoggerPatternConverter)) {
+		if (!($converter instanceof Payone_Log4php_LoggerPatternConverter)) {
 			throw new Payone_Log4php_LoggerException("Class '$converterClass' is not an instance of Payone_Log4php_LoggerPatternConverter.");
 		}
 		
@@ -221,13 +221,13 @@ 
 		$parts = explode('.', $modifiers);
 	
 		if (!empty($parts[0])) {
-			$minPart = (integer) $parts[0];
+			$minPart = (integer)$parts[0];
 			$info->min = abs($minPart);
 			$info->padLeft = ($minPart > 0);
 		}
 	
 		if (!empty($parts[1])) {
-			$maxPart = (integer) $parts[1];
+			$maxPart = (integer)$parts[1];
 			$info->max = abs($maxPart);
 			$info->trimLeft = ($maxPart > 0);
 		}

lib/Payone/Log4php/LoggerReflectionUtils.php

Doc Comments +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
 	/**
 	 * Creates an instances from the given class name.
 	 *
-	 * @param string $classname
+	 * @param string $class
 	 * @return an object from the class with the given classname
 	 */
 	public static function createObject($class) {

Indentation +116 added lines, -116 removed lines

@@ -23,131 +23,131 @@
  * @package log4php
  */
 class Payone_Log4php_LoggerReflectionUtils {
-		/** the target object */
-	private $obj;
+        /** the target object */
+    private $obj;
 	
-	/**
-	 * Create a new LoggerReflectionUtils for the specified Object. 
-	 * This is done in prepartion for invoking {@link setProperty()} 
-	 * one or more times.
-	 * @param object &$obj the object for which to set properties
-	 */
-	public function __construct($obj) {
-		$this->obj = $obj;
-	}
+    /**
+     * Create a new LoggerReflectionUtils for the specified Object. 
+     * This is done in prepartion for invoking {@link setProperty()} 
+     * one or more times.
+     * @param object &$obj the object for which to set properties
+     */
+    public function __construct($obj) {
+        $this->obj = $obj;
+    }
 	
-	/**
-	 * Set the properties of an object passed as a parameter in one
-	 * go. The <code>properties</code> are parsed relative to a
-	 * <code>prefix</code>.
-	 *
-	 * @param object $obj The object to configure.
-	 * @param array $properties An array containing keys and values.
-	 * @param string $prefix Only keys having the specified prefix will be set.
-	 */
-	 // TODO: check, if this is really useful
-	public static function setPropertiesByObject($obj, $properties, $prefix) {
-		$pSetter = new Payone_Log4php_LoggerReflectionUtils($obj);
-		return $pSetter->setProperties($properties, $prefix);
-	}
+    /**
+     * Set the properties of an object passed as a parameter in one
+     * go. The <code>properties</code> are parsed relative to a
+     * <code>prefix</code>.
+     *
+     * @param object $obj The object to configure.
+     * @param array $properties An array containing keys and values.
+     * @param string $prefix Only keys having the specified prefix will be set.
+     */
+        // TODO: check, if this is really useful
+    public static function setPropertiesByObject($obj, $properties, $prefix) {
+        $pSetter = new Payone_Log4php_LoggerReflectionUtils($obj);
+        return $pSetter->setProperties($properties, $prefix);
+    }
 	
 	
-	/**
-	 * Set the properites for the object that match the
-	 * <code>prefix</code> passed as parameter.
-	 * 
-	 * Example:
-	 * 
-	 * $arr['xxxname'] = 'Joe';
- 	 * $arr['xxxmale'] = true;
-	 * and prefix xxx causes setName and setMale.	
-	 *
-	 * @param array $properties An array containing keys and values.
-	 * @param string $prefix Only keys having the specified prefix will be set.
-	 */
-	 // TODO: check, if this is really useful
-	public function setProperties($properties, $prefix) {
-		$len = strlen($prefix);
-		reset($properties);
-		while(list($key,) = each($properties)) {
-			if(strpos($key, $prefix) === 0) {
-				if(strpos($key, '.', ($len + 1)) > 0) {
-					continue;
-				}
-				$value = Payone_Log4php_LoggerOptionConverter::findAndSubst($key, $properties);
-				$key = substr($key, $len);
-				if($key == 'layout' and ($this->obj instanceof Payone_Log4php_LoggerAppender)) {
-					continue;
-				}
-				$this->setProperty($key, $value);
-			}
-		}
-		$this->activate();
-	}
+    /**
+     * Set the properites for the object that match the
+     * <code>prefix</code> passed as parameter.
+     * 
+     * Example:
+     * 
+     * $arr['xxxname'] = 'Joe';
+     * $arr['xxxmale'] = true;
+     * and prefix xxx causes setName and setMale.	
+     *
+     * @param array $properties An array containing keys and values.
+     * @param string $prefix Only keys having the specified prefix will be set.
+     */
+        // TODO: check, if this is really useful
+    public function setProperties($properties, $prefix) {
+        $len = strlen($prefix);
+        reset($properties);
+        while(list($key,) = each($properties)) {
+            if(strpos($key, $prefix) === 0) {
+                if(strpos($key, '.', ($len + 1)) > 0) {
+                    continue;
+                }
+                $value = Payone_Log4php_LoggerOptionConverter::findAndSubst($key, $properties);
+                $key = substr($key, $len);
+                if($key == 'layout' and ($this->obj instanceof Payone_Log4php_LoggerAppender)) {
+                    continue;
+                }
+                $this->setProperty($key, $value);
+            }
+        }
+        $this->activate();
+    }
 	
-	/**
-	 * Set a property on this PropertySetter's Object. If successful, this
-	 * method will invoke a setter method on the underlying Object. The
-	 * setter is the one for the specified property name and the value is
-	 * determined partly from the setter argument type and partly from the
-	 * value specified in the call to this method.
-	 *
-	 * <p>If the setter expects a String no conversion is necessary.
-	 * If it expects an int, then an attempt is made to convert 'value'
-	 * to an int using new Integer(value). If the setter expects a boolean,
-	 * the conversion is by new Boolean(value).
-	 *
-	 * @param string $name	name of the property
-	 * @param string $value	String value of the property
-	 */
-	public function setProperty($name, $value) {
-		if($value === null) {
-			return;
-		}
+    /**
+     * Set a property on this PropertySetter's Object. If successful, this
+     * method will invoke a setter method on the underlying Object. The
+     * setter is the one for the specified property name and the value is
+     * determined partly from the setter argument type and partly from the
+     * value specified in the call to this method.
+     *
+     * <p>If the setter expects a String no conversion is necessary.
+     * If it expects an int, then an attempt is made to convert 'value'
+     * to an int using new Integer(value). If the setter expects a boolean,
+     * the conversion is by new Boolean(value).
+     *
+     * @param string $name	name of the property
+     * @param string $value	String value of the property
+     */
+    public function setProperty($name, $value) {
+        if($value === null) {
+            return;
+        }
 		
-		$method = "set" . ucfirst($name);
+        $method = "set" . ucfirst($name);
 		
-		if(!method_exists($this->obj, $method)) {
-			throw new Exception("Error setting log4php property $name to $value: no method $method in class ".get_class($this->obj)."!");
-		} else {
-			return call_user_func(array($this->obj, $method), $value);
-		} 
-	}
+        if(!method_exists($this->obj, $method)) {
+            throw new Exception("Error setting log4php property $name to $value: no method $method in class ".get_class($this->obj)."!");
+        } else {
+            return call_user_func(array($this->obj, $method), $value);
+        } 
+    }
 	
-	public function activate() {
-		if(method_exists($this->obj, 'activateoptions')) {
-			return call_user_func(array($this->obj, 'activateoptions'));
-		} 
-	}
+    public function activate() {
+        if(method_exists($this->obj, 'activateoptions')) {
+            return call_user_func(array($this->obj, 'activateoptions'));
+        } 
+    }
 	
-	/**
-	 * Creates an instances from the given class name.
-	 *
-	 * @param string $classname
-	 * @return an object from the class with the given classname
-	 */
-	public static function createObject($class) {
-		if(!empty($class)) {
-			return new $class();
-		}
-		return null;
-	}
+    /**
+     * Creates an instances from the given class name.
+     *
+     * @param string $classname
+     * @return an object from the class with the given classname
+     */
+    public static function createObject($class) {
+        if(!empty($class)) {
+            return new $class();
+        }
+        return null;
+    }
 	
-	/**
-	 * @param object $object
-	 * @param string $name
-	 * @param mixed $value
-	 */
-	public static function setter($object, $name, $value) {
-		if (empty($name)) {
-			return false;
-		}
-		$methodName = 'set'.ucfirst($name);
-		if (method_exists($object, $methodName)) {
-			return call_user_func(array($object, $methodName), $value);
-		} else {
-			return false;
-		}
-	}
+    /**
+     * @param object $object
+     * @param string $name
+     * @param mixed $value
+     */
+    public static function setter($object, $name, $value) {
+        if (empty($name)) {
+            return false;
+        }
+        $methodName = 'set'.ucfirst($name);
+        if (method_exists($object, $methodName)) {
+            return call_user_func(array($object, $methodName), $value);
+        } else {
+            return false;
+        }
+    }
 	
 }

Spacing +10 added lines, -10 removed lines

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