fjbender / magento-1

lib/Payone/Api/Request/Parameter/ManageMandate/PersonalData.php

Doc Comments +1 added lines, -1 removed lines

@@ -181,7 +181,7 @@
     }
 
     /**
-     * @return string
+     * @return integer
      */
     public function getUserid()
     {

lib/Payone/Api/Request/Parameter/Vauthorization/PersonalData.php

Doc Comments +2 added lines, -2 removed lines

@@ -95,7 +95,7 @@ 
     }
 
     /**
-     * @return string
+     * @return integer
      */
     public function getBirthday()
     {
@@ -259,7 +259,7 @@ 
     }
 
     /**
-     * @return string
+     * @return integer
      */
     public function getUserid()
     {

lib/Payone/Api/Response/Abstract.php

Doc Comments +3 added lines, -3 removed lines

@@ -224,7 +224,7 @@ 
     }
 
     /**
-     * @param $name
+     * @param string $name
      * @return null|mixed
      */
     protected function get($name)
@@ -237,7 +237,7 @@ 
 
     /**
      * @param string $name
-     * @param mixed $value
+     * @param string $value
      * @return boolean|null
      */
     protected function set($name, $value)
@@ -257,7 +257,7 @@ 
         $this->rawResponse = $rawResponse;
     }
     /**
-     * @return null
+     * @return string
      */
     public function getRawResponse()
     {

lib/Payone/Api/Response/Parameter/Paydata/DataItem.php

Doc Comments -1 removed lines

@@ -30,7 +30,6 @@
     protected $data = NULL;
 
     /**
-     * @param int $key
      * @return array
      */
     public function toArray()

lib/Payone/Builder.php

Doc Comments +10 added lines, -10 removed lines

@@ -65,7 +65,7 @@ 
     /**
      * @api
      *
-     * @return Payone_ClientApi_Service_GenerateHash
+     * @return Payone_Api_Service_Payment_Abstract
      */
     public function buildServiceClientApiGenerateHash() {
         return $this->buildService(self::KEY_CLIENTAPI . '/generateHash');
@@ -119,7 +119,7 @@ 
     /**
      * @api
      *
-     * @return Payone_Api_Service_Verification_3dsCheck
+     * @return Payone_Api_Service_Payment_Abstract
      */
     public function buildServiceVerification3dsCheck() {
         return $this->buildService(self::KEY_API . '/verification/3dscheck');
@@ -128,7 +128,7 @@ 
     /**
      * @api
      *
-     * @return Payone_Api_Service_Management_GetInvoice
+     * @return Payone_Api_Service_Payment_Abstract
      */
     public function buildServiceManagementGetInvoice() {
         return $this->buildService(self::KEY_API . '/management/getInvoice');
@@ -137,7 +137,7 @@ 
     /**
      * @api
      *
-     * @return Payone_Api_Service_Management_GetFile
+     * @return Payone_Api_Service_Payment_Abstract
      */
     public function buildServiceManagementGetFile() {
         return $this->buildService(self::KEY_API . '/management/getFile');
@@ -146,7 +146,7 @@ 
     /**
      * @api
      *
-     * @return Payone_Api_Service_Management_ManageMandate
+     * @return Payone_Api_Service_Payment_Abstract
      */
     public function buildServiceManagementManageMandate() {
         return $this->buildService(self::KEY_API . '/management/manageMandate');
@@ -155,7 +155,7 @@ 
     /**
      * @api
      *
-     * @return Payone_Api_Service_Verification_AddressCheck
+     * @return Payone_Api_Service_Payment_Abstract
      */
     public function buildServiceVerificationAddressCheck() {
         return $this->buildService(self::KEY_API . '/verification/addressCheck');
@@ -164,7 +164,7 @@ 
     /**
      * @api
      *
-     * @return Payone_Api_Service_Verification_CreditCardCheck
+     * @return Payone_Api_Service_Payment_Abstract
      */
     public function buildServiceVerificationCreditCardCheck() {
         return $this->buildService(self::KEY_API . '/verification/creditCardCheck');
@@ -173,7 +173,7 @@ 
     /**
      * @api
      *
-     * @return Payone_Api_Service_Verification_BankAccountCheck
+     * @return Payone_Api_Service_Payment_Abstract
      */
     public function buildServiceVerificationBankAccountCheck() {
         return $this->buildService(self::KEY_API . '/verification/bankAccountCheck');
@@ -182,7 +182,7 @@ 
     /**
      * @api
      *
-     * @return Payone_Api_Service_Verification_Consumerscore
+     * @return Payone_Api_Service_Payment_Abstract
      */
     public function buildServiceVerificationConsumerscore() {
         return $this->buildService(self::KEY_API . '/verification/consumerscore');
@@ -191,7 +191,7 @@ 
     /**
      * @api
      *
-     * @return Payone_Settings_Service_XmlGenerate
+     * @return Payone_Api_Service_Payment_Abstract
      */
     public function buildServiceSettingsXmlGenerate() {
         return $this->buildService(self::KEY_SETTINGS . '/xmlgenerate');

lib/Payone/ClientApi/Factory.php

Doc Comments +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
     /**
      * @param string $key Service Key, e.g. 'payment/refund'
-     * @return Payone_Api_Service_Payment_Authorize|Payone_Api_Service_Payment_Debit|Payone_Api_Service_Payment_Preauthorize|Payone_Api_Service_Payment_Refund
+     * @return Payone_ClientApi_Service_GenerateHash|null
      * @throws Exception
      */
     public function buildService($key)

lib/Payone/Log4php/Logger.php

Doc Comments +3 added lines, -3 removed lines

@@ -84,7 +84,7 @@ 
 
 	/**
 	 * Returns the parent Logger. Can be null if this is the root logger.
-	 * @return Logger
+	 * @return Payone_Log4php_Logger
 	 */
 	public function getParent() {
 		return $this->parent;
@@ -395,7 +395,7 @@ 
 
 	/**
 	 * Sets the parent logger.
-	 * @param Logger $logger
+	 * @param Payone_Log4php_Logger $logger
 	 */
 	public function setParent(Payone_Log4php_Logger $logger) {
 		$this->parent = $logger;
@@ -453,7 +453,7 @@ 
 	
 	/**
 	 * Clears all Logger definitions from the logger hierarchy.
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	public static function clear() {
 		return self::getHierarchy()->clear();

Indentation +503 added lines, -503 removed lines

@@ -41,531 +41,531 @@
  */
 class Payone_Log4php_Logger {
 	
-	/**
-	 * Logger additivity. If set to true then child loggers will inherit
-	 * the appenders of their ancestors by default.
-	 * @var boolean
-	 */
-	private $additive = true;
-	
-	/** 
-	 * The Logger's fully qualified class name.
-	 * TODO: Determine if this is useful. 
-	 */
-	private $fqcn = 'Logger';
+    /**
+     * Logger additivity. If set to true then child loggers will inherit
+     * the appenders of their ancestors by default.
+     * @var boolean
+     */
+    private $additive = true;
+	
+    /** 
+     * The Logger's fully qualified class name.
+     * TODO: Determine if this is useful. 
+     */
+    private $fqcn = 'Logger';
 
-	/** The assigned Logger level. */
-	private $level;
+    /** The assigned Logger level. */
+    private $level;
 	
-	/** The name of this Logger instance. */
-	private $name;
+    /** The name of this Logger instance. */
+    private $name;
 	
-	/** The parent logger. Set to null if this is the root logger. */
-	private $parent;
+    /** The parent logger. Set to null if this is the root logger. */
+    private $parent;
 	
-	/** A collection of appenders linked to this logger. */
-	private $appenders = array();
+    /** A collection of appenders linked to this logger. */
+    private $appenders = array();
 
-	/**
-	 * Constructor.
-	 * @param string $name Name of the logger.	  
-	 */
-	public function __construct($name) {
-		$this->name = $name;
-	}
-	
-	/**
-	 * Returns the logger name.
-	 * @return string
-	 */
-	public function getName() {
-		return $this->name;
-	} 
+    /**
+     * Constructor.
+     * @param string $name Name of the logger.	  
+     */
+    public function __construct($name) {
+        $this->name = $name;
+    }
+	
+    /**
+     * Returns the logger name.
+     * @return string
+     */
+    public function getName() {
+        return $this->name;
+    } 
 
-	/**
-	 * Returns the parent Logger. Can be null if this is the root logger.
-	 * @return Logger
-	 */
-	public function getParent() {
-		return $this->parent;
-	}
-	
-	// ******************************************
-	// *** Logging methods                    ***
-	// ******************************************
-	
-	/**
-	 * Log a message object with the TRACE level.
-	 *
-	 * @param mixed $message message
- 	 * @param Exception $throwable Optional throwable information to include 
-	 *   in the logging event.
-	 */
-	public function trace($message, $throwable = null) {
-		$this->log(Payone_Log4php_LoggerLevel::getLevelTrace(), $message, $throwable);
-	} 		
-	
-	/**
-	 * Log a message object with the DEBUG level.
-	 *
-	 * @param mixed $message message
- 	 * @param Exception $throwable Optional throwable information to include 
-	 *   in the logging event.
-	 */
-	public function debug($message, $throwable = null) {
-		$this->log(Payone_Log4php_LoggerLevel::getLevelDebug(), $message, $throwable);
-	} 
+    /**
+     * Returns the parent Logger. Can be null if this is the root logger.
+     * @return Logger
+     */
+    public function getParent() {
+        return $this->parent;
+    }
+	
+    // ******************************************
+    // *** Logging methods                    ***
+    // ******************************************
+	
+    /**
+     * Log a message object with the TRACE level.
+     *
+     * @param mixed $message message
+     * @param Exception $throwable Optional throwable information to include 
+     *   in the logging event.
+     */
+    public function trace($message, $throwable = null) {
+        $this->log(Payone_Log4php_LoggerLevel::getLevelTrace(), $message, $throwable);
+    } 		
+	
+    /**
+     * Log a message object with the DEBUG level.
+     *
+     * @param mixed $message message
+     * @param Exception $throwable Optional throwable information to include 
+     *   in the logging event.
+     */
+    public function debug($message, $throwable = null) {
+        $this->log(Payone_Log4php_LoggerLevel::getLevelDebug(), $message, $throwable);
+    } 
 
-	/**
-	 * Log a message object with the INFO Level.
-	 *
-	 * @param mixed $message message
- 	 * @param Exception $throwable Optional throwable information to include 
-	 *   in the logging event.
-	 */
-	public function info($message, $throwable = null) {
-		$this->log(Payone_Log4php_LoggerLevel::getLevelInfo(), $message, $throwable);
-	}
+    /**
+     * Log a message object with the INFO Level.
+     *
+     * @param mixed $message message
+     * @param Exception $throwable Optional throwable information to include 
+     *   in the logging event.
+     */
+    public function info($message, $throwable = null) {
+        $this->log(Payone_Log4php_LoggerLevel::getLevelInfo(), $message, $throwable);
+    }
 
-	/**
-	 * Log a message with the WARN level.
-	 *
-	 * @param mixed $message message
-  	 * @param Exception $throwable Optional throwable information to include 
-	 *   in the logging event.
-	 */
-	public function warn($message, $throwable = null) {
-		$this->log(Payone_Log4php_LoggerLevel::getLevelWarn(), $message, $throwable);
-	}
-	
-	/**
-	 * Log a message object with the ERROR level.
-	 *
-	 * @param mixed $message message
-	 * @param Exception $throwable Optional throwable information to include 
-	 *   in the logging event.
-	 */
-	public function error($message, $throwable = null) {
-		$this->log(Payone_Log4php_LoggerLevel::getLevelError(), $message, $throwable);
-	}
-	
-	/**
-	 * Log a message object with the FATAL level.
-	 *
-	 * @param mixed $message message
-	 * @param Exception $throwable Optional throwable information to include 
-	 *   in the logging event.
-	 */
-	public function fatal($message, $throwable = null) {
-		$this->log(Payone_Log4php_LoggerLevel::getLevelFatal(), $message, $throwable);
-	}
+    /**
+     * Log a message with the WARN level.
+     *
+     * @param mixed $message message
+     * @param Exception $throwable Optional throwable information to include 
+     *   in the logging event.
+     */
+    public function warn($message, $throwable = null) {
+        $this->log(Payone_Log4php_LoggerLevel::getLevelWarn(), $message, $throwable);
+    }
+	
+    /**
+     * Log a message object with the ERROR level.
+     *
+     * @param mixed $message message
+     * @param Exception $throwable Optional throwable information to include 
+     *   in the logging event.
+     */
+    public function error($message, $throwable = null) {
+        $this->log(Payone_Log4php_LoggerLevel::getLevelError(), $message, $throwable);
+    }
+	
+    /**
+     * Log a message object with the FATAL level.
+     *
+     * @param mixed $message message
+     * @param Exception $throwable Optional throwable information to include 
+     *   in the logging event.
+     */
+    public function fatal($message, $throwable = null) {
+        $this->log(Payone_Log4php_LoggerLevel::getLevelFatal(), $message, $throwable);
+    }
 
-	/**
-	 * Log a message using the provided logging level.
-	 *
-	 * @param Payone_Log4php_LoggerLevel $level The logging level.
-	 * @param mixed $message Message to log.
- 	 * @param Exception $throwable Optional throwable information to include 
-	 *   in the logging event.
-	 */
-	public function log(Payone_Log4php_LoggerLevel $level, $message, $throwable = null) {
-		if($this->isEnabledFor($level)) {
-			$this->forcedLog($this->fqcn, $throwable, $level, $message);
-		}
-	}
-	
-	/**
-	 * If assertion parameter evaluates as false, then logs the message 
-	 * using the ERROR level.
-	 *
-	 * @param bool $assertion
-	 * @param string $msg message to log
-	 */
-	public function assertLog($assertion = true, $msg = '') {
-		if($assertion == false) {
-			$this->error($msg);
-		}
-	}
-	
-	/**
-	 * This method creates a new logging event and logs the event without 
-	 * further checks.
-	 *
-	 * It should not be called directly. Use {@link trace()}, {@link debug()},
-	 * {@link info()}, {@link warn()}, {@link error()} and {@link fatal()} 
-	 * wrappers.
-	 *
-	 * @param string $fqcn Fully qualified class name of the Logger
-	 * @param Exception $throwable Optional throwable information to include 
-	 *   in the logging event.
-	 * @param Payone_Log4php_LoggerLevel $level log level
-	 * @param mixed $message message to log
-	 */
-	public function forcedLog($fqcn, $throwable, Payone_Log4php_LoggerLevel $level, $message) {
-		if (!($throwable instanceof Exception)) {
-			$throwable = null;
-		}
-		$this->callAppenders(new Payone_Log4php_LoggerLoggingEvent($fqcn, $this, $level, $message, null, $throwable));
-	} 
-	
-	// ******************************************
-	// *** Checker methods                    ***
-	// ******************************************
-	
-	/**
-	 * Check whether this Logger is enabled for a given Level passed as parameter.
-	 *
-	 * @param LoggerLevel level
-	 * @return boolean
-	 */
-	public function isEnabledFor(Payone_Log4php_LoggerLevel $level) {
-		return $level->isGreaterOrEqual($this->getEffectiveLevel());
-	}
-	
-	/**
-	 * Check whether this Logger is enabled for the TRACE Level.
-	 * @return boolean
-	 */
-	public function isTraceEnabled() {
-		return $this->isEnabledFor(Payone_Log4php_LoggerLevel::getLevelTrace());
-	}
-	
-	/**
-	 * Check whether this Logger is enabled for the DEBUG Level.
-	 * @return boolean
-	 */
-	public function isDebugEnabled() {
-		return $this->isEnabledFor(Payone_Log4php_LoggerLevel::getLevelDebug());
-	}
+    /**
+     * Log a message using the provided logging level.
+     *
+     * @param Payone_Log4php_LoggerLevel $level The logging level.
+     * @param mixed $message Message to log.
+     * @param Exception $throwable Optional throwable information to include 
+     *   in the logging event.
+     */
+    public function log(Payone_Log4php_LoggerLevel $level, $message, $throwable = null) {
+        if($this->isEnabledFor($level)) {
+            $this->forcedLog($this->fqcn, $throwable, $level, $message);
+        }
+    }
+	
+    /**
+     * If assertion parameter evaluates as false, then logs the message 
+     * using the ERROR level.
+     *
+     * @param bool $assertion
+     * @param string $msg message to log
+     */
+    public function assertLog($assertion = true, $msg = '') {
+        if($assertion == false) {
+            $this->error($msg);
+        }
+    }
+	
+    /**
+     * This method creates a new logging event and logs the event without 
+     * further checks.
+     *
+     * It should not be called directly. Use {@link trace()}, {@link debug()},
+     * {@link info()}, {@link warn()}, {@link error()} and {@link fatal()} 
+     * wrappers.
+     *
+     * @param string $fqcn Fully qualified class name of the Logger
+     * @param Exception $throwable Optional throwable information to include 
+     *   in the logging event.
+     * @param Payone_Log4php_LoggerLevel $level log level
+     * @param mixed $message message to log
+     */
+    public function forcedLog($fqcn, $throwable, Payone_Log4php_LoggerLevel $level, $message) {
+        if (!($throwable instanceof Exception)) {
+            $throwable = null;
+        }
+        $this->callAppenders(new Payone_Log4php_LoggerLoggingEvent($fqcn, $this, $level, $message, null, $throwable));
+    } 
+	
+    // ******************************************
+    // *** Checker methods                    ***
+    // ******************************************
+	
+    /**
+     * Check whether this Logger is enabled for a given Level passed as parameter.
+     *
+     * @param LoggerLevel level
+     * @return boolean
+     */
+    public function isEnabledFor(Payone_Log4php_LoggerLevel $level) {
+        return $level->isGreaterOrEqual($this->getEffectiveLevel());
+    }
+	
+    /**
+     * Check whether this Logger is enabled for the TRACE Level.
+     * @return boolean
+     */
+    public function isTraceEnabled() {
+        return $this->isEnabledFor(Payone_Log4php_LoggerLevel::getLevelTrace());
+    }
+	
+    /**
+     * Check whether this Logger is enabled for the DEBUG Level.
+     * @return boolean
+     */
+    public function isDebugEnabled() {
+        return $this->isEnabledFor(Payone_Log4php_LoggerLevel::getLevelDebug());
+    }
 
-	/**
-	 * Check whether this Logger is enabled for the INFO Level.
-	 * @return boolean
-	 */
-	public function isInfoEnabled() {
-		return $this->isEnabledFor(Payone_Log4php_LoggerLevel::getLevelInfo());
-	}
-	
-	/**
-	 * Check whether this Logger is enabled for the WARN Level.
-	 * @return boolean
-	 */
-	public function isWarnEnabled() {
-		return $this->isEnabledFor(Payone_Log4php_LoggerLevel::getLevelWarn());
-	}
-	
-	/**
-	 * Check whether this Logger is enabled for the ERROR Level.
-	 * @return boolean
-	 */
-	public function isErrorEnabled() {
-		return $this->isEnabledFor(Payone_Log4php_LoggerLevel::getLevelError());
-	}
-	
-	/**
-	 * Check whether this Logger is enabled for the FATAL Level.
-	 * @return boolean
-	 */
-	public function isFatalEnabled() {
-		return $this->isEnabledFor(Payone_Log4php_LoggerLevel::getLevelFatal());
-	}
-	
-	// ******************************************
-	// *** Configuration methods              ***
-	// ******************************************
-	
-	/**
-	 * Adds a new appender to the Logger.
-	 * @param Payone_Log4php_LoggerAppender $appender The appender to add.
-	 */
-	public function addAppender($appender) {
-		$appenderName = $appender->getName();
-		$this->appenders[$appenderName] = $appender;
-	}
-	
-	/** Removes all appenders from the Logger. */
-	public function removeAllAppenders() {
-		foreach($this->appenders as $name => $appender) {
-			$this->removeAppender($name);
-		}
-	} 
+    /**
+     * Check whether this Logger is enabled for the INFO Level.
+     * @return boolean
+     */
+    public function isInfoEnabled() {
+        return $this->isEnabledFor(Payone_Log4php_LoggerLevel::getLevelInfo());
+    }
+	
+    /**
+     * Check whether this Logger is enabled for the WARN Level.
+     * @return boolean
+     */
+    public function isWarnEnabled() {
+        return $this->isEnabledFor(Payone_Log4php_LoggerLevel::getLevelWarn());
+    }
+	
+    /**
+     * Check whether this Logger is enabled for the ERROR Level.
+     * @return boolean
+     */
+    public function isErrorEnabled() {
+        return $this->isEnabledFor(Payone_Log4php_LoggerLevel::getLevelError());
+    }
+	
+    /**
+     * Check whether this Logger is enabled for the FATAL Level.
+     * @return boolean
+     */
+    public function isFatalEnabled() {
+        return $this->isEnabledFor(Payone_Log4php_LoggerLevel::getLevelFatal());
+    }
+	
+    // ******************************************
+    // *** Configuration methods              ***
+    // ******************************************
+	
+    /**
+     * Adds a new appender to the Logger.
+     * @param Payone_Log4php_LoggerAppender $appender The appender to add.
+     */
+    public function addAppender($appender) {
+        $appenderName = $appender->getName();
+        $this->appenders[$appenderName] = $appender;
+    }
+	
+    /** Removes all appenders from the Logger. */
+    public function removeAllAppenders() {
+        foreach($this->appenders as $name => $appender) {
+            $this->removeAppender($name);
+        }
+    } 
 			
-	/**
-	 * Remove the appender passed as parameter form the Logger.
-	 * @param mixed $appender an appender name or a {@link Payone_Log4php_LoggerAppender} instance.
-	 */
-	public function removeAppender($appender) {
-		if($appender instanceof Payone_Log4php_LoggerAppender) {
-			$appender->close();
-			unset($this->appenders[$appender->getName()]);
-		} else if (is_string($appender) and isset($this->appenders[$appender])) {
-			$this->appenders[$appender]->close();
-			unset($this->appenders[$appender]);
-		}
-	}
-	
-	/**
-	 * Forwards the given logging event to all linked appenders.
-	 * @param Payone_Log4php_LoggerLoggingEvent $event
-	 */
-	public function callAppenders($event) {
-		// Forward the event to each linked appender
-		foreach($this->appenders as $appender) {
-			$appender->doAppend($event);
-		}
+    /**
+     * Remove the appender passed as parameter form the Logger.
+     * @param mixed $appender an appender name or a {@link Payone_Log4php_LoggerAppender} instance.
+     */
+    public function removeAppender($appender) {
+        if($appender instanceof Payone_Log4php_LoggerAppender) {
+            $appender->close();
+            unset($this->appenders[$appender->getName()]);
+        } else if (is_string($appender) and isset($this->appenders[$appender])) {
+            $this->appenders[$appender]->close();
+            unset($this->appenders[$appender]);
+        }
+    }
+	
+    /**
+     * Forwards the given logging event to all linked appenders.
+     * @param Payone_Log4php_LoggerLoggingEvent $event
+     */
+    public function callAppenders($event) {
+        // Forward the event to each linked appender
+        foreach($this->appenders as $appender) {
+            $appender->doAppend($event);
+        }
 		
-		// Forward the event upstream if additivity is turned on
-		if(isset($this->parent) && $this->getAdditivity()) {
-			$this->parent->callAppenders($event);
-		}
-	}
-	
-	/**
-	 * Returns the appenders linked to this logger as an array.
-	 * @return array collection of appender names
-	 */
-	public function getAllAppenders() {
-		return $this->appenders;
-	}
-	
-	/**
-	 * Returns a linked appender by name.
-	 * @return Payone_Log4php_LoggerAppender
-	 */
-	public function getAppender($name) {
-		return $this->appenders[$name];
-	}
+        // Forward the event upstream if additivity is turned on
+        if(isset($this->parent) && $this->getAdditivity()) {
+            $this->parent->callAppenders($event);
+        }
+    }
+	
+    /**
+     * Returns the appenders linked to this logger as an array.
+     * @return array collection of appender names
+     */
+    public function getAllAppenders() {
+        return $this->appenders;
+    }
+	
+    /**
+     * Returns a linked appender by name.
+     * @return Payone_Log4php_LoggerAppender
+     */
+    public function getAppender($name) {
+        return $this->appenders[$name];
+    }
 
-	/**
-	 * Sets the additivity flag.
-	 * @param boolean $additive
-	 */
-	public function setAdditivity($additive) {
-		$this->additive = (bool)$additive;
-	}
-	
-	/**
-	 * Returns the additivity flag.
-	 * @return boolean
-	 */
-	public function getAdditivity() {
-		return $this->additive;
-	}
+    /**
+     * Sets the additivity flag.
+     * @param boolean $additive
+     */
+    public function setAdditivity($additive) {
+        $this->additive = (bool)$additive;
+    }
+	
+    /**
+     * Returns the additivity flag.
+     * @return boolean
+     */
+    public function getAdditivity() {
+        return $this->additive;
+    }
  
-	/**
-	 * Starting from this Logger, search the Logger hierarchy for a non-null level and return it.
-	 * @see LoggerLevel
-	 * @return Payone_Log4php_LoggerLevel or null
-	 */
-	public function getEffectiveLevel() {
-		for($logger = $this; $logger !== null; $logger = $logger->getParent()) {
-			if($logger->getLevel() !== null) {
-				return $logger->getLevel();
-			}
-		}
-	}
+    /**
+     * Starting from this Logger, search the Logger hierarchy for a non-null level and return it.
+     * @see LoggerLevel
+     * @return Payone_Log4php_LoggerLevel or null
+     */
+    public function getEffectiveLevel() {
+        for($logger = $this; $logger !== null; $logger = $logger->getParent()) {
+            if($logger->getLevel() !== null) {
+                return $logger->getLevel();
+            }
+        }
+    }
   
-	/**
-	 * Get the assigned Logger level.
-	 * @return Payone_Log4php_LoggerLevel The assigned level or null if none is assigned.
-	 */
-	public function getLevel() {
-		return $this->level;
-	}
-	
-	/**
-	 * Set the Logger level.
-	 *
-	 * @param Payone_Log4php_LoggerLevel $level the level to set
-	 */
-	public function setLevel($level) {
-		$this->level = $level;
-	}
-	
-	/**
-	 * Checks whether an appender is attached to this logger instance.
-	 *
-	 * @param Payone_Log4php_LoggerAppender $appender
-	 * @return boolean
-	 */
-	public function isAttached(Payone_Log4php_LoggerAppender $appender) {
-		return isset($this->appenders[$appender->getName()]);
-	} 
+    /**
+     * Get the assigned Logger level.
+     * @return Payone_Log4php_LoggerLevel The assigned level or null if none is assigned.
+     */
+    public function getLevel() {
+        return $this->level;
+    }
+	
+    /**
+     * Set the Logger level.
+     *
+     * @param Payone_Log4php_LoggerLevel $level the level to set
+     */
+    public function setLevel($level) {
+        $this->level = $level;
+    }
+	
+    /**
+     * Checks whether an appender is attached to this logger instance.
+     *
+     * @param Payone_Log4php_LoggerAppender $appender
+     * @return boolean
+     */
+    public function isAttached(Payone_Log4php_LoggerAppender $appender) {
+        return isset($this->appenders[$appender->getName()]);
+    } 
 		   
 
-	/**
-	 * Sets the parent logger.
-	 * @param Logger $logger
-	 */
-	public function setParent(Payone_Log4php_Logger $logger) {
-		$this->parent = $logger;
-	} 
-	
-	// ******************************************
-	// *** Static methods and properties      ***
-	// ******************************************
-	
-	/** The logger hierarchy used by log4php. */
-	private static $hierarchy;
-	
-	/** Inidicates if log4php has been initialized */
-	private static $initialized = false;
-	
-	/**
-	 * Returns the hierarchy used by this Logger.
-	 *
-	 * Caution: do not use this hierarchy unless you have called initialize().
-	 * To get Loggers, use the Logger::getLogger and Logger::getRootLogger
-	 * methods instead of operating on on the hierarchy directly.
-	 *
-	 * @return Payone_Log4php_LoggerHierarchy
-	 */
-	public static function getHierarchy() {
-		if(!isset(self::$hierarchy)) {
-			self::$hierarchy = new Payone_Log4php_LoggerHierarchy(new Payone_Log4php_LoggerRoot());
-		}
-		return self::$hierarchy;
-	}
-	
-	/**
-	 * Returns a Logger by name. If it does not exist, it will be created.
-	 *
-	 * @param string $name The logger name
-	 * @return Logger
-	 */
-	public static function getLogger($name) {
-		if(!self::isInitialized()) {
-			self::configure();
-		}
-		return self::getHierarchy()->getLogger($name);
-	}
-	
-	/**
-	 * Returns the Root Logger.
-	 * @return Payone_Log4php_LoggerRoot
-	 */
-	public static function getRootLogger() {
-		if(!self::isInitialized()) {
-			self::configure();
-		}
-		return self::getHierarchy()->getRootLogger();
-	}
-	
-	/**
-	 * Clears all Logger definitions from the logger hierarchy.
-	 * @return boolean
-	 */
-	public static function clear() {
-		return self::getHierarchy()->clear();
-	}
-	
-	/**
-	 * Destroy configurations for logger definitions
-	 */
-	public static function resetConfiguration() {
-		self::getHierarchy()->resetConfiguration();
-		self::getHierarchy()->clear(); // TODO: clear or not?
-		self::$initialized = false;
-	}
-	
-	/**
-	 * Safely close all appenders.
-	 * @deprecated This is no longer necessary due the appenders shutdown via
-	 * destructors.
-	 */
-	public static function shutdown() {
-		return self::getHierarchy()->shutdown();
-	}
-	
-	/**
-	 * check if a given logger exists.
-	 *
-	 * @param string $name logger name
-	 * @return boolean
-	 */
-	public static function exists($name) {
-		return self::getHierarchy()->exists($name);
-	}
-	
-	/**
-	 * Returns an array this whole Logger instances.
-	 * @see Logger
-	 * @return array
-	 */
-	public static function getCurrentLoggers() {
-		return self::getHierarchy()->getCurrentLoggers();
-	}
-	
-	/**
-	 * Configures log4php.
-	 * 
-	 * This method needs to be called before the first logging event has 
-	 * occured. If this method is not called before then the default
-	 * configuration will be used.
-	 *
-	 * @param string|array $configuration Either a path to the configuration
-	 *   file, or a configuration array.
-	 *   
-	 * @param string|LoggerConfigurator $configurator A custom 
-	 * configurator class: either a class name (string), or an object which 
-	 * implements the LoggerConfigurator interface. If left empty, the default
-	 * configurator implementation will be used. 
-	 */
-	public static function configure($configuration = null, $configurator = null) {
-		self::resetConfiguration();
-		$configurator = self::getConfigurator($configurator);
-		$configurator->configure(self::getHierarchy(), $configuration);
-		self::$initialized = true;
-	}
-	
-	/**
-	 * Creates a logger configurator instance based on the provided 
-	 * configurator class. If no class is given, returns an instance of
-	 * the default configurator.
-	 * 
-	 * @param string|LoggerConfigurator $configurator The configurator class 
-	 * or LoggerConfigurator instance.
-	 */
-	private static function getConfigurator($configurator = null) {
-		if ($configurator === null) {
-			return new Payone_Log4php_LoggerConfiguratorDefault();
-		}
+    /**
+     * Sets the parent logger.
+     * @param Logger $logger
+     */
+    public function setParent(Payone_Log4php_Logger $logger) {
+        $this->parent = $logger;
+    } 
+	
+    // ******************************************
+    // *** Static methods and properties      ***
+    // ******************************************
+	
+    /** The logger hierarchy used by log4php. */
+    private static $hierarchy;
+	
+    /** Inidicates if log4php has been initialized */
+    private static $initialized = false;
+	
+    /**
+     * Returns the hierarchy used by this Logger.
+     *
+     * Caution: do not use this hierarchy unless you have called initialize().
+     * To get Loggers, use the Logger::getLogger and Logger::getRootLogger
+     * methods instead of operating on on the hierarchy directly.
+     *
+     * @return Payone_Log4php_LoggerHierarchy
+     */
+    public static function getHierarchy() {
+        if(!isset(self::$hierarchy)) {
+            self::$hierarchy = new Payone_Log4php_LoggerHierarchy(new Payone_Log4php_LoggerRoot());
+        }
+        return self::$hierarchy;
+    }
+	
+    /**
+     * Returns a Logger by name. If it does not exist, it will be created.
+     *
+     * @param string $name The logger name
+     * @return Logger
+     */
+    public static function getLogger($name) {
+        if(!self::isInitialized()) {
+            self::configure();
+        }
+        return self::getHierarchy()->getLogger($name);
+    }
+	
+    /**
+     * Returns the Root Logger.
+     * @return Payone_Log4php_LoggerRoot
+     */
+    public static function getRootLogger() {
+        if(!self::isInitialized()) {
+            self::configure();
+        }
+        return self::getHierarchy()->getRootLogger();
+    }
+	
+    /**
+     * Clears all Logger definitions from the logger hierarchy.
+     * @return boolean
+     */
+    public static function clear() {
+        return self::getHierarchy()->clear();
+    }
+	
+    /**
+     * Destroy configurations for logger definitions
+     */
+    public static function resetConfiguration() {
+        self::getHierarchy()->resetConfiguration();
+        self::getHierarchy()->clear(); // TODO: clear or not?
+        self::$initialized = false;
+    }
+	
+    /**
+     * Safely close all appenders.
+     * @deprecated This is no longer necessary due the appenders shutdown via
+     * destructors.
+     */
+    public static function shutdown() {
+        return self::getHierarchy()->shutdown();
+    }
+	
+    /**
+     * check if a given logger exists.
+     *
+     * @param string $name logger name
+     * @return boolean
+     */
+    public static function exists($name) {
+        return self::getHierarchy()->exists($name);
+    }
+	
+    /**
+     * Returns an array this whole Logger instances.
+     * @see Logger
+     * @return array
+     */
+    public static function getCurrentLoggers() {
+        return self::getHierarchy()->getCurrentLoggers();
+    }
+	
+    /**
+     * Configures log4php.
+     * 
+     * This method needs to be called before the first logging event has 
+     * occured. If this method is not called before then the default
+     * configuration will be used.
+     *
+     * @param string|array $configuration Either a path to the configuration
+     *   file, or a configuration array.
+     *   
+     * @param string|LoggerConfigurator $configurator A custom 
+     * configurator class: either a class name (string), or an object which 
+     * implements the LoggerConfigurator interface. If left empty, the default
+     * configurator implementation will be used. 
+     */
+    public static function configure($configuration = null, $configurator = null) {
+        self::resetConfiguration();
+        $configurator = self::getConfigurator($configurator);
+        $configurator->configure(self::getHierarchy(), $configuration);
+        self::$initialized = true;
+    }
+	
+    /**
+     * Creates a logger configurator instance based on the provided 
+     * configurator class. If no class is given, returns an instance of
+     * the default configurator.
+     * 
+     * @param string|LoggerConfigurator $configurator The configurator class 
+     * or LoggerConfigurator instance.
+     */
+    private static function getConfigurator($configurator = null) {
+        if ($configurator === null) {
+            return new Payone_Log4php_LoggerConfiguratorDefault();
+        }
 		
-		if (is_object($configurator)) {
-			if ($configurator instanceof Payone_Log4php_LoggerConfigurator) {
-				return $configurator;
-			} else {
-				trigger_error("log4php: Given configurator object [$configurator] does not implement the LoggerConfigurator interface. Reverting to default configurator.", E_USER_WARNING);
-				return new Payone_Log4php_LoggerConfiguratorDefault();
-			}
-		}
+        if (is_object($configurator)) {
+            if ($configurator instanceof Payone_Log4php_LoggerConfigurator) {
+                return $configurator;
+            } else {
+                trigger_error("log4php: Given configurator object [$configurator] does not implement the LoggerConfigurator interface. Reverting to default configurator.", E_USER_WARNING);
+                return new Payone_Log4php_LoggerConfiguratorDefault();
+            }
+        }
 		
-		if (is_string($configurator)) {
-			if (!class_exists($configurator)) {
-				trigger_error("log4php: Specified configurator class [$configurator] does not exist. Reverting to default configurator.", E_USER_WARNING);
-				return new Payone_Log4php_LoggerConfiguratorDefault();
-			}
+        if (is_string($configurator)) {
+            if (!class_exists($configurator)) {
+                trigger_error("log4php: Specified configurator class [$configurator] does not exist. Reverting to default configurator.", E_USER_WARNING);
+                return new Payone_Log4php_LoggerConfiguratorDefault();
+            }
 			
-			$instance = new $configurator();
+            $instance = new $configurator();
 				
-			if (!($instance instanceof Payone_Log4php_LoggerConfigurator)) {
-				trigger_error("log4php: Specified configurator class [$configurator] does not implement the LoggerConfigurator interface. Reverting to default configurator.", E_USER_WARNING);
-				return new Payone_Log4php_LoggerConfiguratorDefault();
-			}
+            if (!($instance instanceof Payone_Log4php_LoggerConfigurator)) {
+                trigger_error("log4php: Specified configurator class [$configurator] does not implement the LoggerConfigurator interface. Reverting to default configurator.", E_USER_WARNING);
+                return new Payone_Log4php_LoggerConfiguratorDefault();
+            }
 			
-			return $instance;
-		}
+            return $instance;
+        }
 		
-		trigger_error("log4php: Invalid configurator specified. Expected either a string or a LoggerConfigurator instance. Reverting to default configurator.", E_USER_WARNING);
-		return new Payone_Log4php_LoggerConfiguratorDefault();
-	}
-	
-	/**
-	 * Returns true if the log4php framework has been initialized.
-	 * @return boolean 
-	 */
-	private static function isInitialized() {
-		return self::$initialized;
-	}
+        trigger_error("log4php: Invalid configurator specified. Expected either a string or a LoggerConfigurator instance. Reverting to default configurator.", E_USER_WARNING);
+        return new Payone_Log4php_LoggerConfiguratorDefault();
+    }
+	
+    /**
+     * Returns true if the log4php framework has been initialized.
+     * @return boolean 
+     */
+    private static function isInitialized() {
+        return self::$initialized;
+    }
 	
 }

lib/Payone/Log4php/LoggerConfigurationAdapterXML.php

Doc Comments +5 added lines

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

Indentation +174 added lines, -174 removed lines

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

lib/Payone/Log4php/LoggerConfiguratorDefault.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +382 added lines, -382 removed lines

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