fjbender / magento-1

lib/Payone/Log4php/LoggerAppenderRollingFile.php

Indentation +160 added lines, -160 removed lines

@@ -48,184 +48,184 @@
  */
 class Payone_Log4php_LoggerAppenderRollingFile extends Payone_Log4php_LoggerAppenderFile {
 
-	/**
-	 * Set the maximum size that the output file is allowed to reach
-	 * before being rolled over to backup files.
-	 *
-	 * <p>In configuration files, the <var>MaxFileSize</var> option takes a
-	 * long integer in the range 0 - 2^63. You can specify the value
-	 * with the suffixes "KB", "MB" or "GB" so that the integer is
-	 * interpreted being expressed respectively in kilobytes, megabytes
-	 * or gigabytes. For example, the value "10KB" will be interpreted
-	 * as 10240.</p>
-	 * <p>The default maximum file size is 10MB.</p>
-	 *
-	 * <p>Note that MaxFileSize cannot exceed <b>2 GB</b>.</p>
-	 *
-	 * @var integer
-	 */
-	protected $maxFileSize = 10485760;
+    /**
+     * Set the maximum size that the output file is allowed to reach
+     * before being rolled over to backup files.
+     *
+     * <p>In configuration files, the <var>MaxFileSize</var> option takes a
+     * long integer in the range 0 - 2^63. You can specify the value
+     * with the suffixes "KB", "MB" or "GB" so that the integer is
+     * interpreted being expressed respectively in kilobytes, megabytes
+     * or gigabytes. For example, the value "10KB" will be interpreted
+     * as 10240.</p>
+     * <p>The default maximum file size is 10MB.</p>
+     *
+     * <p>Note that MaxFileSize cannot exceed <b>2 GB</b>.</p>
+     *
+     * @var integer
+     */
+    protected $maxFileSize = 10485760;
 	
-	/**
-	 * Set the maximum number of backup files to keep around.
-	 * 
-	 * <p>The <var>MaxBackupIndex</var> option determines how many backup
-	 * files are kept before the oldest is erased. This option takes
-	 * a positive integer value. If set to zero, then there will be no
-	 * backup files and the log file will be truncated when it reaches
-	 * MaxFileSize.</p>
-	 * <p>There is one backup file by default.</p>
-	 *
-	 * @var integer 
-	 */
-	protected $maxBackupIndex = 1;
+    /**
+     * Set the maximum number of backup files to keep around.
+     * 
+     * <p>The <var>MaxBackupIndex</var> option determines how many backup
+     * files are kept before the oldest is erased. This option takes
+     * a positive integer value. If set to zero, then there will be no
+     * backup files and the log file will be truncated when it reaches
+     * MaxFileSize.</p>
+     * <p>There is one backup file by default.</p>
+     *
+     * @var integer 
+     */
+    protected $maxBackupIndex = 1;
 	
-	/**
-	 * @var string the filename expanded
-	 */
-	private $expandedFileName = null;
+    /**
+     * @var string the filename expanded
+     */
+    private $expandedFileName = null;
 
-	/**
-	 * Returns the value of the MaxBackupIndex option.
-	 * @return integer 
-	 */
-	private function getExpandedFileName() {
-		return $this->expandedFileName;
-	}
+    /**
+     * Returns the value of the MaxBackupIndex option.
+     * @return integer 
+     */
+    private function getExpandedFileName() {
+        return $this->expandedFileName;
+    }
 
-	/**
-	 * Get the maximum size that the output file is allowed to reach
-	 * before being rolled over to backup files.
-	 * @return integer
-	 */
-	public function getMaximumFileSize() {
-		return $this->maxFileSize;
-	}
+    /**
+     * Get the maximum size that the output file is allowed to reach
+     * before being rolled over to backup files.
+     * @return integer
+     */
+    public function getMaximumFileSize() {
+        return $this->maxFileSize;
+    }
 
-	/**
-	 * Implements the usual roll over behaviour.
-	 *
-	 * <p>If MaxBackupIndex is positive, then files File.1, ..., File.MaxBackupIndex -1 are renamed to File.2, ..., File.MaxBackupIndex. 
-	 * Moreover, File is renamed File.1 and closed. A new File is created to receive further log output.
-	 * 
-	 * <p>If MaxBackupIndex is equal to zero, then the File is truncated with no backup files created.
-	 * 
-	 * Rollover must be called while the file is locked so that it is safe for concurrent access. 
-	 */
-	private function rollOver() {
-		// If maxBackups <= 0, then there is no file renaming to be done.
-		if($this->maxBackupIndex > 0) {
-			$fileName = $this->getExpandedFileName();
+    /**
+     * Implements the usual roll over behaviour.
+     *
+     * <p>If MaxBackupIndex is positive, then files File.1, ..., File.MaxBackupIndex -1 are renamed to File.2, ..., File.MaxBackupIndex. 
+     * Moreover, File is renamed File.1 and closed. A new File is created to receive further log output.
+     * 
+     * <p>If MaxBackupIndex is equal to zero, then the File is truncated with no backup files created.
+     * 
+     * Rollover must be called while the file is locked so that it is safe for concurrent access. 
+     */
+    private function rollOver() {
+        // If maxBackups <= 0, then there is no file renaming to be done.
+        if($this->maxBackupIndex > 0) {
+            $fileName = $this->getExpandedFileName();
 
-			// Delete the oldest file, to keep Windows happy.
-			$file = $fileName . '.' . $this->maxBackupIndex;
-			if(is_writable($file))
-				unlink($file);
+            // Delete the oldest file, to keep Windows happy.
+            $file = $fileName . '.' . $this->maxBackupIndex;
+            if(is_writable($file))
+                unlink($file);
 
-			// Map {(maxBackupIndex - 1), ..., 2, 1} to {maxBackupIndex, ..., 3, 2}
-			for($i = $this->maxBackupIndex - 1; $i >= 1; $i--) {
-				$file = $fileName . "." . $i;
-				if(is_readable($file)) {
-					$target = $fileName . '.' . ($i + 1);
-					rename($file, $target);
-				}
-			}
+            // Map {(maxBackupIndex - 1), ..., 2, 1} to {maxBackupIndex, ..., 3, 2}
+            for($i = $this->maxBackupIndex - 1; $i >= 1; $i--) {
+                $file = $fileName . "." . $i;
+                if(is_readable($file)) {
+                    $target = $fileName . '.' . ($i + 1);
+                    rename($file, $target);
+                }
+            }
 	
-			// Backup the active file
-			copy($fileName, "$fileName.1");
-		}
+            // Backup the active file
+            copy($fileName, "$fileName.1");
+        }
 		
-		// Truncate the active file
-		ftruncate($this->fp, 0);
-		rewind($this->fp);
-	}
+        // Truncate the active file
+        ftruncate($this->fp, 0);
+        rewind($this->fp);
+    }
 	
-	public function setFile($fileName) {
-		$this->file = $fileName;
-		// As Payone_Log4php_LoggerAppenderFile does not create the directory, it has to exist.
-		// realpath() fails if the argument does not exist so the filename is separated.
-		$this->expandedFileName = realpath(dirname($fileName));
-		if ($this->expandedFileName === false) throw new Exception("Directory of $fileName does not exist!");
-		$this->expandedFileName .= DIRECTORY_SEPARATOR . basename($fileName);
-	}
+    public function setFile($fileName) {
+        $this->file = $fileName;
+        // As Payone_Log4php_LoggerAppenderFile does not create the directory, it has to exist.
+        // realpath() fails if the argument does not exist so the filename is separated.
+        $this->expandedFileName = realpath(dirname($fileName));
+        if ($this->expandedFileName === false) throw new Exception("Directory of $fileName does not exist!");
+        $this->expandedFileName .= DIRECTORY_SEPARATOR . basename($fileName);
+    }
 
 
-	/**
-	 * Set the maximum number of backup files to keep around.
-	 * 
-	 * <p>The <b>MaxBackupIndex</b> option determines how many backup
-	 * files are kept before the oldest is erased. This option takes
-	 * a positive integer value. If set to zero, then there will be no
-	 * backup files and the log file will be truncated when it reaches
-	 * MaxFileSize.
-	 *
-	 * @param mixed $maxBackups
-	 */
-	public function setMaxBackupIndex($maxBackups) {
-		$this->setPositiveInteger('maxBackupIndex', $maxBackups);
-	}
+    /**
+     * Set the maximum number of backup files to keep around.
+     * 
+     * <p>The <b>MaxBackupIndex</b> option determines how many backup
+     * files are kept before the oldest is erased. This option takes
+     * a positive integer value. If set to zero, then there will be no
+     * backup files and the log file will be truncated when it reaches
+     * MaxFileSize.
+     *
+     * @param mixed $maxBackups
+     */
+    public function setMaxBackupIndex($maxBackups) {
+        $this->setPositiveInteger('maxBackupIndex', $maxBackups);
+    }
 
-	/**
-	 * Set the maximum size that the output file is allowed to reach
-	 * before being rolled over to backup files.
-	 *
-	 * @param mixed $maxFileSize
-	 * @see setMaxFileSize()
-	 * @deprecated
-	 */
-	public function setMaximumFileSize($maxFileSize) {
-		return $this->setMaxFileSize($maxFileSize);
-	}
+    /**
+     * Set the maximum size that the output file is allowed to reach
+     * before being rolled over to backup files.
+     *
+     * @param mixed $maxFileSize
+     * @see setMaxFileSize()
+     * @deprecated
+     */
+    public function setMaximumFileSize($maxFileSize) {
+        return $this->setMaxFileSize($maxFileSize);
+    }
 
-	/**
-	 * Set the maximum size that the output file is allowed to reach
-	 * before being rolled over to backup files.
-	 * <p>In configuration files, the <b>maxFileSize</b> option takes an
-	 * long integer in the range 0 - 2^63. You can specify the value
-	 * with the suffixes "KB", "MB" or "GB" so that the integer is
-	 * interpreted being expressed respectively in kilobytes, megabytes
-	 * or gigabytes. For example, the value "10KB" will be interpreted
-	 * as 10240.
-	 *
-	 * @param mixed $value
-	 * @return the actual file size set
-	 */
-	public function setMaxFileSize($value) {
-		$this->setFileSize('maxFileSize', $value);
-	}
+    /**
+     * Set the maximum size that the output file is allowed to reach
+     * before being rolled over to backup files.
+     * <p>In configuration files, the <b>maxFileSize</b> option takes an
+     * long integer in the range 0 - 2^63. You can specify the value
+     * with the suffixes "KB", "MB" or "GB" so that the integer is
+     * interpreted being expressed respectively in kilobytes, megabytes
+     * or gigabytes. For example, the value "10KB" will be interpreted
+     * as 10240.
+     *
+     * @param mixed $value
+     * @return the actual file size set
+     */
+    public function setMaxFileSize($value) {
+        $this->setFileSize('maxFileSize', $value);
+    }
 
-	public function append(Payone_Log4php_LoggerLoggingEvent $event) {
-		if($this->fp and $this->layout !== null) {
-			if(flock($this->fp, LOCK_EX)) {
-				fwrite($this->fp, $this->layout->format($event));
+    public function append(Payone_Log4php_LoggerLoggingEvent $event) {
+        if($this->fp and $this->layout !== null) {
+            if(flock($this->fp, LOCK_EX)) {
+                fwrite($this->fp, $this->layout->format($event));
 
-				// Stats cache must be cleared, otherwise filesize() returns cached results
-				clearstatcache();
+                // Stats cache must be cleared, otherwise filesize() returns cached results
+                clearstatcache();
 				
-				// Rollover if needed
-				if (filesize($this->expandedFileName) > $this->maxFileSize) {
-					$this->rollOver();
-				}
+                // Rollover if needed
+                if (filesize($this->expandedFileName) > $this->maxFileSize) {
+                    $this->rollOver();
+                }
 				
-				flock($this->fp, LOCK_UN);
-			} else {
-				$this->closed = true;
-			}
-		} 
-	}
+                flock($this->fp, LOCK_UN);
+            } else {
+                $this->closed = true;
+            }
+        } 
+    }
 	
-	/**
-	 * @return Returns the maximum number of backup files to keep around.
-	 */
-	public function getMaxBackupIndex() {
-		return $this->maxBackupIndex;
-	}
+    /**
+     * @return Returns the maximum number of backup files to keep around.
+     */
+    public function getMaxBackupIndex() {
+        return $this->maxBackupIndex;
+    }
 	
-	/**
-	 * @return Returns the maximum size that the output file is allowed to reach
-	 * before being rolled over to backup files.
-	 */
-	public function getMaxFileSize() {
-		return $this->maxFileSize;
-	}
+    /**
+     * @return Returns the maximum size that the output file is allowed to reach
+     * before being rolled over to backup files.
+     */
+    public function getMaxFileSize() {
+        return $this->maxFileSize;
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -114,18 +114,18 @@ 
 	 */
 	private function rollOver() {
 		// If maxBackups <= 0, then there is no file renaming to be done.
-		if($this->maxBackupIndex > 0) {
+		if ($this->maxBackupIndex > 0) {
 			$fileName = $this->getExpandedFileName();
 
 			// Delete the oldest file, to keep Windows happy.
 			$file = $fileName . '.' . $this->maxBackupIndex;
-			if(is_writable($file))
+			if (is_writable($file))
 				unlink($file);
 
 			// Map {(maxBackupIndex - 1), ..., 2, 1} to {maxBackupIndex, ..., 3, 2}
-			for($i = $this->maxBackupIndex - 1; $i >= 1; $i--) {
+			for ($i = $this->maxBackupIndex - 1; $i >= 1; $i--) {
 				$file = $fileName . "." . $i;
-				if(is_readable($file)) {
+				if (is_readable($file)) {
 					$target = $fileName . '.' . ($i + 1);
 					rename($file, $target);
 				}
@@ -195,8 +195,8 @@ 
 	}
 
 	public function append(Payone_Log4php_LoggerLoggingEvent $event) {
-		if($this->fp and $this->layout !== null) {
-			if(flock($this->fp, LOCK_EX)) {
+		if ($this->fp and $this->layout !== null) {
+			if (flock($this->fp, LOCK_EX)) {
 				fwrite($this->fp, $this->layout->format($event));
 
 				// Stats cache must be cleared, otherwise filesize() returns cached results

Braces +6 added lines, -3 removed lines

@@ -119,8 +119,9 @@ 
 
 			// Delete the oldest file, to keep Windows happy.
 			$file = $fileName . '.' . $this->maxBackupIndex;
-			if(is_writable($file))
-				unlink($file);
+			if(is_writable($file)) {
+							unlink($file);
+			}
 
 			// Map {(maxBackupIndex - 1), ..., 2, 1} to {maxBackupIndex, ..., 3, 2}
 			for($i = $this->maxBackupIndex - 1; $i >= 1; $i--) {
@@ -145,7 +146,9 @@ 
 		// As Payone_Log4php_LoggerAppenderFile does not create the directory, it has to exist.
 		// realpath() fails if the argument does not exist so the filename is separated.
 		$this->expandedFileName = realpath(dirname($fileName));
-		if ($this->expandedFileName === false) throw new Exception("Directory of $fileName does not exist!");
+		if ($this->expandedFileName === false) {
+		    throw new Exception("Directory of $fileName does not exist!");
+		}
 		$this->expandedFileName .= DIRECTORY_SEPARATOR . basename($fileName);
 	}
 

lib/Payone/Log4php/LoggerAppenderSyslog.php

Indentation +201 added lines, -201 removed lines

@@ -73,233 +73,233 @@
  */ 
 class Payone_Log4php_LoggerAppenderSyslog extends Payone_Log4php_LoggerAppender {
 	
-	/**
-	 * The ident string is added to each message. Typically the name of your application.
-	 * 
-	 * @var string 
-	 */
-	protected $ident = "Apache log4php";
+    /**
+     * The ident string is added to each message. Typically the name of your application.
+     * 
+     * @var string 
+     */
+    protected $ident = "Apache log4php";
 
-	/**
-	 * The syslog priority to use when overriding priority. This setting is 
-	 * required if {@link overridePriority} is set to true. 
-	 * 
-	 * @var string 
-	 */
-	protected $priority;
+    /**
+     * The syslog priority to use when overriding priority. This setting is 
+     * required if {@link overridePriority} is set to true. 
+     * 
+     * @var string 
+     */
+    protected $priority;
 	
-	/**
-	 * The option used when opening the syslog connection.
-	 * 
-	 * @var string
-	 */
-	protected $option = 'PID|CONS';
+    /**
+     * The option used when opening the syslog connection.
+     * 
+     * @var string
+     */
+    protected $option = 'PID|CONS';
 	
-	/**
-	 * The facility value indicates the source of the message.
-	 *
-	 * @var string
-	 */
-	protected $facility = 'USER';
+    /**
+     * The facility value indicates the source of the message.
+     *
+     * @var string
+     */
+    protected $facility = 'USER';
 	
-	/**
-	 * If set to true, the message priority will always use the value defined 
-	 * in {@link $priority}, otherwise the priority will be determined by the 
-	 * message's log level.
-	 *
-	 * @var string
-	 */
-	protected $overridePriority = false;
+    /**
+     * If set to true, the message priority will always use the value defined 
+     * in {@link $priority}, otherwise the priority will be determined by the 
+     * message's log level.
+     *
+     * @var string
+     */
+    protected $overridePriority = false;
 
-	/**
-	 * Holds the int value of the {@link $priority}.
-	 * @var int
-	 */
-	private $intPriority;
+    /**
+     * Holds the int value of the {@link $priority}.
+     * @var int
+     */
+    private $intPriority;
 	
-	/**
-	 * Holds the int value of the {@link $facility}.
-	 * @var int
-	 */
-	private $intFacility;
+    /**
+     * Holds the int value of the {@link $facility}.
+     * @var int
+     */
+    private $intFacility;
 	
-	/**
-	 * Holds the int value of the {@link $option}.
-	 * @var int
-	 */
-	private $intOption;
+    /**
+     * Holds the int value of the {@link $option}.
+     * @var int
+     */
+    private $intOption;
 
-	/**
-	 * Sets the {@link $ident}.
-	 *
-	 * @param string $ident
-	 */
-	public function setIdent($ident) {
-		$this->ident = $ident; 
-	}
+    /**
+     * Sets the {@link $ident}.
+     *
+     * @param string $ident
+     */
+    public function setIdent($ident) {
+        $this->ident = $ident; 
+    }
 	
-	/**
-	 * Sets the {@link $priority}.
-	 *
-	 * @param string $priority
-	 */
-	public function setPriority($priority) {
-		$this->priority = $priority;
-	}
+    /**
+     * Sets the {@link $priority}.
+     *
+     * @param string $priority
+     */
+    public function setPriority($priority) {
+        $this->priority = $priority;
+    }
 	
-	/**
-	 * Sets the {@link $facility}.
-	 *
-	 * @param string $facility
-	 */
-	public function setFacility($facility) {
-		$this->facility = $facility;
-	} 
+    /**
+     * Sets the {@link $facility}.
+     *
+     * @param string $facility
+     */
+    public function setFacility($facility) {
+        $this->facility = $facility;
+    } 
 	
-	/**
-	 * Sets the {@link $overridePriority}.
-	 *
-	 * @param string $overridePriority
-	 */
-	public function setOverridePriority($overridePriority) {
-		$this->overridePriority = $overridePriority;
-	} 
+    /**
+     * Sets the {@link $overridePriority}.
+     *
+     * @param string $overridePriority
+     */
+    public function setOverridePriority($overridePriority) {
+        $this->overridePriority = $overridePriority;
+    } 
 	
-	/**
-	* Sets the {@link $option}.
-	*
-	* @param string $option
-	*/
-	public function setOption($option) {
-		$this->option = $option;
-	}
+    /**
+     * Sets the {@link $option}.
+     *
+     * @param string $option
+     */
+    public function setOption($option) {
+        $this->option = $option;
+    }
 	
-	/**
-	* Returns the {@link $ident}.
-	*
-	* @return string $ident
-	*/
-	public function getIdent() {
-		return $this->ident;
-	}
+    /**
+     * Returns the {@link $ident}.
+     *
+     * @return string $ident
+     */
+    public function getIdent() {
+        return $this->ident;
+    }
 	
-	/**
-	 * Returns the {@link $priority}.
-	 *
-	 * @return string
-	 */
-	public function getPriority() {
-		return $this->priority;
-	}
+    /**
+     * Returns the {@link $priority}.
+     *
+     * @return string
+     */
+    public function getPriority() {
+        return $this->priority;
+    }
 	
-	/**
-	 * Returns the {@link $facility}.
-	 *
-	 * @return string
-	 */
-	public function getFacility() {
-		return $this->facility;
-	}
+    /**
+     * Returns the {@link $facility}.
+     *
+     * @return string
+     */
+    public function getFacility() {
+        return $this->facility;
+    }
 	
-	/**
-	 * Returns the {@link $overridePriority}.
-	 *
-	 * @return string
-	 */
-	public function getOverridePriority() {
-		return $this->overridePriority;
-	}
+    /**
+     * Returns the {@link $overridePriority}.
+     *
+     * @return string
+     */
+    public function getOverridePriority() {
+        return $this->overridePriority;
+    }
 	
-	/**
-	 * Returns the {@link $option}.
-	 *
-	 * @return string
-	 */
-	public function getOption() {
-		return $this->option;
-	}
+    /**
+     * Returns the {@link $option}.
+     *
+     * @return string
+     */
+    public function getOption() {
+        return $this->option;
+    }
 	
 	
-	public function activateOptions() {
-		$this->intPriority = $this->parsePriority();
-		$this->intOption   = $this->parseOption();
-		$this->intFacility = $this->parseFacility();
+    public function activateOptions() {
+        $this->intPriority = $this->parsePriority();
+        $this->intOption   = $this->parseOption();
+        $this->intFacility = $this->parseFacility();
 		
-		$this->closed = false;
-	}
+        $this->closed = false;
+    }
 	
-	public function close() {
-		if($this->closed != true) {
-			closelog();
-			$this->closed = true;
-		}
-	}
+    public function close() {
+        if($this->closed != true) {
+            closelog();
+            $this->closed = true;
+        }
+    }
 
-	/** 
-	 * Appends the event to syslog.
-	 * 
-	 * Log is opened and closed each time because if it is not closed, it
-	 * can cause the Apache httpd server to log to whatever ident/facility 
-	 * was used in openlog().
-	 *
-	 * @see http://www.php.net/manual/en/function.syslog.php#97843
-	 */
-	public function append(Payone_Log4php_LoggerLoggingEvent $event) {
-		$priority = $this->getSyslogPriority($event->getLevel());
-		$message = $this->layout->format($event);
+    /** 
+     * Appends the event to syslog.
+     * 
+     * Log is opened and closed each time because if it is not closed, it
+     * can cause the Apache httpd server to log to whatever ident/facility 
+     * was used in openlog().
+     *
+     * @see http://www.php.net/manual/en/function.syslog.php#97843
+     */
+    public function append(Payone_Log4php_LoggerLoggingEvent $event) {
+        $priority = $this->getSyslogPriority($event->getLevel());
+        $message = $this->layout->format($event);
 	
-		openlog($this->ident, $this->intOption, $this->intFacility);
-		syslog($priority, $message);
-		closelog();
-	}
+        openlog($this->ident, $this->intOption, $this->intFacility);
+        syslog($priority, $message);
+        closelog();
+    }
 	
-	/** Determines which syslog priority to use based on the given level. */
-	private function getSyslogPriority(Payone_Log4php_LoggerLevel $level) {
-		if($this->overridePriority) {
-			return $this->intPriority;
-		}
-		return $level->getSyslogEquivalent();
-	}
+    /** Determines which syslog priority to use based on the given level. */
+    private function getSyslogPriority(Payone_Log4php_LoggerLevel $level) {
+        if($this->overridePriority) {
+            return $this->intPriority;
+        }
+        return $level->getSyslogEquivalent();
+    }
 	
-	/** Parses a syslog option string and returns the correspodning int value. */
-	private function parseOption() {
-		$value = 0;
-		$options = explode('|', $this->option);
+    /** Parses a syslog option string and returns the correspodning int value. */
+    private function parseOption() {
+        $value = 0;
+        $options = explode('|', $this->option);
 	
-		foreach($options as $option) {
-			if (!empty($option)) {
-				$constant = "LOG_" . trim($option);
-				if (defined($constant)) {
-					$value |= constant($constant);
-				} else {
-					trigger_error("log4php: Invalid syslog option provided: $option. Whole option string: {$this->option}.", E_USER_WARNING);
-				}
-			}
-		}
-		return $value;
-	}
+        foreach($options as $option) {
+            if (!empty($option)) {
+                $constant = "LOG_" . trim($option);
+                if (defined($constant)) {
+                    $value |= constant($constant);
+                } else {
+                    trigger_error("log4php: Invalid syslog option provided: $option. Whole option string: {$this->option}.", E_USER_WARNING);
+                }
+            }
+        }
+        return $value;
+    }
 	
-	/** Parses the facility string and returns the corresponding int value. */
-	private function parseFacility() {
-		if (!empty($this->facility)) {   
-			$constant = "LOG_" . trim($this->facility);
-			if (defined($constant)) {
-				return constant($constant);
-			} else {
-				trigger_error("log4php: Invalid syslog facility provided: {$this->facility}.", E_USER_WARNING);
-			}
-		}
-	}
+    /** Parses the facility string and returns the corresponding int value. */
+    private function parseFacility() {
+        if (!empty($this->facility)) {   
+            $constant = "LOG_" . trim($this->facility);
+            if (defined($constant)) {
+                return constant($constant);
+            } else {
+                trigger_error("log4php: Invalid syslog facility provided: {$this->facility}.", E_USER_WARNING);
+            }
+        }
+    }
 
-	/** Parses the priority string and returns the corresponding int value. */
-	private function parsePriority() {
-		if (!empty($this->priority)) {
-			$constant = "LOG_" . trim($this->priority);
-			if (defined($constant)) {
-				return constant($constant);
-			} else {
-				trigger_error("log4php: Invalid syslog priority provided: {$this->priority}.", E_USER_WARNING);
-			}
-		}	
-	}
+    /** Parses the priority string and returns the corresponding int value. */
+    private function parsePriority() {
+        if (!empty($this->priority)) {
+            $constant = "LOG_" . trim($this->priority);
+            if (defined($constant)) {
+                return constant($constant);
+            } else {
+                trigger_error("log4php: Invalid syslog priority provided: {$this->priority}.", E_USER_WARNING);
+            }
+        }	
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -229,7 +229,7 @@ 
 	}
 	
 	public function close() {
-		if($this->closed != true) {
+		if ($this->closed != true) {
 			closelog();
 			$this->closed = true;
 		}
@@ -255,7 +255,7 @@ 
 	
 	/** Determines which syslog priority to use based on the given level. */
 	private function getSyslogPriority(Payone_Log4php_LoggerLevel $level) {
-		if($this->overridePriority) {
+		if ($this->overridePriority) {
 			return $this->intPriority;
 		}
 		return $level->getSyslogEquivalent();
@@ -266,7 +266,7 @@ 
 		$value = 0;
 		$options = explode('|', $this->option);
 	
-		foreach($options as $option) {
+		foreach ($options as $option) {
 			if (!empty($option)) {
 				$constant = "LOG_" . trim($option);
 				if (defined($constant)) {

lib/Payone/Log4php/LoggerAutoloader.php

Indentation +96 added lines, -96 removed lines

@@ -19,7 +19,7 @@ 
  */
 
 if (function_exists('__autoload')) {
-	//trigger_error("log4php: It looks like your code is using an __autoload() function. log4php uses spl_autoload_register() which will bypass your __autoload() function and may break autoloading.", E_USER_WARNING);
+    //trigger_error("log4php: It looks like your code is using an __autoload() function. log4php uses spl_autoload_register() which will bypass your __autoload() function and may break autoloading.", E_USER_WARNING);
 }
 
 spl_autoload_register(array('Payone_Log4php_LoggerAutoloader', 'autoload'));
@@ -33,108 +33,108 @@ 
  */
 class Payone_Log4php_LoggerAutoloader {
 	
-	/** Maps classnames to files containing the class. */
-	private static $classes = array(
+    /** Maps classnames to files containing the class. */
+    private static $classes = array(
 	
-		// Base
-		'Payone_Log4php_LoggerAppender' => '/LoggerAppender.php',
-		'Payone_Log4php_LoggerAppenderPool' => '/LoggerAppenderPool.php',
-		'Payone_Log4php_LoggerConfigurable' => '/LoggerConfigurable.php',
-		'Payone_Log4php_LoggerConfigurator' => '/LoggerConfigurator.php',
-		'Payone_Log4php_LoggerException' => '/LoggerException.php',
-		'Payone_Log4php_LoggerFilter' => '/LoggerFilter.php',
-		'Payone_Log4php_LoggerHierarchy' => '/LoggerHierarchy.php',
-		'Payone_Log4php_LoggerLevel' => '/LoggerLevel.php',
-		'Payone_Log4php_LoggerLocationInfo' => '/LoggerLocationInfo.php',
-		'Payone_Log4php_LoggerLoggingEvent' => '/LoggerLoggingEvent.php',
-		'Payone_Log4php_LoggerMDC' => '/LoggerMDC.php',
-		'Payone_Log4php_LoggerNDC' => '/LoggerNDC.php',
-		'Payone_Log4php_LoggerLayout' => '/LoggerLayout.php',
-		'Payone_Log4php_LoggerReflectionUtils' => '/LoggerReflectionUtils.php',
-		'Payone_Log4php_LoggerRoot' => '/LoggerRoot.php',
-		'Payone_Log4php_LoggerThrowableInformation' => '/LoggerThrowableInformation.php',
+        // Base
+        'Payone_Log4php_LoggerAppender' => '/LoggerAppender.php',
+        'Payone_Log4php_LoggerAppenderPool' => '/LoggerAppenderPool.php',
+        'Payone_Log4php_LoggerConfigurable' => '/LoggerConfigurable.php',
+        'Payone_Log4php_LoggerConfigurator' => '/LoggerConfigurator.php',
+        'Payone_Log4php_LoggerException' => '/LoggerException.php',
+        'Payone_Log4php_LoggerFilter' => '/LoggerFilter.php',
+        'Payone_Log4php_LoggerHierarchy' => '/LoggerHierarchy.php',
+        'Payone_Log4php_LoggerLevel' => '/LoggerLevel.php',
+        'Payone_Log4php_LoggerLocationInfo' => '/LoggerLocationInfo.php',
+        'Payone_Log4php_LoggerLoggingEvent' => '/LoggerLoggingEvent.php',
+        'Payone_Log4php_LoggerMDC' => '/LoggerMDC.php',
+        'Payone_Log4php_LoggerNDC' => '/LoggerNDC.php',
+        'Payone_Log4php_LoggerLayout' => '/LoggerLayout.php',
+        'Payone_Log4php_LoggerReflectionUtils' => '/LoggerReflectionUtils.php',
+        'Payone_Log4php_LoggerRoot' => '/LoggerRoot.php',
+        'Payone_Log4php_LoggerThrowableInformation' => '/LoggerThrowableInformation.php',
 		
-		// Appenders
-		'Payone_Log4php_LoggerAppenderConsole' => '/LoggerAppenderConsole.php',
-		'Payone_Log4php_LoggerAppenderDailyFile' => '/LoggerAppenderDailyFile.php',
-		'Payone_Log4php_LoggerAppenderEcho' => '/LoggerAppenderEcho.php',
-		'Payone_Log4php_LoggerAppenderFile' => '/LoggerAppenderFile.php',
-		'Payone_Log4php_LoggerAppenderMail' => '/LoggerAppenderMail.php',
-		'Payone_Log4php_LoggerAppenderMailEvent' => '/LoggerAppenderMailEvent.php',
-		'Payone_Log4php_LoggerAppenderMongoDB' => '/LoggerAppenderMongoDB.php',
-		'Payone_Log4php_LoggerAppenderNull' => '/LoggerAppenderNull.php',
-		'Payone_Log4php_LoggerAppenderPDO' => '/LoggerAppenderPDO.php',
-		'Payone_Log4php_LoggerAppenderPhp' => '/LoggerAppenderPhp.php',
-		'Payone_Log4php_LoggerAppenderRollingFile' => '/LoggerAppenderRollingFile.php',
-		'Payone_Log4php_LoggerAppenderSocket' => '/LoggerAppenderSocket.php',
-		'Payone_Log4php_LoggerAppenderSyslog' => '/LoggerAppenderSyslog.php',
+        // Appenders
+        'Payone_Log4php_LoggerAppenderConsole' => '/LoggerAppenderConsole.php',
+        'Payone_Log4php_LoggerAppenderDailyFile' => '/LoggerAppenderDailyFile.php',
+        'Payone_Log4php_LoggerAppenderEcho' => '/LoggerAppenderEcho.php',
+        'Payone_Log4php_LoggerAppenderFile' => '/LoggerAppenderFile.php',
+        'Payone_Log4php_LoggerAppenderMail' => '/LoggerAppenderMail.php',
+        'Payone_Log4php_LoggerAppenderMailEvent' => '/LoggerAppenderMailEvent.php',
+        'Payone_Log4php_LoggerAppenderMongoDB' => '/LoggerAppenderMongoDB.php',
+        'Payone_Log4php_LoggerAppenderNull' => '/LoggerAppenderNull.php',
+        'Payone_Log4php_LoggerAppenderPDO' => '/LoggerAppenderPDO.php',
+        'Payone_Log4php_LoggerAppenderPhp' => '/LoggerAppenderPhp.php',
+        'Payone_Log4php_LoggerAppenderRollingFile' => '/LoggerAppenderRollingFile.php',
+        'Payone_Log4php_LoggerAppenderSocket' => '/LoggerAppenderSocket.php',
+        'Payone_Log4php_LoggerAppenderSyslog' => '/LoggerAppenderSyslog.php',
 		
-		// Configurators
-		'Payone_Log4php_LoggerConfigurationAdapter' => '/LoggerConfigurationAdapter.php',
-		'Payone_Log4php_LoggerConfigurationAdapterINI' => '/LoggerConfigurationAdapterINI.php',
-		'Payone_Log4php_LoggerConfigurationAdapterPHP' => '/LoggerConfigurationAdapterPHP.php',
-		'Payone_Log4php_LoggerConfigurationAdapterXML' => '/LoggerConfigurationAdapterXML.php',
-		'Payone_Log4php_LoggerConfiguratorDefault' => '/LoggerConfiguratorDefault.php',
+        // Configurators
+        'Payone_Log4php_LoggerConfigurationAdapter' => '/LoggerConfigurationAdapter.php',
+        'Payone_Log4php_LoggerConfigurationAdapterINI' => '/LoggerConfigurationAdapterINI.php',
+        'Payone_Log4php_LoggerConfigurationAdapterPHP' => '/LoggerConfigurationAdapterPHP.php',
+        'Payone_Log4php_LoggerConfigurationAdapterXML' => '/LoggerConfigurationAdapterXML.php',
+        'Payone_Log4php_LoggerConfiguratorDefault' => '/LoggerConfiguratorDefault.php',
 
-		// Filters
-		'Payone_Log4php_LoggerFilterDenyAll' => '/LoggerFilterDenyAll.php',
-		'Payone_Log4php_LoggerFilterLevelMatch' => '/LoggerFilterLevelMatch.php',
-		'Payone_Log4php_LoggerFilterLevelRange' => '/LoggerFilterLevelRange.php',
-		'Payone_Log4php_LoggerFilterStringMatch' => '/LoggerFilterStringMatch.php',
+        // Filters
+        'Payone_Log4php_LoggerFilterDenyAll' => '/LoggerFilterDenyAll.php',
+        'Payone_Log4php_LoggerFilterLevelMatch' => '/LoggerFilterLevelMatch.php',
+        'Payone_Log4php_LoggerFilterLevelRange' => '/LoggerFilterLevelRange.php',
+        'Payone_Log4php_LoggerFilterStringMatch' => '/LoggerFilterStringMatch.php',
 
-		// Helpers
-		'Payone_Log4php_LoggerFormattingInfo' => '/LoggerFormattingInfo.php',
-		'Payone_Log4php_LoggerOptionConverter' => '/LoggerOptionConverter.php',
-		'Payone_Log4php_LoggerPatternParser' => '/LoggerPatternParser.php',
-		'Payone_Log4php_LoggerUtils' => '/LoggerUtils.php',
+        // Helpers
+        'Payone_Log4php_LoggerFormattingInfo' => '/LoggerFormattingInfo.php',
+        'Payone_Log4php_LoggerOptionConverter' => '/LoggerOptionConverter.php',
+        'Payone_Log4php_LoggerPatternParser' => '/LoggerPatternParser.php',
+        'Payone_Log4php_LoggerUtils' => '/LoggerUtils.php',
 	
-		// Pattern converters
-		'Payone_Log4php_LoggerPatternConverter' => '/LoggerPatternConverter.php',
-		'Payone_Log4php_LoggerPatternConverterClass' => '/LoggerPatternConverterClass.php',
-		'Payone_Log4php_LoggerPatternConverterCookie' => '/LoggerPatternConverterCookie.php',
-		'Payone_Log4php_LoggerPatternConverterDate' => '/LoggerPatternConverterDate.php',
-		'Payone_Log4php_LoggerPatternConverterEnvironment' => '/LoggerPatternConverterEnvironment.php',
-		'Payone_Log4php_LoggerPatternConverterFile' => '/LoggerPatternConverterFile.php',
-		'Payone_Log4php_LoggerPatternConverterLevel' => '/LoggerPatternConverterLevel.php',
-		'Payone_Log4php_LoggerPatternConverterLine' => '/LoggerPatternConverterLine.php',
-		'Payone_Log4php_LoggerPatternConverterLiteral' => '/LoggerPatternConverterLiteral.php',
-		'Payone_Log4php_LoggerPatternConverterLogger' => '/LoggerPatternConverterLogger.php',
-		'Payone_Log4php_LoggerPatternConverterMDC' => '/LoggerPatternConverterMDC.php',
-		'Payone_Log4php_LoggerPatternConverterMessage' => '/LoggerPatternConverterMessage.php',
-		'Payone_Log4php_LoggerPatternConverterMethod' => '/LoggerPatternConverterMethod.php',
-		'Payone_Log4php_LoggerPatternConverterNDC' => '/LoggerPatternConverterNDC.php',
-		'Payone_Log4php_LoggerPatternConverterNewLine' => '/LoggerPatternConverterNewLine.php',
-		'Payone_Log4php_LoggerPatternConverterProcess' => '/LoggerPatternConverterProcess.php',
-		'Payone_Log4php_LoggerPatternConverterRelative' => '/LoggerPatternConverterRelative.php',
-		'Payone_Log4php_LoggerPatternConverterRequest' => '/LoggerPatternConverterRequest.php',
-		'Payone_Log4php_LoggerPatternConverterServer' => '/LoggerPatternConverterServer.php',
-		'Payone_Log4php_LoggerPatternConverterSession' => '/LoggerPatternConverterSession.php',
-		'Payone_Log4php_LoggerPatternConverterSessionID' => '/LoggerPatternConverterSessionID.php',
-		'Payone_Log4php_LoggerPatternConverterSuperglobal' => '/LoggerPatternConverterSuperglobal.php',
-		'Payone_Log4php_LoggerPatternConverterThrowable' => '/LoggerPatternConverterThrowable.php',
+        // Pattern converters
+        'Payone_Log4php_LoggerPatternConverter' => '/LoggerPatternConverter.php',
+        'Payone_Log4php_LoggerPatternConverterClass' => '/LoggerPatternConverterClass.php',
+        'Payone_Log4php_LoggerPatternConverterCookie' => '/LoggerPatternConverterCookie.php',
+        'Payone_Log4php_LoggerPatternConverterDate' => '/LoggerPatternConverterDate.php',
+        'Payone_Log4php_LoggerPatternConverterEnvironment' => '/LoggerPatternConverterEnvironment.php',
+        'Payone_Log4php_LoggerPatternConverterFile' => '/LoggerPatternConverterFile.php',
+        'Payone_Log4php_LoggerPatternConverterLevel' => '/LoggerPatternConverterLevel.php',
+        'Payone_Log4php_LoggerPatternConverterLine' => '/LoggerPatternConverterLine.php',
+        'Payone_Log4php_LoggerPatternConverterLiteral' => '/LoggerPatternConverterLiteral.php',
+        'Payone_Log4php_LoggerPatternConverterLogger' => '/LoggerPatternConverterLogger.php',
+        'Payone_Log4php_LoggerPatternConverterMDC' => '/LoggerPatternConverterMDC.php',
+        'Payone_Log4php_LoggerPatternConverterMessage' => '/LoggerPatternConverterMessage.php',
+        'Payone_Log4php_LoggerPatternConverterMethod' => '/LoggerPatternConverterMethod.php',
+        'Payone_Log4php_LoggerPatternConverterNDC' => '/LoggerPatternConverterNDC.php',
+        'Payone_Log4php_LoggerPatternConverterNewLine' => '/LoggerPatternConverterNewLine.php',
+        'Payone_Log4php_LoggerPatternConverterProcess' => '/LoggerPatternConverterProcess.php',
+        'Payone_Log4php_LoggerPatternConverterRelative' => '/LoggerPatternConverterRelative.php',
+        'Payone_Log4php_LoggerPatternConverterRequest' => '/LoggerPatternConverterRequest.php',
+        'Payone_Log4php_LoggerPatternConverterServer' => '/LoggerPatternConverterServer.php',
+        'Payone_Log4php_LoggerPatternConverterSession' => '/LoggerPatternConverterSession.php',
+        'Payone_Log4php_LoggerPatternConverterSessionID' => '/LoggerPatternConverterSessionID.php',
+        'Payone_Log4php_LoggerPatternConverterSuperglobal' => '/LoggerPatternConverterSuperglobal.php',
+        'Payone_Log4php_LoggerPatternConverterThrowable' => '/LoggerPatternConverterThrowable.php',
 		
-		// Layouts
-		'Payone_Log4php_LoggerLayoutHtml' => '/LoggerLayoutHtml.php',
-		'Payone_Log4php_LoggerLayoutPattern' => '/LoggerLayoutPattern.php',
-		'Payone_Log4php_LoggerLayoutSerialized' => '/LoggerLayoutSerialized.php',
-		'Payone_Log4php_LoggerLayoutSimple' => '/LoggerLayoutSimple.php',
-		'Payone_Log4php_LoggerLayoutTTCC' => '/LoggerLayoutTTCC.php',
-		'Payone_Log4php_LoggerLayoutXml' => '/LoggerLayoutXml.php',
+        // Layouts
+        'Payone_Log4php_LoggerLayoutHtml' => '/LoggerLayoutHtml.php',
+        'Payone_Log4php_LoggerLayoutPattern' => '/LoggerLayoutPattern.php',
+        'Payone_Log4php_LoggerLayoutSerialized' => '/LoggerLayoutSerialized.php',
+        'Payone_Log4php_LoggerLayoutSimple' => '/LoggerLayoutSimple.php',
+        'Payone_Log4php_LoggerLayoutTTCC' => '/LoggerLayoutTTCC.php',
+        'Payone_Log4php_LoggerLayoutXml' => '/LoggerLayoutXml.php',
 		
-		// Renderers
-		'Payone_Log4php_LoggerRendererDefault' => '/LoggerRendererDefault.php',
-		'Payone_Log4php_LoggerRendererException' => '/LoggerRendererException.php',
-		'Payone_Log4php_LoggerRendererMap' => '/LoggerRendererMap.php',
-		'Payone_Log4php_LoggerRendererObject' => '/LoggerRendererObject.php',
-	);
+        // Renderers
+        'Payone_Log4php_LoggerRendererDefault' => '/LoggerRendererDefault.php',
+        'Payone_Log4php_LoggerRendererException' => '/LoggerRendererException.php',
+        'Payone_Log4php_LoggerRendererMap' => '/LoggerRendererMap.php',
+        'Payone_Log4php_LoggerRendererObject' => '/LoggerRendererObject.php',
+    );
 	
-	/**
-	 * Loads a class.
-	 * @param string $className The name of the class to load.
-	 */
-	public static function autoload($className) {
-		if(isset(self::$classes[$className])) {
-			require_once dirname(__FILE__) . self::$classes[$className];
-		}
-	}
+    /**
+     * Loads a class.
+     * @param string $className The name of the class to load.
+     */
+    public static function autoload($className) {
+        if(isset(self::$classes[$className])) {
+            require_once dirname(__FILE__) . self::$classes[$className];
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -133,7 +133,7 @@
 	 * @param string $className The name of the class to load.
 	 */
 	public static function autoload($className) {
-		if(isset(self::$classes[$className])) {
+		if (isset(self::$classes[$className])) {
 			require_once dirname(__FILE__) . self::$classes[$className];
 		}
 	}

lib/Payone/Log4php/LoggerLayoutXml.php

Indentation +129 added lines, -129 removed lines

@@ -54,157 +54,157 @@
  * @subpackage layouts
  */
 class Payone_Log4php_LoggerLayoutXml extends Payone_Log4php_LoggerLayout {
-	const LOG4J_NS_PREFIX ='log4j';
-	const LOG4J_NS = 'http://jakarta.apache.org/log4j/';
+    const LOG4J_NS_PREFIX ='log4j';
+    const LOG4J_NS = 'http://jakarta.apache.org/log4j/';
 	
-	const LOG4PHP_NS_PREFIX = 'log4php';
-	const LOG4PHP_NS = 'http://logging.apache.org/log4php/';
+    const LOG4PHP_NS_PREFIX = 'log4php';
+    const LOG4PHP_NS = 'http://logging.apache.org/log4php/';
 	
-	const CDATA_START = '<![CDATA[';
-	const CDATA_END = ']]>';
-	const CDATA_PSEUDO_END = ']]&gt;';
-	const CDATA_EMBEDDED_END = ']]>]]&gt;<![CDATA[';
+    const CDATA_START = '<![CDATA[';
+    const CDATA_END = ']]>';
+    const CDATA_PSEUDO_END = ']]&gt;';
+    const CDATA_EMBEDDED_END = ']]>]]&gt;<![CDATA[';
 
-	/**
-	 * If set to true then the file name and line number of the origin of the
-	 * log statement will be output.
-	 * @var boolean
-	 */
-	protected $locationInfo = true;
+    /**
+     * If set to true then the file name and line number of the origin of the
+     * log statement will be output.
+     * @var boolean
+     */
+    protected $locationInfo = true;
   
-	/**
-	 * If set to true, log4j namespace will be used instead of the log4php 
-	 * namespace.
-	 * @var boolean 
-	 */
-	protected $log4jNamespace = false;
+    /**
+     * If set to true, log4j namespace will be used instead of the log4php 
+     * namespace.
+     * @var boolean 
+     */
+    protected $log4jNamespace = false;
 	
-	/** The namespace in use. */
-	protected $namespace = self::LOG4PHP_NS;
+    /** The namespace in use. */
+    protected $namespace = self::LOG4PHP_NS;
 	
-	/** The namespace prefix in use */
-	protected $namespacePrefix = self::LOG4PHP_NS_PREFIX;
+    /** The namespace prefix in use */
+    protected $namespacePrefix = self::LOG4PHP_NS_PREFIX;
 	 
-	public function activateOptions() {
-		if ($this->getLog4jNamespace()) {
-			$this->namespace        = self::LOG4J_NS;
-			$this->namespacePrefix  = self::LOG4J_NS_PREFIX;
-		} else {
-			$this->namespace        = self::LOG4PHP_NS;
-			$this->namespacePrefix  = self::LOG4PHP_NS_PREFIX;
-		}
-	}
+    public function activateOptions() {
+        if ($this->getLog4jNamespace()) {
+            $this->namespace        = self::LOG4J_NS;
+            $this->namespacePrefix  = self::LOG4J_NS_PREFIX;
+        } else {
+            $this->namespace        = self::LOG4PHP_NS;
+            $this->namespacePrefix  = self::LOG4PHP_NS_PREFIX;
+        }
+    }
 	
-	/**
-	 * @return string
-	 */
-	public function getHeader() {
-		return "<{$this->namespacePrefix}:eventSet ".
-			"xmlns:{$this->namespacePrefix}=\"{$this->namespace}\" ".
-			"version=\"0.3\" ".
-			"includesLocationInfo=\"".($this->getLocationInfo() ? "true" : "false")."\"".
-			">" . PHP_EOL;
-	}
+    /**
+     * @return string
+     */
+    public function getHeader() {
+        return "<{$this->namespacePrefix}:eventSet ".
+            "xmlns:{$this->namespacePrefix}=\"{$this->namespace}\" ".
+            "version=\"0.3\" ".
+            "includesLocationInfo=\"".($this->getLocationInfo() ? "true" : "false")."\"".
+            ">" . PHP_EOL;
+    }
 
-	/**
-	 * Formats a {@link LoggerLoggingEvent} in conformance with the log4php.dtd.
-	 *
-	 * @param Payone_Log4php_LoggerLoggingEvent $event
-	 * @return string
-	 */
-	public function format(Payone_Log4php_LoggerLoggingEvent $event) {
-		$ns = $this->namespacePrefix;
+    /**
+     * Formats a {@link LoggerLoggingEvent} in conformance with the log4php.dtd.
+     *
+     * @param Payone_Log4php_LoggerLoggingEvent $event
+     * @return string
+     */
+    public function format(Payone_Log4php_LoggerLoggingEvent $event) {
+        $ns = $this->namespacePrefix;
 		
-		$loggerName = $event->getLoggerName();
-		$timeStamp = number_format((float)($event->getTimeStamp() * 1000), 0, '', '');
-		$thread = $event->getThreadName();
-		$level = $event->getLevel()->toString();
+        $loggerName = $event->getLoggerName();
+        $timeStamp = number_format((float)($event->getTimeStamp() * 1000), 0, '', '');
+        $thread = $event->getThreadName();
+        $level = $event->getLevel()->toString();
 
-		$buf  = "<$ns:event logger=\"{$loggerName}\" level=\"{$level}\" thread=\"{$thread}\" timestamp=\"{$timeStamp}\">".PHP_EOL;
-		$buf .= "<$ns:message>"; 
-		$buf .= $this->encodeCDATA($event->getRenderedMessage()); 
-		$buf .= "</$ns:message>".PHP_EOL;
+        $buf  = "<$ns:event logger=\"{$loggerName}\" level=\"{$level}\" thread=\"{$thread}\" timestamp=\"{$timeStamp}\">".PHP_EOL;
+        $buf .= "<$ns:message>"; 
+        $buf .= $this->encodeCDATA($event->getRenderedMessage()); 
+        $buf .= "</$ns:message>".PHP_EOL;
 
-		$ndc = $event->getNDC();
-		if(!empty($ndc)) {
-			$buf .= "<$ns:NDC><![CDATA[";
-			$buf .= $this->encodeCDATA($ndc);
-			$buf .= "]]></$ns:NDC>".PHP_EOL;
-		}
+        $ndc = $event->getNDC();
+        if(!empty($ndc)) {
+            $buf .= "<$ns:NDC><![CDATA[";
+            $buf .= $this->encodeCDATA($ndc);
+            $buf .= "]]></$ns:NDC>".PHP_EOL;
+        }
 		
-		$mdcMap = $event->getMDCMap();
-		if (!empty($mdcMap)) {
-			$buf .= "<$ns:properties>".PHP_EOL;
-			foreach ($mdcMap as $name=>$value) {
-				$buf .= "<$ns:data name=\"$name\" value=\"$value\" />".PHP_EOL;
-			}
-			$buf .= "</$ns:properties>".PHP_EOL;
-		}
+        $mdcMap = $event->getMDCMap();
+        if (!empty($mdcMap)) {
+            $buf .= "<$ns:properties>".PHP_EOL;
+            foreach ($mdcMap as $name=>$value) {
+                $buf .= "<$ns:data name=\"$name\" value=\"$value\" />".PHP_EOL;
+            }
+            $buf .= "</$ns:properties>".PHP_EOL;
+        }
 
-		if ($this->getLocationInfo()) {
-			$locationInfo = $event->getLocationInformation();
-			$buf .= "<$ns:locationInfo ". 
-					"class=\"" . $locationInfo->getClassName() . "\" ".
-					"file=\"" .  htmlentities($locationInfo->getFileName(), ENT_QUOTES) . "\" ".
-					"line=\"" .  $locationInfo->getLineNumber() . "\" ".
-					"method=\"" . $locationInfo->getMethodName() . "\" ";
-			$buf .= "/>".PHP_EOL;
-		}
+        if ($this->getLocationInfo()) {
+            $locationInfo = $event->getLocationInformation();
+            $buf .= "<$ns:locationInfo ". 
+                    "class=\"" . $locationInfo->getClassName() . "\" ".
+                    "file=\"" .  htmlentities($locationInfo->getFileName(), ENT_QUOTES) . "\" ".
+                    "line=\"" .  $locationInfo->getLineNumber() . "\" ".
+                    "method=\"" . $locationInfo->getMethodName() . "\" ";
+            $buf .= "/>".PHP_EOL;
+        }
 
-		$buf .= "</$ns:event>".PHP_EOL;
+        $buf .= "</$ns:event>".PHP_EOL;
 		
-		return $buf;
-	}
+        return $buf;
+    }
 	
-	/**
-	 * @return string
-	 */
-	public function getFooter() {
-		return "</{$this->namespacePrefix}:eventSet>" . PHP_EOL;
-	}
+    /**
+     * @return string
+     */
+    public function getFooter() {
+        return "</{$this->namespacePrefix}:eventSet>" . PHP_EOL;
+    }
 	
 	
-	/** 
-	 * Whether or not file name and line number will be included in the output.
-	 * @return boolean
-	 */
-	public function getLocationInfo() {
-		return $this->locationInfo;
-	}
+    /** 
+     * Whether or not file name and line number will be included in the output.
+     * @return boolean
+     */
+    public function getLocationInfo() {
+        return $this->locationInfo;
+    }
   
-	/**
-	 * The {@link $locationInfo} option takes a boolean value. By default,
-	 * it is set to false which means there will be no location
-	 * information output by this layout. If the the option is set to
-	 * true, then the file name and line number of the statement at the
-	 * origin of the log statement will be output.
-	 */
-	public function setLocationInfo($flag) {
-		$this->setBoolean('locationInfo', $flag);
-	}
+    /**
+     * The {@link $locationInfo} option takes a boolean value. By default,
+     * it is set to false which means there will be no location
+     * information output by this layout. If the the option is set to
+     * true, then the file name and line number of the statement at the
+     * origin of the log statement will be output.
+     */
+    public function setLocationInfo($flag) {
+        $this->setBoolean('locationInfo', $flag);
+    }
   
-	/**
-	 * @return boolean
-	 */
-	 public function getLog4jNamespace() {
-	 	return $this->log4jNamespace;
-	 }
+    /**
+     * @return boolean
+     */
+        public function getLog4jNamespace() {
+            return $this->log4jNamespace;
+        }
 
-	/**
-	 * @param boolean
-	 */
-	public function setLog4jNamespace($flag) {
-		$this->setBoolean('log4jNamespace', $flag);
-	}
+    /**
+     * @param boolean
+     */
+    public function setLog4jNamespace($flag) {
+        $this->setBoolean('log4jNamespace', $flag);
+    }
 	
-	/** 
-	 * Encases a string in CDATA tags, and escapes any existing CDATA end 
-	 * tags already present in the string.
-	 * @param string $string 
-	 */
-	private function encodeCDATA($string) {
-		$string = str_replace(self::CDATA_END, self::CDATA_EMBEDDED_END, $string);
-		return self::CDATA_START . $string . self::CDATA_END;
-	}
+    /** 
+     * Encases a string in CDATA tags, and escapes any existing CDATA end 
+     * tags already present in the string.
+     * @param string $string 
+     */
+    private function encodeCDATA($string) {
+        $string = str_replace(self::CDATA_END, self::CDATA_EMBEDDED_END, $string);
+        return self::CDATA_START . $string . self::CDATA_END;
+    }
 }
 

Spacing +18 added lines, -18 removed lines

@@ -54,7 +54,7 @@ 
  * @subpackage layouts
  */
 class Payone_Log4php_LoggerLayoutXml extends Payone_Log4php_LoggerLayout {
-	const LOG4J_NS_PREFIX ='log4j';
+	const LOG4J_NS_PREFIX = 'log4j';
 	const LOG4J_NS = 'http://jakarta.apache.org/log4j/';
 	
 	const LOG4PHP_NS_PREFIX = 'log4php';
@@ -99,10 +99,10 @@ 
 	 * @return string
 	 */
 	public function getHeader() {
-		return "<{$this->namespacePrefix}:eventSet ".
-			"xmlns:{$this->namespacePrefix}=\"{$this->namespace}\" ".
-			"version=\"0.3\" ".
-			"includesLocationInfo=\"".($this->getLocationInfo() ? "true" : "false")."\"".
+		return "<{$this->namespacePrefix}:eventSet " .
+			"xmlns:{$this->namespacePrefix}=\"{$this->namespace}\" " .
+			"version=\"0.3\" " .
+			"includesLocationInfo=\"" . ($this->getLocationInfo() ? "true" : "false") . "\"" .
 			">" . PHP_EOL;
 	}
 
@@ -120,38 +120,38 @@ 
 		$thread = $event->getThreadName();
 		$level = $event->getLevel()->toString();
 
-		$buf  = "<$ns:event logger=\"{$loggerName}\" level=\"{$level}\" thread=\"{$thread}\" timestamp=\"{$timeStamp}\">".PHP_EOL;
+		$buf  = "<$ns:event logger=\"{$loggerName}\" level=\"{$level}\" thread=\"{$thread}\" timestamp=\"{$timeStamp}\">" . PHP_EOL;
 		$buf .= "<$ns:message>"; 
 		$buf .= $this->encodeCDATA($event->getRenderedMessage()); 
-		$buf .= "</$ns:message>".PHP_EOL;
+		$buf .= "</$ns:message>" . PHP_EOL;
 
 		$ndc = $event->getNDC();
-		if(!empty($ndc)) {
+		if (!empty($ndc)) {
 			$buf .= "<$ns:NDC><![CDATA[";
 			$buf .= $this->encodeCDATA($ndc);
-			$buf .= "]]></$ns:NDC>".PHP_EOL;
+			$buf .= "]]></$ns:NDC>" . PHP_EOL;
 		}
 		
 		$mdcMap = $event->getMDCMap();
 		if (!empty($mdcMap)) {
-			$buf .= "<$ns:properties>".PHP_EOL;
+			$buf .= "<$ns:properties>" . PHP_EOL;
 			foreach ($mdcMap as $name=>$value) {
-				$buf .= "<$ns:data name=\"$name\" value=\"$value\" />".PHP_EOL;
+				$buf .= "<$ns:data name=\"$name\" value=\"$value\" />" . PHP_EOL;
 			}
-			$buf .= "</$ns:properties>".PHP_EOL;
+			$buf .= "</$ns:properties>" . PHP_EOL;
 		}
 
 		if ($this->getLocationInfo()) {
 			$locationInfo = $event->getLocationInformation();
-			$buf .= "<$ns:locationInfo ". 
-					"class=\"" . $locationInfo->getClassName() . "\" ".
-					"file=\"" .  htmlentities($locationInfo->getFileName(), ENT_QUOTES) . "\" ".
-					"line=\"" .  $locationInfo->getLineNumber() . "\" ".
+			$buf .= "<$ns:locationInfo " . 
+					"class=\"" . $locationInfo->getClassName() . "\" " .
+					"file=\"" . htmlentities($locationInfo->getFileName(), ENT_QUOTES) . "\" " .
+					"line=\"" . $locationInfo->getLineNumber() . "\" " .
 					"method=\"" . $locationInfo->getMethodName() . "\" ";
-			$buf .= "/>".PHP_EOL;
+			$buf .= "/>" . PHP_EOL;
 		}
 
-		$buf .= "</$ns:event>".PHP_EOL;
+		$buf .= "</$ns:event>" . PHP_EOL;
 		
 		return $buf;
 	}

lib/Payone/Log4php/LoggerAppenderNull.php

Indentation +11 added lines, -11 removed lines

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

lib/Payone/Log4php/LoggerMDC.php

Indentation +61 added lines, -61 removed lines

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

Spacing +3 added lines, -3 removed lines

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

lib/Payone/Log4php/LoggerPatternConverterProcess.php

Indentation +3 added lines, -3 removed lines

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

lib/Payone/Log4php/LoggerLayoutPattern.php

Indentation +95 added lines, -95 removed lines

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

lib/Payone/Log4php/LoggerAppender.php

Indentation +229 added lines, -229 removed lines

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

Spacing +6 added lines, -6 removed lines

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