Merge branch 'master' into config_step_2

Conflicts:
	core/Console.php
	piwik.php

1 files changed, 19 insertions, 0 deletions

diff --git a/tests/PHPUnit/Framework/Mock/FakeLogger.php b/tests/PHPUnit/Framework/Mock/FakeLogger.php
new file mode 100644
index 0000000000..8bdd66388c
--- /dev/null
+++ b/tests/PHPUnit/Framework/Mock/FakeLogger.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Piwik\Tests\Framework\Mock;
+
+use Psr\Log\AbstractLogger;
+use Psr\Log\LoggerInterface;
+
+class FakeLogger extends AbstractLogger implements LoggerInterface
+{
+    /**
+     * @var string
+     */
+    public $output = '';
+
+    public function log($level, $message, array $context = array())
+    {
+        $this->output .= $message . PHP_EOL;
+    }
+}