diff options
author | diosmosis <benaka@piwik.pro> | 2015-04-18 11:55:47 +0300 |
---|---|---|
committer | diosmosis <benaka@piwik.pro> | 2015-04-18 12:08:36 +0300 |
commit | 1760412a370823f96eeed21d730acf8f4038c843 (patch) | |
tree | 76b4c6ca0a2f9678b34d247e09e609b9ff7fc108 /plugins/Monolog | |
parent | 5d57e10591a9e7e394f649cc67ea93ed14c47292 (diff) | |
parent | 898afb809d54553dea34e4d101e66b37f50f0334 (diff) |
Merge branch 'master' into config_step_2
Conflicts:
config/global.php
core/CliMulti/RequestCommand.php
core/Config.php
core/Config/IniFileChain.php
tests/PHPUnit/System/BlobReportLimitingTest.php
tests/PHPUnit/TestingEnvironment.php
tests/PHPUnit/Unit/Config/IniFileChainTest.php
tests/PHPUnit/Unit/ConfigTest.php
Diffstat (limited to 'plugins/Monolog')
-rw-r--r-- | plugins/Monolog/config/config.php | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/plugins/Monolog/config/config.php b/plugins/Monolog/config/config.php index 7005573ced..3fd3fcf63a 100644 --- a/plugins/Monolog/config/config.php +++ b/plugins/Monolog/config/config.php @@ -7,7 +7,7 @@ use Piwik\Log; return array( 'Psr\Log\LoggerInterface' => DI\object('Monolog\Logger') - ->constructor('piwik', DI\link('log.handlers'), DI\link('log.processors')), + ->constructor('piwik', DI\get('log.handlers'), DI\get('log.processors')), 'log.handlers' => DI\factory(function (ContainerInterface $c) { if ($c->has('ini.log.log_writers')) { @@ -31,25 +31,25 @@ return array( }), 'log.processors' => array( - DI\link('Piwik\Plugins\Monolog\Processor\SprintfProcessor'), - DI\link('Piwik\Plugins\Monolog\Processor\ClassNameProcessor'), - DI\link('Piwik\Plugins\Monolog\Processor\RequestIdProcessor'), - DI\link('Piwik\Plugins\Monolog\Processor\ExceptionToTextProcessor'), - DI\link('Monolog\Processor\PsrLogMessageProcessor'), - DI\link('Piwik\Plugins\Monolog\Processor\TokenProcessor'), + DI\get('Piwik\Plugins\Monolog\Processor\SprintfProcessor'), + DI\get('Piwik\Plugins\Monolog\Processor\ClassNameProcessor'), + DI\get('Piwik\Plugins\Monolog\Processor\RequestIdProcessor'), + DI\get('Piwik\Plugins\Monolog\Processor\ExceptionToTextProcessor'), + DI\get('Monolog\Processor\PsrLogMessageProcessor'), + DI\get('Piwik\Plugins\Monolog\Processor\TokenProcessor'), ), 'Piwik\Plugins\Monolog\Handler\FileHandler' => DI\object() - ->constructor(DI\link('log.file.filename'), DI\link('log.level')) - ->method('setFormatter', DI\link('Piwik\Plugins\Monolog\Formatter\LineMessageFormatter')), + ->constructor(DI\get('log.file.filename'), DI\get('log.level')) + ->method('setFormatter', DI\get('Piwik\Plugins\Monolog\Formatter\LineMessageFormatter')), 'Piwik\Plugins\Monolog\Handler\DatabaseHandler' => DI\object() - ->constructor(DI\link('log.level')) - ->method('setFormatter', DI\link('Piwik\Plugins\Monolog\Formatter\LineMessageFormatter')), + ->constructor(DI\get('log.level')) + ->method('setFormatter', DI\get('Piwik\Plugins\Monolog\Formatter\LineMessageFormatter')), 'Piwik\Plugins\Monolog\Handler\WebNotificationHandler' => DI\object() - ->constructor(DI\link('log.level')) - ->method('setFormatter', DI\link('Piwik\Plugins\Monolog\Formatter\LineMessageFormatter')), + ->constructor(DI\get('log.level')) + ->method('setFormatter', DI\get('Piwik\Plugins\Monolog\Formatter\LineMessageFormatter')), 'log.level' => DI\factory(function (ContainerInterface $c) { if ($c->has('ini.log.log_level')) { @@ -88,7 +88,7 @@ return array( }), 'Piwik\Plugins\Monolog\Formatter\LineMessageFormatter' => DI\object() - ->constructor(DI\link('log.format')), + ->constructor(DI\get('log.format')), 'log.format' => DI\factory(function (ContainerInterface $c) { if ($c->has('ini.log.string_message_format')) { |