[Up port] Fixed the issue #19347. #19393
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| <?php | ||
tiagosampaio marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| declare(strict_types=1); | ||
|
|
||
| namespace Magento\Checkout\Model\Cart; | ||
|
|
||
| /** | ||
| * Provides the checkout configuration. | ||
| */ | ||
| class ConfigProvider implements \Magento\Framework\View\Element\Block\ArgumentInterface | ||
| { | ||
| /** | ||
| * @var \Magento\Checkout\Model\CompositeConfigProvider | ||
| */ | ||
| private $configProvider; | ||
|
|
||
| /** | ||
| * @var \Magento\Framework\Serialize\SerializerInterface | ||
| */ | ||
| private $serializer; | ||
|
|
||
| /** | ||
| * @var array | ||
| */ | ||
| private $providedConfig = null; | ||
|
|
||
| /** | ||
| * Config constructor. | ||
| * | ||
| * @param \Magento\Checkout\Model\CompositeConfigProvider $configProvider | ||
| * @param \Magento\Framework\Serialize\SerializerInterface $serializer | ||
| */ | ||
| public function __construct( | ||
| \Magento\Checkout\Model\CompositeConfigProvider $configProvider, | ||
| \Magento\Framework\Serialize\SerializerInterface $serializer | ||
| ) { | ||
| $this->configProvider = $configProvider; | ||
| $this->serializer = $serializer; | ||
| } | ||
|
|
||
| /** | ||
| * Retrieve checkout configuration | ||
| * | ||
| * @return array | ||
| */ | ||
| public function getCheckoutConfig() | ||
| { | ||
| if (null === $this->providedConfig) { | ||
| $this->providedConfig = $this->configProvider->getConfig(); | ||
| } | ||
|
|
||
| return $this->providedConfig; | ||
| } | ||
|
|
||
| /** | ||
| * Retrieve checkout serialized configuration | ||
| * | ||
| * @return bool|string | ||
| */ | ||
| public function getSerializedCheckoutConfig() | ||
| { | ||
| return $this->serializer->serialize($this->getCheckoutConfig()); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| namespace Magento\Checkout\Test\Unit\Model\Cart; | ||
|
|
||
| /** | ||
| * Test for Magento\Checkout\Model\Cart\ConfigProvider class. | ||
| */ | ||
| class ConfigProviderTest extends \PHPUnit\Framework\TestCase | ||
| { | ||
| /** | ||
| * @var \Magento\Checkout\Model\Cart\ConfigProvider | ||
| */ | ||
| private $model; | ||
|
|
||
| /** | ||
| * @var \PHPUnit_Framework_MockObject_MockObject | ||
| */ | ||
| private $cartConfigProvider; | ||
|
|
||
| /** | ||
| * @var \PHPUnit_Framework_MockObject_MockObject | ||
| */ | ||
| private $compositeConfigProvider; | ||
|
|
||
| /** | ||
| * @var \PHPUnit_Framework_MockObject_MockObject | ||
| */ | ||
| private $serializer; | ||
|
|
||
| protected function setUp() | ||
| { | ||
| $this->cartConfigProvider = $this->createMock(\Magento\Checkout\Model\Cart\ConfigProvider::class); | ||
| $this->compositeConfigProvider = $this->createMock(\Magento\Checkout\Model\CompositeConfigProvider::class); | ||
| $this->serializer = $this->createMock(\Magento\Framework\Serialize\SerializerInterface::class); | ||
|
|
||
| $this->model = new \Magento\Checkout\Model\Cart\ConfigProvider( | ||
| $this->compositeConfigProvider, | ||
| $this->serializer | ||
| ); | ||
| } | ||
|
|
||
| public function testGetCheckoutConfig() | ||
| { | ||
| $config = ['param' => 'value']; | ||
| $this->compositeConfigProvider | ||
| ->expects($this->once()) | ||
| ->method('getConfig') | ||
| ->willReturn($config); | ||
|
|
||
| $this->assertEquals($config, $this->model->getCheckoutConfig()); | ||
| } | ||
|
|
||
| public function testGetSerializedCheckoutConfig() | ||
| { | ||
| $config = '{"param":"value"}'; | ||
|
|
||
| $this->serializer | ||
| ->expects($this->once()) | ||
| ->method('serialize') | ||
| ->willReturn($config); | ||
|
|
||
| $this->assertEquals($config, $this->model->getSerializedCheckoutConfig()); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| define([ | ||
| 'mage/url', | ||
| 'Magento_Ui/js/block-loader' | ||
| ], function (url, blockLoader) { | ||
| 'use strict'; | ||
|
|
||
| return function (config) { | ||
| window.checkoutConfig = config.checkoutConfig; | ||
| window.customerData = window.checkoutConfig.customerData; | ||
| window.isCustomerLoggedIn = window.checkoutConfig.isCustomerLoggedIn; | ||
|
|
||
| blockLoader(config.loaderFile); | ||
| url.setBaseUrl(config.baseUrl); | ||
| }; | ||
| }); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please inject this class via block argument in layout
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @sivaschenko
Based on the discussion in #23733 I think it's not backwards compatible to add block arguments via layout xml?
If custom modules try to instantiate the same block class in some custom xml file, then after upgrading Magento the module might crash as it's missing some arguments which are then undefined but still being used by the phtml file.
Can you double check this?