From ee1cee27dc25338b8cacd33b84b35c8596a9bb72 Mon Sep 17 00:00:00 2001
From: Rostislav Wolny <rosta@mailpoet.com>
Date: Mon, 5 Aug 2019 08:52:40 +0200
Subject: [PATCH] Inject Session into Initializer using DI

[MAILPOET-2248]
---
 lib/Config/Initializer.php       | 10 +++++++---
 lib/DI/ContainerConfigurator.php |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/Config/Initializer.php b/lib/Config/Initializer.php
index 8112fd8f9f..089f6d3587 100644
--- a/lib/Config/Initializer.php
+++ b/lib/Config/Initializer.php
@@ -60,6 +60,9 @@ class Initializer {
   /** @var DatabaseInitializer */
   private $database_initializer;
 
+  /** @var Session */
+  private $session;
+
   const INITIALIZED = 'MAILPOET_INITIALIZED';
 
   function __construct(
@@ -75,7 +78,8 @@ class Initializer {
     CronTrigger $cron_trigger,
     PermanentNotices $permanent_notices,
     Shortcodes $shortcodes,
-    DatabaseInitializer $database_initializer
+    DatabaseInitializer $database_initializer,
+    Session $session
   ) {
       $this->renderer_factory = $renderer_factory;
       $this->access_control = $access_control;
@@ -90,6 +94,7 @@ class Initializer {
       $this->permanent_notices = $permanent_notices;
       $this->shortcodes = $shortcodes;
       $this->database_initializer = $database_initializer;
+      $this->session = $session;
   }
 
   function init() {
@@ -209,8 +214,7 @@ class Initializer {
   }
 
   function setupSession() {
-    $session = new Session;
-    $session->init();
+    $this->session->init();
   }
 
   function maybeDbUpdate() {
diff --git a/lib/DI/ContainerConfigurator.php b/lib/DI/ContainerConfigurator.php
index 211ee668cd..9e1513b9e6 100644
--- a/lib/DI/ContainerConfigurator.php
+++ b/lib/DI/ContainerConfigurator.php
@@ -87,6 +87,7 @@ class ContainerConfigurator implements IContainerConfigurator {
     $container->autowire(\MailPoet\Config\MP2Migrator::class);
     $container->autowire(\MailPoet\Config\RendererFactory::class)->setPublic(true);
     $container->autowire(\MailPoet\Config\ServicesChecker::class);
+    $container->autowire(\MailPoet\Config\Session::class);
     $container->autowire(\MailPoet\Config\Shortcodes::class)
       ->setShared(false); // Get a new instance each time $container->get() is called, needed for tests
     $container->register(\MailPoet\Config\Renderer::class)