fjbender / magento-1

lib/Payone/Log4php/LoggerPatternConverterMDC.php

Indentation +19 added lines, -19 removed lines

@@ -29,25 +29,25 @@
  */
 class Payone_Log4php_LoggerPatternConverterMDC extends Payone_Log4php_LoggerPatternConverter {
 
-	private $key;
+    private $key;
 
-	public function activateOptions() {
-		if (isset($this->option) && $this->option !== '') {
-			$this->key = $this->option;
-		}
-	}
+    public function activateOptions() {
+        if (isset($this->option) && $this->option !== '') {
+            $this->key = $this->option;
+        }
+    }
 	
-	public function convert(Payone_Log4php_LoggerLoggingEvent $event) {
-		if (isset($this->key)) {
-			return $event->getMDC($this->key);
-		} else {
-			$buff = array();
-			$map = $event->getMDCMap();
-			foreach($map as $key => $value) {
-				$buff []= "$key=$value";
-			}
-			return implode(', ', $buff);
-		}
-	}
+    public function convert(Payone_Log4php_LoggerLoggingEvent $event) {
+        if (isset($this->key)) {
+            return $event->getMDC($this->key);
+        } else {
+            $buff = array();
+            $map = $event->getMDCMap();
+            foreach($map as $key => $value) {
+                $buff []= "$key=$value";
+            }
+            return implode(', ', $buff);
+        }
+    }
 }
- 
\ No newline at end of file
+    
\ No newline at end of file

lib/Payone/Log4php/LoggerLayoutSerialized.php

Indentation +17 added lines, -17 removed lines

@@ -32,24 +32,24 @@
  */  
 class Payone_Log4php_LoggerLayoutSerialized extends Payone_Log4php_LoggerLayout {
 	
-	/** Whether to include the event's location information (slow). */
-	protected $locationInfo = false;
+    /** Whether to include the event's location information (slow). */
+    protected $locationInfo = false;
 	
-	/** Sets the location information flag. */
-	public function setLocationInfo($value) {
-		$this->setBoolean('locationInfo', $value);
-	}
+    /** Sets the location information flag. */
+    public function setLocationInfo($value) {
+        $this->setBoolean('locationInfo', $value);
+    }
 	
-	/** Returns the location information flag. */
-	public function getLocationInfo() {
-		return $this->locationInfo;
-	}
+    /** Returns the location information flag. */
+    public function getLocationInfo() {
+        return $this->locationInfo;
+    }
 	
-	public function format(Payone_Log4php_LoggerLoggingEvent $event) {
-		// If required, initialize the location data
-		if($this->locationInfo) {
-			$event->getLocationInformation();
-		}
-		return serialize($event) . PHP_EOL;
-	}
+    public function format(Payone_Log4php_LoggerLoggingEvent $event) {
+        // If required, initialize the location data
+        if($this->locationInfo) {
+            $event->getLocationInformation();
+        }
+        return serialize($event) . PHP_EOL;
+    }
 }

lib/Payone/Log4php/LoggerFormattingInfo.php

Indentation +20 added lines, -20 removed lines

@@ -28,27 +28,27 @@
  */
 class Payone_Log4php_LoggerFormattingInfo {
 	
-	/** 
-	 * Minimal output length. If output is shorter than this value, it will be
-	 * padded with spaces. 
-	 */
-	public $min = 0;
+    /** 
+     * Minimal output length. If output is shorter than this value, it will be
+     * padded with spaces. 
+     */
+    public $min = 0;
 	
-	/** 
-	 * Maximum output length. If output is longer than this value, it will be 
-	 * trimmed.
-	 */
-	public $max = PHP_INT_MAX;
+    /** 
+     * Maximum output length. If output is longer than this value, it will be 
+     * trimmed.
+     */
+    public $max = PHP_INT_MAX;
 	
-	/**
-	 * Whether to pad the string from the left. If set to false, the string 
-	 * will be padded from the right. 
-	 */
-	public $padLeft = true;
+    /**
+     * Whether to pad the string from the left. If set to false, the string 
+     * will be padded from the right. 
+     */
+    public $padLeft = true;
 	
-	/**
-	 * Whether to trim the string from the left. If set to false, the string
-	 * will be trimmed from the right.
-	 */
-	public $trimLeft = false;
+    /**
+     * Whether to trim the string from the left. If set to false, the string
+     * will be trimmed from the right.
+     */
+    public $trimLeft = false;
 }

lib/Payone/Log4php/LoggerPatternConverterRelative.php

Indentation +4 added lines, -4 removed lines

@@ -27,8 +27,8 @@
  */
 class Payone_Log4php_LoggerPatternConverterRelative extends Payone_Log4php_LoggerPatternConverter {
 
-	public function convert(Payone_Log4php_LoggerLoggingEvent $event) {
-		$ts = $event->getTimeStamp() - $event->getStartTime();
-		return number_format($ts, 4);
-	}
+    public function convert(Payone_Log4php_LoggerLoggingEvent $event) {
+        $ts = $event->getTimeStamp() - $event->getStartTime();
+        return number_format($ts, 4);
+    }
 }

lib/Payone/Log4php/LoggerConfigurationAdapterINI.php

Indentation +225 added lines, -225 removed lines

@@ -32,267 +32,267 @@
  */
 class Payone_Log4php_LoggerConfigurationAdapterINI implements Payone_Log4php_LoggerConfigurationAdapter {
 	
-	/** Name to assign to the root logger. */
-	const ROOT_LOGGER_NAME = "root";
+    /** Name to assign to the root logger. */
+    const ROOT_LOGGER_NAME = "root";
 
-	/** Prefix used for defining logger additivity. */
-	const ADDITIVITY_PREFIX = "log4php.additivity.";
+    /** Prefix used for defining logger additivity. */
+    const ADDITIVITY_PREFIX = "log4php.additivity.";
 	
-	/** Prefix used for defining logger threshold. */
-	const THRESHOLD_PREFIX = "log4php.threshold";
+    /** Prefix used for defining logger threshold. */
+    const THRESHOLD_PREFIX = "log4php.threshold";
 	
-	/** Prefix used for defining the root logger. */
-	const ROOT_LOGGER_PREFIX = "log4php.rootLogger";
+    /** Prefix used for defining the root logger. */
+    const ROOT_LOGGER_PREFIX = "log4php.rootLogger";
 	
-	/** Prefix used for defining a logger. */
-	const LOGGER_PREFIX = "log4php.logger.";
+    /** Prefix used for defining a logger. */
+    const LOGGER_PREFIX = "log4php.logger.";
 	
-	/** Prefix used for defining an appender. */
-	const APPENDER_PREFIX = "log4php.appender.";
+    /** Prefix used for defining an appender. */
+    const APPENDER_PREFIX = "log4php.appender.";
 	
-	/** Prefix used for defining a renderer. */
-	const RENDERER_PREFIX = "log4php.renderer.";
+    /** Prefix used for defining a renderer. */
+    const RENDERER_PREFIX = "log4php.renderer.";
 	
-	/** Holds the configuration. */
-	private $config = array();
+    /** Holds the configuration. */
+    private $config = array();
 	
-	/**
-	 * Loads and parses the INI configuration file.
-	 * 
-	 * @param string $url Path to the config file.
-	 * @throws LoggerException
-	 */
-	private function load($url) {
-		if (!file_exists($url)) {
-			throw new Payone_Log4php_LoggerException("File [$url] does not exist.");
-		}
+    /**
+     * Loads and parses the INI configuration file.
+     * 
+     * @param string $url Path to the config file.
+     * @throws LoggerException
+     */
+    private function load($url) {
+        if (!file_exists($url)) {
+            throw new Payone_Log4php_LoggerException("File [$url] does not exist.");
+        }
 		
-		$properties = @parse_ini_file($url, true);
-		if ($properties === false) {
-			$error = error_get_last();
-			throw new Payone_Log4php_LoggerException("Error parsing configuration file: {$error['message']}");
-		}
+        $properties = @parse_ini_file($url, true);
+        if ($properties === false) {
+            $error = error_get_last();
+            throw new Payone_Log4php_LoggerException("Error parsing configuration file: {$error['message']}");
+        }
 		
-		return $properties;
-	}
+        return $properties;
+    }
 	
-	/**
-	* Converts the provided INI configuration file to a PHP array config.
-	*
-	* @param string $path Path to the config file.
-	* @throws LoggerException If the file cannot be loaded or parsed.
-	*/
-	public function convert($path) {
-		// Load the configuration
-		$properties = $this->load($path);
+    /**
+     * Converts the provided INI configuration file to a PHP array config.
+     *
+     * @param string $path Path to the config file.
+     * @throws LoggerException If the file cannot be loaded or parsed.
+     */
+    public function convert($path) {
+        // Load the configuration
+        $properties = $this->load($path);
 		
-		// Parse threshold
-		if (isset($properties[self::THRESHOLD_PREFIX])) {
-			$this->config['threshold'] = $properties[self::THRESHOLD_PREFIX]; 
-		}
+        // Parse threshold
+        if (isset($properties[self::THRESHOLD_PREFIX])) {
+            $this->config['threshold'] = $properties[self::THRESHOLD_PREFIX]; 
+        }
 		
-		// Parse root logger
-		if (isset($properties[self::ROOT_LOGGER_PREFIX])) {
-			$this->parseLogger($properties[self::ROOT_LOGGER_PREFIX], self::ROOT_LOGGER_NAME);
-		}
+        // Parse root logger
+        if (isset($properties[self::ROOT_LOGGER_PREFIX])) {
+            $this->parseLogger($properties[self::ROOT_LOGGER_PREFIX], self::ROOT_LOGGER_NAME);
+        }
 		
-		$appenders = array();
+        $appenders = array();
 		
-		foreach($properties as $key => $value) {
-			// Parse loggers
-			if ($this->beginsWith($key, self::LOGGER_PREFIX)) {
-				$name = substr($key, strlen(self::LOGGER_PREFIX));
-				$this->parseLogger($value, $name);
-			}
+        foreach($properties as $key => $value) {
+            // Parse loggers
+            if ($this->beginsWith($key, self::LOGGER_PREFIX)) {
+                $name = substr($key, strlen(self::LOGGER_PREFIX));
+                $this->parseLogger($value, $name);
+            }
 			
-			// Parse additivity
-			if ($this->beginsWith($key, self::ADDITIVITY_PREFIX)) {
-				$name = substr($key, strlen(self::ADDITIVITY_PREFIX));
-				$this->config['loggers'][$name]['additivity'] = $value;
-			}
+            // Parse additivity
+            if ($this->beginsWith($key, self::ADDITIVITY_PREFIX)) {
+                $name = substr($key, strlen(self::ADDITIVITY_PREFIX));
+                $this->config['loggers'][$name]['additivity'] = $value;
+            }
 			
-			// Parse appenders
-			else if ($this->beginsWith($key, self::APPENDER_PREFIX)) {
-				$this->parseAppender($key, $value);
-			}
+            // Parse appenders
+            else if ($this->beginsWith($key, self::APPENDER_PREFIX)) {
+                $this->parseAppender($key, $value);
+            }
 			
-			// Parse renderers
-			else if ($this->beginsWith($key, self::RENDERER_PREFIX)) {
-				$this->parseRenderer($key, $value);
-			}
-		}
+            // Parse renderers
+            else if ($this->beginsWith($key, self::RENDERER_PREFIX)) {
+                $this->parseRenderer($key, $value);
+            }
+        }
 		
-		return $this->config;
-	}
+        return $this->config;
+    }
 	
 	
-	/**
-	 * Parses a logger definition.
-	 * 
-	 * Loggers are defined in the following manner:
-	 * <pre>
-	 * log4php.logger.<name> = [<level>], [<appender-ref>, <appender-ref>, ...] 
-	 * </pre>
-	 * 
-	 * @param string $value The configuration value (level and appender-refs).
-	 * @param string $name Logger name. 
-	 */
-	private function parseLogger($value, $name) {
-		// Value is divided by commas
-		$parts = explode(',', $value);
-		if (empty($value) || empty($parts)) {
-			return;
-		}
+    /**
+     * Parses a logger definition.
+     * 
+     * Loggers are defined in the following manner:
+     * <pre>
+     * log4php.logger.<name> = [<level>], [<appender-ref>, <appender-ref>, ...] 
+     * </pre>
+     * 
+     * @param string $value The configuration value (level and appender-refs).
+     * @param string $name Logger name. 
+     */
+    private function parseLogger($value, $name) {
+        // Value is divided by commas
+        $parts = explode(',', $value);
+        if (empty($value) || empty($parts)) {
+            return;
+        }
 
-		// The first value is the logger level 
-		$level = array_shift($parts);
+        // The first value is the logger level 
+        $level = array_shift($parts);
 		
-		// The remaining values are appender references 
-		$appenders = array();
-		while($appender = array_shift($parts)) {
-			$appender = trim($appender);
-			if (!empty($appender)) {
-				$appenders[] = trim($appender);
-			}
-		}
+        // The remaining values are appender references 
+        $appenders = array();
+        while($appender = array_shift($parts)) {
+            $appender = trim($appender);
+            if (!empty($appender)) {
+                $appenders[] = trim($appender);
+            }
+        }
 
-		// Find the target configuration 
-		if ($name == self::ROOT_LOGGER_NAME) {
-			$this->config['rootLogger']['level'] = trim($level);
-			$this->config['rootLogger']['appenders'] = $appenders;
-		} else {
-			$this->config['loggers'][$name]['level'] = trim($level);
-			$this->config['loggers'][$name]['appenders'] = $appenders;
-		}
-	}
+        // Find the target configuration 
+        if ($name == self::ROOT_LOGGER_NAME) {
+            $this->config['rootLogger']['level'] = trim($level);
+            $this->config['rootLogger']['appenders'] = $appenders;
+        } else {
+            $this->config['loggers'][$name]['level'] = trim($level);
+            $this->config['loggers'][$name]['appenders'] = $appenders;
+        }
+    }
 	
-	/**
-	 * Parses an configuration line pertaining to an appender.
-	 * 
-	 * Parses the following patterns:
-	 * 
-	 * Appender class:
-	 * <pre>
-	 * log4php.appender.<name> = <class>
-	 * </pre>
-	 * 
-	 * Appender parameter:
-	 * <pre>
-	 * log4php.appender.<name>.<param> = <value>
-	 * </pre>
-	 * 
- 	 * Appender threshold:
-	 * <pre>
-	 * log4php.appender.<name>.threshold = <level>
-	 * </pre>
-	 * 
- 	 * Appender layout:
-	 * <pre>
-	 * log4php.appender.<name>.layout = <layoutClass>
-	 * </pre>
-	 * 
-	 * Layout parameter:
-	 * <pre>
-	 * log4php.appender.<name>.layout.<param> = <value>
-	 * </pre> 
-	 * 
-	 * For example, a full appender config might look like:
-	 * <pre>
-	 * log4php.appender.myAppender = Payone_Log4php_LoggerAppenderConsole
-	 * log4php.appender.myAppender.threshold = info
-	 * log4php.appender.myAppender.target = stdout
-	 * log4php.appender.myAppender.layout = LoggerLayoutPattern
-	 * log4php.appender.myAppender.layout.conversionPattern = "%d %c: %m%n"
-	 * </pre>
-	 * 
-	 * After parsing all these options, the following configuration can be 
-	 * found under $this->config['appenders']['myAppender']:
-	 * <pre>
-	 * array(
-	 * 	'class' => Payone_Log4php_LoggerAppenderConsole,
-	 * 	'threshold' => info,
-	 * 	'params' => array(
-	 * 		'target' => 'stdout'
-	 * 	),
-	 * 	'layout' => array(
-	 * 		'class' => 'LoggerAppenderConsole',
-	 * 		'params' => array(
-	 * 			'conversionPattern' => '%d %c: %m%n'
-	 * 		)
-	 * 	)
-	 * )
-	 * </pre>
-	 * 
-	 * @param string $key
-	 * @param string $value
-	 */
-	private function parseAppender($key, $value) {
+    /**
+     * Parses an configuration line pertaining to an appender.
+     * 
+     * Parses the following patterns:
+     * 
+     * Appender class:
+     * <pre>
+     * log4php.appender.<name> = <class>
+     * </pre>
+     * 
+     * Appender parameter:
+     * <pre>
+     * log4php.appender.<name>.<param> = <value>
+     * </pre>
+     * 
+     * Appender threshold:
+     * <pre>
+     * log4php.appender.<name>.threshold = <level>
+     * </pre>
+     * 
+     * Appender layout:
+     * <pre>
+     * log4php.appender.<name>.layout = <layoutClass>
+     * </pre>
+     * 
+     * Layout parameter:
+     * <pre>
+     * log4php.appender.<name>.layout.<param> = <value>
+     * </pre> 
+     * 
+     * For example, a full appender config might look like:
+     * <pre>
+     * log4php.appender.myAppender = Payone_Log4php_LoggerAppenderConsole
+     * log4php.appender.myAppender.threshold = info
+     * log4php.appender.myAppender.target = stdout
+     * log4php.appender.myAppender.layout = LoggerLayoutPattern
+     * log4php.appender.myAppender.layout.conversionPattern = "%d %c: %m%n"
+     * </pre>
+     * 
+     * After parsing all these options, the following configuration can be 
+     * found under $this->config['appenders']['myAppender']:
+     * <pre>
+     * array(
+     * 	'class' => Payone_Log4php_LoggerAppenderConsole,
+     * 	'threshold' => info,
+     * 	'params' => array(
+     * 		'target' => 'stdout'
+     * 	),
+     * 	'layout' => array(
+     * 		'class' => 'LoggerAppenderConsole',
+     * 		'params' => array(
+     * 			'conversionPattern' => '%d %c: %m%n'
+     * 		)
+     * 	)
+     * )
+     * </pre>
+     * 
+     * @param string $key
+     * @param string $value
+     */
+    private function parseAppender($key, $value) {
 
-		// Remove the appender prefix from key
-		$subKey = substr($key, strlen(self::APPENDER_PREFIX));
+        // Remove the appender prefix from key
+        $subKey = substr($key, strlen(self::APPENDER_PREFIX));
 		
-		// Divide the string by dots
-		$parts = explode('.', $subKey);
-		$count = count($parts);
+        // Divide the string by dots
+        $parts = explode('.', $subKey);
+        $count = count($parts);
 		
-		// The first part is always the appender name
-		$name = trim($parts[0]);
+        // The first part is always the appender name
+        $name = trim($parts[0]);
 		
-		// Only one part - this line defines the appender class 
-		if ($count == 1) {
-			$this->config['appenders'][$name]['class'] = $value;
-			return;
-		}
+        // Only one part - this line defines the appender class 
+        if ($count == 1) {
+            $this->config['appenders'][$name]['class'] = $value;
+            return;
+        }
 		
-		// Two parts - either a parameter, a threshold or layout class
-		else if ($count == 2) {
+        // Two parts - either a parameter, a threshold or layout class
+        else if ($count == 2) {
 			
-			if ($parts[1] == 'layout') {
-				$this->config['appenders'][$name]['layout']['class'] = $value;
-				return;
-			} else if ($parts[1] == 'threshold') {
-				$this->config['appenders'][$name]['threshold'] = $value;
-				return;
-			} else {
-				$this->config['appenders'][$name]['params'][$parts[1]] = $value;
-				return;
-			}
-		}
+            if ($parts[1] == 'layout') {
+                $this->config['appenders'][$name]['layout']['class'] = $value;
+                return;
+            } else if ($parts[1] == 'threshold') {
+                $this->config['appenders'][$name]['threshold'] = $value;
+                return;
+            } else {
+                $this->config['appenders'][$name]['params'][$parts[1]] = $value;
+                return;
+            }
+        }
 		
-		// Three parts - this can only be a layout parameter
-		else if ($count == 3) {
-			if ($parts[1] == 'layout') {
-				$this->config['appenders'][$name]['layout']['params'][$parts[2]] = $value;
-				return;
-			}
-		}
+        // Three parts - this can only be a layout parameter
+        else if ($count == 3) {
+            if ($parts[1] == 'layout') {
+                $this->config['appenders'][$name]['layout']['params'][$parts[2]] = $value;
+                return;
+            }
+        }
 		
-		trigger_error("log4php: Don't know how to parse the following line: \"$key = $value\". Skipping.");
-	}
+        trigger_error("log4php: Don't know how to parse the following line: \"$key = $value\". Skipping.");
+    }
 
-	/**
-	 * Parses a renderer definition.
-	 * 
-	 * Renderers are defined as:
-	 * <pre>
-	 * log4php.renderer.<renderedClass> = <renderingClass> 
-	 * </pre>
-	 * 
-	 * @param string $key log4php.renderer.<renderedClass>
-	 * @param string $value <renderingClass>
-	 */
-	private function parseRenderer($key, $value) {
-		// Remove the appender prefix from key
-		$renderedClass = substr($key, strlen(self::APPENDER_PREFIX));
-		$renderingClass = $value;
+    /**
+     * Parses a renderer definition.
+     * 
+     * Renderers are defined as:
+     * <pre>
+     * log4php.renderer.<renderedClass> = <renderingClass> 
+     * </pre>
+     * 
+     * @param string $key log4php.renderer.<renderedClass>
+     * @param string $value <renderingClass>
+     */
+    private function parseRenderer($key, $value) {
+        // Remove the appender prefix from key
+        $renderedClass = substr($key, strlen(self::APPENDER_PREFIX));
+        $renderingClass = $value;
 		
-		$this->config['renderers'][] = compact('renderedClass', 'renderingClass');
-	}
+        $this->config['renderers'][] = compact('renderedClass', 'renderingClass');
+    }
 	
-	/** Helper method. Returns true if $str begins with $sub. */
-	private function beginsWith($str, $sub) {
-		return (strncmp($str, $sub, strlen($sub)) == 0);
-	}
+    /** Helper method. Returns true if $str begins with $sub. */
+    private function beginsWith($str, $sub) {
+        return (strncmp($str, $sub, strlen($sub)) == 0);
+    }
 	
 	
 }

lib/Payone/Log4php/LoggerLevel.php

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

lib/Payone/Log4php/LoggerLoggingEvent.php

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

lib/Payone/Log4php/LoggerConfigurator.php

Indentation +11 added lines, -11 removed lines

@@ -28,15 +28,15 @@
  */
 interface Payone_Log4php_LoggerConfigurator
 {
-	/**
-	 * Configures log4php based on the given configuration. 
-	 * 
-	 * All configurators implementations must implement this interface.
-	 * 
-	 * @param Payone_Log4php_LoggerHierarchy $hierarchy The hierarchy on which to perform
-	 * 		the configuration. 
-	 * @param mixed $input Either path to the config file or the 
-	 * 		configuration as an array.
-	 */
-	public function configure(Payone_Log4php_LoggerHierarchy $hierarchy, $input = null);
+    /**
+     * Configures log4php based on the given configuration. 
+     * 
+     * All configurators implementations must implement this interface.
+     * 
+     * @param Payone_Log4php_LoggerHierarchy $hierarchy The hierarchy on which to perform
+     * 		the configuration. 
+     * @param mixed $input Either path to the config file or the 
+     * 		configuration as an array.
+     */
+    public function configure(Payone_Log4php_LoggerHierarchy $hierarchy, $input = null);
 }
\ No newline at end of file

lib/Payone/Api/Request/Vauthorization.php

Indentation +5 added lines, -5 removed lines

@@ -34,11 +34,11 @@
 {
     protected $request = Payone_Api_Enum_RequestType::VAUTHORIZATION;
 
-     /**
-     * Sub account ID
-     *
-     * @var int
-     */
+        /**
+         * Sub account ID
+         *
+         * @var int
+         */
     protected $aid = NULL;
     /**
      * @var string