From 42a62a21cb5c2df97e0b6fe64ecc2c5ea426f119 Mon Sep 17 00:00:00 2001
From: diosmosis <diosmosis@users.noreply.github.com>
Date: Mon, 30 Sep 2019 20:23:18 -0700
Subject: Replace some usages of Common::printDebug w/ use of logger (#13968)

* Start refactoring Common::printDebug().

* Make tracker debug statement error log.

* Remove logger removal for tracker.

* Fix test failure.

* Add two more parent constructor calls.

* Fix failing test
---
 plugins/Monolog/config/config.php                   |  6 +++++-
 plugins/Monolog/config/tracker.php                  | 16 ++++++----------
 plugins/Monolog/tests/System/TrackerLoggingTest.php | 15 +++++++--------
 3 files changed, 18 insertions(+), 19 deletions(-)

(limited to 'plugins/Monolog')

diff --git a/plugins/Monolog/config/config.php b/plugins/Monolog/config/config.php
index ff60f7c5bd..18e07c5c33 100644
--- a/plugins/Monolog/config/config.php
+++ b/plugins/Monolog/config/config.php
@@ -40,7 +40,10 @@ return array(
 
         $writers = [];
         foreach ($writerNames as $writerName) {
-            if ($writerName === 'screen' && \Piwik\Common::isPhpCliMode()) {
+            if ($writerName === 'screen'
+                && \Piwik\Common::isPhpCliMode()
+                && !defined('PIWIK_TEST_MODE')
+            ) {
                 continue; // screen writer is only valid for web requests
             }
 
@@ -112,6 +115,7 @@ return array(
                 return Log::getMonologLevel(constant('Piwik\Log::'.strtoupper($level)));
             }
         }
+
         return Logger::WARNING;
     }),
 
diff --git a/plugins/Monolog/config/tracker.php b/plugins/Monolog/config/tracker.php
index 620101ff7a..bb7820f9f1 100644
--- a/plugins/Monolog/config/tracker.php
+++ b/plugins/Monolog/config/tracker.php
@@ -10,17 +10,13 @@ function isTrackerDebugEnabled(ContainerInterface $c)
 
 return array(
 
-    'Psr\Log\LoggerInterface' => \DI\decorate(function ($previous, ContainerInterface $c) {
-        if (isTrackerDebugEnabled($c)) {
-            return $previous;
-        } else {
-            return new \Psr\Log\NullLogger();
-        }
-    }),
-
-    'log.handler.classes' => DI\decorate(function ($previous) {
-        if (isset($previous['screen'])) {
+    'log.handler.classes' => DI\decorate(function ($previous, ContainerInterface $c) {
+        if (isset($previous['screen'])
+            && isTrackerDebugEnabled($c)
+        ) {
             $previous['screen'] = 'Piwik\Plugins\Monolog\Handler\EchoHandler';
+        } else {
+            unset($previous['screen']);
         }
 
         return $previous;
diff --git a/plugins/Monolog/tests/System/TrackerLoggingTest.php b/plugins/Monolog/tests/System/TrackerLoggingTest.php
index a7b2fe2025..44a7755e9f 100644
--- a/plugins/Monolog/tests/System/TrackerLoggingTest.php
+++ b/plugins/Monolog/tests/System/TrackerLoggingTest.php
@@ -15,6 +15,7 @@ use Piwik\Tests\Framework\Fixture;
 use Piwik\Tests\Framework\TestCase\SystemTestCase;
 use Piwik\Tests\Framework\TestingEnvironmentVariables;
 use PiwikTracker;
+use Psr\Container\ContainerInterface;
 
 /**
  * @group Monolog
@@ -75,11 +76,10 @@ class TrackerLoggingTest extends SystemTestCase
     {
         $response = $t->doTrackPageView('incredible title!');
 
-        $this->assertStringStartsWith("DEBUG: Debug enabled - Input parameters: 
-DEBUG: array (
-DEBUG:   'idsite' => '1',
-DEBUG:   'rec' => '1',
-DEBUG:   'apiv' => '1',", $response);
+        $this->assertStringStartsWith("DEBUG: Debug enabled - Input parameters: array (
+  'idsite' => '1',
+  'rec' => '1',
+  'apiv' => '1',", $response);
     }
 
     private function setTrackerConfig($trackerConfig)
@@ -96,11 +96,10 @@ DEBUG:   'apiv' => '1',", $response);
             'Psr\Log\LoggerInterface' => \DI\get('Monolog\Logger'),
             Config::class => \DI\decorate(function (Config $config) {
                 $config->tests['enable_logging'] = 1;
+                $config->log['log_writers'] = ['screen'];
                 return $config;
             }),
-            'log.handlers' => [
-                \DI\get(EchoHandler::class),
-            ],
+            'Tests.log.allowAllHandlers' => true,
         );
     }
 
-- 
cgit v1.2.3