Author: ihabunek
Date: Sun Jan 29 19:49:36 2012
New Revision: 1237439
URL: http://svn.apache.org/viewvc?rev=1237439&view=rev
Log:
LOG4PHP-167: Removed INI_SCANNER_RAW option from ini parsing function. Fixed
tests to compensate.
Modified:
logging/log4php/trunk/src/main/php/configurators/LoggerConfigurationAdapterINI.php
logging/log4php/trunk/src/test/resources/configs/adapters/ini/config_valid.ini
Modified:
logging/log4php/trunk/src/main/php/configurators/LoggerConfigurationAdapterINI.php
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/main/php/configurators/LoggerConfigurationAdapterINI.php?rev=1237439&r1=1237438&r2=1237439&view=diff
==============================================================================
---
logging/log4php/trunk/src/main/php/configurators/LoggerConfigurationAdapterINI.php
(original)
+++
logging/log4php/trunk/src/main/php/configurators/LoggerConfigurationAdapterINI.php
Sun Jan 29 19:49:36 2012
@@ -73,7 +73,7 @@ class LoggerConfigurationAdapterINI impl
throw new LoggerException("File [$url] does not
exist.");
}
- $properties = @parse_ini_file($url, true, INI_SCANNER_RAW);
+ $properties = @parse_ini_file($url, true);
if ($properties === false) {
$error = error_get_last();
throw new LoggerException("Error parsing configuration
file: {$error['message']}");
Modified:
logging/log4php/trunk/src/test/resources/configs/adapters/ini/config_valid.ini
URL:
http://svn.apache.org/viewvc/logging/log4php/trunk/src/test/resources/configs/adapters/ini/config_valid.ini?rev=1237439&r1=1237438&r2=1237439&view=diff
==============================================================================
---
logging/log4php/trunk/src/test/resources/configs/adapters/ini/config_valid.ini
(original)
+++
logging/log4php/trunk/src/test/resources/configs/adapters/ini/config_valid.ini
Sun Jan 29 19:49:36 2012
@@ -22,7 +22,7 @@ log4php.appender.default.layout = Logger
log4php.appender.file = LoggerAppenderDailyFile
log4php.appender.file.layout = LoggerLayoutPattern
-log4php.appender.file.layout.conversionPattern =%d{ISO8601} [%p] %c: %m (at %F
line %L)%n
+log4php.appender.file.layout.conversionPattern = "%d{ISO8601} [%p] %c: %m (at
%F line %L)%n"
log4php.appender.file.datePattern = Ymd
log4php.appender.file.file = target/examples/daily_%s.log
log4php.appender.file.threshold = warn
@@ -30,10 +30,10 @@ log4php.appender.file.threshold = warn
log4php.logger.foo = warn, default
log4php.logger.foo.bar = debug, file
-log4php.additivity.foo.bar = true
+log4php.additivity.foo.bar = "true"
log4php.logger.foo.bar.baz = trace, default, file
-log4php.additivity.foo.bar.baz = false
+log4php.additivity.foo.bar.baz = "false"
log4php.renderer.Fruit = FruitRenderer
log4php.renderer.Beer = BeerRenderer
