fjbender / magento-1

lib/Payone/Log4php/LoggerNDC.php

Doc Comments +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
 
 	/**
 	 * Never use this method directly, use the {@link LoggerLoggingEvent::getNDC()} method instead.
-	 * @return array
+	 * @return string
 	 */
 	public static function get() {
 		return implode(' ', self::$stack);

Indentation +97 added lines, -97 removed lines

@@ -95,109 +95,109 @@
  */
 class Payone_Log4php_LoggerNDC {
 	
-	/** This is the repository of NDC stack */
-	private static $stack = array();
+    /** This is the repository of NDC stack */
+    private static $stack = array();
 	
-	/**
-	 * Clear any nested diagnostic information if any. This method is
-	 * useful in cases where the same thread can be potentially used
-	 * over and over in different unrelated contexts.
-	 *
-	 * <p>This method is equivalent to calling the {@link setMaxDepth()}
-	 * method with a zero <var>maxDepth</var> argument.
-	 */
-	public static function clear() {
-		self::$stack = array();
-	}
+    /**
+     * Clear any nested diagnostic information if any. This method is
+     * useful in cases where the same thread can be potentially used
+     * over and over in different unrelated contexts.
+     *
+     * <p>This method is equivalent to calling the {@link setMaxDepth()}
+     * method with a zero <var>maxDepth</var> argument.
+     */
+    public static function clear() {
+        self::$stack = array();
+    }
 
-	/**
-	 * Never use this method directly, use the {@link LoggerLoggingEvent::getNDC()} method instead.
-	 * @return array
-	 */
-	public static function get() {
-		return implode(' ', self::$stack);
-	}
+    /**
+     * Never use this method directly, use the {@link LoggerLoggingEvent::getNDC()} method instead.
+     * @return array
+     */
+    public static function get() {
+        return implode(' ', self::$stack);
+    }
   
-	/**
-	 * Get the current nesting depth of this diagnostic context.
-	 *
-	 * @see setMaxDepth()
-	 * @return integer
-	 */
-	public static function getDepth() {
-		return count(self::$stack);
-	}
+    /**
+     * Get the current nesting depth of this diagnostic context.
+     *
+     * @see setMaxDepth()
+     * @return integer
+     */
+    public static function getDepth() {
+        return count(self::$stack);
+    }
 
-	/**
-	 * Clients should call this method before leaving a diagnostic
-	 * context.
-	 *
-	 * <p>The returned value is the value that was pushed last. If no
-	 * context is available, then the empty string "" is returned.</p>
-	 *
-	 * @return string The innermost diagnostic context.
-	 */
-	public static function pop() {
-		if(count(self::$stack) > 0) {
-			return array_pop(self::$stack);
-		} else {
-			return '';
-		}
-	}
+    /**
+     * Clients should call this method before leaving a diagnostic
+     * context.
+     *
+     * <p>The returned value is the value that was pushed last. If no
+     * context is available, then the empty string "" is returned.</p>
+     *
+     * @return string The innermost diagnostic context.
+     */
+    public static function pop() {
+        if(count(self::$stack) > 0) {
+            return array_pop(self::$stack);
+        } else {
+            return '';
+        }
+    }
 
-	/**
-	 * Looks at the last diagnostic context at the top of this NDC
-	 * without removing it.
-	 *
-	 * <p>The returned value is the value that was pushed last. If no
-	 * context is available, then the empty string "" is returned.</p>
-	 * @return string The innermost diagnostic context.
-	 */
-	public static function peek(){
-		if(count(self::$stack) > 0) {
-			return end(self::$stack);
-		} else {
-			return '';
-		}
-	}
+    /**
+     * Looks at the last diagnostic context at the top of this NDC
+     * without removing it.
+     *
+     * <p>The returned value is the value that was pushed last. If no
+     * context is available, then the empty string "" is returned.</p>
+     * @return string The innermost diagnostic context.
+     */
+    public static function peek(){
+        if(count(self::$stack) > 0) {
+            return end(self::$stack);
+        } else {
+            return '';
+        }
+    }
   
-	/**
-	 * Push new diagnostic context information for the current thread.
-	 *
-	 * <p>The contents of the <var>message</var> parameter is
-	 * determined solely by the client.
-	 *	
-	 * @param string $message The new diagnostic context information.
-	 */
-	public static function push($message) {
-		array_push(self::$stack, (string)$message);
-	}
+    /**
+     * Push new diagnostic context information for the current thread.
+     *
+     * <p>The contents of the <var>message</var> parameter is
+     * determined solely by the client.
+     *	
+     * @param string $message The new diagnostic context information.
+     */
+    public static function push($message) {
+        array_push(self::$stack, (string)$message);
+    }
 
-	/**
-	 * Remove the diagnostic context for this thread.
-	 */
-	public static function remove() {
-		Payone_Log4php_LoggerNDC::clear();
-	}
+    /**
+     * Remove the diagnostic context for this thread.
+     */
+    public static function remove() {
+        Payone_Log4php_LoggerNDC::clear();
+    }
 
-	/**
-	 * Set maximum depth of this diagnostic context. If the current
-	 * depth is smaller or equal to <var>maxDepth</var>, then no
-	 * action is taken.
-	 *
-	 * <p>This method is a convenient alternative to multiple 
-	 * {@link pop()} calls. Moreover, it is often the case that at 
-	 * the end of complex call sequences, the depth of the NDC is
-	 * unpredictable. The {@link setMaxDepth()} method circumvents
-	 * this problem.
-	 *
-	 * @param integer $maxDepth
-	 * @see getDepth()
-	 */
-	public static function setMaxDepth($maxDepth) {
-		$maxDepth = (int)$maxDepth;
-		if(Payone_Log4php_LoggerNDC::getDepth() > $maxDepth) {
-			self::$stack = array_slice(self::$stack, 0, $maxDepth);
-		}
-	}
+    /**
+     * Set maximum depth of this diagnostic context. If the current
+     * depth is smaller or equal to <var>maxDepth</var>, then no
+     * action is taken.
+     *
+     * <p>This method is a convenient alternative to multiple 
+     * {@link pop()} calls. Moreover, it is often the case that at 
+     * the end of complex call sequences, the depth of the NDC is
+     * unpredictable. The {@link setMaxDepth()} method circumvents
+     * this problem.
+     *
+     * @param integer $maxDepth
+     * @see getDepth()
+     */
+    public static function setMaxDepth($maxDepth) {
+        $maxDepth = (int)$maxDepth;
+        if(Payone_Log4php_LoggerNDC::getDepth() > $maxDepth) {
+            self::$stack = array_slice(self::$stack, 0, $maxDepth);
+        }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -138,7 +138,7 @@ 
 	 * @return string The innermost diagnostic context.
 	 */
 	public static function pop() {
-		if(count(self::$stack) > 0) {
+		if (count(self::$stack) > 0) {
 			return array_pop(self::$stack);
 		} else {
 			return '';
@@ -153,8 +153,8 @@ 
 	 * context is available, then the empty string "" is returned.</p>
 	 * @return string The innermost diagnostic context.
 	 */
-	public static function peek(){
-		if(count(self::$stack) > 0) {
+	public static function peek() {
+		if (count(self::$stack) > 0) {
 			return end(self::$stack);
 		} else {
 			return '';
@@ -196,7 +196,7 @@ 
 	 */
 	public static function setMaxDepth($maxDepth) {
 		$maxDepth = (int)$maxDepth;
-		if(Payone_Log4php_LoggerNDC::getDepth() > $maxDepth) {
+		if (Payone_Log4php_LoggerNDC::getDepth() > $maxDepth) {
 			self::$stack = array_slice(self::$stack, 0, $maxDepth);
 		}
 	}

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/LoggerPatternConverterLogger.php

Doc Comments +2 added lines

@@ -64,6 +64,8 @@
 	/** 
 	 * Attempts to shorten the given name to the desired length by trimming 
 	 * name fragments. See docs for examples.
+	 * @param string $name
+	 * @param integer $length
 	 */
 	private function shorten($name, $length) {
 	

Indentation +63 added lines, -63 removed lines

@@ -29,86 +29,86 @@
  */
 class Payone_Log4php_LoggerPatternConverterLogger extends Payone_Log4php_LoggerPatternConverter {
 
-	/** Length to which to shorten the name. */
-	private $length;
+    /** Length to which to shorten the name. */
+    private $length;
 	
-	/** Holds processed logger names. */
-	private $cache = array();
+    /** Holds processed logger names. */
+    private $cache = array();
 	
-	public function activateOptions() {
-		// Parse the option (desired output length)
-		if (isset($this->option) && is_numeric($this->option) && $this->option >= 0) {
-			$this->length = (integer) $this->option;
-		}
-	}
+    public function activateOptions() {
+        // Parse the option (desired output length)
+        if (isset($this->option) && is_numeric($this->option) && $this->option >= 0) {
+            $this->length = (integer) $this->option;
+        }
+    }
 	
-	public function convert(Payone_Log4php_LoggerLoggingEvent $event) {
-		$name = $event->getLoggerName();
+    public function convert(Payone_Log4php_LoggerLoggingEvent $event) {
+        $name = $event->getLoggerName();
 		
-		if (!isset($this->cache[$name])) {
+        if (!isset($this->cache[$name])) {
 
-			// If length is set return shortened logger name 
-			if (isset($this->length)) {
-				$this->cache[$name] = $this->shorten($name, $this->length);
-			} 
+            // If length is set return shortened logger name 
+            if (isset($this->length)) {
+                $this->cache[$name] = $this->shorten($name, $this->length);
+            } 
 			 
-			// If no length is specified return full logger name
-			else {
-				$this->cache[$name] = $name;
-			}
-		} 
+            // If no length is specified return full logger name
+            else {
+                $this->cache[$name] = $name;
+            }
+        } 
 		
-		return $this->cache[$name];
-	}
+        return $this->cache[$name];
+    }
 	
-	/** 
-	 * Attempts to shorten the given name to the desired length by trimming 
-	 * name fragments. See docs for examples.
-	 */
-	private function shorten($name, $length) {
+    /** 
+     * Attempts to shorten the given name to the desired length by trimming 
+     * name fragments. See docs for examples.
+     */
+    private function shorten($name, $length) {
 	
-		$currentLength = strlen($name);
+        $currentLength = strlen($name);
 	
-		// Check if any shortening is required
-		if ($currentLength <= $length) {
-			return $name;
-		}
+        // Check if any shortening is required
+        if ($currentLength <= $length) {
+            return $name;
+        }
 	
-		// Split name into fragments
-		$name = str_replace('.', '\\', $name);
-		$name = trim($name, ' \\');
-		$fragments = explode('\\', $name);
-		$count = count($fragments);
+        // Split name into fragments
+        $name = str_replace('.', '\\', $name);
+        $name = trim($name, ' \\');
+        $fragments = explode('\\', $name);
+        $count = count($fragments);
 	
-		// If the name splits to only one fragment, then it cannot be shortened
-		if ($count == 1) {
-			return $name;
-		}
+        // If the name splits to only one fragment, then it cannot be shortened
+        if ($count == 1) {
+            return $name;
+        }
 		
-		foreach($fragments as $key => &$fragment) {
+        foreach($fragments as $key => &$fragment) {
 	
-			// Never shorten last fragment
-			if ($key == $count - 1) {
-				break;
-			}
+            // Never shorten last fragment
+            if ($key == $count - 1) {
+                break;
+            }
 	
-			// Check for empty fragments (shouldn't happen but it's possible)
-			$fragLen = strlen($fragment);
-			if ($fragLen <= 1) {
-				continue;
-			}
+            // Check for empty fragments (shouldn't happen but it's possible)
+            $fragLen = strlen($fragment);
+            if ($fragLen <= 1) {
+                continue;
+            }
 	
-			// Shorten fragment to one character and check if total length satisfactory
-			$fragment = substr($fragment, 0, 1);
-			$currentLength = $currentLength - $fragLen + 1;
+            // Shorten fragment to one character and check if total length satisfactory
+            $fragment = substr($fragment, 0, 1);
+            $currentLength = $currentLength - $fragLen + 1;
 	
-			if ($currentLength <= $length) {
-				break;
-			}
-		}
-		unset($fragment);
+            if ($currentLength <= $length) {
+                break;
+            }
+        }
+        unset($fragment);
 	
-		return implode('\\', $fragments);
-	}
+        return implode('\\', $fragments);
+    }
 	
 }

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
 	public function activateOptions() {
 		// Parse the option (desired output length)
 		if (isset($this->option) && is_numeric($this->option) && $this->option >= 0) {
-			$this->length = (integer) $this->option;
+			$this->length = (integer)$this->option;
 		}
 	}
 	
@@ -85,7 +85,7 @@ 
 			return $name;
 		}
 		
-		foreach($fragments as $key => &$fragment) {
+		foreach ($fragments as $key => &$fragment) {
 	
 			// Never shorten last fragment
 			if ($key == $count - 1) {

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 {

lib/Payone/Log4php/LoggerRendererMap.php

Doc Comments +1 added lines, -2 removed lines

@@ -58,7 +58,6 @@ 
 	 * Add a renderer to a hierarchy passed as parameter.
 	 * Note that hierarchy must implement getRendererMap() and setRenderer() methods.
 	 *
-	 * @param Payone_Log4php_LoggerHierarchy $repository a logger repository.
 	 * @param string $renderedClassName
 	 * @param string $renderingClassName
 	 */
@@ -107,7 +106,7 @@ 
 	 * class of the object parameter.
 	 * 
 	 * @param mixed $o
-	 * @return string
+	 * @return Payone_Log4php_LoggerRendererObject
 	 */
 	public function getByObject($o) {
 		return ($o == null) ? null : $this->getByClassName(get_class($o));

Indentation +100 added lines, -100 removed lines

@@ -36,114 +36,114 @@
  */
 class Payone_Log4php_LoggerRendererMap {
 
-	/**
-	 * @var array
-	 */
-	private $map;
+    /**
+     * @var array
+     */
+    private $map;
 
-	/**
-	 * @var LoggerDefaultRenderer
-	 */
-	private $defaultRenderer;
+    /**
+     * @var LoggerDefaultRenderer
+     */
+    private $defaultRenderer;
 
-	/**
-	 * Constructor
-	 */
-	public function __construct() {
-		$this->map = array();
-		$this->defaultRenderer = new Payone_Log4php_LoggerRendererDefault();
-	}
+    /**
+     * Constructor
+     */
+    public function __construct() {
+        $this->map = array();
+        $this->defaultRenderer = new Payone_Log4php_LoggerRendererDefault();
+    }
 
-	/**
-	 * Add a renderer to a hierarchy passed as parameter.
-	 * Note that hierarchy must implement getRendererMap() and setRenderer() methods.
-	 *
-	 * @param Payone_Log4php_LoggerHierarchy $repository a logger repository.
-	 * @param string $renderedClassName
-	 * @param string $renderingClassName
-	 */
-	public function addRenderer($renderedClassName, $renderingClassName) {
-		$renderer = Payone_Log4php_LoggerReflectionUtils::createObject($renderingClassName);
-		if($renderer == null) {
-			return;
-		} else {
-			$this->put($renderedClassName, $renderer);
-		}
-	}
+    /**
+     * Add a renderer to a hierarchy passed as parameter.
+     * Note that hierarchy must implement getRendererMap() and setRenderer() methods.
+     *
+     * @param Payone_Log4php_LoggerHierarchy $repository a logger repository.
+     * @param string $renderedClassName
+     * @param string $renderingClassName
+     */
+    public function addRenderer($renderedClassName, $renderingClassName) {
+        $renderer = Payone_Log4php_LoggerReflectionUtils::createObject($renderingClassName);
+        if($renderer == null) {
+            return;
+        } else {
+            $this->put($renderedClassName, $renderer);
+        }
+    }
 
 
-	/**
-	 * Find the appropriate renderer for the class type of the
-	 * <var>o</var> parameter. 
-	 *
-	 * This is accomplished by calling the {@link getByObject()} 
-	 * method if <var>o</var> is object or using {@link Payone_Log4php_LoggerRendererDefault}.
-	 * Once a renderer is found, it is applied on the object <var>o</var> and 
-	 * the result is returned as a string.
-	 *
-	 * @param mixed $o
-	 * @return string 
-	 */
-	public function findAndRender($o) {
-		if($o == null) {
-			return null;
-		} else {
-			if(is_object($o)) {
-				$renderer = $this->getByObject($o);
-				if($renderer !== null) {
-					return $renderer->render($o);
-				} else {
-					return null;
-				}
-			} else {
-				$renderer = $this->defaultRenderer;
-				return $renderer->render($o);
-			}
-		}
-	}
+    /**
+     * Find the appropriate renderer for the class type of the
+     * <var>o</var> parameter. 
+     *
+     * This is accomplished by calling the {@link getByObject()} 
+     * method if <var>o</var> is object or using {@link Payone_Log4php_LoggerRendererDefault}.
+     * Once a renderer is found, it is applied on the object <var>o</var> and 
+     * the result is returned as a string.
+     *
+     * @param mixed $o
+     * @return string 
+     */
+    public function findAndRender($o) {
+        if($o == null) {
+            return null;
+        } else {
+            if(is_object($o)) {
+                $renderer = $this->getByObject($o);
+                if($renderer !== null) {
+                    return $renderer->render($o);
+                } else {
+                    return null;
+                }
+            } else {
+                $renderer = $this->defaultRenderer;
+                return $renderer->render($o);
+            }
+        }
+    }
 
-	/**
-	 * Syntactic sugar method that calls {@link PHP_MANUAL#get_class} with the
-	 * class of the object parameter.
-	 * 
-	 * @param mixed $o
-	 * @return string
-	 */
-	public function getByObject($o) {
-		return ($o == null) ? null : $this->getByClassName(get_class($o));
-	}
+    /**
+     * Syntactic sugar method that calls {@link PHP_MANUAL#get_class} with the
+     * class of the object parameter.
+     * 
+     * @param mixed $o
+     * @return string
+     */
+    public function getByObject($o) {
+        return ($o == null) ? null : $this->getByClassName(get_class($o));
+    }
 
 
-	/**
-	 * Search the parents of <var>clazz</var> for a renderer. 
-	 *
-	 * The renderer closest in the hierarchy will be returned. If no
-	 * renderers could be found, then the default renderer is returned.
-	 *
-	 * @param string $class
-	 * @return Payone_Log4php_LoggerRendererObject
-	 */
-	public function getByClassName($class) {
-		$r = null;
-		for($c = $class; !empty($c); $c = get_parent_class($c)) {
-			$c = strtolower($c);
-			if(isset($this->map[$c])) {
-				return $this->map[$c];
-			}
-		}
-		return $this->defaultRenderer;
-	}
+    /**
+     * Search the parents of <var>clazz</var> for a renderer. 
+     *
+     * The renderer closest in the hierarchy will be returned. If no
+     * renderers could be found, then the default renderer is returned.
+     *
+     * @param string $class
+     * @return Payone_Log4php_LoggerRendererObject
+     */
+    public function getByClassName($class) {
+        $r = null;
+        for($c = $class; !empty($c); $c = get_parent_class($c)) {
+            $c = strtolower($c);
+            if(isset($this->map[$c])) {
+                return $this->map[$c];
+            }
+        }
+        return $this->defaultRenderer;
+    }
 
-	public function clear() {
-		$this->map = array();
-	}
+    public function clear() {
+        $this->map = array();
+    }
 
-	/**
-	 * Register a {@link Payone_Log4php_LoggerRendererObject} for <var>clazz</var>.
-	 * @param string $class
-	 * @param Payone_Log4php_LoggerRendererObject $or
-	 */
-	private function put($class, $or) {
-		$this->map[strtolower($class)] = $or;
-	}
+    /**
+     * Register a {@link Payone_Log4php_LoggerRendererObject} for <var>clazz</var>.
+     * @param string $class
+     * @param Payone_Log4php_LoggerRendererObject $or
+     */
+    private function put($class, $or) {
+        $this->map[strtolower($class)] = $or;
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -64,7 +64,7 @@ 
 	 */
 	public function addRenderer($renderedClassName, $renderingClassName) {
 		$renderer = Payone_Log4php_LoggerReflectionUtils::createObject($renderingClassName);
-		if($renderer == null) {
+		if ($renderer == null) {
 			return;
 		} else {
 			$this->put($renderedClassName, $renderer);
@@ -85,12 +85,12 @@ 
 	 * @return string 
 	 */
 	public function findAndRender($o) {
-		if($o == null) {
+		if ($o == null) {
 			return null;
 		} else {
-			if(is_object($o)) {
+			if (is_object($o)) {
 				$renderer = $this->getByObject($o);
-				if($renderer !== null) {
+				if ($renderer !== null) {
 					return $renderer->render($o);
 				} else {
 					return null;
@@ -125,9 +125,9 @@ 
 	 */
 	public function getByClassName($class) {
 		$r = null;
-		for($c = $class; !empty($c); $c = get_parent_class($c)) {
+		for ($c = $class; !empty($c); $c = get_parent_class($c)) {
 			$c = strtolower($c);
-			if(isset($this->map[$c])) {
+			if (isset($this->map[$c])) {
 				return $this->map[$c];
 			}
 		}

lib/Payone/Log4php/LoggerRoot.php

Doc Comments +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 	/**
 	 * Always returns false.
 	 * Because LoggerRoot has no parents, it returns false.
-	 * @param Logger $parent
+	 * @param Payone_Log4php_Logger $parent
 	 * @return boolean
 	 */
 	public function setParent(Payone_Log4php_Logger $parent) {

Indentation +36 added lines, -36 removed lines

@@ -26,45 +26,45 @@
  * @see Logger
  */
 class Payone_Log4php_LoggerRoot extends Payone_Log4php_Logger {
-	/**
-	 * Constructor
-	 *
-	 * @param integer $level initial log level
-	 */
-	public function __construct($level = null) {
-		parent::__construct('root');
+    /**
+     * Constructor
+     *
+     * @param integer $level initial log level
+     */
+    public function __construct($level = null) {
+        parent::__construct('root');
 
-		if($level == null) {
-			$level = Payone_Log4php_LoggerLevel::getLevelAll();
-		}
-		$this->setLevel($level);
-	} 
+        if($level == null) {
+            $level = Payone_Log4php_LoggerLevel::getLevelAll();
+        }
+        $this->setLevel($level);
+    } 
 	
-	/**
-	 * @return Payone_Log4php_LoggerLevel the level
-	 */
-	public function getChainedLevel() {
-		return parent::getLevel();
-	} 
+    /**
+     * @return Payone_Log4php_LoggerLevel the level
+     */
+    public function getChainedLevel() {
+        return parent::getLevel();
+    } 
 	
-	/**
-	 * Setting a null value to the level of the root category may have catastrophic results.
-	 * @param Payone_Log4php_LoggerLevel $level
-	 */
-	public function setLevel($level) {
-		if($level != null) {
-			parent::setLevel($level);
-		}	 
-	}
+    /**
+     * Setting a null value to the level of the root category may have catastrophic results.
+     * @param Payone_Log4php_LoggerLevel $level
+     */
+    public function setLevel($level) {
+        if($level != null) {
+            parent::setLevel($level);
+        }	 
+    }
 	
-	/**
-	 * Always returns false.
-	 * Because LoggerRoot has no parents, it returns false.
-	 * @param Logger $parent
-	 * @return boolean
-	 */
-	public function setParent(Payone_Log4php_Logger $parent) {
-		return false;
-	}
+    /**
+     * Always returns false.
+     * Because LoggerRoot has no parents, it returns false.
+     * @param Logger $parent
+     * @return boolean
+     */
+    public function setParent(Payone_Log4php_Logger $parent) {
+        return false;
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
 	public function __construct($level = null) {
 		parent::__construct('root');
 
-		if($level == null) {
+		if ($level == null) {
 			$level = Payone_Log4php_LoggerLevel::getLevelAll();
 		}
 		$this->setLevel($level);
@@ -52,7 +52,7 @@ 
 	 * @param Payone_Log4php_LoggerLevel $level
 	 */
 	public function setLevel($level) {
-		if($level != null) {
+		if ($level != null) {
 			parent::setLevel($level);
 		}	 
 	}

lib/Payone/Settings/Factory.php

Doc Comments +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     }
 
     /**
-     * @param $key
+     * @param string $key
      * @return Payone_Settings_Service_XmlGenerate
      *
      * @throws Exception

lib/Payone/Settings/Service/XmlGenerate.php

Doc Comments +8 added lines, -4 removed lines

@@ -49,7 +49,7 @@ 
      * @api
      *
      * @param Payone_Settings_Data_ConfigFile_Root $config
-     * @return mixed @see SimpleXMLElement::asXml()
+     * @return string @see SimpleXMLElement::asXml()
      */
     public function generate(Payone_Settings_Data_ConfigFile_Root $config)
     {
@@ -74,7 +74,7 @@ 
      * @api
      *
      * @param Payone_Settings_Data_ConfigFile_Root $config
-     * @return mixed @see SimpleXMLElement::asXml()
+     * @return string|false @see SimpleXMLElement::asXml()
      */
     public function execute(Payone_Settings_Data_ConfigFile_Root $config)
     {
@@ -125,7 +125,7 @@ 
     /**
      * @param Payone_Settings_Data_ConfigFile_Shop $shopConfig
      * @param DOMElement $configXml
-     * @return string
+     * @return DOMElement
      */
     protected function mapShop(Payone_Settings_Data_ConfigFile_Shop $shopConfig, DOMElement $configXml)
     {
@@ -366,6 +366,10 @@ 
         $this->addGlobal($cleatringTypeNode, $valueClearingType);
     }
 
+    /**
+     * @param DOMElement $parent
+     * @param Payone_Settings_Data_ConfigFile_PaymentMethod_Abstract $type
+     */
     public function addGlobal($parent, $type)
     {
 
@@ -401,7 +405,7 @@ 
     /**
      * @param DOMElement $parent
      * @param $object
-     * @param $property
+     * @param string $property
      * @param bool $withCdata
      * @return DOMElement
      */

Spacing +11 added lines, -11 removed lines

@@ -173,9 +173,9 @@ 
         $this->addChild($globalXml, $globalConfig, 'aid');
         $this->addChild($globalXml, $globalConfig, 'portalid');
         $this->addChild($globalXml, $globalConfig, 'request_type');
-        $this->mapParameterInvoice($globalConfig,$globalXml);
+        $this->mapParameterInvoice($globalConfig, $globalXml);
         $this->addStatusMapping($globalConfig, $globalXml);
-        $this->mapPaymentCreditcard($globalConfig,$globalXml);
+        $this->mapPaymentCreditcard($globalConfig, $globalXml);
         return $shopXml;
     }
 
@@ -214,7 +214,7 @@ 
      */
     protected function mapProtect(Payone_Settings_Data_ConfigFile_Shop_Protect $protectConfig, DOMElement $shopXml)
     {
-        $protectXml = $this->appendElement($shopXml,$protectConfig->getKey());
+        $protectXml = $this->appendElement($shopXml, $protectConfig->getKey());
 
         $protectXml = $this->mapConsumerscore($protectConfig->getConsumerscore(), $protectXml);
         $protectXml = $this->mapAddresscheck($protectConfig->getAddresscheck(), $protectXml);
@@ -321,7 +321,7 @@ 
         $tasXml = $this->appendElement($miscXml, $tasForwarding->getKey());
 
         foreach ($tasForwarding->getTransactionstatusForwarding() as $keyTas => $config) {
-            $configNode = $this->appendElement($tasXml,'config');
+            $configNode = $this->appendElement($tasXml, 'config');
 
             foreach ($config as $key => $value) {
                 $configNode->setAttribute($key, $value);
@@ -336,10 +336,10 @@ 
     public function addStatusMapping(Payone_Settings_Data_ConfigFile_Shop_Global $globalConfig, DOMElement $globalXml)
     {
         $statusMapping = $globalConfig->getStatusMapping();
-        $tasXml = $this->appendElement($globalXml,$statusMapping->getKey());
+        $tasXml = $this->appendElement($globalXml, $statusMapping->getKey());
 
         foreach ($statusMapping->getStatusMapping() as $keyStatusMapping => $valueStatusMapping) {
-            $parent = $this->appendElement($tasXml,$keyStatusMapping);
+            $parent = $this->appendElement($tasXml, $keyStatusMapping);
 
             foreach ($valueStatusMapping as $key => $value) {
                 $mapNode = $this->appendElement($parent, 'map');
@@ -385,7 +385,7 @@ 
     {
         $feeConfig = $valueClearingType->getFeeConfig();
         if (!empty($feeConfig)) {
-            $feeConfigNode = $this->appendElement($cleatringTypeNode,'fee_config');
+            $feeConfigNode = $this->appendElement($cleatringTypeNode, 'fee_config');
 
             foreach ($feeConfig as $keyFeeConfig => $valueFeeConfig) {
                 if (array_key_exists('value', $valueFeeConfig) && array_key_exists('attribute', $valueFeeConfig)) {
@@ -411,7 +411,7 @@ 
         $data = $object->$getter();
         $child = $parent;
         if (is_array($data)) {
-            $parentNode = $this->appendElement($parent,$property);
+            $parentNode = $this->appendElement($parent, $property);
             foreach ($data as $key => $value) {
                 $child = $this->appendElement($parentNode, $key, $value, $withCdata);
             }
@@ -452,9 +452,9 @@ 
      * @param bool $asCdata
      * @return DOMElement
      */
-    protected function appendElement( $parent, $key, $value = null, $asCdata = false)
+    protected function appendElement($parent, $key, $value = null, $asCdata = false)
     {
-        if($asCdata === true)
+        if ($asCdata === true)
         {
             $cdata = $this->dom->createCDATASection($value);
             $child = $this->dom->createElement($key);
@@ -463,7 +463,7 @@ 
         else
         {
             $child = $this->dom->createElement($key);
-            if($value !== null)
+            if ($value !== null)
             {
                 $domValue = $this->dom->createTextNode($value);
                 $child->appendChild($domValue);

Braces +5 added lines, -10 removed lines

@@ -109,12 +109,10 @@ 
                     foreach ($value['attribute'] as $attributKey => $attributData) {
                         $node->addAttribute($attributKey, $attributData);
                     }
-                }
-                else {
+                } else {
                     $this->simpleXmlFromNestedArray($key, $value, $parent);
                 }
-            }
-            else {
+            } else {
                 $parent->addChild($key, $value);
             }
 
@@ -415,8 +413,7 @@ 
             foreach ($data as $key => $value) {
                 $child = $this->appendElement($parentNode, $key, $value, $withCdata);
             }
-        }
-        else {
+        } else {
             if (isset($data)) {
                 $child = $this->appendElement($parent, $property, $data, $withCdata);
             }
@@ -436,8 +433,7 @@ 
             foreach ($value as $key => $data) {
                 $mapNode->setAttribute($key, $data);
             }
-        }
-        else {
+        } else {
             if (!empty($data)) {
                 $mapNode->setAttribute($name, $value);
             }
@@ -459,8 +455,7 @@ 
             $cdata = $this->dom->createCDATASection($value);
             $child = $this->dom->createElement($key);
             $child->appendChild($cdata);
-        }
-        else
+        } else
         {
             $child = $this->dom->createElement($key);
             if($value !== null)