Author: kurdalen
Date: Mon May 4 10:49:38 2009
New Revision: 771267
URL: http://svn.apache.org/viewvc?rev=771267&view=rev
Log:
refactoring related to #LOG4PHP-32
Modified:
incubator/log4php/trunk/src/main/php/helpers/LoggerOptionConverter.php
Modified: incubator/log4php/trunk/src/main/php/helpers/LoggerOptionConverter.php
URL:
http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/helpers/LoggerOptionConverter.php?rev=771267&r1=771266&r2=771267&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/helpers/LoggerOptionConverter.php
(original)
+++ incubator/log4php/trunk/src/main/php/helpers/LoggerOptionConverter.php Mon
May 4 10:49:38 2009
@@ -20,11 +20,6 @@
* @subpackage helpers
*/
-define('LOG4PHP_OPTION_CONVERTER_DELIM_START', '${');
-define('LOG4PHP_OPTION_CONVERTER_DELIM_STOP', '}');
-define('LOG4PHP_OPTION_CONVERTER_DELIM_START_LEN', 2);
-define('LOG4PHP_OPTION_CONVERTER_DELIM_STOP_LEN', 1);
-
/**
* A convenience class to convert property values to specific types.
*
@@ -36,6 +31,11 @@
*/
class LoggerOptionConverter {
+ const DELIM_START = '${';
+ const DELIM_STOP = '}';
+ const DELIM_START_LEN = 2;
+ const DELIM_STOP_LEN = 1;
+
/**
* @param array $l
* @param array $r
@@ -270,7 +270,7 @@
$sbuf = '';
$i = 0;
while(true) {
- $j = strpos($val, LOG4PHP_OPTION_CONVERTER_DELIM_START,
$i);
+ $j = strpos($val, self::DELIM_START, $i);
if($j === false) {
// no more variables
if($i == 0) { // this is a simple string
@@ -282,12 +282,12 @@
} else {
$sbuf .= substr($val, $i, $j-$i);
- $k = strpos($val,
LOG4PHP_OPTION_CONVERTER_DELIM_STOP, $j);
+ $k = strpos($val, self::DELIM_STOP, $j);
if($k === false) {
// LoggerOptionConverter::substVars()
has no closing brace. Opening brace
return '';
} else {
- $j +=
LOG4PHP_OPTION_CONVERTER_DELIM_START_LEN;
+ $j += self::START_LEN;
$key = substr($val, $j, $k - $j);
// first try in System properties
$replacement =
LoggerOptionConverter::getSystemProperty($key, null);
@@ -305,7 +305,7 @@
$recursiveReplacement =
LoggerOptionConverter::substVars($replacement, $props);
$sbuf .= $recursiveReplacement;
}
- $i = $k +
LOG4PHP_OPTION_CONVERTER_DELIM_STOP_LEN;
+ $i = $k + self::DELIM_STOP_LEN;
}
}
}
