Skip to content

Commit 298d3c5

Browse files
committed
Make sure that the new dependancy on SerializerInterface is not required
1 parent a26f8da commit 298d3c5

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

app/code/Magento/Captcha/Controller/Adminhtml/Refresh/Refresh.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,18 @@ class Refresh extends \Magento\Backend\App\Action
2222

2323
/**
2424
* @param \Magento\Backend\App\Action\Context $context
25-
* @param \Magento\Framework\Serialize\SerializerInterface $serializer
25+
* @param \Magento\Framework\Serialize\SerializerInterface|null $serializer
2626
* @param \Magento\Captcha\Helper\Data $captchaHelper
27+
* @throws \RuntimeException
2728
*/
2829
public function __construct(
2930
\Magento\Backend\App\Action\Context $context,
30-
\Magento\Framework\Serialize\SerializerInterface $serializer,
31+
\Magento\Framework\Serialize\SerializerInterface $serializer = null,
3132
\Magento\Captcha\Helper\Data $captchaHelper
3233
) {
3334
parent::__construct($context);
34-
$this->serializer = $serializer;
35+
$this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
36+
->get(\Magento\Framework\Serialize\SerializerInterface::class);
3537
$this->captchaHelper = $captchaHelper;
3638
}
3739

app/code/Magento/Captcha/Controller/Refresh/Index.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,17 @@ class Index extends \Magento\Framework\App\Action\Action
2525
/**
2626
* @param Context $context
2727
* @param \Magento\Captcha\Helper\Data $captchaHelper
28-
* @param \Magento\Framework\Serialize\SerializerInterface $serializer
28+
* @param \Magento\Framework\Serialize\SerializerInterface|null $serializer
29+
* @throws \RuntimeException
2930
*/
3031
public function __construct(
3132
Context $context,
3233
\Magento\Captcha\Helper\Data $captchaHelper,
33-
\Magento\Framework\Serialize\SerializerInterface $serializer
34+
\Magento\Framework\Serialize\SerializerInterface $serializer = null
3435
) {
3536
$this->captchaHelper = $captchaHelper;
36-
$this->serializer = $serializer;
37+
$this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
38+
->get(\Magento\Framework\Serialize\SerializerInterface::class);
3739
parent::__construct($context);
3840
}
3941

app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,22 @@ class AjaxLogin
4040
* @param CaptchaHelper $helper
4141
* @param SessionManagerInterface $sessionManager
4242
* @param JsonFactory $resultJsonFactory
43-
* @param \Magento\Framework\Serialize\SerializerInterface $serializer
43+
* @param \Magento\Framework\Serialize\SerializerInterface|null $serializer
4444
* @param array $formIds
45+
* @throws \RuntimeException
4546
*/
4647
public function __construct(
4748
CaptchaHelper $helper,
4849
SessionManagerInterface $sessionManager,
4950
JsonFactory $resultJsonFactory,
50-
\Magento\Framework\Serialize\SerializerInterface $serializer,
51+
\Magento\Framework\Serialize\SerializerInterface $serializer = null,
5152
array $formIds
5253
) {
5354
$this->helper = $helper;
5455
$this->sessionManager = $sessionManager;
5556
$this->resultJsonFactory = $resultJsonFactory;
56-
$this->serializer = $serializer;
57+
$this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
58+
->get(\Magento\Framework\Serialize\SerializerInterface::class);
5759
$this->formIds = $formIds;
5860
}
5961

0 commit comments

Comments
 (0)