fix a system test

plugins/Monolog/.gitignore

+tests/System/processed/*xml
\ No newline at end of file

plugins/Monolog/config/tracker.php

@@ -2,11 +2,16 @@
 
 use Interop\Container\ContainerInterface;
 
+function isTrackerDebugEnabled(ContainerInterface $c)
+{
+    $trackerDebug = $c->get("ini.Tracker.debug");
+    return ($trackerDebug == 1 || !empty($GLOBALS['PIWIK_TRACKER_DEBUG']));
+}
+
 return array(
 
     'Psr\Log\LoggerInterface' => function (ContainerInterface $c) {
-        $trackerDebug = $c->get("ini.Tracker.debug");
-        if ($trackerDebug == 1 || !empty($GLOBALS['PIWIK_TRACKER_DEBUG'])) {
+        if (isTrackerDebugEnabled($c)) {
             return $c->get('Monolog\Logger');
         } else {
             return new \Psr\Log\NullLogger();
@@ -21,8 +26,12 @@ return array(
         return $previous;
     }),
 
-    'log.level' => DI\factory(function (ContainerInterface $c) {
-        return \Monolog\Logger::DEBUG;
+    'log.level' => DI\decorate(function ($previous, ContainerInterface $c) {
+        if (isTrackerDebugEnabled($c)) {
+            return \Monolog\Logger::DEBUG;
+        }
+
+        return $previous;
     })
 
 );

plugins/Monolog/tests/System/TrackerLoggingTest.php

@@ -27,13 +27,6 @@ class TrackerLoggingTest extends SystemTestCase
     {
         parent::setUp();
 
-        $testingEnvironment = self::$fixture->getTestEnvironment();
-        $configOverride = $testingEnvironment->configOverride;
-        $configOverride['Tracker']['debug'] = 1;
-        $configOverride['log']['log_writers'] = array('screen');
-        $testingEnvironment->configOverride = $configOverride;
-        $testingEnvironment->save();
-
         if (!Fixture::siteCreated($this->idSite)) {
             Fixture::createWebsite('2014-01-01 00:00:00');
         }

tests/PHPUnit/System/TrackerTest.php

@@ -179,7 +179,11 @@ class TrackerTest extends IntegrationTestCase
 
     public function test_scheduledTasks_CanBeRunThroughTracker_WithOutputIncluded_IfDebugQueryParamUsed()
     {
-        $this->setScheduledTasksToRunInTracker();
+        $environment = $this->setScheduledTasksToRunInTracker();
+        $config = $environment->configOverride;
+        $config['log']['log_writers'] = array('screen');
+        $environment->configOverride = $config;
+        $environment->save();
 
         $urlToTest = $this->getSimpleTrackingUrl() . '&debug=1';
 
@@ -296,6 +300,8 @@ class TrackerTest extends IntegrationTestCase
         $testingEnvironment->addScheduledTask = true;
         $testingEnvironment->configOverride = array('Tracker' => array('scheduled_tasks_min_interval' => 1, 'debug_on_demand' => 1));
         $testingEnvironment->save();
+
+        return $testingEnvironment;
     }
 
     private function addFailingScheduledTaskToTracker($doFatalError)
@@ -381,4 +387,12 @@ class TrackerTest extends IntegrationTestCase
         Option::clearCachedOption(self::TASKS_STARTED_OPTION_NAME);
         $this->assertEquals(1, Option::get(self::TASKS_STARTED_OPTION_NAME));
     }
+
+    public static function provideContainerConfigBeforeClass()
+    {
+        return array(
+            'Psr\Log\LoggerInterface' => \DI\get('Monolog\Logger')
+        );
+    }
+
 }
\ No newline at end of file