-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
8003: Using System Value for Base Currency Results in Config Error.
- Loading branch information
1 parent
44d2562
commit 38735ac
Showing
4 changed files
with
386 additions
and
4 deletions.
There are no files selected for viewing
This file contains 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
123 changes: 123 additions & 0 deletions
123
app/code/Magento/Directory/Model/CurrencySystemConfig.php
This file contains 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,123 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| namespace Magento\Directory\Model; | ||
|
|
||
| use Magento\Config\App\Config\Type\System; | ||
| use Magento\Framework\App\ResourceConnection; | ||
| use Magento\Store\Model\StoreManagerInterface; | ||
|
|
||
| /** | ||
| * Provide system config values for allowed, base and default currencies. | ||
| */ | ||
| class CurrencySystemConfig | ||
| { | ||
| /** | ||
| * @var System | ||
| */ | ||
| private $systemConfig; | ||
|
|
||
| /** | ||
| * @var StoreManagerInterface | ||
| */ | ||
| private $storeManager; | ||
|
|
||
| /** | ||
| * @var string | ||
| */ | ||
| private $path; | ||
|
|
||
| /** | ||
| * Currency constructor. | ||
| * | ||
| * @param System $systemConfig | ||
| * @param StoreManagerInterface $storeManager | ||
| */ | ||
| public function __construct( | ||
| System $systemConfig, | ||
| StoreManagerInterface $storeManager, | ||
| ResourceConnection $resources | ||
| ) { | ||
| $this->systemConfig = $systemConfig; | ||
| $this->storeManager = $storeManager; | ||
| } | ||
|
|
||
| /** | ||
| * Retrieve config currency data by config path. | ||
| * | ||
| * @param string $path | ||
| * @return array | ||
| */ | ||
| public function getConfigCurrencies(string $path) | ||
| { | ||
| $this->path = $path; | ||
| $result = array_merge( | ||
| $this->getDefaultConfigCurrencies(), | ||
| $this->getWebsiteConfigCurrencies(), | ||
| $this->getStoreConfigCurrencies() | ||
| ); | ||
| sort($result); | ||
|
|
||
| return array_unique($result); | ||
| } | ||
|
|
||
| /** | ||
| * Get system config values as array for default scope. | ||
| * | ||
| * @return array | ||
| */ | ||
| private function getDefaultConfigCurrencies() | ||
| { | ||
| return $this->getConfig($this->path, 'default'); | ||
| } | ||
|
|
||
| /** | ||
| * Get system config values as array for website scope. | ||
| * | ||
| * @return array | ||
| */ | ||
| private function getWebsiteConfigCurrencies() | ||
| { | ||
| $websiteResult = [[]]; | ||
| foreach ($this->storeManager->getWebsites() as $website) { | ||
| $websiteResult[] = $this->getConfig($this->path, 'websites', $website->getId()); | ||
| } | ||
| $websiteResult = array_merge(...$websiteResult); | ||
|
|
||
| return $websiteResult; | ||
| } | ||
|
|
||
| /** | ||
| * Get system config values as array for store scope. | ||
| * | ||
| * @return array | ||
| */ | ||
| private function getStoreConfigCurrencies() | ||
| { | ||
| $storeResult = [[]]; | ||
| foreach ($this->storeManager->getStores() as $store) { | ||
| $storeResult[] = $this->getConfig($this->path, 'stores', $store->getId()); | ||
| } | ||
| $storeResult = array_merge(...$storeResult); | ||
|
|
||
| return $storeResult; | ||
| } | ||
|
|
||
| /** | ||
| * Get system config values as array for specified scope. | ||
| * | ||
| * @param string $scope | ||
| * @param string $scopeId | ||
| * @param string $path | ||
| * @return array | ||
| */ | ||
| private function getConfig(string $path, string $scope, string $scopeId = null) | ||
| { | ||
| $configPath = $scopeId ? sprintf('%s/%s/%s', $scope, $scopeId, $path) : sprintf('%s/%s', $scope, $path); | ||
|
|
||
| return explode(',', $this->systemConfig->get($configPath)); | ||
| } | ||
| } |
116 changes: 116 additions & 0 deletions
116
app/code/Magento/Directory/Test/Unit/Model/CurrencyConfigTest.php
This file contains 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,116 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| namespace Magento\Directory\Test\Unit\Model; | ||
|
|
||
| use Magento\Config\App\Config\Type\System; | ||
| use Magento\Directory\Model\CurrencySystemConfig; | ||
| use Magento\Framework\TestFramework\Unit\Helper\ObjectManager; | ||
| use Magento\Store\Api\Data\StoreInterface; | ||
| use Magento\Store\Api\Data\WebsiteInterface; | ||
| use Magento\Store\Model\StoreManagerInterface; | ||
| use PHPUnit\Framework\TestCase; | ||
|
|
||
| /** | ||
| * Provide tests for CurrencySystemConfig model. | ||
| */ | ||
| class CurrencyConfigTest extends TestCase | ||
| { | ||
| /** | ||
| * @var CurrencySystemConfig | ||
| */ | ||
| private $testSubject; | ||
|
|
||
| /** | ||
| * @var System|\PHPUnit_Framework_MockObject_MockObject | ||
| */ | ||
| private $systemConfig; | ||
|
|
||
| /** | ||
| * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject | ||
| */ | ||
| private $storeManager; | ||
|
|
||
| /** | ||
| * @inheritdoc | ||
| */ | ||
| protected function setUp() | ||
| { | ||
| $this->systemConfig = $this->getMockBuilder(System::class) | ||
| ->disableOriginalConstructor() | ||
| ->getMock(); | ||
| $this->storeManager = $this->getMockBuilder(StoreManagerInterface::class) | ||
| ->setMethods(['getStores', 'getWebsites']) | ||
| ->disableOriginalConstructor() | ||
| ->getMockForAbstractClass(); | ||
| $objectManager = new ObjectManager($this); | ||
| $this->testSubject = $objectManager->getObject( | ||
| CurrencySystemConfig::class, | ||
| [ | ||
| 'systemConfig' => $this->systemConfig, | ||
| 'storeManager' => $this->storeManager, | ||
| ] | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * @return void | ||
| */ | ||
| public function testGetConfigCurrencies() | ||
| { | ||
| $path = 'test/path'; | ||
| $expected = [ | ||
| 0 => 'ARS', | ||
| 1 => 'AUD', | ||
| 3 => 'BZD', | ||
| 4 => 'CAD', | ||
| 5 => 'CLP', | ||
| 6 => 'EUR', | ||
| 7 => 'USD', | ||
| ]; | ||
|
|
||
| /** @var StoreInterface|\PHPUnit_Framework_MockObject_MockObject $store */ | ||
| $store = $this->getMockBuilder(StoreInterface::class) | ||
| ->setMethods(['getId']) | ||
| ->disableOriginalConstructor() | ||
| ->getMockForAbstractClass(); | ||
| $store->expects(self::once()) | ||
| ->method('getId') | ||
| ->willReturn(1); | ||
|
|
||
| /** @var WebsiteInterface|\PHPUnit_Framework_MockObject_MockObject $website */ | ||
| $website = $this->getMockBuilder(WebsiteInterface::class) | ||
| ->setMethods(['getId']) | ||
| ->disableOriginalConstructor() | ||
| ->getMockForAbstractClass(); | ||
| $website->expects(self::once()) | ||
| ->method('getId') | ||
| ->willReturn(1); | ||
|
|
||
| $this->systemConfig->expects(self::exactly(3)) | ||
| ->method('get') | ||
| ->withConsecutive( | ||
| self::identicalTo('default/test/path'), | ||
| self::identicalTo('websites/1/test/path'), | ||
| self::identicalTo('stores/1/test/path') | ||
| )->willReturnOnConsecutiveCalls( | ||
| 'USD,EUR', | ||
| 'AUD,ARS', | ||
| 'BZD,CAD,AUD,CLP' | ||
| ); | ||
|
|
||
| $this->storeManager->expects(self::once()) | ||
| ->method('getStores') | ||
| ->willReturn([$store]); | ||
| $this->storeManager->expects(self::once()) | ||
| ->method('getWebsites') | ||
| ->willReturn([$website]); | ||
|
|
||
| $result = $this->testSubject->getConfigCurrencies($path); | ||
|
|
||
| self::assertEquals($expected, $result); | ||
| } | ||
| } |
Oops, something went wrong.