Make IniSettingsProvider a singleton in order to make sure IniFileChain is shared (again, regressed in a previous commit), and fixed many tests. Changed CacheTest from integration to unit.

1 files changed, 6 insertions, 6 deletions

diff --git a/plugins/Monolog/Test/Integration/LogTest.php b/plugins/Monolog/Test/Integration/LogTest.php
index 2975015301..50de71bf2e 100644
--- a/plugins/Monolog/Test/Integration/LogTest.php
+++ b/plugins/Monolog/Test/Integration/LogTest.php
@@ -9,6 +9,7 @@
 namespace Piwik\Plugins\Monolog\Test\Integration;
 
 use Exception;
+use Piwik\Application\Environment;
 use Piwik\Common;
 use Piwik\Config;
 use Piwik\Container\ContainerFactory;
@@ -39,9 +40,9 @@ class LogTest extends IntegrationTestCase
         parent::setUp();
 
         // Create the container in the normal environment (because in tests logging is disabled)
-        $containerFactory = new ContainerFactory();
-        $container = $containerFactory->create();
-        StaticContainer::set($container);
+        $environment = new Environment(null);
+        $environment->init();
+
         Log::unsetInstance();
 
         Config::getInstance()->log['string_message_format'] = self::STRING_MESSAGE_FORMAT;
@@ -53,13 +54,12 @@ class LogTest extends IntegrationTestCase
 
     public function tearDown()
     {
-        parent::tearDown();
-
-        StaticContainer::clearContainer();
         Log::unsetInstance();
 
         @unlink(self::getLogFileLocation());
         Log::$debugBacktraceForTests = null;
+
+        parent::tearDown();
     }
 
     /**