LOG4PHP-167: Removed INI_SCANNER_RAW option from ini parsing function. Fixed tests...
authorIvan Habunek <ihabunek@apache.org>
Sun, 29 Jan 2012 19:49:36 +0000 (19:49 +0000)
committerIvan Habunek <ihabunek@apache.org>
Sun, 29 Jan 2012 19:49:36 +0000 (19:49 +0000)
git-svn-id: https://svn.apache.org/repos/asf/logging/log4php/trunk@1237439 13f79535-47bb-0310-9956-ffa450edef68

src/main/php/configurators/LoggerConfigurationAdapterINI.php
src/test/resources/configs/adapters/ini/config_valid.ini

index bcee40f..0721f5f 100644 (file)
@@ -73,7 +73,7 @@ class LoggerConfigurationAdapterINI implements LoggerConfigurationAdapter {
                        throw new LoggerException("File [$url] does not exist.");\r
                }\r
                \r
-               $properties = @parse_ini_file($url, true, INI_SCANNER_RAW);\r
+               $properties = @parse_ini_file($url, true);\r
                if ($properties === false) {\r
                        $error = error_get_last();\r
                        throw new LoggerException("Error parsing configuration file: {$error['message']}");\r
index 5046429..5e2a6d9 100644 (file)
@@ -22,7 +22,7 @@ log4php.appender.default.layout = LoggerLayoutTTCC
 \r
 log4php.appender.file = LoggerAppenderDailyFile\r
 log4php.appender.file.layout = LoggerLayoutPattern\r
-log4php.appender.file.layout.conversionPattern =%d{ISO8601} [%p] %c: %m (at %F line %L)%n\r
+log4php.appender.file.layout.conversionPattern = "%d{ISO8601} [%p] %c: %m (at %F line %L)%n"\r
 log4php.appender.file.datePattern = Ymd\r
 log4php.appender.file.file = target/examples/daily_%s.log\r
 log4php.appender.file.threshold = warn\r
@@ -30,10 +30,10 @@ log4php.appender.file.threshold = warn
 log4php.logger.foo = warn, default\r
 \r
 log4php.logger.foo.bar = debug, file\r
-log4php.additivity.foo.bar = true\r
+log4php.additivity.foo.bar = "true"\r
 \r
 log4php.logger.foo.bar.baz = trace, default, file\r
-log4php.additivity.foo.bar.baz = false\r
+log4php.additivity.foo.bar.baz = "false"\r
 \r
 log4php.renderer.Fruit = FruitRenderer\r
 log4php.renderer.Beer = BeerRenderer\r