fjbender / magento-1

lib/Payone/Log4php/LoggerPatternConverterServer.php

Indentation +1 added lines, -1 removed lines

@@ -29,5 +29,5 @@
  * @subpackage pattern
  */
 class Payone_Log4php_LoggerPatternConverterServer extends Payone_Log4php_LoggerPatternConverterSuperglobal {
-	protected $name = '_SERVER';
+    protected $name = '_SERVER';
 }

lib/Payone/Log4php/LoggerPatternConverterSessionID.php

Indentation +3 added lines, -3 removed lines

@@ -25,7 +25,7 @@
  * @subpackage pattern
  */
 class Payone_Log4php_LoggerPatternConverterSessionID extends Payone_Log4php_LoggerPatternConverter {
-	public function convert(Payone_Log4php_LoggerLoggingEvent $event) {
-		return session_id();
-	}
+    public function convert(Payone_Log4php_LoggerLoggingEvent $event) {
+        return session_id();
+    }
 }

lib/Payone/Log4php/LoggerOptionConverter.php

Indentation +378 added lines, -378 removed lines

@@ -28,424 +28,424 @@
  */
 class Payone_Log4php_LoggerOptionConverter {
 
-	const DELIM_START = '${';
-	const DELIM_STOP = '}';
-	const DELIM_START_LEN = 2;
-	const DELIM_STOP_LEN = 1;
+    const DELIM_START = '${';
+    const DELIM_STOP = '}';
+    const DELIM_START_LEN = 2;
+    const DELIM_STOP_LEN = 1;
 	
-	/** String values which are converted to boolean TRUE. */
-	private static $trueValues = array('1', 'true', 'yes', 'on');
+    /** String values which are converted to boolean TRUE. */
+    private static $trueValues = array('1', 'true', 'yes', 'on');
 	
-	/** 
-	 * String values which are converted to boolean FALSE.
-	 * 
-	 * Note that an empty string must convert to false, because 
-	 * parse_ini_file() which is used for parsing configuration 
-	 * converts the value _false_ to an empty string.
-	 */
-	private static $falseValues = array('0', 'false', 'no', 'off', '');
+    /** 
+     * String values which are converted to boolean FALSE.
+     * 
+     * Note that an empty string must convert to false, because 
+     * parse_ini_file() which is used for parsing configuration 
+     * converts the value _false_ to an empty string.
+     */
+    private static $falseValues = array('0', 'false', 'no', 'off', '');
 	
-	/**
-	 * Read a predefined var.
-	 *
-	 * It returns a value referenced by <var>$key</var> using this search criteria:
-	 * - if <var>$key</var> is a constant then return it. Else
-	 * - if <var>$key</var> is set in <var>$_ENV</var> then return it. Else
-	 * - return <var>$def</var>. 
-	 *
-	 * @param string $key The key to search for.
-	 * @param string $def The default value to return.
-	 * @return string	the string value of the system property, or the default
-	 *					value if there is no property with that key.
-	 */
-	public static function getSystemProperty($key, $def) {
-		if(defined($key)) {
-			return (string)constant($key);
-		} else if(isset($_SERVER[$key])) {
-			return (string)$_SERVER[$key];
-		} else if(isset($_ENV[$key])) {
-			return (string)$_ENV[$key];
-		} else {
-			return $def;
-		}
-	}
+    /**
+     * Read a predefined var.
+     *
+     * It returns a value referenced by <var>$key</var> using this search criteria:
+     * - if <var>$key</var> is a constant then return it. Else
+     * - if <var>$key</var> is set in <var>$_ENV</var> then return it. Else
+     * - return <var>$def</var>. 
+     *
+     * @param string $key The key to search for.
+     * @param string $def The default value to return.
+     * @return string	the string value of the system property, or the default
+     *					value if there is no property with that key.
+     */
+    public static function getSystemProperty($key, $def) {
+        if(defined($key)) {
+            return (string)constant($key);
+        } else if(isset($_SERVER[$key])) {
+            return (string)$_SERVER[$key];
+        } else if(isset($_ENV[$key])) {
+            return (string)$_ENV[$key];
+        } else {
+            return $def;
+        }
+    }
 
-	/**
-	 * If <var>$value</var> is <i>true</i>, then <i>true</i> is
-	 * returned. If <var>$value</var> is <i>false</i>, then
-	 * <i>true</i> is returned. Otherwise, <var>$default</var> is
-	 * returned.
-	 *
-	 * <p>Case of value is unimportant.</p>
-	 *
-	 * @param string $value
-	 * @param boolean $default
-	 * @return boolean
-	 */
-	public static function toBoolean($value, $default=true) {
-		if (is_null($value)) {
-			return $default;
-		} elseif (is_string($value)) {
-			$trimmedVal = strtolower(trim($value));
-			if("1" == $trimmedVal or "true" == $trimmedVal or "yes" == $trimmedVal or "on" == $trimmedVal) {
-				return true;
-			} else if ("" == $trimmedVal or "0" == $trimmedVal or "false" == $trimmedVal or "no" == $trimmedVal or "off" == $trimmedVal) {
-				return false;
-			}
-		} elseif (is_bool($value)) {
-			return $value;
-		} elseif (is_int($value)) {
-			return !($value == 0); // true is everything but 0 like in C 
-		}
+    /**
+     * If <var>$value</var> is <i>true</i>, then <i>true</i> is
+     * returned. If <var>$value</var> is <i>false</i>, then
+     * <i>true</i> is returned. Otherwise, <var>$default</var> is
+     * returned.
+     *
+     * <p>Case of value is unimportant.</p>
+     *
+     * @param string $value
+     * @param boolean $default
+     * @return boolean
+     */
+    public static function toBoolean($value, $default=true) {
+        if (is_null($value)) {
+            return $default;
+        } elseif (is_string($value)) {
+            $trimmedVal = strtolower(trim($value));
+            if("1" == $trimmedVal or "true" == $trimmedVal or "yes" == $trimmedVal or "on" == $trimmedVal) {
+                return true;
+            } else if ("" == $trimmedVal or "0" == $trimmedVal or "false" == $trimmedVal or "no" == $trimmedVal or "off" == $trimmedVal) {
+                return false;
+            }
+        } elseif (is_bool($value)) {
+            return $value;
+        } elseif (is_int($value)) {
+            return !($value == 0); // true is everything but 0 like in C 
+        }
 		
-		return $default;
-	}
+        return $default;
+    }
 
-	/** Converts $value to boolean, or throws an exception if not possible. */
-	public static function toBooleanEx($value) {
-		if (isset($value)) {
-			if (is_bool($value)) {
-				return $value;
-			}
-			$value = strtolower(trim($value));
-			if (in_array($value, self::$trueValues)) {
-				return true;
-			}
-			if (in_array($value, self::$falseValues)) {
-				return false;
-			}
-		}
+    /** Converts $value to boolean, or throws an exception if not possible. */
+    public static function toBooleanEx($value) {
+        if (isset($value)) {
+            if (is_bool($value)) {
+                return $value;
+            }
+            $value = strtolower(trim($value));
+            if (in_array($value, self::$trueValues)) {
+                return true;
+            }
+            if (in_array($value, self::$falseValues)) {
+                return false;
+            }
+        }
 		
-		throw new Payone_Log4php_LoggerException("Given value [" . var_export($value, true) . "] cannot be converted to boolean.");
-	}
+        throw new Payone_Log4php_LoggerException("Given value [" . var_export($value, true) . "] cannot be converted to boolean.");
+    }
 	
-	/**
-	 * @param string $value
-	 * @param integer $default
-	 * @return integer
-	 */
-	public static function toInt($value, $default) {
-		$value = trim($value);
-		if(is_numeric($value)) {
-			return (int)$value;
-		} else {
-			return $default;
-		}
-	}
+    /**
+     * @param string $value
+     * @param integer $default
+     * @return integer
+     */
+    public static function toInt($value, $default) {
+        $value = trim($value);
+        if(is_numeric($value)) {
+            return (int)$value;
+        } else {
+            return $default;
+        }
+    }
 	
 	
-	/** 
-	 * Converts $value to integer, or throws an exception if not possible. 
-	 * Floats cannot be converted to integer.
-	 */
-	public static function toIntegerEx($value) {
-		if (is_integer($value)) {
-			return $value;
-		}
-		if (is_numeric($value) && ($value == (integer) $value)) {
-			return (integer) $value;
-		}
+    /** 
+     * Converts $value to integer, or throws an exception if not possible. 
+     * Floats cannot be converted to integer.
+     */
+    public static function toIntegerEx($value) {
+        if (is_integer($value)) {
+            return $value;
+        }
+        if (is_numeric($value) && ($value == (integer) $value)) {
+            return (integer) $value;
+        }
 	
-		throw new Payone_Log4php_LoggerException("Given value [" . var_export($value, true) . "] cannot be converted to integer.");
-	}
+        throw new Payone_Log4php_LoggerException("Given value [" . var_export($value, true) . "] cannot be converted to integer.");
+    }
 	
-	/**
-	 * Converts $value to integer, or throws an exception if not possible.
-	 * Floats cannot be converted to integer.
-	 */
-	public static function toPositiveIntegerEx($value) {
-		if (is_integer($value) && $value > 0) {
-			return $value;
-		}
-		if (is_numeric($value) && ($value == (integer) $value) && $value > 0) {
-			return (integer) $value;
-		}
+    /**
+     * Converts $value to integer, or throws an exception if not possible.
+     * Floats cannot be converted to integer.
+     */
+    public static function toPositiveIntegerEx($value) {
+        if (is_integer($value) && $value > 0) {
+            return $value;
+        }
+        if (is_numeric($value) && ($value == (integer) $value) && $value > 0) {
+            return (integer) $value;
+        }
 	
-		throw new Payone_Log4php_LoggerException("Given value [" . var_export($value, true) . "] cannot be converted to a positive integer.");
-	}
+        throw new Payone_Log4php_LoggerException("Given value [" . var_export($value, true) . "] cannot be converted to a positive integer.");
+    }
 
-	/**
-	 * Converts a standard or custom priority level to a Level
-	 * object.
-	 *
-	 * <p> If <var>$value</var> is of form "<b>level#full_file_classname</b>",
-	 * where <i>full_file_classname</i> means the class filename with path
-	 * but without php extension, then the specified class' <i>toLevel()</i> method
-	 * is called to process the specified level string; if no '#'
-	 * character is present, then the default {@link LoggerLevel}
-	 * class is used to process the level value.</p>
-	 *
-	 * <p>As a special case, if the <var>$value</var> parameter is
-	 * equal to the string "NULL", then the value <i>null</i> will
-	 * be returned.</p>
-	 *
-	 * <p>If any error occurs while converting the value to a level,
-	 * the <var>$defaultValue</var> parameter, which may be
-	 * <i>null</i>, is returned.</p>
-	 *
-	 * <p>Case of <var>$value</var> is insignificant for the level level, but is
-	 * significant for the class name part, if present.</p>
-	 *
-	 * @param string $value
-	 * @param Payone_Log4php_LoggerLevel $defaultValue
-	 * @return Payone_Log4php_LoggerLevel a {@link LoggerLevel} or null
-	 */
-	public static function toLevel($value, $defaultValue) {
-		if($value === null) {
-			return $defaultValue;
-		}
-		$hashIndex = strpos($value, '#');
-		if($hashIndex === false) {
-			if("NULL" == strtoupper($value)) {
-				return null;
-			} else {
-				// no class name specified : use standard Level class
-				return Payone_Log4php_LoggerLevel::toLevel($value, $defaultValue);
-			}
-		}
+    /**
+     * Converts a standard or custom priority level to a Level
+     * object.
+     *
+     * <p> If <var>$value</var> is of form "<b>level#full_file_classname</b>",
+     * where <i>full_file_classname</i> means the class filename with path
+     * but without php extension, then the specified class' <i>toLevel()</i> method
+     * is called to process the specified level string; if no '#'
+     * character is present, then the default {@link LoggerLevel}
+     * class is used to process the level value.</p>
+     *
+     * <p>As a special case, if the <var>$value</var> parameter is
+     * equal to the string "NULL", then the value <i>null</i> will
+     * be returned.</p>
+     *
+     * <p>If any error occurs while converting the value to a level,
+     * the <var>$defaultValue</var> parameter, which may be
+     * <i>null</i>, is returned.</p>
+     *
+     * <p>Case of <var>$value</var> is insignificant for the level level, but is
+     * significant for the class name part, if present.</p>
+     *
+     * @param string $value
+     * @param Payone_Log4php_LoggerLevel $defaultValue
+     * @return Payone_Log4php_LoggerLevel a {@link LoggerLevel} or null
+     */
+    public static function toLevel($value, $defaultValue) {
+        if($value === null) {
+            return $defaultValue;
+        }
+        $hashIndex = strpos($value, '#');
+        if($hashIndex === false) {
+            if("NULL" == strtoupper($value)) {
+                return null;
+            } else {
+                // no class name specified : use standard Level class
+                return Payone_Log4php_LoggerLevel::toLevel($value, $defaultValue);
+            }
+        }
 
-		$result = $defaultValue;
+        $result = $defaultValue;
 
-		$clazz = substr($value, ($hashIndex + 1));
-		$levelName = substr($value, 0, $hashIndex);
+        $clazz = substr($value, ($hashIndex + 1));
+        $levelName = substr($value, 0, $hashIndex);
 
-		// This is degenerate case but you never know.
-		if("NULL" == strtoupper($levelName)) {
-			return null;
-		}
+        // This is degenerate case but you never know.
+        if("NULL" == strtoupper($levelName)) {
+            return null;
+        }
 
-		$clazz = basename($clazz);
+        $clazz = basename($clazz);
 
-		if(class_exists($clazz)) {
-			$result = @call_user_func(array($clazz, 'toLevel'), $levelName, $defaultValue);
-			if(!$result instanceof Payone_Log4php_LoggerLevel) {
-				$result = $defaultValue;
-			}
-		} 
-		return $result;
-	}
+        if(class_exists($clazz)) {
+            $result = @call_user_func(array($clazz, 'toLevel'), $levelName, $defaultValue);
+            if(!$result instanceof Payone_Log4php_LoggerLevel) {
+                $result = $defaultValue;
+            }
+        } 
+        return $result;
+    }
 	
 	
-	/** Converts the value to a level. Throws an exception if not possible. */
-	public static function toLevelEx($value) {
-		if ($value instanceof Payone_Log4php_LoggerLevel) {
-			return $value;
-		}
-		$level = Payone_Log4php_LoggerLevel::toLevel($value);
-		if ($level === null) {
-			throw new Payone_Log4php_LoggerException("Given value [" . var_export($value, true) . "] cannot be converted to a logger level.");
-		}
-		return $level;
-	}
+    /** Converts the value to a level. Throws an exception if not possible. */
+    public static function toLevelEx($value) {
+        if ($value instanceof Payone_Log4php_LoggerLevel) {
+            return $value;
+        }
+        $level = Payone_Log4php_LoggerLevel::toLevel($value);
+        if ($level === null) {
+            throw new Payone_Log4php_LoggerException("Given value [" . var_export($value, true) . "] cannot be converted to a logger level.");
+        }
+        return $level;
+    }
 
-	/**
-	 * @param string $value
-	 * @param float $default
-	 * @return float
-	 */
-	public static function toFileSize($value, $default) {
-		if($value === null) {
-			return $default;
-		}
+    /**
+     * @param string $value
+     * @param float $default
+     * @return float
+     */
+    public static function toFileSize($value, $default) {
+        if($value === null) {
+            return $default;
+        }
 
-		$s = strtoupper(trim($value));
-		$multiplier = (float)1;
-		if(($index = strpos($s, 'KB')) !== false) {
-			$multiplier = 1024;
-			$s = substr($s, 0, $index);
-		} else if(($index = strpos($s, 'MB')) !== false) {
-			$multiplier = 1024 * 1024;
-			$s = substr($s, 0, $index);
-		} else if(($index = strpos($s, 'GB')) !== false) {
-			$multiplier = 1024 * 1024 * 1024;
-			$s = substr($s, 0, $index);
-		}
-		if(is_numeric($s)) {
-			return (float)$s * $multiplier;
-		} 
-		return $default;
-	}
+        $s = strtoupper(trim($value));
+        $multiplier = (float)1;
+        if(($index = strpos($s, 'KB')) !== false) {
+            $multiplier = 1024;
+            $s = substr($s, 0, $index);
+        } else if(($index = strpos($s, 'MB')) !== false) {
+            $multiplier = 1024 * 1024;
+            $s = substr($s, 0, $index);
+        } else if(($index = strpos($s, 'GB')) !== false) {
+            $multiplier = 1024 * 1024 * 1024;
+            $s = substr($s, 0, $index);
+        }
+        if(is_numeric($s)) {
+            return (float)$s * $multiplier;
+        } 
+        return $default;
+    }
 	
 
-	/**
-	 * Converts a value to a valid file size (integer).
-	 * 
-	 * Supports 'KB', 'MB' and 'GB' suffixes, where KB = 1024 B etc. 
-	 *
-	 * The final value will be rounded to the nearest integer.
-	 *
-	 * Examples:
-	 * - '100' => 100
-	 * - '100.12' => 100
-	 * - '100KB' => 102400
-	 * - '1.5MB' => 1572864
-	 * 
-	 * @param mixed $value File size (optionally with suffix).
-	 * @return integer Parsed file size.
-	 */
-	public static function toFileSizeEx($value) {
+    /**
+     * Converts a value to a valid file size (integer).
+     * 
+     * Supports 'KB', 'MB' and 'GB' suffixes, where KB = 1024 B etc. 
+     *
+     * The final value will be rounded to the nearest integer.
+     *
+     * Examples:
+     * - '100' => 100
+     * - '100.12' => 100
+     * - '100KB' => 102400
+     * - '1.5MB' => 1572864
+     * 
+     * @param mixed $value File size (optionally with suffix).
+     * @return integer Parsed file size.
+     */
+    public static function toFileSizeEx($value) {
 		
-		if (empty($value)) {
-			throw new Payone_Log4php_LoggerException("Empty value cannot be converted to a file size.");
-		}
+        if (empty($value)) {
+            throw new Payone_Log4php_LoggerException("Empty value cannot be converted to a file size.");
+        }
 		
-		if (is_numeric($value)) {
-			return (integer) $value;
-		}
+        if (is_numeric($value)) {
+            return (integer) $value;
+        }
 		
-		if (!is_string($value)) {
-			throw new Payone_Log4php_LoggerException("Given value [" . var_export($value, true) . "] cannot be converted to a file size.");
-		}
+        if (!is_string($value)) {
+            throw new Payone_Log4php_LoggerException("Given value [" . var_export($value, true) . "] cannot be converted to a file size.");
+        }
 		
-		$str = strtoupper(trim($value));
-		$count = preg_match('/^([0-9.]+)(KB|MB|GB)?$/', $str, $matches);
+        $str = strtoupper(trim($value));
+        $count = preg_match('/^([0-9.]+)(KB|MB|GB)?$/', $str, $matches);
 		
-		if ($count > 0) {
-			$size = $matches[1];
-			$unit = $matches[2];
+        if ($count > 0) {
+            $size = $matches[1];
+            $unit = $matches[2];
 			
-			switch($unit) {
-				case 'KB': $size *= pow(1024, 1); break;
-				case 'MB': $size *= pow(1024, 2); break;
-				case 'GB': $size *= pow(1024, 3); break;
-			}
+            switch($unit) {
+                case 'KB': $size *= pow(1024, 1); break;
+                case 'MB': $size *= pow(1024, 2); break;
+                case 'GB': $size *= pow(1024, 3); break;
+            }
 			
-			return (integer) $size;
-		}
+            return (integer) $size;
+        }
 		
-		throw new Payone_Log4php_LoggerException("Given value [$value] cannot be converted to a file size.");
-	}
+        throw new Payone_Log4php_LoggerException("Given value [$value] cannot be converted to a file size.");
+    }
 
-	/** 
-	 * Converts a value to string, or throws an exception if not possible. 
-	 * 
-	 * Objects can be converted to string if they implement the magic 
-	 * __toString() method.
-	 * 
-	 */
-	public static function toStringEx($value) {
-		if (is_string($value)) {
-			return $value;
-		}
-		if (is_numeric($value)) {
-			return (string) $value;
-		}
-		if (is_object($value) && method_exists($value, '__toString')) {
-			return (string) $value;
-		}
+    /** 
+     * Converts a value to string, or throws an exception if not possible. 
+     * 
+     * Objects can be converted to string if they implement the magic 
+     * __toString() method.
+     * 
+     */
+    public static function toStringEx($value) {
+        if (is_string($value)) {
+            return $value;
+        }
+        if (is_numeric($value)) {
+            return (string) $value;
+        }
+        if (is_object($value) && method_exists($value, '__toString')) {
+            return (string) $value;
+        }
 	
-		throw new Payone_Log4php_LoggerException("Given value [" . var_export($value, true) . "] cannot be converted to string.");
-	}
+        throw new Payone_Log4php_LoggerException("Given value [" . var_export($value, true) . "] cannot be converted to string.");
+    }
 	
 	
-	/**
-	 * Find the value corresponding to <var>$key</var> in
-	 * <var>$props</var>. Then perform variable substitution on the
-	 * found value.
-	 *
-	 * @param string $key
-	 * @param array $props
-	 * @return string
-	 */
-	public static function findAndSubst($key, $props) {
-		$value = @$props[$key];
+    /**
+     * Find the value corresponding to <var>$key</var> in
+     * <var>$props</var>. Then perform variable substitution on the
+     * found value.
+     *
+     * @param string $key
+     * @param array $props
+     * @return string
+     */
+    public static function findAndSubst($key, $props) {
+        $value = @$props[$key];
 
-		// If coming from the LoggerConfiguratorIni, some options were
-		// already mangled by parse_ini_file:
-		//
-		// not specified      => never reaches this code
-		// ""|off|false|null  => string(0) ""
-		// "1"|on|true        => string(1) "1"
-		// "true"             => string(4) "true"
-		// "false"            => string(5) "false"
-		// 
-		// As the integer 1 and the boolean true are therefore indistinguable
-		// it's up to the setter how to deal with it, they can not be cast
-		// into a boolean here. {@see toBoolean}
-		// Even an empty value has to be given to the setter as it has been
-		// explicitly set by the user and is different from an option which
-		// has not been specified and therefore keeps its default value.
-		//
-		// if(!empty($value)) {
-			return Payone_Log4php_LoggerOptionConverter::substVars($value, $props);
-		// }
-	}
+        // If coming from the LoggerConfiguratorIni, some options were
+        // already mangled by parse_ini_file:
+        //
+        // not specified      => never reaches this code
+        // ""|off|false|null  => string(0) ""
+        // "1"|on|true        => string(1) "1"
+        // "true"             => string(4) "true"
+        // "false"            => string(5) "false"
+        // 
+        // As the integer 1 and the boolean true are therefore indistinguable
+        // it's up to the setter how to deal with it, they can not be cast
+        // into a boolean here. {@see toBoolean}
+        // Even an empty value has to be given to the setter as it has been
+        // explicitly set by the user and is different from an option which
+        // has not been specified and therefore keeps its default value.
+        //
+        // if(!empty($value)) {
+            return Payone_Log4php_LoggerOptionConverter::substVars($value, $props);
+        // }
+    }
 
-	/**
-	 * Perform variable substitution in string <var>$val</var> from the
-	 * values of keys found with the {@link getSystemProperty()} method.
-	 * 
-	 * <p>The variable substitution delimeters are <b>${</b> and <b>}</b>.
-	 * 
-	 * <p>For example, if the "MY_CONSTANT" contains "value", then
-	 * the call
-	 * <code>
-	 * $s = LoggerOptionConverter::substVars("Value of key is ${MY_CONSTANT}.");
-	 * </code>
-	 * will set the variable <i>$s</i> to "Value of key is value.".</p>
-	 * 
-	 * <p>If no value could be found for the specified key, then the
-	 * <var>$props</var> parameter is searched, if the value could not
-	 * be found there, then substitution defaults to the empty string.</p>
-	 * 
-	 * <p>For example, if {@link getSystemProperty()} cannot find any value for the key
-	 * "inexistentKey", then the call
-	 * <code>
-	 * $s = LoggerOptionConverter::substVars("Value of inexistentKey is [${inexistentKey}]");
-	 * </code>
-	 * will set <var>$s</var> to "Value of inexistentKey is []".</p>
-	 * 
-	 * <p>A warn is thrown if <var>$val</var> contains a start delimeter "${" 
-	 * which is not balanced by a stop delimeter "}" and an empty string is returned.</p>
-	 * 
-	 * @param string $val The string on which variable substitution is performed.
-	 * @param array $props
-	 * @return string
-	 */
-	 // TODO: this method doesn't work correctly with key = true, it needs key = "true" which is odd
-	public static function substVars($val, $props = null) {
-		$sbuf = '';
-		$i = 0;
-		while(true) {
-			$j = strpos($val, self::DELIM_START, $i);
-			if($j === false) {
-				// no more variables
-				if($i == 0) { // this is a simple string
-					return $val;
-				} else { // add the tail string which contails no variables and return the result.
-					$sbuf .= substr($val, $i);
-					return $sbuf;
-				}
-			} else {
+    /**
+     * Perform variable substitution in string <var>$val</var> from the
+     * values of keys found with the {@link getSystemProperty()} method.
+     * 
+     * <p>The variable substitution delimeters are <b>${</b> and <b>}</b>.
+     * 
+     * <p>For example, if the "MY_CONSTANT" contains "value", then
+     * the call
+     * <code>
+     * $s = LoggerOptionConverter::substVars("Value of key is ${MY_CONSTANT}.");
+     * </code>
+     * will set the variable <i>$s</i> to "Value of key is value.".</p>
+     * 
+     * <p>If no value could be found for the specified key, then the
+     * <var>$props</var> parameter is searched, if the value could not
+     * be found there, then substitution defaults to the empty string.</p>
+     * 
+     * <p>For example, if {@link getSystemProperty()} cannot find any value for the key
+     * "inexistentKey", then the call
+     * <code>
+     * $s = LoggerOptionConverter::substVars("Value of inexistentKey is [${inexistentKey}]");
+     * </code>
+     * will set <var>$s</var> to "Value of inexistentKey is []".</p>
+     * 
+     * <p>A warn is thrown if <var>$val</var> contains a start delimeter "${" 
+     * which is not balanced by a stop delimeter "}" and an empty string is returned.</p>
+     * 
+     * @param string $val The string on which variable substitution is performed.
+     * @param array $props
+     * @return string
+     */
+        // TODO: this method doesn't work correctly with key = true, it needs key = "true" which is odd
+    public static function substVars($val, $props = null) {
+        $sbuf = '';
+        $i = 0;
+        while(true) {
+            $j = strpos($val, self::DELIM_START, $i);
+            if($j === false) {
+                // no more variables
+                if($i == 0) { // this is a simple string
+                    return $val;
+                } else { // add the tail string which contails no variables and return the result.
+                    $sbuf .= substr($val, $i);
+                    return $sbuf;
+                }
+            } else {
 			
-				$sbuf .= substr($val, $i, $j-$i);
-				$k = strpos($val, self::DELIM_STOP, $j);
-				if($k === false) {
-					// LoggerOptionConverter::substVars() has no closing brace. Opening brace
-					return '';
-				} else {
-					$j += self::DELIM_START_LEN;
-					$key = substr($val, $j, $k - $j);
-					// first try in System properties
-					$replacement = Payone_Log4php_LoggerOptionConverter::getSystemProperty($key, null);
-					// then try props parameter
-					if($replacement == null and $props !== null) {
-						$replacement = @$props[$key];
-					}
+                $sbuf .= substr($val, $i, $j-$i);
+                $k = strpos($val, self::DELIM_STOP, $j);
+                if($k === false) {
+                    // LoggerOptionConverter::substVars() has no closing brace. Opening brace
+                    return '';
+                } else {
+                    $j += self::DELIM_START_LEN;
+                    $key = substr($val, $j, $k - $j);
+                    // first try in System properties
+                    $replacement = Payone_Log4php_LoggerOptionConverter::getSystemProperty($key, null);
+                    // then try props parameter
+                    if($replacement == null and $props !== null) {
+                        $replacement = @$props[$key];
+                    }
 
-					if(!empty($replacement)) {
-						// Do variable substitution on the replacement string
-						// such that we can solve "Hello ${x2}" as "Hello p1" 
-						// the where the properties are
-						// x1=p1
-						// x2=${x1}
-						$recursiveReplacement = Payone_Log4php_LoggerOptionConverter::substVars($replacement, $props);
-						$sbuf .= $recursiveReplacement;
-					}
-					$i = $k + self::DELIM_STOP_LEN;
-				}
-			}
-		}
-	}
+                    if(!empty($replacement)) {
+                        // Do variable substitution on the replacement string
+                        // such that we can solve "Hello ${x2}" as "Hello p1" 
+                        // the where the properties are
+                        // x1=p1
+                        // x2=${x1}
+                        $recursiveReplacement = Payone_Log4php_LoggerOptionConverter::substVars($replacement, $props);
+                        $sbuf .= $recursiveReplacement;
+                    }
+                    $i = $k + self::DELIM_STOP_LEN;
+                }
+            }
+        }
+    }
 
 }

Spacing +33 added lines, -33 removed lines

@@ -59,11 +59,11 @@ 
 	 *					value if there is no property with that key.
 	 */
 	public static function getSystemProperty($key, $def) {
-		if(defined($key)) {
+		if (defined($key)) {
 			return (string)constant($key);
-		} else if(isset($_SERVER[$key])) {
+		} else if (isset($_SERVER[$key])) {
 			return (string)$_SERVER[$key];
-		} else if(isset($_ENV[$key])) {
+		} else if (isset($_ENV[$key])) {
 			return (string)$_ENV[$key];
 		} else {
 			return $def;
@@ -82,12 +82,12 @@ 
 	 * @param boolean $default
 	 * @return boolean
 	 */
-	public static function toBoolean($value, $default=true) {
+	public static function toBoolean($value, $default = true) {
 		if (is_null($value)) {
 			return $default;
 		} elseif (is_string($value)) {
 			$trimmedVal = strtolower(trim($value));
-			if("1" == $trimmedVal or "true" == $trimmedVal or "yes" == $trimmedVal or "on" == $trimmedVal) {
+			if ("1" == $trimmedVal or "true" == $trimmedVal or "yes" == $trimmedVal or "on" == $trimmedVal) {
 				return true;
 			} else if ("" == $trimmedVal or "0" == $trimmedVal or "false" == $trimmedVal or "no" == $trimmedVal or "off" == $trimmedVal) {
 				return false;
@@ -126,7 +126,7 @@ 
 	 */
 	public static function toInt($value, $default) {
 		$value = trim($value);
-		if(is_numeric($value)) {
+		if (is_numeric($value)) {
 			return (int)$value;
 		} else {
 			return $default;
@@ -142,8 +142,8 @@ 
 		if (is_integer($value)) {
 			return $value;
 		}
-		if (is_numeric($value) && ($value == (integer) $value)) {
-			return (integer) $value;
+		if (is_numeric($value) && ($value == (integer)$value)) {
+			return (integer)$value;
 		}
 	
 		throw new Payone_Log4php_LoggerException("Given value [" . var_export($value, true) . "] cannot be converted to integer.");
@@ -157,8 +157,8 @@ 
 		if (is_integer($value) && $value > 0) {
 			return $value;
 		}
-		if (is_numeric($value) && ($value == (integer) $value) && $value > 0) {
-			return (integer) $value;
+		if (is_numeric($value) && ($value == (integer)$value) && $value > 0) {
+			return (integer)$value;
 		}
 	
 		throw new Payone_Log4php_LoggerException("Given value [" . var_export($value, true) . "] cannot be converted to a positive integer.");
@@ -191,12 +191,12 @@ 
 	 * @return Payone_Log4php_LoggerLevel a {@link LoggerLevel} or null
 	 */
 	public static function toLevel($value, $defaultValue) {
-		if($value === null) {
+		if ($value === null) {
 			return $defaultValue;
 		}
 		$hashIndex = strpos($value, '#');
-		if($hashIndex === false) {
-			if("NULL" == strtoupper($value)) {
+		if ($hashIndex === false) {
+			if ("NULL" == strtoupper($value)) {
 				return null;
 			} else {
 				// no class name specified : use standard Level class
@@ -210,15 +210,15 @@ 
 		$levelName = substr($value, 0, $hashIndex);
 
 		// This is degenerate case but you never know.
-		if("NULL" == strtoupper($levelName)) {
+		if ("NULL" == strtoupper($levelName)) {
 			return null;
 		}
 
 		$clazz = basename($clazz);
 
-		if(class_exists($clazz)) {
+		if (class_exists($clazz)) {
 			$result = @call_user_func(array($clazz, 'toLevel'), $levelName, $defaultValue);
-			if(!$result instanceof Payone_Log4php_LoggerLevel) {
+			if (!$result instanceof Payone_Log4php_LoggerLevel) {
 				$result = $defaultValue;
 			}
 		} 
@@ -244,23 +244,23 @@ 
 	 * @return float
 	 */
 	public static function toFileSize($value, $default) {
-		if($value === null) {
+		if ($value === null) {
 			return $default;
 		}
 
 		$s = strtoupper(trim($value));
 		$multiplier = (float)1;
-		if(($index = strpos($s, 'KB')) !== false) {
+		if (($index = strpos($s, 'KB')) !== false) {
 			$multiplier = 1024;
 			$s = substr($s, 0, $index);
-		} else if(($index = strpos($s, 'MB')) !== false) {
+		} else if (($index = strpos($s, 'MB')) !== false) {
 			$multiplier = 1024 * 1024;
 			$s = substr($s, 0, $index);
-		} else if(($index = strpos($s, 'GB')) !== false) {
+		} else if (($index = strpos($s, 'GB')) !== false) {
 			$multiplier = 1024 * 1024 * 1024;
 			$s = substr($s, 0, $index);
 		}
-		if(is_numeric($s)) {
+		if (is_numeric($s)) {
 			return (float)$s * $multiplier;
 		} 
 		return $default;
@@ -290,7 +290,7 @@ 
 		}
 		
 		if (is_numeric($value)) {
-			return (integer) $value;
+			return (integer)$value;
 		}
 		
 		if (!is_string($value)) {
@@ -304,13 +304,13 @@ 
 			$size = $matches[1];
 			$unit = $matches[2];
 			
-			switch($unit) {
+			switch ($unit) {
 				case 'KB': $size *= pow(1024, 1); break;
 				case 'MB': $size *= pow(1024, 2); break;
 				case 'GB': $size *= pow(1024, 3); break;
 			}
 			
-			return (integer) $size;
+			return (integer)$size;
 		}
 		
 		throw new Payone_Log4php_LoggerException("Given value [$value] cannot be converted to a file size.");
@@ -328,10 +328,10 @@ 
 			return $value;
 		}
 		if (is_numeric($value)) {
-			return (string) $value;
+			return (string)$value;
 		}
 		if (is_object($value) && method_exists($value, '__toString')) {
-			return (string) $value;
+			return (string)$value;
 		}
 	
 		throw new Payone_Log4php_LoggerException("Given value [" . var_export($value, true) . "] cannot be converted to string.");
@@ -406,11 +406,11 @@ 
 	public static function substVars($val, $props = null) {
 		$sbuf = '';
 		$i = 0;
-		while(true) {
+		while (true) {
 			$j = strpos($val, self::DELIM_START, $i);
-			if($j === false) {
+			if ($j === false) {
 				// no more variables
-				if($i == 0) { // this is a simple string
+				if ($i == 0) { // this is a simple string
 					return $val;
 				} else { // add the tail string which contails no variables and return the result.
 					$sbuf .= substr($val, $i);
@@ -418,9 +418,9 @@ 
 				}
 			} else {
 			
-				$sbuf .= substr($val, $i, $j-$i);
+				$sbuf .= substr($val, $i, $j - $i);
 				$k = strpos($val, self::DELIM_STOP, $j);
-				if($k === false) {
+				if ($k === false) {
 					// LoggerOptionConverter::substVars() has no closing brace. Opening brace
 					return '';
 				} else {
@@ -429,11 +429,11 @@ 
 					// first try in System properties
 					$replacement = Payone_Log4php_LoggerOptionConverter::getSystemProperty($key, null);
 					// then try props parameter
-					if($replacement == null and $props !== null) {
+					if ($replacement == null and $props !== null) {
 						$replacement = @$props[$key];
 					}
 
-					if(!empty($replacement)) {
+					if (!empty($replacement)) {
 						// Do variable substitution on the replacement string
 						// such that we can solve "Hello ${x2}" as "Hello p1" 
 						// the where the properties are

lib/Payone/Log4php/LoggerPatternConverterThrowable.php

Indentation +30 added lines, -30 removed lines

@@ -28,41 +28,41 @@
  */
 class Payone_Log4php_LoggerPatternConverterThrowable extends Payone_Log4php_LoggerPatternConverter {
 	
-	private $depth;
+    private $depth;
 	
-	public function activateOptions() {
-		if (isset($this->option) && is_numeric($op) && $op >= 0) {
-			$this->depth = (integer) $this->option;
-		}
-	}
+    public function activateOptions() {
+        if (isset($this->option) && is_numeric($op) && $op >= 0) {
+            $this->depth = (integer) $this->option;
+        }
+    }
 	
-	public function convert(Payone_Log4php_LoggerLoggingEvent $event) {
+    public function convert(Payone_Log4php_LoggerLoggingEvent $event) {
 		
-		$info = $event->getThrowableInformation();
-		if ($info === null) {
-			return '';
-		}
+        $info = $event->getThrowableInformation();
+        if ($info === null) {
+            return '';
+        }
 		
-		$ex = $info->getThrowable();
+        $ex = $info->getThrowable();
 		
-		// Format exception to string
-		$strEx = get_class($ex) . ': "' . $ex->getMessage() . '"' . PHP_EOL;
-		$strEx .= 'at '. $ex->getFile() . ':' . $ex->getLine();
+        // Format exception to string
+        $strEx = get_class($ex) . ': "' . $ex->getMessage() . '"' . PHP_EOL;
+        $strEx .= 'at '. $ex->getFile() . ':' . $ex->getLine();
 		
-		// Add trace if required
-		if ($this->depth === null || $this->depth > 0) {
-			$trace = $ex->getTrace();
-			foreach($trace as $key => $item) {
-				if (isset($this->depth) && $key > $this->depth) {
-					break;
-				}
-				$strEx .= PHP_EOL . "#$key " . 
-					"{$item['file']}:{$item['line']} " .
-					"in {$item['class']}{$item['type']}{$item['function']}()"; 
-			}
-		}
+        // Add trace if required
+        if ($this->depth === null || $this->depth > 0) {
+            $trace = $ex->getTrace();
+            foreach($trace as $key => $item) {
+                if (isset($this->depth) && $key > $this->depth) {
+                    break;
+                }
+                $strEx .= PHP_EOL . "#$key " . 
+                    "{$item['file']}:{$item['line']} " .
+                    "in {$item['class']}{$item['type']}{$item['function']}()"; 
+            }
+        }
 		
-		return $strEx;
-	}
+        return $strEx;
+    }
 }
- 
\ No newline at end of file
+    
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
 	
 	public function activateOptions() {
 		if (isset($this->option) && is_numeric($op) && $op >= 0) {
-			$this->depth = (integer) $this->option;
+			$this->depth = (integer)$this->option;
 		}
 	}
 	
@@ -47,12 +47,12 @@ 
 		
 		// Format exception to string
 		$strEx = get_class($ex) . ': "' . $ex->getMessage() . '"' . PHP_EOL;
-		$strEx .= 'at '. $ex->getFile() . ':' . $ex->getLine();
+		$strEx .= 'at ' . $ex->getFile() . ':' . $ex->getLine();
 		
 		// Add trace if required
 		if ($this->depth === null || $this->depth > 0) {
 			$trace = $ex->getTrace();
-			foreach($trace as $key => $item) {
+			foreach ($trace as $key => $item) {
 				if (isset($this->depth) && $key > $this->depth) {
 					break;
 				}

lib/Payone/Log4php/LoggerUtils.php

Indentation +78 added lines, -78 removed lines

@@ -27,97 +27,97 @@
  */
 class Payone_Log4php_LoggerUtils {
 	
-	/**
- 	 * Splits a fully qualified class name into fragments delimited by the 
- 	 * namespace separator (\). 
- 	 * 
- 	 * For backward compatibility, a dot (.) can be used as a delimiter as
- 	 * well. 
-	 * 
-	 * @param string $name
-	 * 
-	 * @return array Class name split into fragments.
-	 */
-	public static function tokenizeClassName($name) {
-		$name = str_replace('.', '\\', $name);
-		$name = trim($name, ' \\');
-		$fragments = explode('\\', $name);
+    /**
+     * Splits a fully qualified class name into fragments delimited by the 
+     * namespace separator (\). 
+     * 
+     * For backward compatibility, a dot (.) can be used as a delimiter as
+     * well. 
+     * 
+     * @param string $name
+     * 
+     * @return array Class name split into fragments.
+     */
+    public static function tokenizeClassName($name) {
+        $name = str_replace('.', '\\', $name);
+        $name = trim($name, ' \\');
+        $fragments = explode('\\', $name);
 		
-		foreach($fragments as $key => $fragment) {
-			if (trim($fragment) === '') {
-				unset($fragments[$key]);
-			}
-		}
+        foreach($fragments as $key => $fragment) {
+            if (trim($fragment) === '') {
+                unset($fragments[$key]);
+            }
+        }
 		
-		return $fragments;
-	}
+        return $fragments;
+    }
 	
-	/**
-	 * Attempts to shorten the given class name to the desired length.
-	 * 
-	 * This is done by separating the class name into fragments (delimited
-	 * by \ or .) and trimming individual fragments, starting with the left,
-	 * until desired length has been reached. 
-	 * 
-	 * The final fragment (i.e. class name) will never be shortened so the 
-	 * result may still be longer than given length.
-	 * 
-	 * @param string $name The (qualified) class name.  
-	 * @param integer $length The length to shorten to. If null or 0 is given,
-	 * the name will be returned without shortening. 
-	 */
-	public static function shortenClassName($name, $length) {
-		if ($length === null || $length < 0) {
-			return $name;
-		}
+    /**
+     * Attempts to shorten the given class name to the desired length.
+     * 
+     * This is done by separating the class name into fragments (delimited
+     * by \ or .) and trimming individual fragments, starting with the left,
+     * until desired length has been reached. 
+     * 
+     * The final fragment (i.e. class name) will never be shortened so the 
+     * result may still be longer than given length.
+     * 
+     * @param string $name The (qualified) class name.  
+     * @param integer $length The length to shorten to. If null or 0 is given,
+     * the name will be returned without shortening. 
+     */
+    public static function shortenClassName($name, $length) {
+        if ($length === null || $length < 0) {
+            return $name;
+        }
 		
-		$name = str_replace('.', '\\', $name);
-		$name = trim($name, ' \\');
+        $name = str_replace('.', '\\', $name);
+        $name = trim($name, ' \\');
 		
-		// Check if any shortening is required
-		$currentLength = strlen($name);
-		if ($currentLength <= $length) {
-			return $name;
-		}
+        // Check if any shortening is required
+        $currentLength = strlen($name);
+        if ($currentLength <= $length) {
+            return $name;
+        }
 	
-		// Split name into fragments
-		$fragments = explode('\\', $name);
+        // Split name into fragments
+        $fragments = explode('\\', $name);
 
-		// If zero length is specified, return only last fragment
-		if ($length == 0) {
-			return array_pop($fragments);
-		}
+        // If zero length is specified, return only last fragment
+        if ($length == 0) {
+            return array_pop($fragments);
+        }
 		
-		// If the name splits to only one fragment, then it cannot be shortened
-		$count = count($fragments);
-		if ($count == 1) {
-			return $name;
-		}
+        // If the name splits to only one fragment, then it cannot be shortened
+        $count = count($fragments);
+        if ($count == 1) {
+            return $name;
+        }
 	
-		foreach($fragments as $key => &$fragment) {
+        foreach($fragments as $key => &$fragment) {
 	
-			// Never shorten last fragment
-			if ($key == $count - 1) {
-				break;
-			}
+            // Never shorten last fragment
+            if ($key == $count - 1) {
+                break;
+            }
 	
-			// Check for empty fragments (shouldn't happen but it's possible)
-			$fragLen = strlen($fragment);
-			if ($fragLen <= 1) {
-				continue;
-			}
+            // Check for empty fragments (shouldn't happen but it's possible)
+            $fragLen = strlen($fragment);
+            if ($fragLen <= 1) {
+                continue;
+            }
 	
-			// Shorten fragment to one character and check if total length satisfactory
-			$fragment = substr($fragment, 0, 1);
-			$currentLength = $currentLength - $fragLen + 1;
+            // Shorten fragment to one character and check if total length satisfactory
+            $fragment = substr($fragment, 0, 1);
+            $currentLength = $currentLength - $fragLen + 1;
 	
-			if ($currentLength <= $length) {
-				break;
-			}
-		}
-		unset($fragment);
+            if ($currentLength <= $length) {
+                break;
+            }
+        }
+        unset($fragment);
 	
-		return implode('\\', $fragments);
-	}
+        return implode('\\', $fragments);
+    }
 }
 

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
 		$name = trim($name, ' \\');
 		$fragments = explode('\\', $name);
 		
-		foreach($fragments as $key => $fragment) {
+		foreach ($fragments as $key => $fragment) {
 			if (trim($fragment) === '') {
 				unset($fragments[$key]);
 			}
@@ -94,7 +94,7 @@ 
 			return $name;
 		}
 	
-		foreach($fragments as $key => &$fragment) {
+		foreach ($fragments as $key => &$fragment) {
 	
 			// Never shorten last fragment
 			if ($key == $count - 1) {

lib/Payone/Log4php/LoggerAppenderConsole.php

Indentation +51 added lines, -51 removed lines

@@ -43,63 +43,63 @@
  */
 class Payone_Log4php_LoggerAppenderConsole extends Payone_Log4php_LoggerAppender {
 
-	const STDOUT = 'php://stdout';
-	const STDERR = 'php://stderr';
+    const STDOUT = 'php://stdout';
+    const STDERR = 'php://stderr';
 
-	/**
-	 * Can be 'php://stdout' or 'php://stderr'. But it's better to use keywords <b>STDOUT</b> and <b>STDERR</b> (case insensitive). 
-	 * Default is STDOUT
-	 * @var string
-	 */
-	protected $target = self::STDOUT;
+    /**
+     * Can be 'php://stdout' or 'php://stderr'. But it's better to use keywords <b>STDOUT</b> and <b>STDERR</b> (case insensitive). 
+     * Default is STDOUT
+     * @var string
+     */
+    protected $target = self::STDOUT;
 	
-	/**
-	 * @var mixed the resource used to open stdout/stderr
-	 */
-	protected $fp = null;
+    /**
+     * @var mixed the resource used to open stdout/stderr
+     */
+    protected $fp = null;
 
-	/**
-	 * Set console target.
-	 * @param mixed $value a constant or a string
-	 */
-	public function setTarget($value) {
-		$v = trim($value);
-		if ($v == self::STDOUT || strtoupper($v) == 'STDOUT') {
-			$this->target = self::STDOUT;
-		} elseif ($v == self::STDERR || strtoupper($v) == 'STDERR') {
-			$this->target = self::STDERR;
-		} else {
-			$value = var_export($value);
-			$this->warn("Invalid value given for 'target' property: [$value]. Property not set.");
-		}
-	}
+    /**
+     * Set console target.
+     * @param mixed $value a constant or a string
+     */
+    public function setTarget($value) {
+        $v = trim($value);
+        if ($v == self::STDOUT || strtoupper($v) == 'STDOUT') {
+            $this->target = self::STDOUT;
+        } elseif ($v == self::STDERR || strtoupper($v) == 'STDERR') {
+            $this->target = self::STDERR;
+        } else {
+            $value = var_export($value);
+            $this->warn("Invalid value given for 'target' property: [$value]. Property not set.");
+        }
+    }
 
-	public function getTarget() {
-		return $this->target;
-	}
+    public function getTarget() {
+        return $this->target;
+    }
 
-	public function activateOptions() {
-		$this->fp = fopen($this->target, 'w');
-		if(is_resource($this->fp) && $this->layout !== null) {
-			fwrite($this->fp, $this->layout->getHeader());
-		}
-		$this->closed = (bool)is_resource($this->fp) === false;
-	}
+    public function activateOptions() {
+        $this->fp = fopen($this->target, 'w');
+        if(is_resource($this->fp) && $this->layout !== null) {
+            fwrite($this->fp, $this->layout->getHeader());
+        }
+        $this->closed = (bool)is_resource($this->fp) === false;
+    }
 	
-	public function close() {
-		if($this->closed != true) {
-			if (is_resource($this->fp) && $this->layout !== null) {
-				fwrite($this->fp, $this->layout->getFooter());
-				fclose($this->fp);
-			}
-			$this->closed = true;
-		}
-	}
+    public function close() {
+        if($this->closed != true) {
+            if (is_resource($this->fp) && $this->layout !== null) {
+                fwrite($this->fp, $this->layout->getFooter());
+                fclose($this->fp);
+            }
+            $this->closed = true;
+        }
+    }
 
-	public function append(Payone_Log4php_LoggerLoggingEvent $event) {
-		if (is_resource($this->fp) && $this->layout !== null) {
-			fwrite($this->fp, $this->layout->format($event));
-		}
-	}
+    public function append(Payone_Log4php_LoggerLoggingEvent $event) {
+        if (is_resource($this->fp) && $this->layout !== null) {
+            fwrite($this->fp, $this->layout->format($event));
+        }
+    }
 }
 

Spacing +2 added lines, -2 removed lines

@@ -80,14 +80,14 @@
 
 	public function activateOptions() {
 		$this->fp = fopen($this->target, 'w');
-		if(is_resource($this->fp) && $this->layout !== null) {
+		if (is_resource($this->fp) && $this->layout !== null) {
 			fwrite($this->fp, $this->layout->getHeader());
 		}
 		$this->closed = (bool)is_resource($this->fp) === false;
 	}
 	
 	public function close() {
-		if($this->closed != true) {
+		if ($this->closed != true) {
 			if (is_resource($this->fp) && $this->layout !== null) {
 				fwrite($this->fp, $this->layout->getFooter());
 				fclose($this->fp);

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