-
+
getFileThumbUrl($file)):?>
) ?>)
diff --git a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml
index 9f886f6f1345e..793fc7d26cb4a 100644
--- a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml
+++ b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml
@@ -146,7 +146,6 @@
true
- true
text
diff --git a/app/code/Magento/Config/App/Config/Type/System.php b/app/code/Magento/Config/App/Config/Type/System.php
index 83c61f90f789a..c07872a630830 100644
--- a/app/code/Magento/Config/App/Config/Type/System.php
+++ b/app/code/Magento/Config/App/Config/Type/System.php
@@ -11,6 +11,7 @@
use Magento\Framework\App\Config\Spi\PreProcessorInterface;
use Magento\Framework\App\ObjectManager;
use Magento\Config\App\Config\Type\System\Reader;
+use Magento\Framework\Lock\LockManagerInterface;
use Magento\Framework\Serialize\Serializer\Sensitive as SensitiveSerializer;
use Magento\Framework\Serialize\Serializer\SensitiveFactory as SensitiveSerializerFactory;
use Magento\Framework\App\ScopeInterface;
@@ -24,12 +25,43 @@
*
* @api
* @since 100.1.2
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class System implements ConfigTypeInterface
{
+ /**
+ * Config cache tag.
+ */
const CACHE_TAG = 'config_scopes';
+
+ /**
+ * System config type.
+ */
const CONFIG_TYPE = 'system';
+ /**
+ * @var string
+ */
+ private static $lockName = 'SYSTEM_CONFIG';
+
+ /**
+ * Timeout between retrieves to load the configuration from the cache.
+ *
+ * Value of the variable in microseconds.
+ *
+ * @var int
+ */
+ private static $delayTimeout = 50000;
+
+ /**
+ * Lifetime of the lock for write in cache.
+ *
+ * Value of the variable in seconds.
+ *
+ * @var int
+ */
+ private static $lockTimeout = 8;
+
/**
* @var array
*/
@@ -71,6 +103,11 @@ class System implements ConfigTypeInterface
*/
private $availableDataScopes;
+ /**
+ * @var LockManagerInterface
+ */
+ private $locker;
+
/**
* @param ConfigSourceInterface $source
* @param PostProcessorInterface $postProcessor
@@ -82,7 +119,7 @@ class System implements ConfigTypeInterface
* @param string $configType
* @param Reader $reader
* @param SensitiveSerializerFactory|null $sensitiveFactory
- *
+ * @param LockManagerInterface|null $locker
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
@@ -96,7 +133,8 @@ public function __construct(
$cachingNestedLevel = 1,
$configType = self::CONFIG_TYPE,
Reader $reader = null,
- SensitiveSerializerFactory $sensitiveFactory = null
+ SensitiveSerializerFactory $sensitiveFactory = null,
+ LockManagerInterface $locker = null
) {
$this->postProcessor = $postProcessor;
$this->cache = $cache;
@@ -110,6 +148,7 @@ public function __construct(
$this->serializer = $sensitiveFactory->create(
['serializer' => $serializer]
);
+ $this->locker = $locker ?: ObjectManager::getInstance()->get(LockManagerInterface::class);
}
/**
@@ -153,7 +192,7 @@ private function getWithParts($path)
if (count($pathParts) === 1 && $pathParts[0] !== ScopeInterface::SCOPE_DEFAULT) {
if (!isset($this->data[$pathParts[0]])) {
- $data = $this->readData();
+ $data = $this->loadAllData();
$this->data = array_replace_recursive($data, $this->data);
}
@@ -186,21 +225,60 @@ private function getWithParts($path)
}
/**
- * Load configuration data for all scopes
+ * Make lock on data load.
*
+ * @param callable $dataLoader
+ * @param bool $flush
* @return array
*/
- private function loadAllData()
+ private function lockedLoadData(callable $dataLoader, bool $flush = false): array
{
- $cachedData = $this->cache->load($this->configType);
+ $cachedData = $dataLoader(); //optimistic read
- if ($cachedData === false) {
- $data = $this->readData();
- } else {
- $data = $this->serializer->unserialize($cachedData);
+ while ($cachedData === false && $this->locker->isLocked(self::$lockName)) {
+ usleep(self::$delayTimeout);
+ $cachedData = $dataLoader();
}
- return $data;
+ while ($cachedData === false) {
+ try {
+ if ($this->locker->lock(self::$lockName, self::$lockTimeout)) {
+ if (!$flush) {
+ $data = $this->readData();
+ $this->cacheData($data);
+ $cachedData = $data;
+ } else {
+ $this->cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_TAG, [self::CACHE_TAG]);
+ $cachedData = [];
+ }
+ }
+ } finally {
+ $this->locker->unlock(self::$lockName);
+ }
+
+ if ($cachedData === false) {
+ usleep(self::$delayTimeout);
+ $cachedData = $dataLoader();
+ }
+ }
+
+ return $cachedData;
+ }
+
+ /**
+ * Load configuration data for all scopes
+ *
+ * @return array
+ */
+ private function loadAllData()
+ {
+ return $this->lockedLoadData(function () {
+ $cachedData = $this->cache->load($this->configType);
+ if ($cachedData === false) {
+ return $cachedData;
+ }
+ return $this->serializer->unserialize($cachedData);
+ });
}
/**
@@ -211,16 +289,13 @@ private function loadAllData()
*/
private function loadDefaultScopeData($scopeType)
{
- $cachedData = $this->cache->load($this->configType . '_' . $scopeType);
-
- if ($cachedData === false) {
- $data = $this->readData();
- $this->cacheData($data);
- } else {
- $data = [$scopeType => $this->serializer->unserialize($cachedData)];
- }
-
- return $data;
+ return $this->lockedLoadData(function () use ($scopeType) {
+ $cachedData = $this->cache->load($this->configType . '_' . $scopeType);
+ if ($cachedData === false) {
+ return $cachedData;
+ }
+ return [$scopeType => $this->serializer->unserialize($cachedData)];
+ });
}
/**
@@ -232,25 +307,22 @@ private function loadDefaultScopeData($scopeType)
*/
private function loadScopeData($scopeType, $scopeId)
{
- $cachedData = $this->cache->load($this->configType . '_' . $scopeType . '_' . $scopeId);
-
- if ($cachedData === false) {
- if ($this->availableDataScopes === null) {
- $cachedScopeData = $this->cache->load($this->configType . '_scopes');
- if ($cachedScopeData !== false) {
- $this->availableDataScopes = $this->serializer->unserialize($cachedScopeData);
+ return $this->lockedLoadData(function () use ($scopeType, $scopeId) {
+ $cachedData = $this->cache->load($this->configType . '_' . $scopeType . '_' . $scopeId);
+ if ($cachedData === false) {
+ if ($this->availableDataScopes === null) {
+ $cachedScopeData = $this->cache->load($this->configType . '_scopes');
+ if ($cachedScopeData !== false) {
+ $this->availableDataScopes = $this->serializer->unserialize($cachedScopeData);
+ }
}
+ if (is_array($this->availableDataScopes) && !isset($this->availableDataScopes[$scopeType][$scopeId])) {
+ return [$scopeType => [$scopeId => []]];
+ }
+ return false;
}
- if (is_array($this->availableDataScopes) && !isset($this->availableDataScopes[$scopeType][$scopeId])) {
- return [$scopeType => [$scopeId => []]];
- }
- $data = $this->readData();
- $this->cacheData($data);
- } else {
- $data = [$scopeType => [$scopeId => $this->serializer->unserialize($cachedData)]];
- }
-
- return $data;
+ return [$scopeType => [$scopeId => $this->serializer->unserialize($cachedData)]];
+ });
}
/**
@@ -340,6 +412,11 @@ private function readData(): array
public function clean()
{
$this->data = [];
- $this->cache->clean(\Zend_Cache::CLEANING_MODE_MATCHING_TAG, [self::CACHE_TAG]);
+ $this->lockedLoadData(
+ function () {
+ return false;
+ },
+ true
+ );
}
}
diff --git a/app/code/Magento/Config/Block/System/Config/Form.php b/app/code/Magento/Config/Block/System/Config/Form.php
index 81e39a83296d7..63a2b811f93ec 100644
--- a/app/code/Magento/Config/Block/System/Config/Form.php
+++ b/app/code/Magento/Config/Block/System/Config/Form.php
@@ -143,13 +143,15 @@ public function __construct(
\Magento\Config\Model\Config\Structure $configStructure,
\Magento\Config\Block\System\Config\Form\Fieldset\Factory $fieldsetFactory,
\Magento\Config\Block\System\Config\Form\Field\Factory $fieldFactory,
- array $data = []
+ array $data = [],
+ SettingChecker $settingChecker = null
) {
parent::__construct($context, $registry, $formFactory, $data);
$this->_configFactory = $configFactory;
$this->_configStructure = $configStructure;
$this->_fieldsetFactory = $fieldsetFactory;
$this->_fieldFactory = $fieldFactory;
+ $this->settingChecker = $settingChecker ?: ObjectManager::getInstance()->get(SettingChecker::class);
$this->_scopeLabels = [
self::SCOPE_DEFAULT => __('[GLOBAL]'),
@@ -158,18 +160,6 @@ public function __construct(
];
}
- /**
- * @deprecated 100.1.2
- * @return SettingChecker
- */
- private function getSettingChecker()
- {
- if ($this->settingChecker === null) {
- $this->settingChecker = ObjectManager::getInstance()->get(SettingChecker::class);
- }
- return $this->settingChecker;
- }
-
/**
* Initialize objects required to render config form
*
@@ -366,9 +356,8 @@ protected function _initElement(
$sharedClass = $this->_getSharedCssClass($field);
$requiresClass = $this->_getRequiresCssClass($field, $fieldPrefix);
+ $isReadOnly = $this->isReadOnly($field, $path);
- $isReadOnly = $this->getElementVisibility()->isDisabled($field->getPath())
- ?: $this->getSettingChecker()->isReadOnly($path, $this->getScope(), $this->getStringScopeCode());
$formField = $fieldset->addField(
$elementId,
$field->getType(),
@@ -417,7 +406,7 @@ private function getFieldData(\Magento\Config\Model\Config\Structure\Element\Fie
{
$data = $this->getAppConfigDataValue($path);
- $placeholderValue = $this->getSettingChecker()->getPlaceholderValue(
+ $placeholderValue = $this->settingChecker->getPlaceholderValue(
$path,
$this->getScope(),
$this->getStringScopeCode()
@@ -434,6 +423,10 @@ private function getFieldData(\Magento\Config\Model\Config\Structure\Element\Fie
$backendModel = $field->getBackendModel();
// Backend models which implement ProcessorInterface are processed by ScopeConfigInterface
if (!$backendModel instanceof ProcessorInterface) {
+ if (array_key_exists($path, $this->_configData)) {
+ $data = $this->_configData[$path];
+ }
+
$backendModel->setPath($path)
->setValue($data)
->setWebsite($this->getWebsiteCode())
@@ -718,6 +711,7 @@ protected function _getAdditionalElementTypes()
*
* @TODO delete this methods when {^see above^} is done
* @return string
+ * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
*/
public function getSectionCode()
{
@@ -729,6 +723,7 @@ public function getSectionCode()
*
* @TODO delete this methods when {^see above^} is done
* @return string
+ * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
*/
public function getWebsiteCode()
{
@@ -740,6 +735,7 @@ public function getWebsiteCode()
*
* @TODO delete this methods when {^see above^} is done
* @return string
+ * @SuppressWarnings(PHPMD.RequestAwareBlockMethod)
*/
public function getStoreCode()
{
@@ -797,6 +793,26 @@ private function getAppConfig()
return $this->appConfig;
}
+ /**
+ * Check Path is Readonly
+ *
+ * @param \Magento\Config\Model\Config\Structure\Element\Field $field
+ * @param string $path
+ * @return boolean
+ */
+ private function isReadOnly(\Magento\Config\Model\Config\Structure\Element\Field $field, $path)
+ {
+ $isReadOnly = $this->settingChecker->isReadOnly(
+ $path,
+ ScopeConfigInterface::SCOPE_TYPE_DEFAULT
+ );
+ if (!$isReadOnly) {
+ $isReadOnly = $this->getElementVisibility()->isDisabled($field->getPath())
+ ?: $this->settingChecker->isReadOnly($path, $this->getScope(), $this->getStringScopeCode());
+ }
+ return $isReadOnly;
+ }
+
/**
* Retrieve deployment config data value by path
*
diff --git a/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php b/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
index d7d513bfad423..86ae1f96749df 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSet/DefaultProcessor.php
@@ -7,17 +7,19 @@
use Magento\Config\App\Config\Type\System;
use Magento\Config\Console\Command\ConfigSetCommand;
+use Magento\Config\Model\Config\Factory as ConfigFactory;
use Magento\Framework\App\Config\ConfigPathResolver;
use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\ObjectManager;
use Magento\Framework\Exception\CouldNotSaveException;
use Magento\Config\Model\PreparedValueFactory;
-use Magento\Framework\App\Config\Value;
/**
* Processes default flow of config:set command.
+ *
* This processor saves the value of configuration into database.
*
- * {@inheritdoc}
+ * @inheritdoc
* @api
* @since 100.2.0
*/
@@ -44,26 +46,36 @@ class DefaultProcessor implements ConfigSetProcessorInterface
*/
private $preparedValueFactory;
+ /**
+ * @var ConfigFactory
+ */
+ private $configFactory;
+
/**
* @param PreparedValueFactory $preparedValueFactory The factory for prepared value
* @param DeploymentConfig $deploymentConfig The deployment configuration reader
* @param ConfigPathResolver $configPathResolver The resolver for configuration paths according to source type
+ * @param ConfigFactory|null $configFactory
*/
public function __construct(
PreparedValueFactory $preparedValueFactory,
DeploymentConfig $deploymentConfig,
- ConfigPathResolver $configPathResolver
+ ConfigPathResolver $configPathResolver,
+ ConfigFactory $configFactory = null
) {
$this->preparedValueFactory = $preparedValueFactory;
$this->deploymentConfig = $deploymentConfig;
$this->configPathResolver = $configPathResolver;
+
+ $this->configFactory = $configFactory ?? ObjectManager::getInstance()->get(ConfigFactory::class);
}
/**
* Processes database flow of config:set command.
+ *
* Requires installed application.
*
- * {@inheritdoc}
+ * @inheritdoc
* @since 100.2.0
*/
public function process($path, $value, $scope, $scopeCode)
@@ -78,12 +90,12 @@ public function process($path, $value, $scope, $scopeCode)
}
try {
- /** @var Value $backendModel */
- $backendModel = $this->preparedValueFactory->create($path, $value, $scope, $scopeCode);
- if ($backendModel instanceof Value) {
- $resourceModel = $backendModel->getResource();
- $resourceModel->save($backendModel);
- }
+ $config = $this->configFactory->create([
+ 'scope' => $scope,
+ 'scope_code' => $scopeCode,
+ ]);
+ $config->setDataByPath($path, $value);
+ $config->save();
} catch (\Exception $exception) {
throw new CouldNotSaveException(__('%1', $exception->getMessage()), $exception);
}
diff --git a/app/code/Magento/Config/Console/Command/ConfigSetCommand.php b/app/code/Magento/Config/Console/Command/ConfigSetCommand.php
index cb79daddbf5f9..999d8e41af5bc 100644
--- a/app/code/Magento/Config/Console/Command/ConfigSetCommand.php
+++ b/app/code/Magento/Config/Console/Command/ConfigSetCommand.php
@@ -114,13 +114,13 @@ protected function configure()
),
new InputOption(
static::OPTION_LOCK_ENV,
- 'le',
+ 'e',
InputOption::VALUE_NONE,
'Lock value which prevents modification in the Admin (will be saved in app/etc/env.php)'
),
new InputOption(
static::OPTION_LOCK_CONFIG,
- 'lc',
+ 'c',
InputOption::VALUE_NONE,
'Lock and share value with other installations, prevents modification in the Admin '
. '(will be saved in app/etc/config.php)'
@@ -139,8 +139,10 @@ protected function configure()
/**
* Creates and run appropriate processor, depending on input options.
*
- * {@inheritdoc}
+ * @param InputInterface $input
+ * @param OutputInterface $output
* @since 100.2.0
+ * @return int|null
*/
protected function execute(InputInterface $input, OutputInterface $output)
{
diff --git a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php
index 7f7d461ea090d..893a73654137e 100644
--- a/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php
+++ b/app/code/Magento/Config/Controller/Adminhtml/System/Config/Save.php
@@ -6,6 +6,7 @@
namespace Magento\Config\Controller\Adminhtml\System\Config;
use Magento\Config\Controller\Adminhtml\System\AbstractConfig;
+use Magento\Framework\Exception\NotFoundException;
/**
* System Configuration Save Controller
@@ -140,9 +141,14 @@ protected function _saveAdvanced()
* Save configuration
*
* @return \Magento\Backend\Model\View\Result\Redirect
+ * @throws NotFoundException
*/
public function execute()
{
+ if (!$this->getRequest()->isPost()) {
+ throw new NotFoundException(__('Page not found'));
+ }
+
try {
// custom save logic
$this->_saveSection();
diff --git a/app/code/Magento/Config/Model/Config.php b/app/code/Magento/Config/Model/Config.php
index 0472c5daa276f..6bf191c20a844 100644
--- a/app/code/Magento/Config/Model/Config.php
+++ b/app/code/Magento/Config/Model/Config.php
@@ -9,15 +9,32 @@
use Magento\Config\Model\Config\Structure\Element\Group;
use Magento\Config\Model\Config\Structure\Element\Field;
use Magento\Framework\App\ObjectManager;
+use Magento\Framework\App\ScopeInterface;
+use Magento\Framework\App\ScopeResolverPool;
+use Magento\Store\Model\ScopeInterface as StoreScopeInterface;
+use Magento\Store\Model\ScopeTypeNormalizer;
/**
* Backend config model
+ *
* Used to save configuration
*
* @author Magento Core Team
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @api
* @since 100.0.2
+ * @method string getSection()
+ * @method void setSection(string $section)
+ * @method string getWebsite()
+ * @method void setWebsite(string $website)
+ * @method string getStore()
+ * @method void setStore(string $store)
+ * @method string getScope()
+ * @method void setScope(string $scope)
+ * @method int getScopeId()
+ * @method void setScopeId(int $scopeId)
+ * @method string getScopeCode()
+ * @method void setScopeCode(string $scopeCode)
*/
class Config extends \Magento\Framework\DataObject
{
@@ -87,6 +104,16 @@ class Config extends \Magento\Framework\DataObject
*/
private $settingChecker;
+ /**
+ * @var ScopeResolverPool
+ */
+ private $scopeResolverPool;
+
+ /**
+ * @var ScopeTypeNormalizer
+ */
+ private $scopeTypeNormalizer;
+
/**
* @param \Magento\Framework\App\Config\ReinitableConfigInterface $config
* @param \Magento\Framework\Event\ManagerInterface $eventManager
@@ -97,6 +124,9 @@ class Config extends \Magento\Framework\DataObject
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
* @param Config\Reader\Source\Deployed\SettingChecker|null $settingChecker
* @param array $data
+ * @param ScopeResolverPool|null $scopeResolverPool
+ * @param ScopeTypeNormalizer|null $scopeTypeNormalizer
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\App\Config\ReinitableConfigInterface $config,
@@ -107,7 +137,9 @@ public function __construct(
\Magento\Framework\App\Config\ValueFactory $configValueFactory,
\Magento\Store\Model\StoreManagerInterface $storeManager,
SettingChecker $settingChecker = null,
- array $data = []
+ array $data = [],
+ ScopeResolverPool $scopeResolverPool = null,
+ ScopeTypeNormalizer $scopeTypeNormalizer = null
) {
parent::__construct($data);
$this->_eventManager = $eventManager;
@@ -117,11 +149,17 @@ public function __construct(
$this->_configLoader = $configLoader;
$this->_configValueFactory = $configValueFactory;
$this->_storeManager = $storeManager;
- $this->settingChecker = $settingChecker ?: ObjectManager::getInstance()->get(SettingChecker::class);
+ $this->settingChecker = $settingChecker
+ ?? ObjectManager::getInstance()->get(SettingChecker::class);
+ $this->scopeResolverPool = $scopeResolverPool
+ ?? ObjectManager::getInstance()->get(ScopeResolverPool::class);
+ $this->scopeTypeNormalizer = $scopeTypeNormalizer
+ ?? ObjectManager::getInstance()->get(ScopeTypeNormalizer::class);
}
/**
* Save config section
+ *
* Require set: section, website, store and groups
*
* @throws \Exception
@@ -386,6 +424,11 @@ protected function _processGroup(
if (!isset($fieldData['value'])) {
$fieldData['value'] = null;
}
+
+ if ($field->getType() == 'multiline' && is_array($fieldData['value'])) {
+ $fieldData['value'] = trim(implode(PHP_EOL, $fieldData['value']));
+ }
+
$data = [
'field' => $fieldId,
'groups' => $groups,
@@ -482,30 +525,35 @@ public function setDataByPath($path, $value)
if ($path === '') {
throw new \UnexpectedValueException('Path must not be empty');
}
+
$pathParts = explode('/', $path);
$keyDepth = count($pathParts);
- if ($keyDepth !== 3) {
+ if ($keyDepth < 3) {
throw new \UnexpectedValueException(
- "Allowed depth of configuration is 3 (//). Your configuration depth is "
- . $keyDepth . " for path '$path'"
+ 'Minimal depth of configuration is 3. Your configuration depth is ' . $keyDepth
);
}
+
+ $section = array_shift($pathParts);
$data = [
- 'section' => $pathParts[0],
- 'groups' => [
- $pathParts[1] => [
- 'fields' => [
- $pathParts[2] => ['value' => $value],
- ],
- ],
+ 'fields' => [
+ array_pop($pathParts) => ['value' => $value],
],
];
+ while ($pathParts) {
+ $data = [
+ 'groups' => [
+ array_pop($pathParts) => $data,
+ ],
+ ];
+ }
+ $data['section'] = $section;
$this->addData($data);
}
/**
- * Get scope name and scopeId
- * @todo refactor to scope resolver
+ * Set scope data
+ *
* @return void
*/
private function initScope()
@@ -513,31 +561,66 @@ private function initScope()
if ($this->getSection() === null) {
$this->setSection('');
}
+
+ $scope = $this->retrieveScope();
+ $this->setScope($this->scopeTypeNormalizer->normalize($scope->getScopeType()));
+ $this->setScopeCode($scope->getCode());
+ $this->setScopeId($scope->getId());
+
if ($this->getWebsite() === null) {
- $this->setWebsite('');
+ $this->setWebsite(StoreScopeInterface::SCOPE_WEBSITES === $this->getScope() ? $scope->getId() : '');
}
if ($this->getStore() === null) {
- $this->setStore('');
+ $this->setStore(StoreScopeInterface::SCOPE_STORES === $this->getScope() ? $scope->getId() : '');
}
+ }
- if ($this->getStore()) {
- $scope = 'stores';
- $store = $this->_storeManager->getStore($this->getStore());
- $scopeId = (int)$store->getId();
- $scopeCode = $store->getCode();
- } elseif ($this->getWebsite()) {
- $scope = 'websites';
- $website = $this->_storeManager->getWebsite($this->getWebsite());
- $scopeId = (int)$website->getId();
- $scopeCode = $website->getCode();
+ /**
+ * Retrieve scope from initial data
+ *
+ * @return ScopeInterface
+ */
+ private function retrieveScope(): ScopeInterface
+ {
+ $scopeType = $this->getScope();
+ if (!$scopeType) {
+ switch (true) {
+ case $this->getStore():
+ $scopeType = StoreScopeInterface::SCOPE_STORES;
+ $scopeIdentifier = $this->getStore();
+ break;
+ case $this->getWebsite():
+ $scopeType = StoreScopeInterface::SCOPE_WEBSITES;
+ $scopeIdentifier = $this->getWebsite();
+ break;
+ default:
+ $scopeType = ScopeInterface::SCOPE_DEFAULT;
+ $scopeIdentifier = null;
+ break;
+ }
} else {
- $scope = 'default';
- $scopeId = 0;
- $scopeCode = '';
+ switch (true) {
+ case $this->getScopeId() !== null:
+ $scopeIdentifier = $this->getScopeId();
+ break;
+ case $this->getScopeCode() !== null:
+ $scopeIdentifier = $this->getScopeCode();
+ break;
+ case $this->getStore() !== null:
+ $scopeIdentifier = $this->getStore();
+ break;
+ case $this->getWebsite() !== null:
+ $scopeIdentifier = $this->getWebsite();
+ break;
+ default:
+ $scopeIdentifier = null;
+ break;
+ }
}
- $this->setScope($scope);
- $this->setScopeId($scopeId);
- $this->setScopeCode($scopeCode);
+ $scope = $this->scopeResolverPool->get($scopeType)
+ ->getScope($scopeIdentifier);
+
+ return $scope;
}
/**
diff --git a/app/code/Magento/Config/Model/Config/Backend/Admin/Usecustom.php b/app/code/Magento/Config/Model/Config/Backend/Admin/Usecustom.php
index 9a483de6a695b..d12569eebe5b2 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Admin/Usecustom.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Admin/Usecustom.php
@@ -56,8 +56,9 @@ public function beforeSave()
{
$value = $this->getValue();
if ($value == 1) {
- $customUrl = $this->getData('groups/url/fields/custom/value');
- if (empty($customUrl)) {
+ $customUrlField = $this->getData('groups/url/fields/custom/value');
+ $customUrlConfig = $this->_config->getValue('admin/url/custom');
+ if (empty($customUrlField) && empty($customUrlConfig)) {
throw new \Magento\Framework\Exception\LocalizedException(__('Please specify the admin custom URL.'));
}
}
diff --git a/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php b/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php
index 4ae66bfd9692b..25303093ace5d 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Currency/AbstractCurrency.php
@@ -14,6 +14,8 @@
namespace Magento\Config\Model\Config\Backend\Currency;
/**
+ * Base currency class
+ *
* @api
* @since 100.0.2
*/
@@ -26,18 +28,19 @@ abstract class AbstractCurrency extends \Magento\Framework\App\Config\Value
*/
protected function _getAllowedCurrencies()
{
- if (!$this->isFormData() || $this->getData('groups/options/fields/allow/inherit')) {
- return explode(
+ $allowValue = $this->getData('groups/options/fields/allow/value');
+ $allowedCurrencies = $allowValue === null || $this->getData('groups/options/fields/allow/inherit')
+ ? explode(
',',
(string)$this->_config->getValue(
\Magento\Directory\Model\Currency::XML_PATH_CURRENCY_ALLOW,
$this->getScope(),
$this->getScopeId()
)
- );
- }
+ )
+ : (array) $allowValue;
- return (array)$this->getData('groups/options/fields/allow/value');
+ return $allowedCurrencies;
}
/**
diff --git a/app/code/Magento/Config/Model/Config/Backend/Serialized.php b/app/code/Magento/Config/Model/Config/Backend/Serialized.php
index 3d5713357c39c..4d5da764db470 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Serialized.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Serialized.php
@@ -52,7 +52,18 @@ protected function _afterLoad()
{
$value = $this->getValue();
if (!is_array($value)) {
- $this->setValue(empty($value) ? false : $this->serializer->unserialize($value));
+ try {
+ $this->setValue(empty($value) ? false : $this->serializer->unserialize($value));
+ } catch (\Exception $e) {
+ $this->_logger->critical(
+ sprintf(
+ 'Failed to unserialize %s config value. The error is: %s',
+ $this->getPath(),
+ $e->getMessage()
+ )
+ );
+ $this->setValue(false);
+ }
}
}
diff --git a/app/code/Magento/Config/Model/Config/Source/Locale/Currency.php b/app/code/Magento/Config/Model/Config/Source/Locale/Currency.php
index b3474674cf76d..5beff0d043ade 100644
--- a/app/code/Magento/Config/Model/Config/Source/Locale/Currency.php
+++ b/app/code/Magento/Config/Model/Config/Source/Locale/Currency.php
@@ -4,12 +4,15 @@
* See COPYING.txt for license details.
*/
-/**
- * Locale currency source
- */
namespace Magento\Config\Model\Config\Source\Locale;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Locale\ListsInterface;
+
/**
+ * Locale currency source.
+ *
* @api
* @since 100.0.2
*/
@@ -21,27 +24,70 @@ class Currency implements \Magento\Framework\Option\ArrayInterface
protected $_options;
/**
- * @var \Magento\Framework\Locale\ListsInterface
+ * @var ListsInterface
*/
protected $_localeLists;
/**
- * @param \Magento\Framework\Locale\ListsInterface $localeLists
+ * @var ScopeConfigInterface
*/
- public function __construct(\Magento\Framework\Locale\ListsInterface $localeLists)
- {
+ private $config;
+
+ /**
+ * @var array
+ */
+ private $installedCurrencies;
+
+ /**
+ * @param ListsInterface $localeLists
+ * @param ScopeConfigInterface $config
+ */
+ public function __construct(
+ ListsInterface $localeLists,
+ ScopeConfigInterface $config = null
+ ) {
$this->_localeLists = $localeLists;
+ $this->config = $config ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
}
/**
- * @return array
+ * @inheritdoc
*/
public function toOptionArray()
{
if (!$this->_options) {
$this->_options = $this->_localeLists->getOptionCurrencies();
}
- $options = $this->_options;
+
+ $selected = array_flip($this->getInstalledCurrencies());
+
+ $options = array_filter(
+ $this->_options,
+ function ($option) use ($selected) {
+ return isset($selected[$option['value']]);
+ }
+ );
+
return $options;
}
+
+ /**
+ * Retrieve Installed Currencies.
+ *
+ * @return array
+ */
+ private function getInstalledCurrencies()
+ {
+ if (!$this->installedCurrencies) {
+ $this->installedCurrencies = explode(
+ ',',
+ $this->config->getValue(
+ 'system/currency/installed',
+ \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+ )
+ );
+ }
+
+ return $this->installedCurrencies;
+ }
}
diff --git a/app/code/Magento/Config/Setup/ConfigOptionsList.php b/app/code/Magento/Config/Setup/ConfigOptionsList.php
new file mode 100644
index 0000000000000..45e3987d282f1
--- /dev/null
+++ b/app/code/Magento/Config/Setup/ConfigOptionsList.php
@@ -0,0 +1,88 @@
+configDataFactory = $configDataFactory;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getOptions()
+ {
+ return [
+ new SelectConfigOption(
+ self::INPUT_KEY_DEBUG_LOGGING,
+ SelectConfigOption::FRONTEND_WIZARD_RADIO,
+ [true, false, 1, 0],
+ self::CONFIG_PATH_DEBUG_LOGGING,
+ 'Enable debug logging'
+ )
+ ];
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function createConfig(array $options, DeploymentConfig $deploymentConfig)
+ {
+ $config = [];
+ if (isset($options[self::INPUT_KEY_DEBUG_LOGGING])) {
+ $configData = $this->configDataFactory->create(ConfigFilePool::APP_ENV);
+ if ($options[self::INPUT_KEY_DEBUG_LOGGING] === 'true'
+ || $options[self::INPUT_KEY_DEBUG_LOGGING] === '1') {
+ $value = 1;
+ } else {
+ $value = 0;
+ }
+ $configData->set(self::CONFIG_PATH_DEBUG_LOGGING, $value);
+ $config[] = $configData;
+ }
+
+ return $config;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function validate(array $options, DeploymentConfig $deploymentConfig)
+ {
+ return [];
+ }
+}
diff --git a/app/code/Magento/Config/Test/Mftf/Data/LocaleOptionsData.xml b/app/code/Magento/Config/Test/Mftf/Data/LocaleOptionsData.xml
new file mode 100644
index 0000000000000..e998730d11ae7
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Data/LocaleOptionsData.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+ LocaleOptionsFrance
+
+
+ fr_FR
+
+
+
+ LocaleOptionsUSA
+
+
+ en_US
+
+
diff --git a/app/code/Magento/Config/Test/Mftf/Metadata/locale_options_config-meta.xml b/app/code/Magento/Config/Test/Mftf/Metadata/locale_options_config-meta.xml
new file mode 100644
index 0000000000000..6398d51cda916
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/Metadata/locale_options_config-meta.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml
index c58e77d200bfb..62b5cdcf9ceec 100644
--- a/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml
+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/FileTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/FileTest.php
index de18d45d26864..011bcfee64af5 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/FileTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/FileTest.php
@@ -11,6 +11,11 @@
class FileTest extends \PHPUnit\Framework\TestCase
{
+ /**
+ * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $escaperMock;
+
/**
* @var \Magento\Config\Block\System\Config\Form\Field\File
*/
@@ -24,6 +29,8 @@ class FileTest extends \PHPUnit\Framework\TestCase
protected function setUp()
{
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $this->escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+ $this->escaperMock->method('escapeHtml')->willReturnArgument(0);
$this->testData = [
'before_element_html' => 'test_before_element_html',
@@ -40,7 +47,10 @@ protected function setUp()
$this->file = $objectManager->getObject(
\Magento\Config\Block\System\Config\Form\Field\File::class,
- ['data' => $this->testData]
+ [
+ 'escaper' => $this->escaperMock,
+ 'data' => $this->testData
+ ]
);
$formMock = new \Magento\Framework\DataObject();
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php
index e62aa37af47dc..6f771a2e38078 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/ImageTest.php
@@ -13,6 +13,11 @@
class ImageTest extends \PHPUnit\Framework\TestCase
{
+ /**
+ * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $escaperMock;
+
/**
* @var \Magento\Framework\Url|\PHPUnit_Framework_MockObject_MockObject
*/
@@ -31,10 +36,13 @@ class ImageTest extends \PHPUnit\Framework\TestCase
protected function setUp()
{
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $this->escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+ $this->escaperMock->method('escapeHtml')->willReturnArgument(0);
$this->urlBuilderMock = $this->createMock(\Magento\Framework\Url::class);
$this->image = $objectManager->getObject(
\Magento\Config\Block\System\Config\Form\Field\Image::class,
[
+ 'escaper' => $this->escaperMock,
'urlBuilder' => $this->urlBuilderMock,
]
);
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
index f5c65e848b3bf..3799136aea9c0 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/Form/Field/Select/AllowspecificTest.php
@@ -7,6 +7,11 @@
class AllowspecificTest extends \PHPUnit\Framework\TestCase
{
+ /**
+ * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
+ */
+ private $escaperMock;
+
/**
* @var \Magento\Config\Block\System\Config\Form\Field\Select\Allowspecific
*/
@@ -20,8 +25,11 @@ class AllowspecificTest extends \PHPUnit\Framework\TestCase
protected function setUp()
{
$testHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $this->escaperMock = $this->createMock(\Magento\Framework\Escaper::class);
+ $this->escaperMock->method('escapeHtml')->willReturnArgument(0);
$this->_object = $testHelper->getObject(
- \Magento\Config\Block\System\Config\Form\Field\Select\Allowspecific::class
+ \Magento\Config\Block\System\Config\Form\Field\Select\Allowspecific::class,
+ ['escaper' => $this->escaperMock]
);
$this->_object->setData('html_id', 'spec_element');
$this->_formMock = $this->createPartialMock(
diff --git a/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php b/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php
index 83b7bd5fda42e..528d141306cce 100644
--- a/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php
+++ b/app/code/Magento/Config/Test/Unit/Block/System/Config/FormTest.php
@@ -103,6 +103,9 @@ protected function setUp()
$this->_fieldsetFactoryMock = $this->createMock(\Magento\Config\Block\System\Config\Form\Fieldset\Factory::class);
$this->_fieldFactoryMock = $this->createMock(\Magento\Config\Block\System\Config\Form\Field\Factory::class);
$this->_coreConfigMock = $this->createMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
+ $settingCheckerMock = $this->getMockBuilder(SettingChecker::class)
+ ->disableOriginalConstructor()
+ ->getMock();
$this->_backendConfigMock = $this->createMock(\Magento\Config\Model\Config::class);
@@ -150,6 +153,7 @@ protected function setUp()
'fieldsetFactory' => $this->_fieldsetFactoryMock,
'fieldFactory' => $this->_fieldFactoryMock,
'context' => $context,
+ 'settingChecker' => $settingCheckerMock,
];
$objectArguments = $helper->getConstructArguments(\Magento\Config\Block\System\Config\Form::class, $data);
@@ -529,7 +533,7 @@ public function testInitFields(
$elementVisibilityMock = $this->getMockBuilder(ElementVisibilityInterface::class)
->getMockForAbstractClass();
- $elementVisibilityMock->expects($this->once())
+ $elementVisibilityMock->expects($this->any())
->method('isDisabled')
->willReturn($isDisabled);
diff --git a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php
index 984e0fe842687..3fb7d9ad21cd4 100644
--- a/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php
+++ b/app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/DefaultProcessorTest.php
@@ -7,13 +7,14 @@
use Magento\Config\App\Config\Type\System;
use Magento\Config\Console\Command\ConfigSet\DefaultProcessor;
+use Magento\Config\Model\Config;
+use Magento\Config\Model\Config\Factory as ConfigFactory;
use Magento\Framework\App\Config\ConfigPathResolver;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\App\DeploymentConfig;
use Magento\Store\Model\ScopeInterface;
use Magento\Config\Model\PreparedValueFactory;
use Magento\Framework\App\Config\Value;
-use Magento\Framework\App\Config\ValueInterface;
use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
use PHPUnit_Framework_MockObject_MockObject as Mock;
@@ -55,17 +56,18 @@ class DefaultProcessorTest extends \PHPUnit\Framework\TestCase
*/
private $resourceModelMock;
+ /**
+ * @var ConfigFactory|Mock
+ */
+ private $configFactory;
+
/**
* @inheritdoc
*/
protected function setUp()
{
- $this->deploymentConfigMock = $this->getMockBuilder(DeploymentConfig::class)
- ->disableOriginalConstructor()
- ->getMock();
- $this->configPathResolverMock = $this->getMockBuilder(ConfigPathResolver::class)
- ->disableOriginalConstructor()
- ->getMock();
+ $this->deploymentConfigMock = $this->createMock(DeploymentConfig::class);
+ $this->configPathResolverMock = $this->createMock(ConfigPathResolver::class);
$this->resourceModelMock = $this->getMockBuilder(AbstractDb::class)
->disableOriginalConstructor()
->setMethods(['save'])
@@ -74,14 +76,14 @@ protected function setUp()
->disableOriginalConstructor()
->setMethods(['getResource'])
->getMock();
- $this->preparedValueFactoryMock = $this->getMockBuilder(PreparedValueFactory::class)
- ->disableOriginalConstructor()
- ->getMock();
+ $this->preparedValueFactoryMock = $this->createMock(PreparedValueFactory::class);
+ $this->configFactory = $this->createMock(ConfigFactory::class);
$this->model = new DefaultProcessor(
$this->preparedValueFactoryMock,
$this->deploymentConfigMock,
- $this->configPathResolverMock
+ $this->configPathResolverMock,
+ $this->configFactory
);
}
@@ -98,15 +100,14 @@ public function testProcess($path, $value, $scope, $scopeCode)
{
$this->configMockForProcessTest($path, $scope, $scopeCode);
- $this->preparedValueFactoryMock->expects($this->once())
- ->method('create')
- ->willReturn($this->valueMock);
- $this->valueMock->expects($this->once())
- ->method('getResource')
- ->willReturn($this->resourceModelMock);
- $this->resourceModelMock->expects($this->once())
+ $config = $this->createMock(Config::class);
+ $this->configFactory->method('create')
+ ->with(['scope' => $scope, 'scope_code' => $scopeCode])
+ ->willReturn($config);
+ $config->method('setDataByPath')
+ ->with($path, $value);
+ $config->expects($this->once())
->method('save')
- ->with($this->valueMock)
->willReturnSelf();
$this->model->process($path, $value, $scope, $scopeCode);
@@ -124,28 +125,6 @@ public function processDataProvider()
];
}
- public function testProcessWithWrongValueInstance()
- {
- $path = 'test/test/test';
- $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT;
- $scopeCode = null;
- $value = 'value';
- $valueInterfaceMock = $this->getMockBuilder(ValueInterface::class)
- ->getMockForAbstractClass();
-
- $this->configMockForProcessTest($path, $scope, $scopeCode);
-
- $this->preparedValueFactoryMock->expects($this->once())
- ->method('create')
- ->willReturn($valueInterfaceMock);
- $this->valueMock->expects($this->never())
- ->method('getResource');
- $this->resourceModelMock->expects($this->never())
- ->method('save');
-
- $this->model->process($path, $value, $scope, $scopeCode);
- }
-
/**
* @param string $path
* @param string $scope
@@ -185,6 +164,9 @@ public function testProcessLockedValue()
->method('resolve')
->willReturn('system/default/test/test/test');
+ $this->configFactory->expects($this->never())
+ ->method('create');
+
$this->model->process($path, $value, ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null);
}
}
diff --git a/app/code/Magento/Config/Test/Unit/Controller/Adminhtml/System/Config/SaveTest.php b/app/code/Magento/Config/Test/Unit/Controller/Adminhtml/System/Config/SaveTest.php
index 069a1c20b2966..980d8355de555 100644
--- a/app/code/Magento/Config/Test/Unit/Controller/Adminhtml/System/Config/SaveTest.php
+++ b/app/code/Magento/Config/Test/Unit/Controller/Adminhtml/System/Config/SaveTest.php
@@ -69,6 +69,7 @@ class SaveTest extends \PHPUnit\Framework\TestCase
protected function setUp()
{
$this->_requestMock = $this->createMock(\Magento\Framework\App\Request\Http::class);
+ $this->_requestMock->expects($this->any())->method('isPost')->willReturn(true);
$this->_responseMock = $this->createMock(\Magento\Framework\App\Response\Http::class);
$configStructureMock = $this->createMock(\Magento\Config\Model\Config\Structure::class);
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Backend/SerializedTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Backend/SerializedTest.php
index bb1e0e0225901..048df95f98649 100644
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Backend/SerializedTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/Config/Backend/SerializedTest.php
@@ -9,6 +9,7 @@
use Magento\Framework\Model\Context;
use Magento\Framework\Serialize\Serializer\Json;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
+use Psr\Log\LoggerInterface;
class SerializedTest extends \PHPUnit\Framework\TestCase
{
@@ -18,14 +19,20 @@ class SerializedTest extends \PHPUnit\Framework\TestCase
/** @var Json|\PHPUnit_Framework_MockObject_MockObject */
private $serializerMock;
+ /** @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject */
+ private $loggerMock;
+
protected function setUp()
{
$objectManager = new ObjectManager($this);
$this->serializerMock = $this->createMock(Json::class);
+ $this->loggerMock = $this->createMock(LoggerInterface::class);
$contextMock = $this->createMock(Context::class);
$eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
$contextMock->method('getEventDispatcher')
->willReturn($eventManagerMock);
+ $contextMock->method('getLogger')
+ ->willReturn($this->loggerMock);
$this->serializedConfig = $objectManager->getObject(
Serialized::class,
[
@@ -72,6 +79,20 @@ public function afterLoadDataProvider()
];
}
+ public function testAfterLoadWithException()
+ {
+ $value = '{"key":';
+ $expected = false;
+ $this->serializedConfig->setValue($value);
+ $this->serializerMock->expects($this->once())
+ ->method('unserialize')
+ ->willThrowException(new \Exception());
+ $this->loggerMock->expects($this->once())
+ ->method('critical');
+ $this->serializedConfig->afterLoad();
+ $this->assertEquals($expected, $this->serializedConfig->getValue());
+ }
+
/**
* @param string $expected
* @param int|double|string|array|boolean|null $value
diff --git a/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php b/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
index fcc1ff8b9c70c..a731be96af963 100644
--- a/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
+++ b/app/code/Magento/Config/Test/Unit/Model/ConfigTest.php
@@ -5,138 +5,183 @@
*/
namespace Magento\Config\Test\Unit\Model;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
+use Magento\Config\Model\Config;
+use Magento\Framework\App\Config\ReinitableConfigInterface;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Config\Model\Config\Structure\Reader;
+use Magento\Framework\DB\TransactionFactory;
+use Magento\Config\Model\Config\Loader;
+use Magento\Framework\App\Config\ValueFactory;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\Config\Model\Config\Structure;
+use Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker;
+use Magento\Framework\App\ScopeResolverPool;
+use Magento\Framework\App\ScopeResolverInterface;
+use Magento\Framework\App\ScopeInterface;
+use Magento\Store\Model\ScopeTypeNormalizer;
+use Magento\Framework\DB\Transaction;
+use Magento\Framework\App\Config\Value;
+use Magento\Store\Model\Website;
+use Magento\Config\Model\Config\Structure\Element\Group;
+use Magento\Config\Model\Config\Structure\Element\Field;
+
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class ConfigTest extends \PHPUnit\Framework\TestCase
{
/**
- * @var \Magento\Config\Model\Config
+ * @var Config
+ */
+ private $model;
+
+ /**
+ * @var ManagerInterface|MockObject
+ */
+ private $eventManagerMock;
+
+ /**
+ * @var Reader|MockObject
+ */
+ private $structureReaderMock;
+
+ /**
+ * @var TransactionFactory|MockObject
*/
- protected $_model;
+ private $transFactoryMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var ReinitableConfigInterface|MockObject
*/
- protected $_eventManagerMock;
+ private $appConfigMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var Loader|MockObject
*/
- protected $_structureReaderMock;
+ private $configLoaderMock;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var ValueFactory|MockObject
*/
- protected $_transFactoryMock;
+ private $dataFactoryMock;
/**
- * @var \Magento\Framework\App\Config\ReinitableConfigInterface|\PHPUnit_Framework_MockObject_MockObject
+ * @var StoreManagerInterface|MockObject
*/
- protected $_appConfigMock;
+ private $storeManager;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var Structure|MockObject
*/
- protected $_applicationMock;
+ private $configStructure;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var SettingChecker|MockObject
*/
- protected $_configLoaderMock;
+ private $settingsChecker;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var ScopeResolverPool|MockObject
*/
- protected $_dataFactoryMock;
+ private $scopeResolverPool;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var ScopeResolverInterface|MockObject
*/
- protected $_storeManager;
+ private $scopeResolver;
/**
- * @var \Magento\Config\Model\Config\Structure
+ * @var ScopeInterface|MockObject
*/
- protected $_configStructure;
+ private $scope;
/**
- * @var \PHPUnit_Framework_MockObject_MockObject
+ * @var ScopeTypeNormalizer|MockObject
*/
- private $_settingsChecker;
+ private $scopeTypeNormalizer;
protected function setUp()
{
- $this->_eventManagerMock = $this->createMock(\Magento\Framework\Event\ManagerInterface::class);
- $this->_structureReaderMock = $this->createPartialMock(
- \Magento\Config\Model\Config\Structure\Reader::class,
+ $this->eventManagerMock = $this->createMock(ManagerInterface::class);
+ $this->structureReaderMock = $this->createPartialMock(
+ Reader::class,
['getConfiguration']
);
- $this->_configStructure = $this->createMock(\Magento\Config\Model\Config\Structure::class);
+ $this->configStructure = $this->createMock(Structure::class);
- $this->_structureReaderMock->expects(
- $this->any()
- )->method(
- 'getConfiguration'
- )->will(
- $this->returnValue($this->_configStructure)
- );
+ $this->structureReaderMock->method('getConfiguration')
+ ->willReturn($this->configStructure);
- $this->_transFactoryMock = $this->createPartialMock(
- \Magento\Framework\DB\TransactionFactory::class,
+ $this->transFactoryMock = $this->createPartialMock(
+ TransactionFactory::class,
['create', 'addObject']
);
- $this->_appConfigMock = $this->createMock(\Magento\Framework\App\Config\ReinitableConfigInterface::class);
- $this->_configLoaderMock = $this->createPartialMock(
- \Magento\Config\Model\Config\Loader::class,
+ $this->appConfigMock = $this->createMock(ReinitableConfigInterface::class);
+ $this->configLoaderMock = $this->createPartialMock(
+ Loader::class,
['getConfigByPath']
);
- $this->_dataFactoryMock = $this->createMock(\Magento\Framework\App\Config\ValueFactory::class);
-
- $this->_storeManager = $this->getMockForAbstractClass(\Magento\Store\Model\StoreManagerInterface::class);
-
- $this->_settingsChecker = $this
- ->createMock(\Magento\Config\Model\Config\Reader\Source\Deployed\SettingChecker::class);
-
- $this->_model = new \Magento\Config\Model\Config(
- $this->_appConfigMock,
- $this->_eventManagerMock,
- $this->_configStructure,
- $this->_transFactoryMock,
- $this->_configLoaderMock,
- $this->_dataFactoryMock,
- $this->_storeManager,
- $this->_settingsChecker
+ $this->dataFactoryMock = $this->createMock(ValueFactory::class);
+
+ $this->storeManager = $this->createMock(StoreManagerInterface::class);
+
+ $this->settingsChecker = $this->createMock(SettingChecker::class);
+
+ $this->scopeResolverPool = $this->createMock(ScopeResolverPool::class);
+ $this->scopeResolver = $this->createMock(ScopeResolverInterface::class);
+ $this->scopeResolverPool->method('get')
+ ->willReturn($this->scopeResolver);
+ $this->scope = $this->createMock(ScopeInterface::class);
+ $this->scopeResolver->method('getScope')
+ ->willReturn($this->scope);
+
+ $this->scopeTypeNormalizer = $this->createMock(ScopeTypeNormalizer::class);
+
+ $this->model = new Config(
+ $this->appConfigMock,
+ $this->eventManagerMock,
+ $this->configStructure,
+ $this->transFactoryMock,
+ $this->configLoaderMock,
+ $this->dataFactoryMock,
+ $this->storeManager,
+ $this->settingsChecker,
+ [],
+ $this->scopeResolverPool,
+ $this->scopeTypeNormalizer
);
}
public function testSaveDoesNotDoAnythingIfGroupsAreNotPassed()
{
- $this->_configLoaderMock->expects($this->never())->method('getConfigByPath');
- $this->_model->save();
+ $this->configLoaderMock->expects($this->never())->method('getConfigByPath');
+ $this->model->save();
}
public function testSaveEmptiesNonSetArguments()
{
- $this->_structureReaderMock->expects($this->never())->method('getConfiguration');
- $this->assertNull($this->_model->getSection());
- $this->assertNull($this->_model->getWebsite());
- $this->assertNull($this->_model->getStore());
- $this->_model->save();
- $this->assertSame('', $this->_model->getSection());
- $this->assertSame('', $this->_model->getWebsite());
- $this->assertSame('', $this->_model->getStore());
+ $this->structureReaderMock->expects($this->never())->method('getConfiguration');
+ $this->assertNull($this->model->getSection());
+ $this->assertNull($this->model->getWebsite());
+ $this->assertNull($this->model->getStore());
+ $this->model->save();
+ $this->assertSame('', $this->model->getSection());
+ $this->assertSame('', $this->model->getWebsite());
+ $this->assertSame('', $this->model->getStore());
}
public function testSaveToCheckAdminSystemConfigChangedSectionEvent()
{
- $transactionMock = $this->createMock(\Magento\Framework\DB\Transaction::class);
+ $transactionMock = $this->createMock(Transaction::class);
- $this->_transFactoryMock->expects($this->any())->method('create')->will($this->returnValue($transactionMock));
+ $this->transFactoryMock->method('create')
+ ->willReturn($transactionMock);
- $this->_configLoaderMock->expects($this->any())->method('getConfigByPath')->will($this->returnValue([]));
+ $this->configLoaderMock->method('getConfigByPath')
+ ->willReturn([]);
- $this->_eventManagerMock->expects(
+ $this->eventManagerMock->expects(
$this->at(0)
)->method(
'dispatch'
@@ -145,7 +190,7 @@ public function testSaveToCheckAdminSystemConfigChangedSectionEvent()
$this->arrayHasKey('website')
);
- $this->_eventManagerMock->expects(
+ $this->eventManagerMock->expects(
$this->at(0)
)->method(
'dispatch'
@@ -154,123 +199,147 @@ public function testSaveToCheckAdminSystemConfigChangedSectionEvent()
$this->arrayHasKey('store')
);
- $this->_model->setGroups(['1' => ['data']]);
- $this->_model->save();
+ $this->model->setGroups(['1' => ['data']]);
+ $this->model->save();
}
public function testDoNotSaveReadOnlyFields()
{
- $transactionMock = $this->createMock(\Magento\Framework\DB\Transaction::class);
- $this->_transFactoryMock->expects($this->any())->method('create')->will($this->returnValue($transactionMock));
+ $transactionMock = $this->createMock(Transaction::class);
+ $this->transFactoryMock->method('create')
+ ->willReturn($transactionMock);
- $this->_settingsChecker->expects($this->any())->method('isReadOnly')->will($this->returnValue(true));
- $this->_configLoaderMock->expects($this->any())->method('getConfigByPath')->will($this->returnValue([]));
+ $this->settingsChecker->method('isReadOnly')
+ ->willReturn(true);
+ $this->configLoaderMock->method('getConfigByPath')
+ ->willReturn([]);
- $this->_model->setGroups(['1' => ['fields' => ['key' => ['data']]]]);
- $this->_model->setSection('section');
+ $this->model->setGroups(['1' => ['fields' => ['key' => ['data']]]]);
+ $this->model->setSection('section');
- $group = $this->createMock(\Magento\Config\Model\Config\Structure\Element\Group::class);
- $group->method('getPath')->willReturn('section/1');
+ $group = $this->createMock(Group::class);
+ $group->method('getPath')
+ ->willReturn('section/1');
- $field = $this->createMock(\Magento\Config\Model\Config\Structure\Element\Field::class);
- $field->method('getGroupPath')->willReturn('section/1');
- $field->method('getId')->willReturn('key');
+ $field = $this->createMock(Field::class);
+ $field->method('getGroupPath')
+ ->willReturn('section/1');
+ $field->method('getId')
+ ->willReturn('key');
- $this->_configStructure->expects($this->at(0))
+ $this->configStructure->expects($this->at(0))
->method('getElement')
->with('section/1')
- ->will($this->returnValue($group));
- $this->_configStructure->expects($this->at(1))
+ ->willReturn($group);
+ $this->configStructure->expects($this->at(1))
->method('getElement')
->with('section/1')
- ->will($this->returnValue($group));
- $this->_configStructure->expects($this->at(2))
+ ->willReturn($group);
+ $this->configStructure->expects($this->at(2))
->method('getElement')
->with('section/1/key')
- ->will($this->returnValue($field));
+ ->willReturn($field);
$backendModel = $this->createPartialMock(
- \Magento\Framework\App\Config\Value::class,
+ Value::class,
['addData']
);
- $this->_dataFactoryMock->expects($this->any())->method('create')->will($this->returnValue($backendModel));
+ $this->dataFactoryMock->method('create')
+ ->willReturn($backendModel);
- $this->_transFactoryMock->expects($this->never())->method('addObject');
- $backendModel->expects($this->never())->method('addData');
+ $this->transFactoryMock->expects($this->never())
+ ->method('addObject');
+ $backendModel->expects($this->never())
+ ->method('addData');
- $this->_model->save();
+ $this->model->save();
}
public function testSaveToCheckScopeDataSet()
{
- $transactionMock = $this->createMock(\Magento\Framework\DB\Transaction::class);
- $this->_transFactoryMock->expects($this->any())->method('create')->will($this->returnValue($transactionMock));
+ $transactionMock = $this->createMock(Transaction::class);
+ $this->transFactoryMock->method('create')
+ ->willReturn($transactionMock);
- $this->_configLoaderMock->expects($this->any())->method('getConfigByPath')->will($this->returnValue([]));
+ $this->configLoaderMock->method('getConfigByPath')
+ ->willReturn([]);
- $this->_eventManagerMock->expects($this->at(0))
+ $this->eventManagerMock->expects($this->at(0))
->method('dispatch')
->with(
$this->equalTo('admin_system_config_changed_section_section'),
$this->arrayHasKey('website')
);
- $this->_eventManagerMock->expects($this->at(0))
+ $this->eventManagerMock->expects($this->at(0))
->method('dispatch')
->with(
$this->equalTo('admin_system_config_changed_section_section'),
$this->arrayHasKey('store')
);
- $group = $this->createMock(\Magento\Config\Model\Config\Structure\Element\Group::class);
+ $group = $this->createMock(Group::class);
$group->method('getPath')->willReturn('section/1');
- $field = $this->createMock(\Magento\Config\Model\Config\Structure\Element\Field::class);
+ $field = $this->createMock(Field::class);
$field->method('getGroupPath')->willReturn('section/1');
$field->method('getId')->willReturn('key');
- $this->_configStructure->expects($this->at(0))
+ $this->configStructure->expects($this->at(0))
->method('getElement')
->with('section/1')
- ->will($this->returnValue($group));
- $this->_configStructure->expects($this->at(1))
+ ->willReturn($group);
+ $this->configStructure->expects($this->at(1))
->method('getElement')
->with('section/1')
- ->will($this->returnValue($group));
- $this->_configStructure->expects($this->at(2))
+ ->willReturn($group);
+ $this->configStructure->expects($this->at(2))
->method('getElement')
->with('section/1/key')
- ->will($this->returnValue($field));
- $this->_configStructure->expects($this->at(3))
+ ->willReturn($field);
+ $this->configStructure->expects($this->at(3))
->method('getElement')
->with('section/1')
- ->will($this->returnValue($group));
- $this->_configStructure->expects($this->at(4))
+ ->willReturn($group);
+ $this->configStructure->expects($this->at(4))
->method('getElement')
->with('section/1/key')
- ->will($this->returnValue($field));
-
- $website = $this->createMock(\Magento\Store\Model\Website::class);
- $website->expects($this->any())->method('getCode')->will($this->returnValue('website_code'));
- $this->_storeManager->expects($this->any())->method('getWebsite')->will($this->returnValue($website));
- $this->_storeManager->expects($this->any())->method('getWebsites')->will($this->returnValue([$website]));
- $this->_storeManager->expects($this->any())->method('isSingleStoreMode')->will($this->returnValue(true));
-
- $this->_model->setWebsite('website');
- $this->_model->setSection('section');
- $this->_model->setGroups(['1' => ['fields' => ['key' => ['data']]]]);
+ ->willReturn($field);
+
+ $this->scopeResolver->method('getScope')
+ ->with('1')
+ ->willReturn($this->scope);
+ $this->scope->expects($this->atLeastOnce())
+ ->method('getScopeType')
+ ->willReturn('website');
+ $this->scope->expects($this->atLeastOnce())
+ ->method('getId')
+ ->willReturn(1);
+ $this->scope->expects($this->atLeastOnce())
+ ->method('getCode')
+ ->willReturn('website_code');
+ $this->scopeTypeNormalizer->expects($this->atLeastOnce())
+ ->method('normalize')
+ ->with('website')
+ ->willReturn('websites');
+ $website = $this->createMock(Website::class);
+ $this->storeManager->method('getWebsites')->willReturn([$website]);
+ $this->storeManager->method('isSingleStoreMode')->willReturn(true);
+
+ $this->model->setWebsite('1');
+ $this->model->setSection('section');
+ $this->model->setGroups(['1' => ['fields' => ['key' => ['data']]]]);
$backendModel = $this->createPartialMock(
- \Magento\Framework\App\Config\Value::class,
+ Value::class,
['setPath', 'addData', '__sleep', '__wakeup']
);
- $backendModel->expects($this->once())
- ->method('addData')
+ $backendModel->method('addData')
->with([
'field' => 'key',
'groups' => [1 => ['fields' => ['key' => ['data']]]],
'group_id' => null,
'scope' => 'websites',
- 'scope_id' => 0,
+ 'scope_id' => 1,
'scope_code' => 'website_code',
'field_config' => null,
'fieldset_data' => ['key' => null],
@@ -278,29 +347,68 @@ public function testSaveToCheckScopeDataSet()
$backendModel->expects($this->once())
->method('setPath')
->with('section/1/key')
- ->will($this->returnValue($backendModel));
+ ->willReturn($backendModel);
- $this->_dataFactoryMock->expects($this->any())->method('create')->will($this->returnValue($backendModel));
+ $this->dataFactoryMock->method('create')
+ ->willReturn($backendModel);
- $this->_model->save();
+ $this->model->save();
}
- public function testSetDataByPath()
+ /**
+ * @param string $path
+ * @param string $value
+ * @param string $section
+ * @param array $groups
+ * @return void
+ * @dataProvider setDataByPathDataProvider
+ */
+ public function testSetDataByPath(string $path, string $value, string $section, array $groups)
{
- $value = 'value';
- $path = '//';
- $this->_model->setDataByPath($path, $value);
- $expected = [
- 'section' => '',
- 'groups' => [
- '' => [
- 'fields' => [
- '' => ['value' => $value],
+ $this->model->setDataByPath($path, $value);
+ $this->assertEquals($section, $this->model->getData('section'));
+ $this->assertEquals($groups, $this->model->getData('groups'));
+ }
+
+ /**
+ * @return array
+ */
+ public function setDataByPathDataProvider(): array
+ {
+ return [
+ 'depth 3' => [
+ 'a/b/c',
+ 'value1',
+ 'a',
+ [
+ 'b' => [
+ 'fields' => [
+ 'c' => ['value' => 'value1'],
+ ],
+ ],
+ ],
+ ],
+ 'depth 5' => [
+ 'a/b/c/d/e',
+ 'value1',
+ 'a',
+ [
+ 'b' => [
+ 'groups' => [
+ 'c' => [
+ 'groups' => [
+ 'd' => [
+ 'fields' => [
+ 'e' => ['value' => 'value1'],
+ ],
+ ],
+ ],
+ ],
+ ],
],
],
],
];
- $this->assertSame($expected, $this->_model->getData());
}
/**
@@ -309,34 +417,32 @@ public function testSetDataByPath()
*/
public function testSetDataByPathEmpty()
{
- $this->_model->setDataByPath('', 'value');
+ $this->model->setDataByPath('', 'value');
}
/**
* @param string $path
- * @param string $expectedException
- *
+ * @return void
* @dataProvider setDataByPathWrongDepthDataProvider
*/
- public function testSetDataByPathWrongDepth($path, $expectedException)
+ public function testSetDataByPathWrongDepth(string $path)
{
- $expectedException = 'Allowed depth of configuration is 3 (//). ' . $expectedException;
- $this->expectException('\UnexpectedValueException');
+ $currentDepth = count(explode('/', $path));
+ $expectedException = 'Minimal depth of configuration is 3. Your configuration depth is ' . $currentDepth;
+ $this->expectException(\UnexpectedValueException::class);
$this->expectExceptionMessage($expectedException);
$value = 'value';
- $this->_model->setDataByPath($path, $value);
+ $this->model->setDataByPath($path, $value);
}
/**
* @return array
*/
- public function setDataByPathWrongDepthDataProvider()
+ public function setDataByPathWrongDepthDataProvider(): array
{
return [
- 'depth 2' => ['section/group', "Your configuration depth is 2 for path 'section/group'"],
- 'depth 1' => ['section', "Your configuration depth is 1 for path 'section'"],
- 'depth 4' => ['section/group/field/sub-field', "Your configuration depth is 4 for path"
- . " 'section/group/field/sub-field'", ],
+ 'depth 2' => ['section/group'],
+ 'depth 1' => ['section'],
];
}
}
diff --git a/app/code/Magento/Config/composer.json b/app/code/Magento/Config/composer.json
index 793d423280414..f36c29d387c9b 100644
--- a/app/code/Magento/Config/composer.json
+++ b/app/code/Magento/Config/composer.json
@@ -13,7 +13,7 @@
"magento/module-deploy": "100.2.*"
},
"type": "magento2-module",
- "version": "101.0.7",
+ "version": "101.0.8",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Config/etc/di.xml b/app/code/Magento/Config/etc/di.xml
index a5dd18097fb47..87a0e666d2d7b 100644
--- a/app/code/Magento/Config/etc/di.xml
+++ b/app/code/Magento/Config/etc/di.xml
@@ -77,6 +77,11 @@
+
+
+ Magento\Framework\App\Cache\Type\Config
+
+
systemConfigSourceAggregatedProxy
@@ -85,6 +90,7 @@
Magento\Framework\App\Config\PreProcessorComposite
Magento\Framework\Serialize\Serializer\Serialize
Magento\Config\App\Config\Type\System\Reader\Proxy
+ Magento\Framework\Lock\Backend\Cache
diff --git a/app/code/Magento/Config/etc/module.xml b/app/code/Magento/Config/etc/module.xml
index cdf31ab7a5d19..b7df33554af90 100644
--- a/app/code/Magento/Config/etc/module.xml
+++ b/app/code/Magento/Config/etc/module.xml
@@ -6,7 +6,7 @@
*/
-->
-
+
diff --git a/app/code/Magento/ConfigurableImportExport/composer.json b/app/code/Magento/ConfigurableImportExport/composer.json
index b3d8af9f419d2..cf0e0e819a89c 100644
--- a/app/code/Magento/ConfigurableImportExport/composer.json
+++ b/app/code/Magento/ConfigurableImportExport/composer.json
@@ -12,7 +12,7 @@
"magento/module-store": "100.2.*"
},
"type": "magento2-module",
- "version": "100.2.4",
+ "version": "100.2.5",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
index a80a15b59c2ce..efade5cd2c605 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
@@ -15,6 +15,8 @@
use Magento\Framework\Pricing\PriceCurrencyInterface;
/**
+ * Configurable product view type.
+ *
* @api
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @api
@@ -277,6 +279,8 @@ protected function getOptionImages()
}
/**
+ * Collect price options.
+ *
* @return array
*/
protected function getOptionPrices()
@@ -315,6 +319,11 @@ protected function getOptionPrices()
),
],
'tierPrices' => $tierPrices,
+ 'msrpPrice' => [
+ 'amount' => $this->localeFormat->getNumber(
+ $product->getMsrp()
+ ),
+ ],
];
}
return $prices;
diff --git a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php
index 6f5f106a8bb24..45057a3591044 100644
--- a/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php
+++ b/app/code/Magento/ConfigurableProduct/Controller/Adminhtml/Product/Attribute/CreateOptions.php
@@ -50,7 +50,11 @@ public function __construct(
*/
public function execute()
{
- $this->getResponse()->representJson($this->jsonHelper->jsonEncode($this->saveAttributeOptions()));
+ $result = [];
+ if ($this->getRequest()->isPost()) {
+ $result = $this->saveAttributeOptions();
+ }
+ $this->getResponse()->representJson($this->jsonHelper->jsonEncode($result));
}
/**
diff --git a/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php b/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
index 01981b5dae9db..fcbd0075b4cd0 100644
--- a/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
+++ b/app/code/Magento/ConfigurableProduct/Model/LinkManagement.php
@@ -1,6 +1,5 @@
productRepository->get($sku);
+ $product = $this->productRepository->get($sku, true);
$child = $this->productRepository->get($childSku);
$childrenIds = array_values($this->configurableType->getChildrenIds($product->getId())[0]);
@@ -144,7 +152,11 @@ public function addChild($sku, $childSku)
}
/**
- * {@inheritdoc}
+ * @inheritdoc
+ * @throws InputException
+ * @throws NoSuchEntityException
+ * @throws StateException
+ * @throws \Magento\Framework\Exception\CouldNotSaveException
*/
public function removeChild($sku, $childSku)
{
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index f98075f2294cc..46f10608bc95e 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -24,6 +24,7 @@
* @SuppressWarnings(PHPMD.TooManyFields)
* @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
* @api
* @since 100.0.2
*/
@@ -1385,7 +1386,7 @@ function ($item) {
*/
private function getUsedProductsCacheKey($keyParts)
{
- return md5(implode('_', $keyParts));
+ return sha1(implode('_', $keyParts));
}
/**
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
index bee334596e990..f2bf3116af9e4 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable/Price.php
@@ -7,14 +7,15 @@
*/
namespace Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\Catalog\Model\Product;
+
+/**
+ * Class Price for configurable product
+ */
class Price extends \Magento\Catalog\Model\Product\Type\Price
{
/**
- * Get product final price
- *
- * @param float $qty
- * @param \Magento\Catalog\Model\Product $product
- * @return float
+ * @inheritdoc
*/
public function getFinalPrice($qty, $product)
{
@@ -22,7 +23,10 @@ public function getFinalPrice($qty, $product)
return $product->getCalculatedFinalPrice();
}
if ($product->getCustomOption('simple_product') && $product->getCustomOption('simple_product')->getProduct()) {
- $finalPrice = parent::getFinalPrice($qty, $product->getCustomOption('simple_product')->getProduct());
+ /** @var Product $simpleProduct */
+ $simpleProduct = $product->getCustomOption('simple_product')->getProduct();
+ $simpleProduct->setCustomerGroupId($product->getCustomerGroupId());
+ $finalPrice = parent::getFinalPrice($qty, $simpleProduct);
} else {
$priceInfo = $product->getPriceInfo();
$finalPrice = $priceInfo->getPrice('final_price')->getAmount()->getValue();
@@ -35,7 +39,7 @@ public function getFinalPrice($qty, $product)
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function getPrice($product)
{
@@ -48,6 +52,7 @@ public function getPrice($product)
}
}
}
+
return 0;
}
}
diff --git a/app/code/Magento/ConfigurableProduct/Plugin/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php b/app/code/Magento/ConfigurableProduct/Plugin/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
new file mode 100644
index 0000000000000..8bdde2aeb0cff
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Plugin/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
@@ -0,0 +1,44 @@
+getProduct()->getTypeId() === Configurable::TYPE_CODE && $item->getHasChildren()) {
+ $childItem = $item->getChildren()[0];
+ $result->getTaxClassKey()->setValue($childItem->getProduct()->getTaxClassId());
+ }
+
+ return $result;
+ }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Pricing/Render/TierPriceBox.php b/app/code/Magento/ConfigurableProduct/Pricing/Render/TierPriceBox.php
index 611523a60b06d..816de36b16f96 100644
--- a/app/code/Magento/ConfigurableProduct/Pricing/Render/TierPriceBox.php
+++ b/app/code/Magento/ConfigurableProduct/Pricing/Render/TierPriceBox.php
@@ -5,6 +5,8 @@
*/
namespace Magento\ConfigurableProduct\Pricing\Render;
+use Magento\Catalog\Pricing\Price\TierPrice;
+
/**
* Responsible for displaying tier price box on configurable product page.
*
@@ -17,9 +19,28 @@ class TierPriceBox extends FinalPriceBox
*/
public function toHtml()
{
- // Hide tier price block in case of MSRP.
- if (!$this->isMsrpPriceApplicable()) {
+ // Hide tier price block in case of MSRP or in case when no options with tier price.
+ if (!$this->isMsrpPriceApplicable() && $this->isTierPriceApplicable()) {
return parent::toHtml();
}
}
+
+ /**
+ * Check if at least one of simple products has tier price.
+ *
+ * @return bool
+ */
+ private function isTierPriceApplicable(): bool
+ {
+ $product = $this->getSaleableItem();
+ foreach ($product->getTypeInstance()->getUsedProducts($product) as $simpleProduct) {
+ if ($simpleProduct->isSalable()
+ && !empty($simpleProduct->getPriceInfo()->getPrice(TierPrice::PRICE_CODE)->getTierPriceList())
+ ) {
+ return true;
+ }
+ }
+
+ return false;
+ }
}
diff --git a/app/code/Magento/ConfigurableProduct/Setup/InstallData.php b/app/code/Magento/ConfigurableProduct/Setup/InstallData.php
index 1c26f159405dd..57cc287aa24aa 100644
--- a/app/code/Magento/ConfigurableProduct/Setup/InstallData.php
+++ b/app/code/Magento/ConfigurableProduct/Setup/InstallData.php
@@ -57,18 +57,24 @@ public function install(ModuleDataSetupInterface $setup, ModuleContextInterface
'color'
];
foreach ($attributes as $attributeCode) {
- $relatedProductTypes = explode(
- ',',
- $eavSetup->getAttribute(\Magento\Catalog\Model\Product::ENTITY, $attributeCode, 'apply_to')
- );
- if (!in_array(Configurable::TYPE_CODE, $relatedProductTypes)) {
- $relatedProductTypes[] = Configurable::TYPE_CODE;
- $eavSetup->updateAttribute(
- \Magento\Catalog\Model\Product::ENTITY,
- $attributeCode,
- 'apply_to',
- implode(',', $relatedProductTypes)
+ if ($attribute = $eavSetup->getAttribute(
+ \Magento\Catalog\Model\Product::ENTITY,
+ $attributeCode,
+ 'apply_to'
+ )) {
+ $relatedProductTypes = explode(
+ ',',
+ $attribute
);
+ if (!in_array(Configurable::TYPE_CODE, $relatedProductTypes)) {
+ $relatedProductTypes[] = Configurable::TYPE_CODE;
+ $eavSetup->updateAttribute(
+ \Magento\Catalog\Model\Product::ENTITY,
+ $attributeCode,
+ 'apply_to',
+ implode(',', $relatedProductTypes)
+ );
+ }
}
}
}
diff --git a/app/code/Magento/ConfigurableProduct/Setup/UpgradeData.php b/app/code/Magento/ConfigurableProduct/Setup/UpgradeData.php
index 1ff78a632c3bb..ca100cbf85bfc 100644
--- a/app/code/Magento/ConfigurableProduct/Setup/UpgradeData.php
+++ b/app/code/Magento/ConfigurableProduct/Setup/UpgradeData.php
@@ -47,16 +47,18 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
if (version_compare($context->getVersion(), '2.2.0') < 0) {
$relatedProductTypes = $this->getRelatedProductTypes('tier_price', $eavSetup);
- $key = array_search(Configurable::TYPE_CODE, $relatedProductTypes);
- if ($key !== false) {
- unset($relatedProductTypes[$key]);
- $this->updateRelatedProductTypes('tier_price', $relatedProductTypes, $eavSetup);
+ if (!empty($relatedProductTypes)) {
+ $key = array_search(Configurable::TYPE_CODE, $relatedProductTypes);
+ if ($key !== false) {
+ unset($relatedProductTypes[$key]);
+ $this->updateRelatedProductTypes('tier_price', $relatedProductTypes, $eavSetup);
+ }
}
}
if (version_compare($context->getVersion(), '2.2.1') < 0) {
$relatedProductTypes = $this->getRelatedProductTypes('manufacturer', $eavSetup);
- if (!in_array(Configurable::TYPE_CODE, $relatedProductTypes)) {
+ if (!empty($relatedProductTypes) && !in_array(Configurable::TYPE_CODE, $relatedProductTypes)) {
$relatedProductTypes[] = Configurable::TYPE_CODE;
$this->updateRelatedProductTypes('manufacturer', $relatedProductTypes, $eavSetup);
}
@@ -78,10 +80,17 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
*/
private function getRelatedProductTypes(string $attributeId, EavSetup $eavSetup)
{
- return explode(
- ',',
- $eavSetup->getAttribute(Product::ENTITY, $attributeId, 'apply_to')
- );
+ if ($attribute = $eavSetup->getAttribute(
+ Product::ENTITY,
+ $attributeId,
+ 'apply_to'
+ )) {
+ return explode(
+ ',',
+ $attribute
+ );
+ }
+ return [];
}
/**
@@ -109,8 +118,10 @@ private function updateRelatedProductTypes(string $attributeId, array $relatedPr
*/
private function upgradeQuoteItemPrice(ModuleDataSetupInterface $setup)
{
- $connection = $setup->getConnection();
- $quoteItemTable = $setup->getTable('quote_item');
+ $connectionName = 'checkout';
+ $connection = $setup->getConnection($connectionName);
+ $quoteItemTable = $setup->getTable('quote_item', $connectionName);
+
$select = $connection->select();
$select->joinLeft(
['qi2' => $quoteItemTable],
@@ -121,10 +132,10 @@ private function upgradeQuoteItemPrice(ModuleDataSetupInterface $setup)
. ' AND qi1.parent_item_id IS NOT NULL'
. ' AND qi2.product_type = "' . Configurable::TYPE_CODE . '"'
);
- $updateQuoteItem = $setup->getConnection()->updateFromSelect(
+ $updateQuoteItem = $connection->updateFromSelect(
$select,
['qi1' => $quoteItemTable]
);
- $setup->getConnection()->query($updateQuoteItem);
+ $connection->query($updateQuoteItem);
}
}
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateApiConfigurableProductActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateApiConfigurableProductActionGroup.xml
index d918649ed4914..abbef02adc520 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateApiConfigurableProductActionGroup.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateApiConfigurableProductActionGroup.xml
@@ -10,7 +10,7 @@
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
-
+
@@ -69,4 +69,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 50
+
+
+
+
+ 60
+
+
+
+
+ 70
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateConfigurableProductActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateConfigurableProductActionGroup.xml
index 3b4e7f55d186c..6c47a24315c9a 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateConfigurableProductActionGroup.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminCreateConfigurableProductActionGroup.xml
@@ -65,4 +65,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml
index 429d535952f76..7a722959c9996 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminNewAttributePanelSection.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
@@ -21,5 +21,12 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
index 5ae70488d164d..c774dad1ed607 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index be0c2b05e48ba..4f2320666efbc 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -14,5 +14,6 @@
+
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
new file mode 100644
index 0000000000000..03f4d8461cebb
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckValidatorConfigurableProductTest.xml
@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckingProductQtyAfterOrderCancelTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckingProductQtyAfterOrderCancelTest.xml
new file mode 100644
index 0000000000000..af463c9042357
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckingProductQtyAfterOrderCancelTest.xml
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.xml
new file mode 100644
index 0000000000000..5daf699294155
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminTierPriceNotAvailableForProductOptionsWithoutTierPriceTest.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductWithFileCustomOptionTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductWithFileCustomOptionTest.xml
index 36615d3af6b7b..bddd71f565c33 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductWithFileCustomOptionTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontConfigurableProductWithFileCustomOptionTest.xml
@@ -7,7 +7,7 @@
-->
+ xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -42,7 +42,9 @@
-
+
+
+
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php
index b45306d670bff..20b0905b7707b 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Block/Product/View/Type/ConfigurableTest.php
@@ -347,15 +347,15 @@ public function testGetJsonConfig()
}
/**
- * Retrieve array with expected parameters for method getJsonConfig()
+ * Retrieve array with expected parameters for method getJsonConfig().
*
- * @param $productId
- * @param $amount
- * @param $priceQty
- * @param $percentage
+ * @param int $productId
+ * @param float $amount
+ * @param int $priceQty
+ * @param int $percentage
* @return array
*/
- private function getExpectedArray($productId, $amount, $priceQty, $percentage)
+ private function getExpectedArray(int $productId, float $amount, int $priceQty, int $percentage): array
{
$expectedArray = [
'attributes' => [],
@@ -379,6 +379,9 @@ private function getExpectedArray($productId, $amount, $priceQty, $percentage)
'percentage' => $percentage,
],
],
+ 'msrpPrice' => [
+ 'amount' => null,
+ ],
],
],
'priceFormat' => [],
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/PriceTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/PriceTest.php
index 64b9b3776442a..0fc650a4113c6 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/PriceTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/Configurable/PriceTest.php
@@ -6,22 +6,47 @@
namespace Magento\ConfigurableProduct\Test\Unit\Model\Product\Type\Configurable;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Configuration\Item\Option;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Price as ConfigurablePrice;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\Pricing\Amount\AmountInterface;
+use Magento\Framework\Pricing\Price\PriceInterface;
+use Magento\Framework\Pricing\PriceInfo\Base as PriceInfoBase;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use PHPUnit_Framework_MockObject_MockObject as MockObject;
class PriceTest extends \PHPUnit\Framework\TestCase
{
- /** @var \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Price */
+ /**
+ * @var ObjectManagerHelper
+ */
+ protected $objectManagerHelper;
+
+ /**
+ * @var ConfigurablePrice
+ */
protected $model;
- /** @var ObjectManagerHelper */
- protected $objectManagerHelper;
+ /**
+ * @var ManagerInterface|MockObject
+ */
+ private $eventManagerMock;
+ /**
+ * @inheritdoc
+ */
protected function setUp()
{
$this->objectManagerHelper = new ObjectManagerHelper($this);
+ $this->eventManagerMock = $this->createPartialMock(
+ ManagerInterface::class,
+ ['dispatch']
+ );
$this->model = $this->objectManagerHelper->getObject(
- \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Price::class
+ ConfigurablePrice::class,
+ ['eventManager' => $this->eventManagerMock]
);
}
@@ -29,29 +54,29 @@ public function testGetFinalPrice()
{
$finalPrice = 10;
$qty = 1;
- $configurableProduct = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
- ->disableOriginalConstructor()
- ->setMethods(['getCustomOption', 'getPriceInfo', 'setFinalPrice', '__wakeUp'])
- ->getMock();
- $customOption = $this->getMockBuilder(\Magento\Catalog\Model\Product\Configuration\Item\Option::class)
+
+ /** @var Product|MockObject $configurableProduct */
+ $configurableProduct = $this->getMockBuilder(Product::class)
->disableOriginalConstructor()
- ->setMethods(['getProduct'])
+ ->setMethods(['getCustomOption', 'getPriceInfo', 'setFinalPrice'])
->getMock();
- $priceInfo = $this->getMockBuilder(\Magento\Framework\Pricing\PriceInfo\Base::class)
+ /** @var PriceInfoBase|MockObject $priceInfo */
+ $priceInfo = $this->getMockBuilder(PriceInfoBase::class)
->disableOriginalConstructor()
->setMethods(['getPrice'])
->getMock();
- $price = $this->getMockBuilder(\Magento\Framework\Pricing\Price\PriceInterface::class)
+ /** @var PriceInterface|MockObject $price */
+ $price = $this->getMockBuilder(PriceInterface::class)
->disableOriginalConstructor()
->getMock();
- $amount = $this->getMockBuilder(\Magento\Framework\Pricing\Amount\AmountInterface::class)
+ /** @var AmountInterface|MockObject $amount */
+ $amount = $this->getMockBuilder(AmountInterface::class)
->disableOriginalConstructor()
->getMock();
$configurableProduct->expects($this->any())
->method('getCustomOption')
->willReturnMap([['simple_product', false], ['option_ids', false]]);
- $customOption->expects($this->never())->method('getProduct');
$configurableProduct->expects($this->once())->method('getPriceInfo')->willReturn($priceInfo);
$priceInfo->expects($this->once())->method('getPrice')->with('final_price')->willReturn($price);
$price->expects($this->once())->method('getAmount')->willReturn($amount);
@@ -60,4 +85,60 @@ public function testGetFinalPrice()
$this->assertEquals($finalPrice, $this->model->getFinalPrice($qty, $configurableProduct));
}
+
+ public function testGetFinalPriceWithSimpleProduct()
+ {
+ $finalPrice = 10;
+ $qty = 1;
+ $customerGroupId = 1;
+
+ /** @var Product|MockObject $configurableProduct */
+ $configurableProduct = $this->createPartialMock(
+ Product::class,
+ ['getCustomOption', 'setFinalPrice', 'getCustomerGroupId']
+ );
+ /** @var Option|MockObject $customOption */
+ $customOption = $this->createPartialMock(
+ Option::class,
+ ['getProduct']
+ );
+ /** @var Product|MockObject $simpleProduct */
+ $simpleProduct = $this->createPartialMock(
+ Product::class,
+ ['setCustomerGroupId', 'setFinalPrice', 'getPrice', 'getTierPrice', 'getData', 'getCustomOption']
+ );
+
+ $configurableProduct->method('getCustomOption')
+ ->willReturnMap([
+ ['simple_product', $customOption],
+ ['option_ids', false]
+ ]);
+ $configurableProduct->method('getCustomerGroupId')->willReturn($customerGroupId);
+ $configurableProduct->expects($this->atLeastOnce())
+ ->method('setFinalPrice')
+ ->with($finalPrice)
+ ->willReturnSelf();
+ $customOption->method('getProduct')->willReturn($simpleProduct);
+ $simpleProduct->expects($this->atLeastOnce())
+ ->method('setCustomerGroupId')
+ ->with($customerGroupId)
+ ->willReturnSelf();
+ $simpleProduct->method('getPrice')->willReturn($finalPrice);
+ $simpleProduct->method('getTierPrice')->with($qty)->willReturn($finalPrice);
+ $simpleProduct->expects($this->atLeastOnce())
+ ->method('setFinalPrice')
+ ->with($finalPrice)
+ ->willReturnSelf();
+ $simpleProduct->method('getData')->with('final_price')->willReturn($finalPrice);
+ $simpleProduct->method('getCustomOption')->with('option_ids')->willReturn(false);
+ $this->eventManagerMock->expects($this->once())
+ ->method('dispatch')
+ ->with('catalog_product_get_final_price', ['product' => $simpleProduct, 'qty' => $qty]);
+
+ $this->assertEquals(
+ $finalPrice,
+ $this->model->getFinalPrice($qty, $configurableProduct),
+ 'The final price calculation is wrong'
+ );
+ }
}
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/ConfigurableTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/ConfigurableTest.php
index d1cf77f03a7bd..c351d12fa813d 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/ConfigurableTest.php
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Model/Product/Type/ConfigurableTest.php
@@ -11,10 +11,13 @@
use Magento\Catalog\Model\Product\Configuration\Item\Option\OptionInterface;
use Magento\ConfigurableProduct\Model\Product\Type\Collection\SalableProcessor;
use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute;
use Magento\ConfigurableProduct\Model\Product\Type\Configurable\AttributeFactory;
use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\Collection;
use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Attribute\CollectionFactory;
use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection as ProductCollection;
+use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\CollectionFactory
+ as ProductCollectionFactory;
use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\ConfigurableFactory;
use Magento\Customer\Model\Session;
use Magento\Eav\Model\Entity\Attribute\Frontend\AbstractFrontend;
@@ -27,7 +30,6 @@
* @SuppressWarnings(PHPMD.LongVariable)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @SuppressWarnings(PHPMD.TooManyFields)
- * @codingStandardsIgnoreFile
*/
class ConfigurableTest extends \PHPUnit\Framework\TestCase
{
@@ -154,8 +156,7 @@ protected function setUp()
->disableOriginalConstructor()
->setMethods(['create'])
->getMock();
- $this->productCollectionFactory = $this->getMockBuilder(
- \Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\CollectionFactory::class)
+ $this->productCollectionFactory = $this->getMockBuilder(ProductCollectionFactory::class)
->disableOriginalConstructor()
->setMethods(['create'])
->getMock();
@@ -281,8 +282,7 @@ public function testSave()
$product->expects($this->atLeastOnce())
->method('getData')
->willReturnMap($dataMap);
- $attribute = $this->getMockBuilder(
- \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute::class)
+ $attribute = $this->getMockBuilder(Attribute::class)
->disableOriginalConstructor()
->setMethods(['addData', 'setStoreId', 'setProductId', 'save', '__wakeup', '__sleep'])
->getMock();
@@ -464,8 +464,7 @@ public function testGetConfigurableAttributesAsArray($productStore)
$eavAttribute->expects($this->once())->method('getSource')->willReturn($attributeSource);
$eavAttribute->expects($this->atLeastOnce())->method('getStoreLabel')->willReturn('Store Label');
- $attribute = $this->getMockBuilder(
- \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute::class)
+ $attribute = $this->getMockBuilder(Attribute::class)
->disableOriginalConstructor()
->setMethods(['getProductAttribute', '__wakeup', '__sleep'])
->getMock();
@@ -524,7 +523,7 @@ public function testGetConfigurableAttributesNewProduct()
$this->assertEquals([], $this->model->getConfigurableAttributes($product));
}
- public function testGetConfigurableAttributes()
+ public function testGetConfigurableAttributes()
{
$configurableAttributes = '_cache_instance_configurable_attributes';
@@ -591,8 +590,7 @@ public function testHasOptionsConfigurableAttribute()
->setMethods(['__wakeup', 'getAttributeCode', 'getOptions', 'hasData', 'getData'])
->disableOriginalConstructor()
->getMock();
- $attributeMock = $this->getMockBuilder(
- \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute::class)
+ $attributeMock = $this->getMockBuilder(Attribute::class)
->disableOriginalConstructor()
->getMock();
@@ -698,7 +696,7 @@ function ($value) {
->disableOriginalConstructor()
->getMock();
$usedAttributeMock = $this->getMockBuilder(
- \Magento\ConfigurableProduct\Model\Product\Type\Configurable\Attribute::class
+ Attribute::class
)
->setMethods(['getProductAttribute'])
->disableOriginalConstructor()
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Tax/Model/Sales/Total/Quote/CommonTaxCollectorTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Tax/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
new file mode 100644
index 0000000000000..1a5c6c0003bfa
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Tax/Model/Sales/Total/Quote/CommonTaxCollectorTest.php
@@ -0,0 +1,94 @@
+objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
+ $this->commonTaxCollectorPlugin = $this->objectManager->getObject(CommonTaxCollectorPlugin::class);
+ }
+
+ /**
+ * Test to apply Tax Class Id from child item for configurable product
+ */
+ public function testAfterMapItem()
+ {
+ $childTaxClassId = 10;
+
+ /** @var Product|MockObject $childProductMock */
+ $childProductMock = $this->createPartialMock(
+ Product::class,
+ ['getTaxClassId']
+ );
+ $childProductMock->method('getTaxClassId')->willReturn($childTaxClassId);
+ /* @var AbstractItem|MockObject $quoteItemMock */
+ $childQuoteItemMock = $this->createMock(
+ AbstractItem::class
+ );
+ $childQuoteItemMock->method('getProduct')->willReturn($childProductMock);
+
+ /** @var Product|MockObject $productMock */
+ $productMock = $this->createPartialMock(
+ Product::class,
+ ['getTypeId']
+ );
+ $productMock->method('getTypeId')->willReturn(Configurable::TYPE_CODE);
+ /* @var AbstractItem|MockObject $quoteItemMock */
+ $quoteItemMock = $this->createPartialMock(
+ AbstractItem::class,
+ ['getProduct', 'getHasChildren', 'getChildren', 'getQuote', 'getAddress', 'getOptionByCode']
+ );
+ $quoteItemMock->method('getProduct')->willReturn($productMock);
+ $quoteItemMock->method('getHasChildren')->willReturn(true);
+ $quoteItemMock->method('getChildren')->willReturn([$childQuoteItemMock]);
+
+ /* @var TaxClassKeyInterface|MockObject $taxClassObjectMock */
+ $taxClassObjectMock = $this->createMock(TaxClassKeyInterface::class);
+ $taxClassObjectMock->expects($this->once())->method('setValue')->with($childTaxClassId);
+
+ /* @var QuoteDetailsItemInterface|MockObject $quoteDetailsItemMock */
+ $quoteDetailsItemMock = $this->createMock(QuoteDetailsItemInterface::class);
+ $quoteDetailsItemMock->method('getTaxClassKey')->willReturn($taxClassObjectMock);
+
+ $this->commonTaxCollectorPlugin->afterMapItem(
+ $this->createMock(CommonTaxCollector::class),
+ $quoteDetailsItemMock,
+ $this->createMock(QuoteDetailsItemInterfaceFactory::class),
+ $quoteItemMock
+ );
+ }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
index 9fd225e8acaab..44d0ca86d98d0 100644
--- a/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
+++ b/app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php
@@ -5,14 +5,14 @@
*/
namespace Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier;
+use Magento\Catalog\Model\Locator\LocatorInterface;
use Magento\Catalog\Model\Product\Attribute\Backend\Sku;
use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
+use Magento\Framework\UrlInterface;
use Magento\Ui\Component\Container;
-use Magento\Ui\Component\Form;
use Magento\Ui\Component\DynamicRows;
+use Magento\Ui\Component\Form;
use Magento\Ui\Component\Modal;
-use Magento\Framework\UrlInterface;
-use Magento\Catalog\Model\Locator\LocatorInterface;
/**
* Data provider for Configurable panel
@@ -90,7 +90,7 @@ public function __construct(
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function modifyData(array $data)
{
@@ -98,7 +98,7 @@ public function modifyData(array $data)
}
/**
- * {@inheritdoc}
+ * @inheritdoc
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function modifyMeta(array $meta)
@@ -197,7 +197,7 @@ public function modifyMeta(array $meta)
'autoRender' => false,
'componentType' => 'insertListing',
'component' => 'Magento_ConfigurableProduct/js'
- .'/components/associated-product-insert-listing',
+ . '/components/associated-product-insert-listing',
'dataScope' => $this->associatedListingPrefix
. static::ASSOCIATED_PRODUCT_LISTING,
'externalProvider' => $this->associatedListingPrefix
@@ -328,14 +328,12 @@ protected function getButtonSet()
'component' => 'Magento_Ui/js/form/components/button',
'actions' => [
[
- 'targetName' =>
- $this->dataScopeName . '.configurableModal',
+ 'targetName' => $this->dataScopeName . '.configurableModal',
'actionName' => 'trigger',
'params' => ['active', true],
],
[
- 'targetName' =>
- $this->dataScopeName . '.configurableModal',
+ 'targetName' => $this->dataScopeName . '.configurableModal',
'actionName' => 'openModal',
],
],
@@ -574,6 +572,7 @@ protected function getColumn(
'dataType' => Form\Element\DataType\Text::NAME,
'dataScope' => $name,
'visibleIfCanEdit' => false,
+ 'labelVisible' => false,
'imports' => [
'visible' => '!${$.provider}:${$.parentScope}.canEdit'
],
@@ -591,7 +590,9 @@ protected function getColumn(
'formElement' => Container::NAME,
'component' => 'Magento_Ui/js/form/components/group',
'label' => $label,
+ 'showLabel' => false,
'dataScope' => '',
+ 'showLabel' => false
];
$container['children'] = [
$name . '_edit' => $fieldEdit,
diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json
index 74e611af2cbbc..90b1ce26a920b 100644
--- a/app/code/Magento/ConfigurableProduct/composer.json
+++ b/app/code/Magento/ConfigurableProduct/composer.json
@@ -22,10 +22,11 @@
"magento/module-sales-rule": "101.0.*",
"magento/module-product-video": "100.2.*",
"magento/module-configurable-sample-data": "Sample Data version:100.2.*",
- "magento/module-product-links-sample-data": "Sample Data version:100.2.*"
+ "magento/module-product-links-sample-data": "Sample Data version:100.2.*",
+ "magento/module-tax": "100.2.*"
},
"type": "magento2-module",
- "version": "100.2.7",
+ "version": "100.2.8",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/ConfigurableProduct/etc/di.xml b/app/code/Magento/ConfigurableProduct/etc/di.xml
index e6e0da721e150..dd39bcb477699 100644
--- a/app/code/Magento/ConfigurableProduct/etc/di.xml
+++ b/app/code/Magento/ConfigurableProduct/etc/di.xml
@@ -245,4 +245,14 @@
+
+
+
+
+
+
+ - configurable
+
+
+
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
index a8712cdc183de..78fa8b1c68b7a 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/composite/fieldset/configurable.phtml
@@ -20,9 +20,8 @@
-