Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Inject Session into Initializer using DI

Browse Source 
[MAILPOET-2248]
This commit is contained in:
Rostislav Wolny
2019-08-05 08:52:40 +02:00
committed by Jack Kitterhing
parent 7cb322196f
commit ee1cee27dc
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Config/Initializer.php
View File

@ -60,6 +60,9 @@ class Initializer {
/** @var DatabaseInitializer */ /** @var DatabaseInitializer */
private $database_initializer; private $database_initializer;
/** @var Session */
private $session;
const INITIALIZED = 'MAILPOET_INITIALIZED'; const INITIALIZED = 'MAILPOET_INITIALIZED';
function __construct( function __construct(
@ -75,7 +78,8 @@ class Initializer {
CronTrigger $cron_trigger, CronTrigger $cron_trigger,
PermanentNotices $permanent_notices, PermanentNotices $permanent_notices,
Shortcodes $shortcodes, Shortcodes $shortcodes,
DatabaseInitializer $database_initializer DatabaseInitializer $database_initializer,
Session $session
) { ) {
$this->renderer_factory = $renderer_factory; $this->renderer_factory = $renderer_factory;
$this->access_control = $access_control; $this->access_control = $access_control;
@ -90,6 +94,7 @@ class Initializer {
$this->permanent_notices = $permanent_notices; $this->permanent_notices = $permanent_notices;
$this->shortcodes = $shortcodes; $this->shortcodes = $shortcodes;
$this->database_initializer = $database_initializer; $this->database_initializer = $database_initializer;
$this->session = $session;
} }
function init() { function init() {
@ -209,8 +214,7 @@ class Initializer {
} }
function setupSession() { function setupSession() {
$session = new Session; $this->session->init();
$session->init();
} }
function maybeDbUpdate() { function maybeDbUpdate() {

1
lib/DI/ContainerConfigurator.php
View File

@ -87,6 +87,7 @@ class ContainerConfigurator implements IContainerConfigurator {
$container->autowire(\MailPoet\Config\MP2Migrator::class); $container->autowire(\MailPoet\Config\MP2Migrator::class);
$container->autowire(\MailPoet\Config\RendererFactory::class)->setPublic(true); $container->autowire(\MailPoet\Config\RendererFactory::class)->setPublic(true);
$container->autowire(\MailPoet\Config\ServicesChecker::class); $container->autowire(\MailPoet\Config\ServicesChecker::class);
$container->autowire(\MailPoet\Config\Session::class);
$container->autowire(\MailPoet\Config\Shortcodes::class) $container->autowire(\MailPoet\Config\Shortcodes::class)
->setShared(false); // Get a new instance each time $container->get() is called, needed for tests ->setShared(false); // Get a new instance each time $container->get() is called, needed for tests
$container->register(\MailPoet\Config\Renderer::class) $container->register(\MailPoet\Config\Renderer::class)