Skip to content

Commit 8b2069b

Browse files
authored
fix: Use Object Manager for ModeConfigured
Fixing #38875 (AC-12299)
1 parent 6a18520 commit 8b2069b

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

app/code/Magento/Csp/Model/Mode/ConfigManager.php

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use Magento\Framework\App\ObjectManager;
1212
use Magento\Csp\Api\Data\ModeConfiguredInterface;
1313
use Magento\Csp\Api\ModeConfigManagerInterface;
14-
use Magento\Csp\Model\Mode\Data\ModeConfigured;
14+
use Magento\Csp\Model\Mode\Data\ModeConfiguredFactory;
1515
use Magento\Framework\App\Area;
1616
use Magento\Framework\App\Config\ScopeConfigInterface;
1717
use Magento\Framework\App\State;
@@ -24,10 +24,15 @@
2424
class ConfigManager implements ModeConfigManagerInterface
2525
{
2626
/**
27-
* @var ScopeConfigInterface
27+
* @var ScopeConfigInterfaceFactory
2828
*/
2929
private $config;
3030

31+
/**
32+
* @var ModeConfiguredFactory
33+
*/
34+
private $modeConfiguredFactory;
35+
3136
/**
3237
* @var Store
3338
*/
@@ -45,17 +50,20 @@ class ConfigManager implements ModeConfigManagerInterface
4550

4651
/**
4752
* @param ScopeConfigInterface $config
53+
* @param ModeConfiguredFactory $modeConfiguredFactory
4854
* @param Store $store
4955
* @param State $state
5056
* @param Http|null $request
5157
*/
5258
public function __construct(
5359
ScopeConfigInterface $config,
60+
ModeConfiguredFactory $modeConfiguredFactory,
5461
Store $store,
5562
State $state,
5663
?Http $request = null
5764
) {
5865
$this->config = $config;
66+
$this->modeConfiguredFactory = $modeConfiguredFactory;
5967
$this->storeModel = $store;
6068
$this->state = $state;
6169

@@ -118,9 +126,9 @@ public function getConfigured(): ModeConfiguredInterface
118126
);
119127
}
120128

121-
return new ModeConfigured(
122-
(bool) $reportOnly,
123-
!empty($reportUri) ? $reportUri : null
124-
);
129+
return $this->modeConfiguredFactory->create([
130+
'reportOnly' => $reportOnly,
131+
'reportUri' => !empty($reportUri) ? $reportUri : null,
132+
]);
125133
}
126134
}

0 commit comments

Comments
 (0)