Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix "area code is not set" in all commands that depend on Payment/Helper/Data #33726

Merged
merged 10 commits into from
Oct 28, 2021
Merged

Fix "area code is not set" in all commands that depend on Payment/Helper/Data #33726

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d0f2201
Fix "area code is not set" in all commands that depend on Payment/Hel…
marvinhinz Aug 9, 2021
b4a7f92
Fix
marvinhinz Aug 9, 2021
ee828bc
Fix #2
marvinhinz Aug 9, 2021
1a3a59f
restore $layout property and make it deprecated
marvinhinz Aug 13, 2021
63e87da
Change new property visibility to private
marvinhinz Aug 13, 2021
e264762
Merge remote-tracking branch 'origin/2.4-develop' into patch-7
Den4ik Aug 25, 2021
2c2454a
Fix unit tests
Den4ik Aug 25, 2021
19178be
Merge branch '2.4-develop' into patch-7
marvinhinz Oct 13, 2021
c8777f0
Fix static tests
Den4ik Oct 18, 2021
aaf035d
Move declare stric type after copyright
Den4ik Oct 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions app/code/Magento/Payment/Helper/Data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,9 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
protected $_paymentConfig;

/**
* Layout
*
* @var \Magento\Framework\View\LayoutInterface
* @var \Magento\Framework\View\LayoutFactory
*/
protected $_layout;
protected $_layoutFactory;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't rename exist properties in @api class. It's backward incompatible.
Just add another one private property and deprecate current

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done 👍🏼


/**
* Factory for payment method models
Expand Down Expand Up @@ -76,7 +74,7 @@ public function __construct(
\Magento\Framework\App\Config\Initial $initialConfig
) {
parent::__construct($context);
$this->_layout = $layoutFactory->create();
$this->_layoutFactory = $_layoutFactory;
$this->_methodFactory = $paymentMethodFactory;
$this->_appEmulation = $appEmulation;
$this->_paymentConfig = $paymentConfig;
Expand Down Expand Up @@ -183,7 +181,7 @@ public function getMethodFormBlock(MethodInterface $method, LayoutInterface $lay
*/
public function getInfoBlock(InfoInterface $info, LayoutInterface $layout = null)
{
$layout = $layout ?: $this->_layout;
$layout = $layout ?: $this->_layoutFactory->create();
$blockType = $info->getMethodInstance()->getInfoBlockType();
$block = $layout->createBlock($blockType);
$block->setInfo($info);
Expand Down