-
+
-
+
@@ -42,10 +42,10 @@
-
-
+
-
+
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/payment.html b/app/code/Magento/Checkout/view/frontend/web/template/payment.html
index a3e1a0f7aca90..1e3d3fed3876f 100644
--- a/app/code/Magento/Checkout/view/frontend/web/template/payment.html
+++ b/app/code/Magento/Checkout/view/frontend/web/template/payment.html
@@ -21,6 +21,10 @@
+ + + +
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/shipping-method-item.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/shipping-method-item.html index 11e419054582f..fd6be02657e3e 100644 --- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/shipping-method-item.html +++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/shipping-method-item.html @@ -15,9 +15,11 @@ attr="'aria-labelledby': 'label_method_' + method.method_code + '_' + method.carrier_code + ' ' + 'label_carrier_' + method.method_code + '_' + method.carrier_code, 'checked': element.rates().length == 1 || element.isSelected" /> +
+
+ + + +
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/shipping-method-item.html b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/shipping-method-item.html index 11e419054582f..fd6be02657e3e 100644 --- a/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/shipping-method-item.html +++ b/app/code/Magento/Checkout/view/frontend/web/template/shipping-address/shipping-method-item.html @@ -15,9 +15,11 @@ attr="'aria-labelledby': 'label_method_' + method.method_code + '_' + method.carrier_code + ' ' + 'label_carrier_' + method.method_code + '_' + method.carrier_code, 'checked': element.rates().length == 1 || element.isSelected" /> +
diff --git a/app/code/Magento/CheckoutAgreements/Model/AgreementsValidator.php b/app/code/Magento/CheckoutAgreements/Model/AgreementsValidator.php
index 2643e69ba1efd..c78c807f9ea20 100644
--- a/app/code/Magento/CheckoutAgreements/Model/AgreementsValidator.php
+++ b/app/code/Magento/CheckoutAgreements/Model/AgreementsValidator.php
@@ -35,12 +35,12 @@ public function __construct($list = null)
public function isValid($agreementIds = [])
{
$agreementIds = $agreementIds === null ? [] : $agreementIds;
- $requiredAgreements = [[]];
+ $requiredAgreements = [];
foreach ($this->agreementsProviders as $agreementsProvider) {
$requiredAgreements[] = $agreementsProvider->getRequiredAgreementIds();
}
- $agreementsDiff = array_diff(array_merge(...$requiredAgreements), $agreementIds);
+ $agreementsDiff = array_diff(array_merge([], ...$requiredAgreements), $agreementIds);
return empty($agreementsDiff);
}
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php
index 41e9358e160cf..c033e09ca8db0 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php
@@ -58,6 +58,7 @@ public function __construct(
* Json tree builder
*
* @return string
+ * @throws \Magento\Framework\Exception\ValidatorException
*/
public function getTreeJson()
{
@@ -75,8 +76,8 @@ public function getTreeJson()
'path' => substr($item->getFilename(), strlen($storageRoot)),
'cls' => 'folder',
];
-
- $hasNestedDirectories = count(glob($item->getFilename() . '/*', GLOB_ONLYDIR)) > 0;
+ $nestedDirectories = $this->getMediaDirectory()->readRecursively($item->getFilename());
+ $hasNestedDirectories = count($nestedDirectories) > 0;
// if no nested directories inside dir, add 'leaf' state so that jstree hides dropdown arrow next to dir
if (!$hasNestedDirectories) {
diff --git a/app/code/Magento/Cms/Block/Block.php b/app/code/Magento/Cms/Block/Block.php
index 86cf059525e1e..afc95d369f67d 100644
--- a/app/code/Magento/Cms/Block/Block.php
+++ b/app/code/Magento/Cms/Block/Block.php
@@ -10,6 +10,8 @@
/**
* Cms block content block
+ * @deprecated This class introduces caching issues and should no longer be used
+ * @see \Magento\Cms\Block\BlockByIdentifier
*/
class Block extends AbstractBlock implements \Magento\Framework\DataObject\IdentityInterface
{
diff --git a/app/code/Magento/Cms/Block/BlockByIdentifier.php b/app/code/Magento/Cms/Block/BlockByIdentifier.php
new file mode 100644
index 0000000000000..eb8bf3d5fe352
--- /dev/null
+++ b/app/code/Magento/Cms/Block/BlockByIdentifier.php
@@ -0,0 +1,175 @@
+blockByIdentifier = $blockByIdentifier;
+ $this->storeManager = $storeManager;
+ $this->filterProvider = $filterProvider;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ protected function _toHtml(): string
+ {
+ try {
+ return $this->filterOutput(
+ $this->getCmsBlock()->getContent()
+ );
+ } catch (NoSuchEntityException $e) {
+ return '';
+ }
+ }
+
+ /**
+ * Returns the value of `identifier` injected in `` definition
+ *
+ * @return string|null
+ */
+ private function getIdentifier(): ?string
+ {
+ return $this->getData('identifier') ?: null;
+ }
+
+ /**
+ * Filters the Content
+ *
+ * @param string $content
+ * @return string
+ * @throws NoSuchEntityException
+ */
+ private function filterOutput(string $content): string
+ {
+ return $this->filterProvider->getBlockFilter()
+ ->setStoreId($this->getCurrentStoreId())
+ ->filter($content);
+ }
+
+ /**
+ * Loads the CMS block by `identifier` provided as an argument
+ *
+ * @return BlockInterface|BlockModel
+ * @throws \InvalidArgumentException
+ * @throws NoSuchEntityException
+ */
+ private function getCmsBlock(): BlockInterface
+ {
+ if (!$this->getIdentifier()) {
+ throw new \InvalidArgumentException('Expected value of `identifier` was not provided');
+ }
+
+ if (null === $this->cmsBlock) {
+ $this->cmsBlock = $this->blockByIdentifier->execute(
+ (string)$this->getIdentifier(),
+ $this->getCurrentStoreId()
+ );
+
+ if (!$this->cmsBlock->isActive()) {
+ throw new NoSuchEntityException(
+ __('The CMS block with identifier "%identifier" is not enabled.', $this->getIdentifier())
+ );
+ }
+ }
+
+ return $this->cmsBlock;
+ }
+
+ /**
+ * Returns the current Store ID
+ *
+ * @return int
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
+ */
+ private function getCurrentStoreId(): int
+ {
+ return (int)$this->storeManager->getStore()->getId();
+ }
+
+ /**
+ * Returns array of Block Identifiers used to determine Cache Tags
+ *
+ * This implementation supports different CMS blocks caching having the same identifier,
+ * resolving the bug introduced in scope of \Magento\Cms\Block\Block
+ *
+ * @return string[]
+ */
+ public function getIdentities(): array
+ {
+ if (!$this->getIdentifier()) {
+ return [];
+ }
+
+ $identities = [
+ self::CACHE_KEY_PREFIX . '_' . $this->getIdentifier(),
+ self::CACHE_KEY_PREFIX . '_' . $this->getIdentifier() . '_' . $this->getCurrentStoreId()
+ ];
+
+ try {
+ $cmsBlock = $this->getCmsBlock();
+ if ($cmsBlock instanceof IdentityInterface) {
+ $identities = array_merge($identities, $cmsBlock->getIdentities());
+ }
+ // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
+ } catch (NoSuchEntityException $e) {
+ }
+
+ return $identities;
+ }
+}
diff --git a/app/code/Magento/Cms/Command/WysiwygRestrictCommand.php b/app/code/Magento/Cms/Command/WysiwygRestrictCommand.php
new file mode 100644
index 0000000000000..e676cb1fe0ee5
--- /dev/null
+++ b/app/code/Magento/Cms/Command/WysiwygRestrictCommand.php
@@ -0,0 +1,72 @@
+configWriter = $configWriter;
+ $this->cache = $cache;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ protected function configure()
+ {
+ $this->setName('cms:wysiwyg:restrict');
+ $this->setDescription('Set whether to enforce user HTML content validation or show a warning instead');
+ $this->setDefinition([new InputArgument('restrict', InputArgument::REQUIRED, 'y\n')]);
+
+ parent::configure();
+ }
+
+ /**
+ * @inheritDoc
+ */
+ protected function execute(InputInterface $input, OutputInterface $output)
+ {
+ $restrictArg = mb_strtolower((string)$input->getArgument('restrict'));
+ $restrict = $restrictArg === 'y' ? '1' : '0';
+ $this->configWriter->saveConfig(Validator::CONFIG_PATH_THROW_EXCEPTION, $restrict);
+ $this->cache->cleanType('config');
+
+ $output->writeln('HTML user content validation is now ' .($restrictArg === 'y' ? 'enforced' : 'suggested'));
+
+ return 0;
+ }
+}
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
index a3370b2666264..5172ff8088bf8 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
@@ -13,6 +13,8 @@
use Magento\Cms\Model\Template\Filter;
use Magento\Cms\Model\Wysiwyg\Config;
use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Filesystem;
use Magento\Framework\Image\Adapter\AdapterInterface;
use Magento\Framework\Image\AdapterFactory;
use Psr\Log\LoggerInterface;
@@ -27,6 +29,7 @@
* Process template text for wysiwyg editor.
*
* Class Directive
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects) usage of $this->file eliminated, but it's still there due to BC
*/
class Directive extends Action implements HttpGetActionInterface
{
@@ -70,8 +73,13 @@ class Directive extends Action implements HttpGetActionInterface
/**
* @var File
+ * @deprecated use $filesystem instead
*/
private $file;
+ /**
+ * @var Filesystem|null
+ */
+ private $filesystem;
/**
* Constructor
@@ -84,6 +92,7 @@ class Directive extends Action implements HttpGetActionInterface
* @param Config|null $config
* @param Filter|null $filter
* @param File|null $file
+ * @param Filesystem|null $filesystem
*/
public function __construct(
Context $context,
@@ -93,7 +102,8 @@ public function __construct(
LoggerInterface $logger = null,
Config $config = null,
Filter $filter = null,
- File $file = null
+ File $file = null,
+ Filesystem $filesystem = null
) {
parent::__construct($context);
$this->urlDecoder = $urlDecoder;
@@ -103,17 +113,21 @@ public function __construct(
$this->config = $config ?: ObjectManager::getInstance()->get(Config::class);
$this->filter = $filter ?: ObjectManager::getInstance()->get(Filter::class);
$this->file = $file ?: ObjectManager::getInstance()->get(File::class);
+ $this->filesystem = $filesystem ?: ObjectManager::getInstance()->get(Filesystem::class);
}
/**
* Template directives callback
*
* @return Raw
+ * @throws \Magento\Framework\Exception\FileSystemException
*/
public function execute()
{
$directive = $this->getRequest()->getParam('___directive');
$directive = $this->urlDecoder->decode($directive);
+ $image = null;
+ $resultRaw = null;
try {
/** @var Filter $filter */
$imagePath = $this->filter->filter($directive);
@@ -141,7 +155,8 @@ public function execute()
// To avoid issues with PNG images with alpha blending we return raw file
// after validation as an image source instead of generating the new PNG image
// with image adapter
- $content = $this->file->fileGetContents($imagePath);
+ $content = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA)->getDriver()
+ ->fileGetContents($imagePath);
$resultRaw->setHeader('Content-Type', $mimeType);
$resultRaw->setContents($content);
diff --git a/app/code/Magento/Cms/Model/Block.php b/app/code/Magento/Cms/Model/Block.php
index 9da444c72e80c..ab8d65399f37c 100644
--- a/app/code/Magento/Cms/Model/Block.php
+++ b/app/code/Magento/Cms/Model/Block.php
@@ -6,8 +6,15 @@
namespace Magento\Cms\Model;
use Magento\Cms\Api\Data\BlockInterface;
+use Magento\Framework\App\ObjectManager;
use Magento\Framework\DataObject\IdentityInterface;
use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\Validation\ValidationException;
+use Magento\Framework\Validator\HTML\WYSIWYGValidatorInterface;
+use Magento\Framework\Model\Context;
+use Magento\Framework\Registry;
+use Magento\Framework\Model\ResourceModel\AbstractResource;
+use Magento\Framework\Data\Collection\AbstractDb;
/**
* CMS block model
@@ -40,6 +47,32 @@ class Block extends AbstractModel implements BlockInterface, IdentityInterface
*/
protected $_eventPrefix = 'cms_block';
+ /**
+ * @var WYSIWYGValidatorInterface
+ */
+ private $wysiwygValidator;
+
+ /**
+ * @param Context $context
+ * @param Registry $registry
+ * @param AbstractResource|null $resource
+ * @param AbstractDb|null $resourceCollection
+ * @param array $data
+ * @param WYSIWYGValidatorInterface|null $wysiwygValidator
+ */
+ public function __construct(
+ Context $context,
+ Registry $registry,
+ AbstractResource $resource = null,
+ AbstractDb $resourceCollection = null,
+ array $data = [],
+ ?WYSIWYGValidatorInterface $wysiwygValidator = null
+ ) {
+ parent::__construct($context, $registry, $resource, $resourceCollection, $data);
+ $this->wysiwygValidator = $wysiwygValidator
+ ?? ObjectManager::getInstance()->get(WYSIWYGValidatorInterface::class);
+ }
+
/**
* Construct.
*
@@ -63,12 +96,26 @@ public function beforeSave()
}
$needle = 'block_id="' . $this->getId() . '"';
- if (false == strstr($this->getContent(), (string) $needle)) {
- return parent::beforeSave();
+ if (strstr($this->getContent(), (string) $needle) !== false) {
+ throw new \Magento\Framework\Exception\LocalizedException(
+ __('Make sure that static block content does not reference the block itself.')
+ );
}
- throw new \Magento\Framework\Exception\LocalizedException(
- __('Make sure that static block content does not reference the block itself.')
- );
+ parent::beforeSave();
+
+ //Validating HTML content.
+ if ($this->getContent() && $this->getContent() !== $this->getOrigData(self::CONTENT)) {
+ try {
+ $this->wysiwygValidator->validate($this->getContent());
+ } catch (ValidationException $exception) {
+ throw new ValidationException(
+ __('Content field contains restricted HTML elements. %1', $exception->getMessage()),
+ $exception
+ );
+ }
+ }
+
+ return $this;
}
/**
diff --git a/app/code/Magento/Cms/Model/BlockRepository.php b/app/code/Magento/Cms/Model/BlockRepository.php
index d0df0d2b31caa..ef57f8ca7b849 100644
--- a/app/code/Magento/Cms/Model/BlockRepository.php
+++ b/app/code/Magento/Cms/Model/BlockRepository.php
@@ -12,14 +12,16 @@
use Magento\Cms\Model\ResourceModel\Block\CollectionFactory as BlockCollectionFactory;
use Magento\Framework\Api\DataObjectHelper;
use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Magento\Framework\App\ObjectManager;
use Magento\Framework\Exception\CouldNotDeleteException;
use Magento\Framework\Exception\CouldNotSaveException;
use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Framework\Reflection\DataObjectProcessor;
use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\EntityManager\HydratorInterface;
/**
- * Class BlockRepository
+ * Default block repo impl.
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class BlockRepository implements BlockRepositoryInterface
@@ -69,6 +71,11 @@ class BlockRepository implements BlockRepositoryInterface
*/
private $collectionProcessor;
+ /**
+ * @var HydratorInterface
+ */
+ private $hydrator;
+
/**
* @param ResourceBlock $resource
* @param BlockFactory $blockFactory
@@ -79,6 +86,9 @@ class BlockRepository implements BlockRepositoryInterface
* @param DataObjectProcessor $dataObjectProcessor
* @param StoreManagerInterface $storeManager
* @param CollectionProcessorInterface $collectionProcessor
+ * @param HydratorInterface|null $hydrator
+ *
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
ResourceBlock $resource,
@@ -89,7 +99,8 @@ public function __construct(
DataObjectHelper $dataObjectHelper,
DataObjectProcessor $dataObjectProcessor,
StoreManagerInterface $storeManager,
- CollectionProcessorInterface $collectionProcessor = null
+ CollectionProcessorInterface $collectionProcessor = null,
+ ?HydratorInterface $hydrator = null
) {
$this->resource = $resource;
$this->blockFactory = $blockFactory;
@@ -100,6 +111,7 @@ public function __construct(
$this->dataObjectProcessor = $dataObjectProcessor;
$this->storeManager = $storeManager;
$this->collectionProcessor = $collectionProcessor ?: $this->getCollectionProcessor();
+ $this->hydrator = $hydrator ?? ObjectManager::getInstance()->get(HydratorInterface::class);
}
/**
@@ -115,6 +127,10 @@ public function save(Data\BlockInterface $block)
$block->setStoreId($this->storeManager->getStore()->getId());
}
+ if ($block->getId() && $block instanceof Block && !$block->getOrigData()) {
+ $block = $this->hydrator->hydrate($this->getById($block->getId()), $this->hydrator->extract($block));
+ }
+
try {
$this->resource->save($block);
} catch (\Exception $exception) {
@@ -201,6 +217,7 @@ public function deleteById($blockId)
*/
private function getCollectionProcessor()
{
+ //phpcs:disable Magento2.PHP.LiteralNamespaces
if (!$this->collectionProcessor) {
$this->collectionProcessor = \Magento\Framework\App\ObjectManager::getInstance()->get(
'Magento\Cms\Model\Api\SearchCriteria\BlockCollectionProcessor'
diff --git a/app/code/Magento/Cms/Model/Page.php b/app/code/Magento/Cms/Model/Page.php
index 28d013f45f1fa..7e3e3ff44cfa0 100644
--- a/app/code/Magento/Cms/Model/Page.php
+++ b/app/code/Magento/Cms/Model/Page.php
@@ -13,6 +13,8 @@
use Magento\Framework\DataObject\IdentityInterface;
use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\Validation\ValidationException;
+use Magento\Framework\Validator\HTML\WYSIWYGValidatorInterface;
/**
* Cms Page Model
@@ -21,12 +23,13 @@
* @method Page setStoreId(int $storeId)
* @method int getStoreId()
* @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @since 100.0.2
*/
class Page extends AbstractModel implements PageInterface, IdentityInterface
{
/**
- * No route page id
+ * Page ID for the 404 page.
*/
const NOROUTE_PAGE_ID = 'no-route';
@@ -64,6 +67,11 @@ class Page extends AbstractModel implements PageInterface, IdentityInterface
*/
private $customLayoutRepository;
+ /**
+ * @var WYSIWYGValidatorInterface
+ */
+ private $wysiwygValidator;
+
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
@@ -71,6 +79,7 @@ class Page extends AbstractModel implements PageInterface, IdentityInterface
* @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
* @param array $data
* @param CustomLayoutRepository|null $customLayoutRepository
+ * @param WYSIWYGValidatorInterface|null $wysiwygValidator
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -78,11 +87,14 @@ public function __construct(
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
array $data = [],
- ?CustomLayoutRepository $customLayoutRepository = null
+ ?CustomLayoutRepository $customLayoutRepository = null,
+ ?WYSIWYGValidatorInterface $wysiwygValidator = null
) {
parent::__construct($context, $registry, $resource, $resourceCollection, $data);
$this->customLayoutRepository = $customLayoutRepository
?? ObjectManager::getInstance()->get(CustomLayoutRepository::class);
+ $this->wysiwygValidator = $wysiwygValidator
+ ?? ObjectManager::getInstance()->get(WYSIWYGValidatorInterface::class);
}
/**
@@ -594,6 +606,8 @@ private function validateNewIdentifier(): void
/**
* @inheritdoc
* @since 101.0.0
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function beforeSave()
{
@@ -615,6 +629,26 @@ public function beforeSave()
$this->setData('layout_update_selected', $layoutUpdate);
$this->customLayoutRepository->validateLayoutSelectedFor($this);
+ //Validating Content HTML.
+ $oldValue = null;
+ if ($this->getId()) {
+ if ($this->getOrigData()) {
+ $oldValue = $this->getOrigData(self::CONTENT);
+ } elseif (array_key_exists(self::CONTENT, $this->getStoredData())) {
+ $oldValue = $this->getStoredData()[self::CONTENT];
+ }
+ }
+ if ($this->getContent() && $this->getContent() !== $oldValue) {
+ try {
+ $this->wysiwygValidator->validate($this->getContent());
+ } catch (ValidationException $exception) {
+ throw new ValidationException(
+ __('Content HTML contains restricted elements. %1', $exception->getMessage()),
+ $exception
+ );
+ }
+ }
+
return parent::beforeSave();
}
diff --git a/app/code/Magento/Cms/Model/PageRepository.php b/app/code/Magento/Cms/Model/PageRepository.php
index 0439fbcd2f799..7e84b93f5a1e6 100644
--- a/app/code/Magento/Cms/Model/PageRepository.php
+++ b/app/code/Magento/Cms/Model/PageRepository.php
@@ -7,22 +7,29 @@
namespace Magento\Cms\Model;
use Magento\Cms\Api\Data;
+use Magento\Cms\Api\Data\PageInterface;
+use Magento\Cms\Api\Data\PageInterfaceFactory;
+use Magento\Cms\Api\Data\PageSearchResultsInterface;
use Magento\Cms\Api\PageRepositoryInterface;
+use Magento\Cms\Model\Api\SearchCriteria\PageCollectionProcessor;
use Magento\Cms\Model\Page\IdentityMap;
use Magento\Cms\Model\ResourceModel\Page as ResourcePage;
use Magento\Cms\Model\ResourceModel\Page\CollectionFactory as PageCollectionFactory;
use Magento\Framework\Api\DataObjectHelper;
use Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface;
+use Magento\Framework\Api\SearchCriteriaInterface;
use Magento\Framework\App\ObjectManager;
use Magento\Framework\EntityManager\HydratorInterface;
+use Magento\Framework\App\Route\Config;
use Magento\Framework\Exception\CouldNotDeleteException;
use Magento\Framework\Exception\CouldNotSaveException;
+use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Framework\Reflection\DataObjectProcessor;
use Magento\Store\Model\StoreManagerInterface;
/**
- * @inheritdoc
+ * Cms page repository
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
@@ -59,12 +66,12 @@ class PageRepository implements PageRepositoryInterface
protected $dataObjectProcessor;
/**
- * @var \Magento\Cms\Api\Data\PageInterfaceFactory
+ * @var PageInterfaceFactory
*/
protected $dataPageFactory;
/**
- * @var \Magento\Store\Model\StoreManagerInterface
+ * @var StoreManagerInterface
*/
private $storeManager;
@@ -83,10 +90,15 @@ class PageRepository implements PageRepositoryInterface
*/
private $hydrator;
+ /**
+ * @var Config
+ */
+ private $routeConfig;
+
/**
* @param ResourcePage $resource
* @param PageFactory $pageFactory
- * @param Data\PageInterfaceFactory $dataPageFactory
+ * @param PageInterfaceFactory $dataPageFactory
* @param PageCollectionFactory $pageCollectionFactory
* @param Data\PageSearchResultsInterfaceFactory $searchResultsFactory
* @param DataObjectHelper $dataObjectHelper
@@ -95,12 +107,13 @@ class PageRepository implements PageRepositoryInterface
* @param CollectionProcessorInterface $collectionProcessor
* @param IdentityMap|null $identityMap
* @param HydratorInterface|null $hydrator
+ * @param Config|null $routeConfig
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
ResourcePage $resource,
PageFactory $pageFactory,
- Data\PageInterfaceFactory $dataPageFactory,
+ PageInterfaceFactory $dataPageFactory,
PageCollectionFactory $pageCollectionFactory,
Data\PageSearchResultsInterfaceFactory $searchResultsFactory,
DataObjectHelper $dataObjectHelper,
@@ -108,7 +121,8 @@ public function __construct(
StoreManagerInterface $storeManager,
CollectionProcessorInterface $collectionProcessor = null,
?IdentityMap $identityMap = null,
- ?HydratorInterface $hydrator = null
+ ?HydratorInterface $hydrator = null,
+ ?Config $routeConfig = null
) {
$this->resource = $resource;
$this->pageFactory = $pageFactory;
@@ -119,29 +133,39 @@ public function __construct(
$this->dataObjectProcessor = $dataObjectProcessor;
$this->storeManager = $storeManager;
$this->collectionProcessor = $collectionProcessor ?: $this->getCollectionProcessor();
- $this->identityMap = $identityMap ?? ObjectManager::getInstance()->get(IdentityMap::class);
- $this->hydrator = $hydrator ?: ObjectManager::getInstance()->get(HydratorInterface::class);
+ $this->identityMap = $identityMap ?? ObjectManager::getInstance()
+ ->get(IdentityMap::class);
+ $this->hydrator = $hydrator ?: ObjectManager::getInstance()
+ ->get(HydratorInterface::class);
+ $this->routeConfig = $routeConfig ?? ObjectManager::getInstance()
+ ->get(Config::class);
}
/**
* Validate new layout update values.
*
- * @param Data\PageInterface $page
+ * @param PageInterface $page
* @return void
* @throws \InvalidArgumentException
*/
- private function validateLayoutUpdate(Data\PageInterface $page): void
+ private function validateLayoutUpdate(PageInterface $page): void
{
//Persisted data
- $savedPage = $page->getId() ? $this->getById($page->getId()) : null;
+ $oldData = null;
+ if ($page->getId() && $page instanceof Page) {
+ $oldData = $page->getOrigData();
+ }
//Custom layout update can be removed or kept as is.
if ($page->getCustomLayoutUpdateXml()
- && (!$savedPage || $page->getCustomLayoutUpdateXml() !== $savedPage->getCustomLayoutUpdateXml())
+ && (
+ !$oldData
+ || $page->getCustomLayoutUpdateXml() !== $oldData[Data\PageInterface::CUSTOM_LAYOUT_UPDATE_XML]
+ )
) {
throw new \InvalidArgumentException('Custom layout updates must be selected from a file');
}
if ($page->getLayoutUpdateXml()
- && (!$savedPage || $page->getLayoutUpdateXml() !== $savedPage->getLayoutUpdateXml())
+ && (!$oldData || $page->getLayoutUpdateXml() !== $oldData[Data\PageInterface::LAYOUT_UPDATE_XML])
) {
throw new \InvalidArgumentException('Custom layout updates must be selected from a file');
}
@@ -150,30 +174,35 @@ private function validateLayoutUpdate(Data\PageInterface $page): void
/**
* Save Page data
*
- * @param \Magento\Cms\Api\Data\PageInterface|Page $page
+ * @param PageInterface|Page $page
* @return Page
* @throws CouldNotSaveException
*/
- public function save(\Magento\Cms\Api\Data\PageInterface $page)
+ public function save(PageInterface $page)
{
- if ($page->getStoreId() === null) {
- $storeId = $this->storeManager->getStore()->getId();
- $page->setStoreId($storeId);
- }
- $pageId = $page->getId();
-
try {
- $this->validateLayoutUpdate($page);
- if ($pageId) {
+ $pageId = $page->getId();
+ if ($pageId && !($page instanceof Page && $page->getOrigData())) {
$page = $this->hydrator->hydrate($this->getById($pageId), $this->hydrator->extract($page));
}
+ if ($page->getStoreId() === null) {
+ $storeId = $this->storeManager->getStore()->getId();
+ $page->setStoreId($storeId);
+ }
+ $this->validateLayoutUpdate($page);
+ $this->validateRoutesDuplication($page);
$this->resource->save($page);
$this->identityMap->add($page);
- } catch (\Exception $exception) {
+ } catch (LocalizedException $exception) {
throw new CouldNotSaveException(
__('Could not save the page: %1', $exception->getMessage()),
$exception
);
+ } catch (\Throwable $exception) {
+ throw new CouldNotSaveException(
+ __('Could not save the page: %1', __('Something went wrong while saving the page.')),
+ $exception
+ );
}
return $page;
}
@@ -183,7 +212,7 @@ public function save(\Magento\Cms\Api\Data\PageInterface $page)
*
* @param string $pageId
* @return Page
- * @throws \Magento\Framework\Exception\NoSuchEntityException
+ * @throws NoSuchEntityException
*/
public function getById($pageId)
{
@@ -202,17 +231,15 @@ public function getById($pageId)
*
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
- * @param \Magento\Framework\Api\SearchCriteriaInterface $criteria
- * @return \Magento\Cms\Api\Data\PageSearchResultsInterface
+ * @param SearchCriteriaInterface $criteria
+ * @return PageSearchResultsInterface
*/
- public function getList(\Magento\Framework\Api\SearchCriteriaInterface $criteria)
+ public function getList(SearchCriteriaInterface $criteria)
{
- /** @var \Magento\Cms\Model\ResourceModel\Page\Collection $collection */
$collection = $this->pageCollectionFactory->create();
$this->collectionProcessor->process($criteria, $collection);
- /** @var Data\PageSearchResultsInterface $searchResults */
$searchResults = $this->searchResultsFactory->create();
$searchResults->setSearchCriteria($criteria);
$searchResults->setItems($collection->getItems());
@@ -223,11 +250,11 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $criteria
/**
* Delete Page
*
- * @param \Magento\Cms\Api\Data\PageInterface $page
+ * @param PageInterface $page
* @return bool
* @throws CouldNotDeleteException
*/
- public function delete(\Magento\Cms\Api\Data\PageInterface $page)
+ public function delete(PageInterface $page)
{
try {
$this->resource->delete($page);
@@ -262,11 +289,26 @@ public function deleteById($pageId)
private function getCollectionProcessor()
{
if (!$this->collectionProcessor) {
- $this->collectionProcessor = \Magento\Framework\App\ObjectManager::getInstance()->get(
- // phpstan:ignore "Class Magento\Cms\Model\Api\SearchCriteria\PageCollectionProcessor not found."
- \Magento\Cms\Model\Api\SearchCriteria\PageCollectionProcessor::class
- );
+ // phpstan:ignore "Class Magento\Cms\Model\Api\SearchCriteria\PageCollectionProcessor not found."
+ $this->collectionProcessor = ObjectManager::getInstance()
+ ->get(PageCollectionProcessor::class);
}
return $this->collectionProcessor;
}
+
+ /**
+ * Checks that page identifier doesn't duplicate existed routes
+ *
+ * @param PageInterface $page
+ * @return void
+ * @throws CouldNotSaveException
+ */
+ private function validateRoutesDuplication($page): void
+ {
+ if ($this->routeConfig->getRouteByFrontName($page->getIdentifier(), 'frontend')) {
+ throw new CouldNotSaveException(
+ __('The value specified in the URL Key field would generate a URL that already exists.')
+ );
+ }
+ }
}
diff --git a/app/code/Magento/Cms/Model/PageRepository/ValidationComposite.php b/app/code/Magento/Cms/Model/PageRepository/ValidationComposite.php
index 9fd94d4c11e1c..fe8817f5f40b4 100644
--- a/app/code/Magento/Cms/Model/PageRepository/ValidationComposite.php
+++ b/app/code/Magento/Cms/Model/PageRepository/ValidationComposite.php
@@ -11,6 +11,8 @@
use Magento\Cms\Api\Data\PageInterface;
use Magento\Cms\Api\PageRepositoryInterface;
use Magento\Framework\Api\SearchCriteriaInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\EntityManager\HydratorInterface;
/**
* Validates and saves a page
@@ -27,13 +29,20 @@ class ValidationComposite implements PageRepositoryInterface
*/
private $validators;
+ /**
+ * @var HydratorInterface
+ */
+ private $hydrator;
+
/**
* @param PageRepositoryInterface $repository
* @param ValidatorInterface[] $validators
+ * @param HydratorInterface|null $hydrator
*/
public function __construct(
PageRepositoryInterface $repository,
- array $validators = []
+ array $validators = [],
+ ?HydratorInterface $hydrator = null
) {
foreach ($validators as $validator) {
if (!$validator instanceof ValidatorInterface) {
@@ -44,6 +53,7 @@ public function __construct(
}
$this->repository = $repository;
$this->validators = $validators;
+ $this->hydrator = $hydrator ?? ObjectManager::getInstance()->get(HydratorInterface::class);
}
/**
@@ -51,6 +61,9 @@ public function __construct(
*/
public function save(PageInterface $page)
{
+ if ($page->getId()) {
+ $page = $this->hydrator->hydrate($this->getById($page->getId()), $this->hydrator->extract($page));
+ }
foreach ($this->validators as $validator) {
$validator->validate($page);
}
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
index ae88b24bd2682..2c94e2e76914f 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php
@@ -22,6 +22,7 @@
* @SuppressWarnings(PHPMD.TooManyFields)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
*
* @api
* @since 100.0.2
@@ -152,6 +153,11 @@ class Storage extends \Magento\Framework\DataObject
*/
private $ioFile;
+ /**
+ * @var \Magento\Framework\File\Mime|null
+ */
+ private $mime;
+
/**
* Construct
*
@@ -174,6 +180,7 @@ class Storage extends \Magento\Framework\DataObject
* @param \Magento\Framework\Filesystem\DriverInterface $file
* @param \Magento\Framework\Filesystem\Io\File|null $ioFile
* @param \Psr\Log\LoggerInterface|null $logger
+ * @param \Magento\Framework\File\Mime $mime
*
* @throws \Magento\Framework\Exception\FileSystemException
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -197,7 +204,8 @@ public function __construct(
array $data = [],
\Magento\Framework\Filesystem\DriverInterface $file = null,
\Magento\Framework\Filesystem\Io\File $ioFile = null,
- \Psr\Log\LoggerInterface $logger = null
+ \Psr\Log\LoggerInterface $logger = null,
+ \Magento\Framework\File\Mime $mime = null
) {
$this->_session = $session;
$this->_backendUrl = $backendUrl;
@@ -217,6 +225,7 @@ public function __construct(
$this->_dirs = $dirs;
$this->file = $file ?: ObjectManager::getInstance()->get(\Magento\Framework\Filesystem\Driver\File::class);
$this->ioFile = $ioFile ?: ObjectManager::getInstance()->get(\Magento\Framework\Filesystem\Io\File::class);
+ $this->mime = $mime ?: ObjectManager::getInstance()->get(\Magento\Framework\File\Mime::class);
parent::__construct($data);
}
@@ -354,15 +363,16 @@ public function getFilesCollection($path, $type = null)
$collection->setFilesFilter('/\.(' . implode('|', $allowed) . ')$/i');
}
- // prepare items
foreach ($collection as $item) {
$item->setId($this->_cmsWysiwygImages->idEncode($item->getBasename()));
$item->setName($item->getBasename());
$item->setShortName($this->_cmsWysiwygImages->getShortFilename($item->getBasename()));
$item->setUrl($this->_cmsWysiwygImages->getCurrentUrl() . $item->getBasename());
- $itemStats = $this->file->stat($item->getFilename());
+ $driver = $this->_directory->getDriver();
+ $itemStats = $driver->stat($item->getFilename());
$item->setSize($itemStats['size']);
- $item->setMimeType(\mime_content_type($item->getFilename()));
+ $mimeType = $itemStats['mimetype'] ?? $this->mime->getMimeType($item->getFilename());
+ $item->setMimeType($mimeType);
if ($this->isImage($item->getBasename())) {
$thumbUrl = $this->getThumbnailUrl($item->getFilename(), true);
@@ -372,7 +382,9 @@ public function getFilesCollection($path, $type = null)
}
try {
- $size = getimagesize($item->getFilename());
+ $size = getimagesizefromstring(
+ $driver->fileGetContents($item->getFilename())
+ );
if (is_array($size)) {
$item->setWidth($size[0]);
@@ -429,7 +441,7 @@ public function createDirectory($name, $path)
$path = $this->_cmsWysiwygImages->getStorageRoot();
}
- $newPath = $path . '/' . $name;
+ $newPath = rtrim($path, '/') . '/' . $name;
$relativeNewPath = $this->_directory->getRelativePath($newPath);
if ($this->_directory->isDirectory($relativeNewPath)) {
throw new \Magento\Framework\Exception\LocalizedException(
@@ -562,7 +574,7 @@ public function uploadFile($targetPath, $type = null)
}
// create thumbnail
- $this->resizeFile($targetPath . '/' . $uploader->getUploadedFileName(), true);
+ $this->resizeFile($targetPath . '/' . ltrim($uploader->getUploadedFileName(), '/'), true);
return $result;
}
@@ -646,8 +658,8 @@ public function resizeFile($source, $keepRatio = true)
$image->keepAspectRatio($keepRatio);
- list($imageWidth, $imageHeight) = $this->getResizedParams($source);
-
+ [$imageWidth, $imageHeight] = $this->getResizedParams($source);
+
$image->resize($imageWidth, $imageHeight);
$dest = $targetDir . '/' . $this->ioFile->getPathInfo($source)['basename'];
$image->save($dest);
@@ -669,8 +681,8 @@ private function getResizedParams(string $source): array
$configHeight = $this->_resizeParameters['height'];
//phpcs:ignore Generic.PHP.NoSilencedErrors
- list($imageWidth, $imageHeight) = @getimagesize($source);
-
+ [$imageWidth, $imageHeight] = @getimagesize($source);
+
if ($imageWidth && $imageHeight) {
$imageWidth = $configWidth > $imageWidth ? $imageWidth : $configWidth;
$imageHeight = $configHeight > $imageHeight ? $imageHeight : $configHeight;
@@ -679,7 +691,7 @@ private function getResizedParams(string $source): array
}
return [$configWidth, $configHeight];
}
-
+
/**
* Resize images on the fly in controller action
*
@@ -750,7 +762,7 @@ public function getAllowedExtensions($type = null)
*/
public function getThumbnailRoot()
{
- return $this->_cmsWysiwygImages->getStorageRoot() . '/' . self::THUMBS_DIRECTORY_NAME;
+ return rtrim($this->_cmsWysiwygImages->getStorageRoot(), '/') . '/' . self::THUMBS_DIRECTORY_NAME;
}
/**
@@ -835,7 +847,7 @@ protected function _sanitizePath($path)
{
return rtrim(
preg_replace(
- '~[/\\\]+~',
+ '~[/\\\]+(?_directory->getDriver()->getRealPathSafety(
$this->_directory->getAbsolutePath($path)
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage/Collection.php b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage/Collection.php
index f66c0f6b06d91..617c8663d6f80 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage/Collection.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Images/Storage/Collection.php
@@ -30,7 +30,7 @@ public function __construct(
\Magento\Framework\Filesystem $filesystem
) {
$this->_filesystem = $filesystem;
- parent::__construct($entityFactory);
+ parent::__construct($entityFactory, $filesystem);
}
/**
@@ -41,10 +41,11 @@ public function __construct(
*/
protected function _generateRow($filename)
{
- $filename = preg_replace('~[/\\\]+~', '/', $filename);
+ $filename = preg_replace('~[/\\\]+(?_filesystem->getDirectoryWrite(DirectoryList::MEDIA);
return [
- 'filename' => $filename,
+ 'filename' => rtrim($filename, '/'),
+ // phpcs:ignore Magento2.Functions.DiscouragedFunction
'basename' => basename($filename),
'mtime' => $path->stat($path->getRelativePath($filename))['mtime']
];
diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Validator.php b/app/code/Magento/Cms/Model/Wysiwyg/Validator.php
new file mode 100644
index 0000000000000..39360e6350967
--- /dev/null
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Validator.php
@@ -0,0 +1,112 @@
+validator = $validator;
+ $this->messages = $messages;
+ $this->config = $config;
+ $this->logger = $logger;
+ $this->messageFactory = $messageFactory;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function validate(string $content): void
+ {
+ $throwException = $this->config->isSetFlag(self::CONFIG_PATH_THROW_EXCEPTION);
+ try {
+ $this->validator->validate($content);
+ } catch (ValidationException $exception) {
+ if ($throwException) {
+ throw $exception;
+ } else {
+ $this->messages->addUniqueMessages(
+ [
+ $this->messageFactory->create(
+ MessageInterface::TYPE_WARNING,
+ (string)__(
+ 'Temporarily allowed to save HTML value that contains restricted elements. %1',
+ $exception->getMessage()
+ )
+ )
+ ]
+ );
+ }
+ } catch (\Throwable $exception) {
+ if ($throwException) {
+ throw $exception;
+ } else {
+ $this->messages->addUniqueMessages(
+ [
+ $this->messageFactory->create(
+ MessageInterface::TYPE_WARNING,
+ (string)__('Invalid HTML provided')
+ )
+ ]
+ );
+ $this->logger->error($exception);
+ }
+ }
+ }
+}
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCmsPageFillOutBasicFieldsActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCmsPageFillOutBasicFieldsActionGroup.xml
new file mode 100644
index 0000000000000..52b4cee37b03c
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminCmsPageFillOutBasicFieldsActionGroup.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+ Fills out the Page details (Page Title, Content and URL Key) on the Admin Page creation/edit page.
+
+
+
+
+
+
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDeleteCMSBlockFromGridActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDeleteCMSBlockFromGridActionGroup.xml
new file mode 100644
index 0000000000000..a61f565bac2bc
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDeleteCMSBlockFromGridActionGroup.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDisableWYSIWYGActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDisableWYSIWYGActionGroup.xml
index 7e035a47824ee..8407860959184 100644
--- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDisableWYSIWYGActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminDisableWYSIWYGActionGroup.xml
@@ -13,6 +13,6 @@
Runs bin/magento command to disable WYSIWYG
- Runs bin/magento command to enable WYSIWYG
-
-
+
Navigates to CMS page grid.
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCmsBlocksGridActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCmsBlocksGridActionGroup.xml
new file mode 100644
index 0000000000000..4b57e0c1274f6
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminOpenCmsBlocksGridActionGroup.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+ Goes to the Cms Blocks grid page.
+
+
+
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminPressAddNewCmsBlockButtonActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminPressAddNewCmsBlockButtonActionGroup.xml
new file mode 100644
index 0000000000000..17fc1cd7bdc50
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminPressAddNewCmsBlockButtonActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ Press Add new block button on Cms Blocks gid page
+
+
+
+
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminPressSaveCmsBlockButtonActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminPressSaveCmsBlockButtonActionGroup.xml
new file mode 100644
index 0000000000000..a45e5ed6b9fbf
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminPressSaveCmsBlockButtonActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ Press save button on Cms Block page
+
+
+
+
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSaveAndContinueEditCmsPageActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSaveAndContinueEditCmsPageActionGroup.xml
new file mode 100644
index 0000000000000..5c8b390b59ba0
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSaveAndContinueEditCmsPageActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+ Clicks on the Save and Continue button and see success message.
+
+
+
+
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSearchCMSBlockInGridByIdentifierActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSearchCMSBlockInGridByIdentifierActionGroup.xml
new file mode 100644
index 0000000000000..1099cd7e753c9
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSearchCMSBlockInGridByIdentifierActionGroup.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSelectCMSBlockStoreViewActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSelectCMSBlockStoreViewActionGroup.xml
new file mode 100644
index 0000000000000..e5b8caf1e209f
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AdminSelectCMSBlockStoreViewActionGroup.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertAdminCMSBlockIsNotInGridActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertAdminCMSBlockIsNotInGridActionGroup.xml
new file mode 100644
index 0000000000000..1b5a5301eda1b
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertAdminCMSBlockIsNotInGridActionGroup.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertAdminProperUrlIsShownActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertAdminProperUrlIsShownActionGroup.xml
new file mode 100644
index 0000000000000..fb97c9656aca2
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/AssertAdminProperUrlIsShownActionGroup.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+ Assert current page has proper URL
+
+
+
+
+
+
diff --git a/app/code/Magento/Cms/Test/Mftf/ActionGroup/NavigateToMediaFolderActionGroup.xml b/app/code/Magento/Cms/Test/Mftf/ActionGroup/NavigateToMediaFolderActionGroup.xml
index c3d84fafd071c..f3cf259842e1b 100644
--- a/app/code/Magento/Cms/Test/Mftf/ActionGroup/NavigateToMediaFolderActionGroup.xml
+++ b/app/code/Magento/Cms/Test/Mftf/ActionGroup/NavigateToMediaFolderActionGroup.xml
@@ -15,8 +15,9 @@
-
+
- Clicks on the Save and Continue button.
+ DEPRECATED. Use AdminSaveAndContinueEditCmsPageActionGroup instead. Clicks on the Save and Continue button.
+ Test Block
+ ActiveTestBlock
+ All Store Views
+ Test Block content
+ 1
+
diff --git a/app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml b/app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml
index ea5e90383511c..66f2983140b45 100644
--- a/app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Data/WysiwygConfigData.xml
@@ -16,7 +16,7 @@
cms/wysiwyg/enabled
0
- hidden
+ disabled
cms/wysiwyg/editor
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/AdminBlockGridSection.xml b/app/code/Magento/Cms/Test/Mftf/Section/AdminBlockGridSection.xml
index ab15570a01f40..f558619fa49ac 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/AdminBlockGridSection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/AdminBlockGridSection.xml
@@ -14,5 +14,6 @@
diff --git a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/MediaGallerySection.xml b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/MediaGallerySection.xml
index 725d050554f2d..212035fbc575a 100644
--- a/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/MediaGallerySection.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/MediaGallerySection.xml
@@ -36,5 +36,6 @@
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsPageTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsPageTest.xml
index 90da152e7a7b1..f82ae3eed5de6 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsPageTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminCreateCmsPageTest.xml
@@ -25,7 +25,7 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/AdminDeleteCmsPageTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/AdminDeleteCmsPageTest.xml
index 3687bb4fe5743..e80f6010b6c69 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/AdminDeleteCmsPageTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/AdminDeleteCmsPageTest.xml
@@ -21,7 +21,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $grabTotalRecordsCmsPagesBeforeClickSearchButton
+ $grabTotalRecordsCmsPagesAfterClickSearchButton
+
+
+
+
+
+
+
+
+
+
+
+
+ $grabTotalRecordsBlocksBeforeClickSearchButton
+ $grabTotalRecordsBlocksAfterClickSearchButton
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Cms/Test/Mftf/Test/CheckOrderOfProdsInWidgetOnCMSPageTest.xml b/app/code/Magento/Cms/Test/Mftf/Test/CheckOrderOfProdsInWidgetOnCMSPageTest.xml
index c69cd620b1d72..484dc16faa3b9 100644
--- a/app/code/Magento/Cms/Test/Mftf/Test/CheckOrderOfProdsInWidgetOnCMSPageTest.xml
+++ b/app/code/Magento/Cms/Test/Mftf/Test/CheckOrderOfProdsInWidgetOnCMSPageTest.xml
@@ -102,6 +102,7 @@
+
-
-
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Cms/Test/Unit/Block/BlockByIdentifierTest.php b/app/code/Magento/Cms/Test/Unit/Block/BlockByIdentifierTest.php
new file mode 100644
index 0000000000000..44b94b059cb6d
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Unit/Block/BlockByIdentifierTest.php
@@ -0,0 +1,225 @@
+storeMock = $this->createMock(StoreInterface::class);
+ $this->storeManagerMock = $this->createMock(StoreManagerInterface::class);
+ $this->storeManagerMock->method('getStore')->willReturn($this->storeMock);
+
+ $this->getBlockByIdentifierMock = $this->createMock(GetBlockByIdentifierInterface::class);
+
+ $this->filterProviderMock = $this->createMock(FilterProvider::class);
+ $this->filterProviderMock->method('getBlockFilter')->willReturn($this->getPassthroughFilterMock());
+ }
+
+ public function testBlockThrowsInvalidArgumentExceptionWhenNoIdentifierProvided(): void
+ {
+ // Given
+ $missingIdentifierBlock = $this->getTestedBlockUsingIdentifier(null);
+ $this->storeMock->method('getId')->willReturn(self::STUB_DEFAULT_STORE);
+
+ // Expect
+ $this->expectException(\InvalidArgumentException::class);
+ $this->expectExceptionMessage('Expected value of `identifier` was not provided');
+
+ // When
+ $missingIdentifierBlock->toHtml();
+ }
+
+ public function testBlockReturnsEmptyStringWhenIdentifierProvidedNotFound(): void
+ {
+ // Given
+ $this->getBlockByIdentifierMock->method('execute')->willThrowException(
+ new NoSuchEntityException(__('NoSuchEntityException'))
+ );
+ $missingIdentifierBlock = $this->getTestedBlockUsingIdentifier(self::STUB_UNAVAILABLE_IDENTIFIER);
+ $this->storeMock->method('getId')->willReturn(self::STUB_DEFAULT_STORE);
+
+ // Expect
+ $this->assertSame(self::ASSERT_EMPTY_BLOCK_HTML, $missingIdentifierBlock->toHtml());
+ $this->assertSame(
+ self::ASSERT_UNAVAILABLE_IDENTIFIER_BASED_IDENTITIES,
+ $missingIdentifierBlock->getIdentities()
+ );
+ }
+
+ public function testBlockReturnsCmsContentsWhenIdentifierFound(): void
+ {
+ // Given
+ $cmsBlockMock = $this->getCmsBlockMock(
+ self::STUB_CMS_BLOCK_ID,
+ self::STUB_EXISTING_IDENTIFIER,
+ self::STUB_CONTENT
+ );
+ $this->storeMock->method('getId')->willReturn(self::STUB_DEFAULT_STORE);
+ $this->getBlockByIdentifierMock->method('execute')
+ ->with(self::STUB_EXISTING_IDENTIFIER, self::STUB_DEFAULT_STORE)
+ ->willReturn($cmsBlockMock);
+ $block = $this->getTestedBlockUsingIdentifier(self::STUB_EXISTING_IDENTIFIER);
+
+ // Expect
+ $this->assertSame(self::ASSERT_CONTENT_HTML, $block->toHtml());
+ }
+
+ public function testBlockCacheIdentitiesContainCmsBlockIdentities(): void
+ {
+ // Given
+ $cmsBlockMock = $this->createMock(Block::class);
+ $cmsBlockMock->method('getId')->willReturn(self::STUB_CMS_BLOCK_ID);
+ $cmsBlockMock->method('isActive')->willReturn(true);
+ $cmsBlockMock->method('getIdentifier')->willReturn(self::STUB_EXISTING_IDENTIFIER);
+ $cmsBlockMock->method('getIdentities')->willReturn(
+ [
+ self::STUB_CMS_BLOCK_IDENTITY_BY_ID,
+ self::STUB_CMS_BLOCK_IDENTITY_BY_IDENTIFIER
+ ]
+ );
+
+ $this->storeMock->method('getId')->willReturn(self::STUB_DEFAULT_STORE);
+ $this->getBlockByIdentifierMock->method('execute')
+ ->with(self::STUB_EXISTING_IDENTIFIER, self::STUB_DEFAULT_STORE)
+ ->willReturn($cmsBlockMock);
+ $block = $this->getTestedBlockUsingIdentifier(self::STUB_EXISTING_IDENTIFIER);
+
+ // When
+ $identities = $block->getIdentities();
+
+ // Then
+ $this->assertContains($this->getIdentityStubById(self::STUB_CMS_BLOCK_ID), $identities);
+ $this->assertContains(self::STUB_CMS_BLOCK_IDENTITY_BY_ID, $identities);
+ $this->assertContains(self::STUB_CMS_BLOCK_IDENTITY_BY_IDENTIFIER, $identities);
+ }
+
+ /**
+ * Initializes the tested block with injecting the references required by parent classes.
+ *
+ * @param string|null $identifier
+ * @return BlockByIdentifier
+ */
+ private function getTestedBlockUsingIdentifier(?string $identifier): BlockByIdentifier
+ {
+ $eventManagerMock = $this->createMock(ManagerInterface::class);
+ $scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
+ $scopeConfigMock->method('getValue')->willReturn(self::STUB_MODULE_OUTPUT_DISABLED);
+
+ $contextMock = $this->createMock(Context::class);
+ $contextMock->method('getEventManager')->willReturn($eventManagerMock);
+ $contextMock->method('getScopeConfig')->willReturn($scopeConfigMock);
+
+ return new BlockByIdentifier(
+ $this->getBlockByIdentifierMock,
+ $this->storeManagerMock,
+ $this->filterProviderMock,
+ $contextMock,
+ ['identifier' => $identifier]
+ );
+ }
+
+ /**
+ * Mocks the CMS Block object for further play
+ *
+ * @param int $entityId
+ * @param string $identifier
+ * @param string $content
+ * @param bool $isActive
+ * @return MockObject|BlockInterface
+ */
+ private function getCmsBlockMock(
+ int $entityId,
+ string $identifier,
+ string $content,
+ bool $isActive = true
+ ): BlockInterface {
+ $cmsBlock = $this->createMock(BlockInterface::class);
+
+ $cmsBlock->method('getId')->willReturn($entityId);
+ $cmsBlock->method('getIdentifier')->willReturn($identifier);
+ $cmsBlock->method('getContent')->willReturn($content);
+ $cmsBlock->method('isActive')->willReturn($isActive);
+
+ return $cmsBlock;
+ }
+
+ /**
+ * Creates mock of the Filter that actually is doing nothing
+ *
+ * @return MockObject|Template
+ */
+ private function getPassthroughFilterMock(): Template
+ {
+ $filterMock = $this->getMockBuilder(Template::class)
+ ->disableOriginalConstructor()
+ ->setMethods(['setStoreId', 'filter'])
+ ->getMock();
+ $filterMock->method('setStoreId')->willReturnSelf();
+ $filterMock->method('filter')->willReturnArgument(0);
+
+ return $filterMock;
+ }
+
+ /**
+ * Returns stub of Identity based on `$cmsBlockId`
+ *
+ * @param int $cmsBlockId
+ * @return string
+ */
+ private function getIdentityStubById(int $cmsBlockId): string
+ {
+ return BlockByIdentifier::CACHE_KEY_PREFIX . '_' . $cmsBlockId;
+ }
+}
diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Wysiwyg/DirectiveTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Wysiwyg/DirectiveTest.php
index 5791ecea4e4e3..70dd95521f040 100644
--- a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Wysiwyg/DirectiveTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Wysiwyg/DirectiveTest.php
@@ -15,7 +15,10 @@
use Magento\Framework\App\ResponseInterface;
use Magento\Framework\Controller\Result\Raw;
use Magento\Framework\Controller\Result\RawFactory;
+use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
use Magento\Framework\Filesystem\Driver\File;
+use Magento\Framework\Filesystem\DriverInterface;
use Magento\Framework\Image\Adapter\AdapterInterface;
use Magento\Framework\Image\AdapterFactory;
use Magento\Framework\ObjectManagerInterface;
@@ -78,11 +81,6 @@ class DirectiveTest extends TestCase
*/
protected $responseMock;
- /**
- * @var File|MockObject
- */
- protected $fileMock;
-
/**
* @var Config|MockObject
*/
@@ -103,6 +101,11 @@ class DirectiveTest extends TestCase
*/
protected $rawMock;
+ /**
+ * @var DriverInterface|MockObject
+ */
+ private $driverMock;
+
protected function setUp(): void
{
$this->actionContextMock = $this->getMockBuilder(Context::class)
@@ -146,10 +149,6 @@ protected function setUp(): void
->disableOriginalConstructor()
->setMethods(['setHeader', 'setBody', 'sendResponse'])
->getMockForAbstractClass();
- $this->fileMock = $this->getMockBuilder(File::class)
- ->disableOriginalConstructor()
- ->setMethods(['fileGetContents'])
- ->getMock();
$this->wysiwygConfigMock = $this->getMockBuilder(Config::class)
->disableOriginalConstructor()
->getMock();
@@ -173,6 +172,17 @@ protected function setUp(): void
$this->actionContextMock->expects($this->any())
->method('getObjectManager')
->willReturn($this->objectManagerMock);
+ $this->driverMock = $this->getMockBuilder(DriverInterface::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $directoryWrite = $this->getMockBuilder(WriteInterface::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $directoryWrite->expects($this->any())->method('getDriver')->willReturn($this->driverMock);
+ $filesystemMock = $this->getMockBuilder(Filesystem::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $filesystemMock->expects($this->any())->method('getDirectoryWrite')->willReturn($directoryWrite);
$objectManager = new ObjectManager($this);
$this->wysiwygDirective = $objectManager->getObject(
@@ -185,7 +195,7 @@ protected function setUp(): void
'logger' => $this->loggerMock,
'config' => $this->wysiwygConfigMock,
'filter' => $this->templateFilterMock,
- 'file' => $this->fileMock,
+ 'filesystem' => $filesystemMock
]
);
}
@@ -216,7 +226,7 @@ public function testExecute()
$this->imageAdapterMock->expects($this->once())
->method('getImage')
->willReturn($imageBody);
- $this->fileMock->expects($this->once())
+ $this->driverMock->expects($this->once())
->method('fileGetContents')
->willReturn($imageBody);
$this->rawFactoryMock->expects($this->any())
@@ -267,7 +277,7 @@ public function testExecuteException()
$this->imageAdapterMock->expects($this->any())
->method('getImage')
->willReturn($imageBody);
- $this->fileMock->expects($this->once())
+ $this->driverMock->expects($this->once())
->method('fileGetContents')
->willReturn($imageBody);
$this->loggerMock->expects($this->once())
diff --git a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/ConfigTest.php b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/ConfigTest.php
index 33bf352adf6c5..0ba3fada2a072 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/ConfigTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/ConfigTest.php
@@ -192,12 +192,12 @@ public function testGetConfig($data, $isAuthorizationAllowed, $expectedResults)
->willReturn('localhost/index.php/');
$this->filesystemMock->expects($this->once())
->method('getUri')
- ->willReturn('pub/static');
+ ->willReturn('static');
/** @var ContextInterface|MockObject $contextMock */
$contextMock = $this->getMockForAbstractClass(ContextInterface::class);
$contextMock->expects($this->once())
->method('getBaseUrl')
- ->willReturn('localhost/pub/static/');
+ ->willReturn('localhost/static/');
$this->assetRepoMock->expects($this->once())
->method('getStaticViewFileContext')
->willReturn($contextMock);
@@ -217,8 +217,8 @@ public function testGetConfig($data, $isAuthorizationAllowed, $expectedResults)
$config = $this->wysiwygConfig->getConfig($data);
$this->assertInstanceOf(DataObject::class, $config);
$this->assertEquals($expectedResults[0], $config->getData('someData'));
- $this->assertEquals('localhost/pub/static/', $config->getData('baseStaticUrl'));
- $this->assertEquals('localhost/pub/static/', $config->getData('baseStaticDefaultUrl'));
+ $this->assertEquals('localhost/static/', $config->getData('baseStaticUrl'));
+ $this->assertEquals('localhost/static/', $config->getData('baseStaticDefaultUrl'));
}
/**
diff --git a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
index c2c748dcc7633..b03dbb8f0c888 100644
--- a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
+++ b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/Images/StorageTest.php
@@ -494,7 +494,7 @@ public function testUploadFile()
$targetPath = self::STORAGE_ROOT_DIR . $path;
$fileName = 'image.gif';
$realPath = $targetPath . '/' . $fileName;
- $thumbnailTargetPath = self::STORAGE_ROOT_DIR . '/.thumbs' . $path;
+ $thumbnailTargetPath = self::STORAGE_ROOT_DIR . '.thumbs' . $path;
$thumbnailDestination = $thumbnailTargetPath . '/' . $fileName;
$type = 'image';
$result = [
diff --git a/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/ValidatorTest.php b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/ValidatorTest.php
new file mode 100644
index 0000000000000..8e2fa44a24545
--- /dev/null
+++ b/app/code/Magento/Cms/Test/Unit/Model/Wysiwyg/ValidatorTest.php
@@ -0,0 +1,87 @@
+ [true, new ValidationException(__('Invalid html')), true, false],
+ 'invalid-warning' => [false, new \RuntimeException('Invalid html'), false, true],
+ 'valid' => [false, null, false, false]
+ ];
+ }
+
+ /**
+ * Test validation.
+ *
+ * @param bool $isFlagSet
+ * @param \Throwable|null $thrown
+ * @param bool $exceptionThrown
+ * @param bool $warned
+ * @dataProvider getValidationCases
+ */
+ public function testValidate(bool $isFlagSet, ?\Throwable $thrown, bool $exceptionThrown, bool $warned): void
+ {
+ $actuallyWarned = false;
+
+ $messageFactoryMock = $this->createMock(MessageFactory::class);
+ $messageFactoryMock->method('create')
+ ->willReturnCallback(
+ function () {
+ return $this->getMockForAbstractClass(MessageInterface::class);
+ }
+ );
+ $configMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
+ $configMock->method('isSetFlag')
+ ->with(Validator::CONFIG_PATH_THROW_EXCEPTION)
+ ->willReturn($isFlagSet);
+
+ $backendMock = $this->getMockForAbstractClass(WYSIWYGValidatorInterface::class);
+ if ($thrown) {
+ $backendMock->method('validate')->willThrowException($thrown);
+ }
+
+ $messagesMock = $this->getMockForAbstractClass(ManagerInterface::class);
+ $messagesMock->method('addUniqueMessages')
+ ->willReturnCallback(
+ function () use (&$actuallyWarned): void {
+ $actuallyWarned = true;
+ }
+ );
+
+ $loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
+
+ $validator = new Validator($backendMock, $messagesMock, $configMock, $loggerMock, $messageFactoryMock);
+ try {
+ $validator->validate('content');
+ $actuallyThrown = false;
+ } catch (\Throwable $exception) {
+ $actuallyThrown = true;
+ }
+ $this->assertEquals($exceptionThrown, $actuallyThrown);
+ $this->assertEquals($warned, $actuallyWarned);
+ }
+}
diff --git a/app/code/Magento/Cms/etc/config.xml b/app/code/Magento/Cms/etc/config.xml
index 7090bb7a1fd25..c1b3717386454 100644
--- a/app/code/Magento/Cms/etc/config.xml
+++ b/app/code/Magento/Cms/etc/config.xml
@@ -24,12 +24,14 @@
enabled
mage/adminhtml/wysiwyg/tiny_mce/tinymce4Adapter
+ 0
wysiwyg
+ .thumbs
diff --git a/app/code/Magento/Cms/etc/di.xml b/app/code/Magento/Cms/etc/di.xml
index 7fc8268eea5e0..61cf33f88abd6 100644
--- a/app/code/Magento/Cms/etc/di.xml
+++ b/app/code/Magento/Cms/etc/di.xml
@@ -57,35 +57,35 @@
-
-
- true
- - pub[/\\]+media[/\\]+captcha[/\\]*$
+ - media[/\\]+captcha[/\\]*$
-
- true
- - pub[/\\]+media[/\\]+catalog[/\\]+product[/\\]*$
+ - media[/\\]+catalog[/\\]+product[/\\]*$
-
- true
- - pub[/\\]+media[/\\]+customer[/\\]*$
+ - media[/\\]+customer[/\\]*$
-
- true
- - pub[/\\]+media[/\\]+downloadable[/\\]*$
+ - media[/\\]+downloadable[/\\]*$
-
- true
- - pub[/\\]+media[/\\]+import[/\\]*$
+ - media[/\\]+import[/\\]*$
-
- true
- - pub[/\\]+media[/\\]+theme[/\\]*$
+ - media[/\\]+theme[/\\]*$
-
- true
- - pub[/\\]+media[/\\]+theme_customization[/\\]*$
+ - media[/\\]+theme_customization[/\\]*$
-
- true
- - pub[/\\]+media[/\\]+tmp[/\\]*$
+ - media[/\\]+tmp[/\\]*$
Magento\Cms\Model\Api\SearchCriteria\BlockCollectionProcessor
+ Magento\Framework\EntityManager\AbstractModelHydrator
@@ -234,6 +235,7 @@
- Magento\Cms\Model\PageRepository\Validator\LayoutUpdateValidator
+ Magento\Framework\EntityManager\AbstractModelHydrator
+
+ DefaultWYSIWYGValidator
+
+
+
+
+
+ - Magento\Cms\Command\WysiwygRestrictCommand
+
+
+
+
+
+
+ - div
+ - a
+ - p
+ - span
+ - em
+ - strong
+ - ul
+ - li
+ - ol
+ - h5
+ - h4
+ - h3
+ - h2
+ - h1
+ - table
+ - tbody
+ - tr
+ - td
+ - th
+ - tfoot
+ - img
+ - hr
+ - figure
+ - button
+ - i
+ - u
+
+
+ - class
+ - width
+ - height
+ - style
+ - alt
+ - title
+ - border
+ - id
+
+
+ -
+
- href
+
+ -
+
- src
+
+ -
+
- type
+
+
+
+ - Magento\Framework\Validator\HTML\StyleAttributeValidator
+
+
+
diff --git a/app/code/Magento/Cms/etc/webapi.xml b/app/code/Magento/Cms/etc/webapi.xml
index 5b66d0e3ed879..464f5146e6358 100644
--- a/app/code/Magento/Cms/etc/webapi.xml
+++ b/app/code/Magento/Cms/etc/webapi.xml
@@ -23,19 +23,19 @@
-
-
-
diff --git a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
index d1c204c01ad1c..154e76bd93e41 100644
--- a/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
+++ b/app/code/Magento/Cms/view/adminhtml/templates/browser/content/uploader.phtml
@@ -11,14 +11,14 @@ $filters = $block->getConfig()->getFilters() ?? [];
$allowedExtensions = [];
$blockHtmlId = $block->getHtmlId();
-$listExtensions = [[]];
+$listExtensions = [];
foreach ($filters as $media_type) {
$listExtensions[] = array_map(function ($fileExt) {
return ltrim($fileExt, '.*');
}, $media_type['files']);
}
-$allowedExtensions = array_merge(...$listExtensions);
+$allowedExtensions = array_merge([], ...$listExtensions);
$resizeConfig = $block->getImageUploadConfigData()->getIsResizeEnabled()
? "{action: 'resize', maxWidth: "
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 af54df24b64f5..332c316396122 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
@@ -64,7 +64,7 @@
store_id
- componentType = column, index = ${ $.index }:visible
+ ns = ${ $.ns }, index = ${ $.index }:visible
diff --git a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_listing.xml b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_listing.xml
index 846356adf9429..12c3e8287ecd8 100644
--- a/app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_listing.xml
+++ b/app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_listing.xml
@@ -69,7 +69,7 @@
store_id
- componentType = column, index = ${ $.index }:visible
+ ns = ${ $.ns }, index = ${ $.index }:visible
diff --git a/app/code/Magento/Config/App/Config/Source/ConfigStructureSource.php b/app/code/Magento/Config/App/Config/Source/ConfigStructureSource.php
new file mode 100644
index 0000000000000..f176e0d518230
--- /dev/null
+++ b/app/code/Magento/Config/App/Config/Source/ConfigStructureSource.php
@@ -0,0 +1,68 @@
+structure = $structure;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function get($path = '')
+ {
+ $fieldPaths = array_keys($this->structure->getFieldPaths());
+ $defaultConfig = [];
+ foreach ($fieldPaths as $fieldPath) {
+ $defaultConfig = $this->addPathToConfig($defaultConfig, $fieldPath);
+ }
+ $data = new DataObject(['default' => $defaultConfig]);
+
+ return $data->getData($path);
+ }
+
+ /**
+ * Add config path to config structure
+ *
+ * @param array $config
+ * @param string $path
+ * @return array
+ */
+ private function addPathToConfig(array $config, string $path): array
+ {
+ if (strpos($path, '/') !== false) {
+ list ($key, $subPath) = explode('/', $path, 2);
+ $config[$key] = $this->addPathToConfig(
+ $config[$key] ?? [],
+ $subPath
+ );
+ } else {
+ $config[$path] = null;
+ }
+
+ return $config;
+ }
+}
diff --git a/app/code/Magento/Config/Model/Config.php b/app/code/Magento/Config/Model/Config.php
index f61e99529c3cc..eda02612ded1a 100644
--- a/app/code/Magento/Config/Model/Config.php
+++ b/app/code/Magento/Config/Model/Config.php
@@ -207,10 +207,9 @@ public function save()
$deleteTransaction
);
- $groupChangedPaths = $this->getChangedPaths($sectionId, $groupId, $groupData, $oldConfig, $extraOldGroups);
- // phpcs:ignore Magento2.Performance.ForeachArrayMerge
- $changedPaths = \array_merge($changedPaths, $groupChangedPaths);
+ $changedPaths[] = $this->getChangedPaths($sectionId, $groupId, $groupData, $oldConfig, $extraOldGroups);
}
+ $changedPaths = array_merge([], ...$changedPaths);
try {
$deleteTransaction->delete();
@@ -356,7 +355,7 @@ private function getChangedPaths(
$field = $this->getField($sectionId, $groupId, $fieldId);
$path = $this->getFieldPath($field, $fieldId, $oldConfig, $extraOldGroups);
if ($this->isValueChanged($oldConfig, $path, $fieldData)) {
- $changedPaths[] = $path;
+ $changedPaths[] = [$path];
}
}
}
@@ -371,12 +370,11 @@ private function getChangedPaths(
$oldConfig,
$extraOldGroups
);
- // phpcs:ignore Magento2.Performance.ForeachArrayMerge
- $changedPaths = \array_merge($changedPaths, $subGroupChangedPaths);
+ $changedPaths[] = $subGroupChangedPaths;
}
}
- return $changedPaths;
+ return \array_merge([], ...$changedPaths);
}
/**
diff --git a/app/code/Magento/Config/Model/Config/Backend/Admin/Robots.php b/app/code/Magento/Config/Model/Config/Backend/Admin/Robots.php
index e6acd431be3d5..1763a6d1800a1 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Admin/Robots.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Admin/Robots.php
@@ -10,6 +10,7 @@
namespace Magento\Config\Model\Config\Backend\Admin;
use Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot;
+use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\App\ObjectManager;
/**
@@ -36,7 +37,6 @@ class Robots extends \Magento\Framework\App\Config\Value
* @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
* @param array $data
- * @param DocumentRoot $documentRoot
*/
public function __construct(
\Magento\Framework\Model\Context $context,
@@ -46,13 +46,11 @@ public function __construct(
\Magento\Framework\Filesystem $filesystem,
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
- array $data = [],
- \Magento\Config\Model\Config\Reader\Source\Deployed\DocumentRoot $documentRoot = null
+ array $data = []
) {
parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
- $documentRoot = $documentRoot ?: ObjectManager::getInstance()->get(DocumentRoot::class);
- $this->_directory = $filesystem->getDirectoryWrite($documentRoot->getPath());
+ $this->_directory = $filesystem->getDirectoryWrite(DirectoryList::PUB);
$this->_file = 'robots.txt';
}
diff --git a/app/code/Magento/Config/Model/Config/Backend/Serialized.php b/app/code/Magento/Config/Model/Config/Backend/Serialized.php
index 6e0b6275db836..88fdae8908797 100644
--- a/app/code/Magento/Config/Model/Config/Backend/Serialized.php
+++ b/app/code/Magento/Config/Model/Config/Backend/Serialized.php
@@ -5,6 +5,7 @@
*/
namespace Magento\Config\Model\Config\Backend;
+use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\App\ObjectManager;
use Magento\Framework\Serialize\Serializer\Json;
@@ -84,4 +85,26 @@ public function beforeSave()
parent::beforeSave();
return $this;
}
+
+ /**
+ * Get old value from existing config
+ *
+ * @return string
+ */
+ public function getOldValue()
+ {
+ // If the value is retrieved from defaults defined in config.xml
+ // it may be returned as an array.
+ $value = $this->_config->getValue(
+ $this->getPath(),
+ $this->getScope() ?: ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
+ $this->getScopeCode()
+ );
+
+ if (is_array($value)) {
+ return $this->serializer->serialize($value);
+ }
+
+ return (string)$value;
+ }
}
diff --git a/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/DocumentRoot.php b/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/DocumentRoot.php
index bf59c729790a7..fb78de35569ac 100644
--- a/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/DocumentRoot.php
+++ b/app/code/Magento/Config/Model/Config/Reader/Source/Deployed/DocumentRoot.php
@@ -3,57 +3,50 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-
namespace Magento\Config\Model\Config\Reader\Source\Deployed;
-use Magento\Framework\Config\ConfigOptionsListConstants;
-use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\App\Filesystem\DirectoryList;
/**
- * Class DocumentRoot
- * @package Magento\Config\Model\Config\Reader\Source\Deployed
+ * Document root detector.
+ *
* @api
* @since 101.0.0
+ *
+ * @deprecated Magento always uses the pub directory
+ * @see DirectoryList::PUB
*/
class DocumentRoot
{
/**
- * @var DeploymentConfig
- */
- private $config;
-
- /**
- * DocumentRoot constructor.
* @param DeploymentConfig $config
+ *
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function __construct(DeploymentConfig $config)
{
- $this->config = $config;
}
/**
- * A shortcut to load the document root path from the DirectoryList based on the
- * deployment configuration.
+ * A shortcut to load the document root path from the DirectoryList.
*
* @return string
* @since 101.0.0
*/
public function getPath()
{
- return $this->isPub() ? DirectoryList::PUB : DirectoryList::ROOT;
+ return DirectoryList::PUB;
}
/**
- * Returns whether the deployment configuration specifies that the document root is
- * in the pub/ folder. This affects ares such as sitemaps and robots.txt (and will
- * likely be extended to control other areas).
+ * Checks if root folder is /pub.
*
* @return bool
* @since 101.0.0
*/
public function isPub()
{
- return (bool)$this->config->get(ConfigOptionsListConstants::CONFIG_PATH_DOCUMENT_ROOT_IS_PUB);
+ return true;
}
}
diff --git a/app/code/Magento/Config/Model/Config/Structure.php b/app/code/Magento/Config/Model/Config/Structure.php
index 437aca04ec577..156867f34318a 100644
--- a/app/code/Magento/Config/Model/Config/Structure.php
+++ b/app/code/Magento/Config/Model/Config/Structure.php
@@ -292,20 +292,16 @@ public function getFieldPathsByAttribute($attributeName, $attributeValue)
foreach ($section['children'] as $group) {
if (isset($group['children'])) {
$path = $section['id'] . '/' . $group['id'];
- // phpcs:ignore Magento2.Performance.ForeachArrayMerge.ForeachArrayMerge
- $result = array_merge(
- $result,
- $this->_getGroupFieldPathsByAttribute(
- $group['children'],
- $path,
- $attributeName,
- $attributeValue
- )
+ $result[] = $this->_getGroupFieldPathsByAttribute(
+ $group['children'],
+ $path,
+ $attributeName,
+ $attributeValue
);
}
}
}
- return $result;
+ return array_merge([], ...$result);
}
/**
diff --git a/app/code/Magento/Config/Test/Mftf/Suite/AppConfigDumpSuite.xml b/app/code/Magento/Config/Test/Mftf/Suite/AppConfigDumpSuite.xml
index 762d17bdf87f1..127677ce05e0d 100644
--- a/app/code/Magento/Config/Test/Mftf/Suite/AppConfigDumpSuite.xml
+++ b/app/code/Magento/Config/Test/Mftf/Suite/AppConfigDumpSuite.xml
@@ -8,6 +8,7 @@
+
diff --git a/app/code/Magento/Config/Test/Unit/App/Config/Source/ConfigStructureSourceTest.php b/app/code/Magento/Config/Test/Unit/App/Config/Source/ConfigStructureSourceTest.php
new file mode 100644
index 0000000000000..8fc7b04a13c64
--- /dev/null
+++ b/app/code/Magento/Config/Test/Unit/App/Config/Source/ConfigStructureSourceTest.php
@@ -0,0 +1,72 @@
+structure = $this->createMock(Structure::class);
+ $this->source = new ConfigStructureSource($this->structure);
+ }
+
+ /**
+ * @dataProvider getDataProvider
+ * @param array $fieldPaths
+ * @param array $expectedConfig
+ */
+ public function testGet(array $fieldPaths, array $expectedConfig)
+ {
+ $this->structure->expects($this->once())
+ ->method('getFieldPaths')
+ ->willReturn($fieldPaths);
+ $this->assertEquals($expectedConfig, $this->source->get('default'));
+ }
+
+ /**
+ * @return array
+ */
+ public function getDataProvider(): array
+ {
+ return [
+ [
+ [
+ 'general/single_store_mode/enabled' => [],
+ 'general/locale/timezone' => [],
+ 'general/locale/code' => [],
+ ],
+ [
+ 'general' => [
+ 'single_store_mode' => [
+ 'enabled' => null,
+ ],
+ 'locale' => [
+ 'timezone' => null,
+ 'code' => null,
+ ],
+ ],
+ ],
+ ],
+ ];
+ }
+}
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 c509b515b3112..90a381cff714b 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
@@ -8,6 +8,7 @@
namespace Magento\Config\Test\Unit\Model\Config\Backend;
use Magento\Config\Model\Config\Backend\Serialized;
+use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Event\ManagerInterface;
use Magento\Framework\Model\Context;
use Magento\Framework\Serialize\Serializer\Json;
@@ -27,11 +28,14 @@ class SerializedTest extends TestCase
/** @var LoggerInterface|MockObject */
private $loggerMock;
+ private $scopeConfigMock;
+
protected function setUp(): void
{
$objectManager = new ObjectManager($this);
$this->serializerMock = $this->createMock(Json::class);
$this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
+ $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
$contextMock = $this->createMock(Context::class);
$eventManagerMock = $this->getMockForAbstractClass(ManagerInterface::class);
$contextMock->method('getEventDispatcher')
@@ -43,6 +47,7 @@ protected function setUp(): void
[
'serializer' => $this->serializerMock,
'context' => $contextMock,
+ 'config' => $this->scopeConfigMock,
]
);
}
@@ -135,4 +140,29 @@ public function beforeSaveDataProvider()
]
];
}
+
+ /**
+ * If a config value is not available in core_confid_data the defaults are
+ * loaded from the config.xml file. Those defaults may be arrays.
+ * The Serialized backend model has to override its parent
+ * getOldValue function, to prevent an array to string conversion error
+ * and serialize those values.
+ */
+ public function testGetOldValueWithNonScalarDefaultValue(): void
+ {
+ $value = [
+ ['foo' => '1', 'bar' => '2'],
+ ];
+ $serializedValue = \json_encode($value);
+
+ $this->scopeConfigMock->method('getValue')->willReturn($value);
+ $this->serializerMock->method('serialize')->willReturn($serializedValue);
+
+ $this->serializedConfig->setData('value', $serializedValue);
+
+ $oldValue = $this->serializedConfig->getOldValue();
+
+ $this->assertIsString($oldValue, 'Default value from the config is not serialized.');
+ $this->assertSame($serializedValue, $oldValue);
+ }
}
diff --git a/app/code/Magento/Config/Test/Unit/Model/Config/Reader/Source/Deployed/DocumentRootTest.php b/app/code/Magento/Config/Test/Unit/Model/Config/Reader/Source/Deployed/DocumentRootTest.php
deleted file mode 100644
index 6f1758f3d2b92..0000000000000
--- a/app/code/Magento/Config/Test/Unit/Model/Config/Reader/Source/Deployed/DocumentRootTest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-configMock = $this->getMockBuilder(DeploymentConfig::class)
- ->disableOriginalConstructor()
- ->getMock();
-
- $this->documentRoot = new DocumentRoot($this->configMock);
- }
-
- /**
- * Ensures that the path returned matches the pub/ path.
- */
- public function testGetPath()
- {
- $this->configMockSetForDocumentRootIsPub();
-
- $this->assertSame(DirectoryList::PUB, $this->documentRoot->getPath());
- }
-
- /**
- * Ensures that the deployment configuration returns the mocked value for
- * the pub/ folder.
- */
- public function testIsPub()
- {
- $this->configMockSetForDocumentRootIsPub();
-
- $this->assertTrue($this->documentRoot->isPub());
- }
-
- private function configMockSetForDocumentRootIsPub()
- {
- $this->configMock->expects($this->any())
- ->method('get')
- ->willReturnMap([
- [
- ConfigOptionsListConstants::CONFIG_PATH_DOCUMENT_ROOT_IS_PUB,
- null,
- true
- ],
- ]);
- }
-}
diff --git a/app/code/Magento/Config/etc/di.xml b/app/code/Magento/Config/etc/di.xml
index 85304e9c20f27..4277ca0a6de26 100644
--- a/app/code/Magento/Config/etc/di.xml
+++ b/app/code/Magento/Config/etc/di.xml
@@ -207,6 +207,10 @@
+ -
+
- Magento\Config\App\Config\Source\ConfigStructureSource
+ - 1
+
-
- Magento\Config\App\Config\Source\ModularConfigSource
- 10
@@ -346,4 +350,19 @@
Magento\Config\Model\Config\Export\ExcludeList
+
+
+ adminhtmlConfigScope
+
+
+
+
+ adminhtmlConfigStructureData
+
+
+
+
+ adminhtmlConfigStructure
+
+
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 6a9e84e345985..26923fc9df837 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Product/View/Type/Configurable.php
@@ -7,6 +7,7 @@
*/
namespace Magento\ConfigurableProduct\Block\Product\View\Type;
+use Magento\Catalog\Api\Data\ProductInterface;
use Magento\Catalog\Model\Product\Attribute\Source\Status;
use Magento\ConfigurableProduct\Model\ConfigurableAttributeData;
use Magento\Customer\Helper\Session\CurrentCustomer;
@@ -287,53 +288,70 @@ protected function getOptionPrices()
{
$prices = [];
foreach ($this->getAllowProducts() as $product) {
- $tierPrices = [];
$priceInfo = $product->getPriceInfo();
- $tierPriceModel = $priceInfo->getPrice('tier_price');
- $tierPricesList = $tierPriceModel->getTierPriceList();
- foreach ($tierPricesList as $tierPrice) {
- $tierPrices[] = [
- 'qty' => $this->localeFormat->getNumber($tierPrice['price_qty']),
- 'price' => $this->localeFormat->getNumber($tierPrice['price']->getValue()),
- 'percentage' => $this->localeFormat->getNumber(
- $tierPriceModel->getSavePercent($tierPrice['price'])
- ),
- ];
- }
- $prices[$product->getId()] =
- [
- 'baseOldPrice' => [
- 'amount' => $this->localeFormat->getNumber(
- $priceInfo->getPrice('regular_price')->getAmount()->getBaseAmount()
- ),
- ],
- 'oldPrice' => [
- 'amount' => $this->localeFormat->getNumber(
- $priceInfo->getPrice('regular_price')->getAmount()->getValue()
- ),
- ],
- 'basePrice' => [
- 'amount' => $this->localeFormat->getNumber(
- $priceInfo->getPrice('final_price')->getAmount()->getBaseAmount()
- ),
- ],
- 'finalPrice' => [
- 'amount' => $this->localeFormat->getNumber(
- $priceInfo->getPrice('final_price')->getAmount()->getValue()
- ),
- ],
- 'tierPrices' => $tierPrices,
- 'msrpPrice' => [
- 'amount' => $this->localeFormat->getNumber(
- $this->priceCurrency->convertAndRound($product->getMsrp())
- ),
- ],
- ];
+ $prices[$product->getId()] = [
+ 'baseOldPrice' => [
+ 'amount' => $this->localeFormat->getNumber(
+ $priceInfo->getPrice('regular_price')->getAmount()->getBaseAmount()
+ ),
+ ],
+ 'oldPrice' => [
+ 'amount' => $this->localeFormat->getNumber(
+ $priceInfo->getPrice('regular_price')->getAmount()->getValue()
+ ),
+ ],
+ 'basePrice' => [
+ 'amount' => $this->localeFormat->getNumber(
+ $priceInfo->getPrice('final_price')->getAmount()->getBaseAmount()
+ ),
+ ],
+ 'finalPrice' => [
+ 'amount' => $this->localeFormat->getNumber(
+ $priceInfo->getPrice('final_price')->getAmount()->getValue()
+ ),
+ ],
+ 'tierPrices' => $this->getTierPricesByProduct($product),
+ 'msrpPrice' => [
+ 'amount' => $this->localeFormat->getNumber(
+ $this->priceCurrency->convertAndRound($product->getMsrp())
+ ),
+ ],
+ ];
}
+
return $prices;
}
+ /**
+ * Returns product's tier prices list
+ *
+ * @param ProductInterface $product
+ * @return array
+ */
+ private function getTierPricesByProduct(ProductInterface $product): array
+ {
+ $tierPrices = [];
+ $tierPriceModel = $product->getPriceInfo()->getPrice('tier_price');
+ foreach ($tierPriceModel->getTierPriceList() as $tierPrice) {
+ $tierPriceData = [
+ 'qty' => $this->localeFormat->getNumber($tierPrice['price_qty']),
+ 'price' => $this->localeFormat->getNumber($tierPrice['price']->getValue()),
+ 'percentage' => $this->localeFormat->getNumber(
+ $tierPriceModel->getSavePercent($tierPrice['price'])
+ ),
+ ];
+
+ if (isset($tierPrice['excl_tax_price'])) {
+ $excludingTax = $tierPrice['excl_tax_price'];
+ $tierPriceData['excl_tax_price'] = $this->localeFormat->getNumber($excludingTax->getBaseAmount());
+ }
+ $tierPrices[] = $tierPriceData;
+ }
+
+ return $tierPrices;
+ }
+
/**
* Replace ',' on '.' for js
*
diff --git a/app/code/Magento/ConfigurableProduct/Helper/Data.php b/app/code/Magento/ConfigurableProduct/Helper/Data.php
index a5fdcd62c7aa1..54b95bcd7bd90 100644
--- a/app/code/Magento/ConfigurableProduct/Helper/Data.php
+++ b/app/code/Magento/ConfigurableProduct/Helper/Data.php
@@ -7,9 +7,11 @@
namespace Magento\ConfigurableProduct\Helper;
use Magento\Catalog\Model\Product\Image\UrlBuilder;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
use Magento\Framework\App\ObjectManager;
use Magento\Catalog\Helper\Image as ImageHelper;
use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Model\Product;
use Magento\Catalog\Model\Product\Image;
/**
@@ -73,7 +75,7 @@ public function getGalleryImages(ProductInterface $product)
/**
* Get Options for Configurable Product Options
*
- * @param \Magento\Catalog\Model\Product $currentProduct
+ * @param Product $currentProduct
* @param array $allowedProducts
* @return array
*/
@@ -100,11 +102,13 @@ public function getOptions($currentProduct, $allowedProducts)
/**
* Get allowed attributes
*
- * @param \Magento\Catalog\Model\Product $product
+ * @param Product $product
* @return array
*/
public function getAllowAttributes($product)
{
- return $product->getTypeInstance()->getConfigurableAttributes($product);
+ return ($product->getTypeId() == Configurable::TYPE_CODE)
+ ? $product->getTypeInstance()->getConfigurableAttributes($product)
+ : [];
}
}
diff --git a/app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/UsedProductsWebsiteFilter.php b/app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/UsedProductsWebsiteFilter.php
new file mode 100644
index 0000000000000..9e1f3482d3c0f
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Model/Plugin/Frontend/UsedProductsWebsiteFilter.php
@@ -0,0 +1,34 @@
+setStoreFilter($product->getStore(), $product);
+ }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index c2ae381b345c6..79f6d1e47f1a2 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -17,6 +17,7 @@
use Magento\Framework\App\ObjectManager;
use Magento\Framework\EntityManager\MetadataPool;
use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\File\UploaderFactory;
/**
* Configurable product type implementation
@@ -235,11 +236,12 @@ class Configurable extends \Magento\Catalog\Model\Product\Type\AbstractType
* @param \Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface $extensionAttributesJoinProcessor
* @param \Magento\Framework\Cache\FrontendInterface|null $cache
* @param \Magento\Customer\Model\Session|null $customerSession
- * @param \Magento\Framework\Serialize\Serializer\Json $serializer
- * @param ProductInterfaceFactory $productFactory
- * @param SalableProcessor $salableProcessor
+ * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+ * @param ProductInterfaceFactory|null $productFactory
+ * @param SalableProcessor|null $salableProcessor
* @param ProductAttributeRepositoryInterface|null $productAttributeRepository
* @param SearchCriteriaBuilder|null $searchCriteriaBuilder
+ * @param UploaderFactory|null $uploaderFactory
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
@@ -266,7 +268,8 @@ public function __construct(
ProductInterfaceFactory $productFactory = null,
SalableProcessor $salableProcessor = null,
ProductAttributeRepositoryInterface $productAttributeRepository = null,
- SearchCriteriaBuilder $searchCriteriaBuilder = null
+ SearchCriteriaBuilder $searchCriteriaBuilder = null,
+ UploaderFactory $uploaderFactory = null
) {
$this->typeConfigurableFactory = $typeConfigurableFactory;
$this->_eavAttributeFactory = $eavAttributeFactory;
@@ -295,7 +298,8 @@ public function __construct(
$coreRegistry,
$logger,
$productRepository,
- $serializer
+ $serializer,
+ $uploaderFactory
);
}
diff --git a/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php b/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php
index 56993ecec1fbf..75592efc52dca 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Quote/Item/CartItemProcessor.php
@@ -5,6 +5,8 @@
*/
namespace Magento\ConfigurableProduct\Model\Quote\Item;
+use Magento\ConfigurableProduct\Api\Data\ConfigurableItemOptionValueInterface;
+use Magento\Quote\Api\Data\ProductOptionExtensionInterface;
use Magento\Quote\Model\Quote\Item\CartItemProcessorInterface;
use Magento\Quote\Api\Data\CartItemInterface;
use Magento\Framework\Serialize\Serializer\Json;
@@ -64,7 +66,7 @@ public function __construct(
public function convertToBuyRequest(CartItemInterface $cartItem)
{
if ($cartItem->getProductOption() && $cartItem->getProductOption()->getExtensionAttributes()) {
- /** @var \Magento\ConfigurableProduct\Api\Data\ConfigurableItemOptionValueInterface $options */
+ /** @var ConfigurableItemOptionValueInterface $options */
$options = $cartItem->getProductOption()->getExtensionAttributes()->getConfigurableItemOptions();
if (is_array($options)) {
$requestData = [];
@@ -82,13 +84,17 @@ public function convertToBuyRequest(CartItemInterface $cartItem)
*/
public function processOptions(CartItemInterface $cartItem)
{
- $attributesOption = $cartItem->getProduct()->getCustomOption('attributes');
+ $attributesOption = $cartItem->getProduct()
+ ->getCustomOption('attributes');
+ if (!$attributesOption) {
+ return $cartItem;
+ }
$selectedConfigurableOptions = $this->serializer->unserialize($attributesOption->getValue());
if (is_array($selectedConfigurableOptions)) {
$configurableOptions = [];
foreach ($selectedConfigurableOptions as $optionId => $optionValue) {
- /** @var \Magento\ConfigurableProduct\Api\Data\ConfigurableItemOptionValueInterface $option */
+ /** @var ConfigurableItemOptionValueInterface $option */
$option = $this->itemOptionValueFactory->create();
$option->setOptionId($optionId);
$option->setOptionValue($optionValue);
@@ -99,8 +105,8 @@ public function processOptions(CartItemInterface $cartItem)
? $cartItem->getProductOption()
: $this->productOptionFactory->create();
- /** @var \Magento\Quote\Api\Data\ProductOptionExtensionInterface $extensibleAttribute */
- $extensibleAttribute = $productOption->getExtensionAttributes()
+ /** @var ProductOptionExtensionInterface $extensibleAttribute */
+ $extensibleAttribute = $productOption->getExtensionAttributes()
? $productOption->getExtensionAttributes()
: $this->extensionFactory->create();
@@ -108,6 +114,7 @@ public function processOptions(CartItemInterface $cartItem)
$productOption->setExtensionAttributes($extensibleAttribute);
$cartItem->setProductOption($productOption);
}
+
return $cartItem;
}
}
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/BaseStockStatusSelectProcessor.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/BaseStockStatusSelectProcessor.php
new file mode 100644
index 0000000000000..cbeaf2cea90e0
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/BaseStockStatusSelectProcessor.php
@@ -0,0 +1,68 @@
+resource = $resource;
+ $this->stockConfig = $stockConfig;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function process(Select $select)
+ {
+ // Does not make sense to extend query if out of stock products won't appear in tables for indexing
+ if ($this->stockConfig->isShowOutOfStock()) {
+ $select->join(
+ ['si' => $this->resource->getTableName('cataloginventory_stock_item')],
+ 'si.product_id = l.product_id',
+ []
+ );
+ $select->join(
+ ['si_parent' => $this->resource->getTableName('cataloginventory_stock_item')],
+ 'si_parent.product_id = l.parent_id',
+ []
+ );
+ $select->where('si.is_in_stock = ?', Stock::STOCK_IN_STOCK);
+ $select->orWhere('si_parent.is_in_stock = ?', Stock::STOCK_OUT_OF_STOCK);
+ }
+
+ return $select;
+ }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
index 6031ab6f8f8ae..d00e5c72a4622 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
@@ -3,9 +3,13 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price;
+use Magento\Catalog\Model\ResourceModel\Product\BaseSelectProcessorInterface;
use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\BasePriceModifier;
+use Magento\Framework\DB\Select;
use Magento\Framework\Indexer\DimensionalIndexerInterface;
use Magento\Framework\EntityManager\MetadataPool;
use Magento\Catalog\Model\Indexer\Product\Price\TableMaintainer;
@@ -13,10 +17,8 @@
use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructureFactory;
use Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\IndexTableStructure;
use Magento\Framework\App\Config\ScopeConfigInterface;
-use Magento\Store\Model\ScopeInterface;
use Magento\Framework\App\ObjectManager;
use Magento\CatalogInventory\Model\Stock;
-use Magento\CatalogInventory\Model\Configuration;
/**
* Configurable Products Price Indexer Resource model
@@ -75,6 +77,11 @@ class Configurable implements DimensionalIndexerInterface
*/
private $scopeConfig;
+ /**
+ * @var BaseSelectProcessorInterface
+ */
+ private $baseSelectProcessor;
+
/**
* @param BaseFinalPrice $baseFinalPrice
* @param IndexTableStructureFactory $indexTableStructureFactory
@@ -85,6 +92,9 @@ class Configurable implements DimensionalIndexerInterface
* @param bool $fullReindexAction
* @param string $connectionName
* @param ScopeConfigInterface $scopeConfig
+ * @param BaseSelectProcessorInterface|null $baseSelectProcessor
+ *
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
BaseFinalPrice $baseFinalPrice,
@@ -95,7 +105,8 @@ public function __construct(
BasePriceModifier $basePriceModifier,
$fullReindexAction = false,
$connectionName = 'indexer',
- ScopeConfigInterface $scopeConfig = null
+ ScopeConfigInterface $scopeConfig = null,
+ ?BaseSelectProcessorInterface $baseSelectProcessor = null
) {
$this->baseFinalPrice = $baseFinalPrice;
$this->indexTableStructureFactory = $indexTableStructureFactory;
@@ -106,6 +117,8 @@ public function __construct(
$this->fullReindexAction = $fullReindexAction;
$this->basePriceModifier = $basePriceModifier;
$this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
+ $this->baseSelectProcessor = $baseSelectProcessor ?:
+ ObjectManager::getInstance()->get(BaseSelectProcessorInterface::class);
}
/**
@@ -198,15 +211,7 @@ private function fillTemporaryOptionsTable(string $temporaryOptionsTableName, ar
[]
);
- // Does not make sense to extend query if out of stock products won't appear in tables for indexing
- if ($this->isConfigShowOutOfStock()) {
- $select->join(
- ['si' => $this->getTable('cataloginventory_stock_item')],
- 'si.product_id = l.product_id',
- []
- );
- $select->where('si.is_in_stock = ?', Stock::STOCK_IN_STOCK);
- }
+ $this->baseSelectProcessor->process($select);
$select->columns(
[
@@ -295,17 +300,4 @@ private function getTable($tableName)
{
return $this->resource->getTableName($tableName, $this->connectionName);
}
-
- /**
- * Is flag Show Out Of Stock setted
- *
- * @return bool
- */
- private function isConfigShowOutOfStock(): bool
- {
- return $this->scopeConfig->isSetFlag(
- Configuration::XML_PATH_SHOW_OUT_OF_STOCK,
- ScopeInterface::SCOPE_STORE
- );
- }
}
diff --git a/app/code/Magento/ConfigurableProduct/Plugin/Model/Order/Invoice/UpdateConfigurableProductTotalQty.php b/app/code/Magento/ConfigurableProduct/Plugin/Model/Order/Invoice/UpdateConfigurableProductTotalQty.php
new file mode 100644
index 0000000000000..28237ca71b07a
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Plugin/Model/Order/Invoice/UpdateConfigurableProductTotalQty.php
@@ -0,0 +1,43 @@
+getOrder();
+ $productTotalQty = 0;
+ $hasConfigurableProduct = false;
+ foreach ($order->getAllItems() as $orderItem) {
+ if ($orderItem->getParentItemId() === null &&
+ $orderItem->getProductType() == Configurable::TYPE_CODE
+ ) {
+ $hasConfigurableProduct = true;
+ continue;
+ }
+ $productTotalQty += (float) $orderItem->getQtyOrdered();
+ }
+ return $hasConfigurableProduct ? $productTotalQty : $totalQty;
+ }
+}
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontAssertExcludingTierPriceActionGroup.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontAssertExcludingTierPriceActionGroup.xml
new file mode 100644
index 0000000000000..d609fb0346900
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/StorefrontAssertExcludingTierPriceActionGroup.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+ Assert product item tier price excluding price.
+
+
+
+
+
+ {{excludingPrice}}
+ tierPriceExcluding
+
+
+
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
index 37c129dc3bbde..460040431bb97 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
@@ -23,5 +23,6 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateDownloadableProductSwitchToConfigurableTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateDownloadableProductSwitchToConfigurableTest.xml
index dc3608ec827df..17c7426dc547f 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateDownloadableProductSwitchToConfigurableTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType/AdminCreateDownloadableProductSwitchToConfigurableTest.xml
@@ -27,7 +27,7 @@
-
@@ -62,7 +62,7 @@
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminSimpleProductTypeSwitchingToConfigurableProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminSimpleProductTypeSwitchingToConfigurableProductTest.xml
index 14979f93ca423..f3b79765f746d 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminSimpleProductTypeSwitchingToConfigurableProductTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminSimpleProductTypeSwitchingToConfigurableProductTest.xml
@@ -61,7 +61,7 @@
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminVirtualProductTypeSwitchingToConfigurableProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminVirtualProductTypeSwitchingToConfigurableProductTest.xml
index e986ea38f0fe1..bb5baf33d95fb 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminVirtualProductTypeSwitchingToConfigurableProductTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminProductTypeSwitchingOnEditingTest/AdminVirtualProductTypeSwitchingToConfigurableProductTest.xml
@@ -60,7 +60,7 @@
diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml
index b87ddf612be19..aa2c19ebc17f4 100644
--- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml
+++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/NoOptionAvailableToConfigureDisabledProductTest.xml
@@ -135,7 +135,8 @@
-
@@ -70,8 +70,7 @@
-
@@ -142,8 +143,9 @@
-
+
diff --git a/app/code/Magento/ConfigurableProduct/etc/di.xml b/app/code/Magento/ConfigurableProduct/etc/di.xml
index c8a278df92dc6..c7f67a69d669f 100644
--- a/app/code/Magento/ConfigurableProduct/etc/di.xml
+++ b/app/code/Magento/ConfigurableProduct/etc/di.xml
@@ -198,6 +198,7 @@
Magento\Catalog\Model\ResourceModel\Product\Indexer\TemporaryTableStrategy
indexer
+ Magento\ConfigurableProduct\Model\ResourceModel\Product\Indexer\Price\BaseStockStatusSelectProcessor
diff --git a/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml b/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
index f60234453dc60..3942ec52cbb8b 100644
--- a/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
+++ b/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
@@ -12,5 +12,6 @@
diff --git a/app/code/Magento/ConfigurableProduct/view/adminhtml/ui_component/configurable_associated_product_listing.xml b/app/code/Magento/ConfigurableProduct/view/adminhtml/ui_component/configurable_associated_product_listing.xml
index 2a40caaabae04..c23141d44a2ec 100644
--- a/app/code/Magento/ConfigurableProduct/view/adminhtml/ui_component/configurable_associated_product_listing.xml
+++ b/app/code/Magento/ConfigurableProduct/view/adminhtml/ui_component/configurable_associated_product_listing.xml
@@ -58,7 +58,7 @@
status
- componentType = column, index = ${ $.index }:visible
+ ns = ${ $.ns }, index = ${ $.index }:visible
diff --git a/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/tier_price.phtml b/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/tier_price.phtml
index c68419b955e6d..7ce1fd2ccb451 100644
--- a/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/tier_price.phtml
+++ b/app/code/Magento/ConfigurableProduct/view/base/templates/product/price/tier_price.phtml
@@ -6,22 +6,34 @@
?>
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Cart/BuyRequest/SuperAttributeDataProvider.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Cart/BuyRequest/SuperAttributeDataProvider.php
index 4a613254ddf84..0fa4b8da50817 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/Model/Cart/BuyRequest/SuperAttributeDataProvider.php
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Cart/BuyRequest/SuperAttributeDataProvider.php
@@ -8,14 +8,17 @@
namespace Magento\ConfigurableProductGraphQl\Model\Cart\BuyRequest;
use Magento\Catalog\Api\Data\ProductInterface;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\CatalogInventory\Api\StockStateInterface;
+use Magento\ConfigurableProductGraphQl\Model\Options\Collection as OptionCollection;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Quote\Model\Quote;
use Magento\QuoteGraphQl\Model\Cart\BuyRequest\BuyRequestDataProviderInterface;
-use Magento\Catalog\Api\ProductRepositoryInterface;
-use Magento\ConfigurableProductGraphQl\Model\Options\Collection as OptionCollection;
-use Magento\Framework\EntityManager\MetadataPool;
/**
* DataProvider for building super attribute options in buy requests
@@ -42,22 +45,30 @@ class SuperAttributeDataProvider implements BuyRequestDataProviderInterface
*/
private $metadataPool;
+ /**
+ * @var StockStateInterface
+ */
+ private $stockState;
+
/**
* @param ArrayManager $arrayManager
* @param ProductRepositoryInterface $productRepository
* @param OptionCollection $optionCollection
* @param MetadataPool $metadataPool
+ * @param StockStateInterface $stockState
*/
public function __construct(
ArrayManager $arrayManager,
ProductRepositoryInterface $productRepository,
OptionCollection $optionCollection,
- MetadataPool $metadataPool
+ MetadataPool $metadataPool,
+ StockStateInterface $stockState
) {
$this->arrayManager = $arrayManager;
$this->productRepository = $productRepository;
$this->optionCollection = $optionCollection;
$this->metadataPool = $metadataPool;
+ $this->stockState = $stockState;
}
/**
@@ -70,13 +81,20 @@ public function execute(array $cartItemData): array
return [];
}
$sku = $this->arrayManager->get('data/sku', $cartItemData);
-
+ $qty = $this->arrayManager->get('data/quantity', $cartItemData);
+ $cart = $this->arrayManager->get('model', $cartItemData);
+ if (!$cart instanceof Quote) {
+ throw new LocalizedException(__('"model" value should be specified'));
+ }
try {
$parentProduct = $this->productRepository->get($parentSku);
$product = $this->productRepository->get($sku);
} catch (NoSuchEntityException $e) {
throw new GraphQlNoSuchEntityException(__('Could not find specified product.'));
}
+
+ $this->checkProductStock($sku, (float) $qty, (int) $cart->getStoreId());
+
$configurableProductLinks = $parentProduct->getExtensionAttributes()->getConfigurableProductLinks();
if (!in_array($product->getId(), $configurableProductLinks)) {
throw new GraphQlInputException(__('Could not find specified product.'));
@@ -95,6 +113,47 @@ public function execute(array $cartItemData): array
}
}
}
+ $this->checkSuperAttributeData($parentSku, $superAttributesData);
+
return ['super_attribute' => $superAttributesData];
}
+
+ /**
+ * Stock check for a product
+ *
+ * @param string $sku
+ * @param float $qty
+ * @param int $scopeId
+ */
+ private function checkProductStock(string $sku, float $qty, int $scopeId): void
+ {
+ // Child stock check has to be performed a catalog by default would not show/check it
+ $childProduct = $this->productRepository->get($sku, false, null, true);
+
+ $result = $this->stockState->checkQuoteItemQty($childProduct->getId(), $qty, $qty, $qty, $scopeId);
+
+ if ($result->getHasError()) {
+ throw new LocalizedException(
+ __($result->getMessage())
+ );
+ }
+ }
+
+ /**
+ * Check super attribute data.
+ *
+ * Some options might be disabled and/or available when parent and child sku are provided.
+ *
+ * @param string $parentSku
+ * @param array $superAttributesData
+ * @throws LocalizedException
+ */
+ private function checkSuperAttributeData(string $parentSku, array $superAttributesData): void
+ {
+ if (empty($superAttributesData)) {
+ throw new LocalizedException(
+ __('The product with SKU %sku is out of stock.', ['sku' => $parentSku])
+ );
+ }
+ }
}
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Options/DataProvider/Variant.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Options/DataProvider/Variant.php
new file mode 100644
index 0000000000000..80fbdc76bacb3
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Options/DataProvider/Variant.php
@@ -0,0 +1,67 @@
+configurableType = $configurableType;
+ $this->stockStatusFactory = $stockStatusFactory;
+ }
+
+ /**
+ * Load available child products by parent
+ *
+ * @param ProductInterface $product
+ * @return ProductInterface[]
+ * @throws \Magento\Framework\Exception\LocalizedException
+ */
+ public function getSalableVariantsByParent(ProductInterface $product)
+ {
+ $collection = $this->configurableType->getUsedProductCollection($product);
+ $collection
+ ->addAttributeToSelect('*')
+ ->addFilterByRequiredOptions();
+ $collection->addMediaGalleryData();
+ $collection->addTierPriceData();
+
+ $stockFlag = 'has_stock_status_filter';
+ if (!$collection->hasFlag($stockFlag)) {
+ $stockStatusResource = $this->stockStatusFactory->create();
+ $stockStatusResource->addStockDataToCollection($collection, true);
+ $collection->setFlag($stockFlag, true);
+ }
+ $collection->clear();
+
+ return $collection->getItems();
+ }
+}
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Options/Metadata.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Options/Metadata.php
new file mode 100644
index 0000000000000..9fa6e4f23fa56
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Options/Metadata.php
@@ -0,0 +1,173 @@
+configurableProductHelper = $configurableProductHelper;
+ $this->selectionUidFormatter = $selectionUidFormatter;
+ $this->productRepository = $productRepository;
+ $this->variant = $variant;
+ }
+
+ /**
+ * Load available selections from configurable options.
+ *
+ * @param ProductInterface $product
+ * @param array $selectedOptionsUid
+ * @return array
+ * @throws NoSuchEntityException
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ */
+ public function getAvailableSelections(
+ ProductInterface $product,
+ array $selectedOptionsUid
+ ): array {
+ $options = $this->configurableProductHelper->getOptions($product, $this->getAllowProducts($product));
+ $selectedOptions = $this->selectionUidFormatter->extract($selectedOptionsUid);
+ $attributeCodes = $this->getAttributeCodes($product);
+ $availableSelections = $availableProducts = $variantData = [];
+
+ if (isset($options['index']) && $options['index']) {
+ foreach ($options['index'] as $productId => $productOptions) {
+ if (!empty($selectedOptions) && !$this->hasProductRequiredOptions($selectedOptions, $productOptions)) {
+ continue;
+ }
+
+ $availableProducts[] = $productId;
+ foreach ($productOptions as $attributeId => $optionIndex) {
+ $uid = $this->selectionUidFormatter->encode($attributeId, (int)$optionIndex);
+
+ if (isset($availableSelections[$attributeId]['option_value_uids'])
+ && in_array($uid, $availableSelections[$attributeId]['option_value_uids'])
+ ) {
+ continue;
+ }
+ $availableSelections[$attributeId]['option_value_uids'][] = $uid;
+ $availableSelections[$attributeId]['attribute_code'] = $attributeCodes[$attributeId];
+ }
+
+ if ($this->hasSelectionProduct($selectedOptions, $productOptions)) {
+ $variantProduct = $this->productRepository->getById($productId);
+ $variantData = $variantProduct->getData();
+ $variantData['model'] = $variantProduct;
+ }
+ }
+ }
+
+ return [
+ 'options_available_for_selection' => $availableSelections,
+ 'variant' => $variantData,
+ 'availableSelectionProducts' => array_unique($availableProducts),
+ 'product' => $product
+ ];
+ }
+
+ /**
+ * Get allowed products.
+ *
+ * @param ProductInterface $product
+ * @return ProductInterface[]
+ */
+ public function getAllowProducts(ProductInterface $product): array
+ {
+ return $this->variant->getSalableVariantsByParent($product) ?? [];
+ }
+
+ /**
+ * Check if a product has the selected options.
+ *
+ * @param array $requiredOptions
+ * @param array $productOptions
+ * @return bool
+ */
+ private function hasProductRequiredOptions($requiredOptions, $productOptions): bool
+ {
+ $result = true;
+ foreach ($requiredOptions as $attributeId => $optionIndex) {
+ if (!isset($productOptions[$attributeId]) || !$productOptions[$attributeId]
+ || $optionIndex != $productOptions[$attributeId]
+ ) {
+ $result = false;
+ break;
+ }
+ }
+
+ return $result;
+ }
+
+ /**
+ * Check if selected options match a product.
+ *
+ * @param array $requiredOptions
+ * @param array $productOptions
+ * @return bool
+ */
+ private function hasSelectionProduct($requiredOptions, $productOptions): bool
+ {
+ return $this->hasProductRequiredOptions($productOptions, $requiredOptions);
+ }
+
+ /**
+ * Retrieve attribute codes
+ *
+ * @param ProductInterface $product
+ * @return string[]
+ */
+ private function getAttributeCodes(ProductInterface $product): array
+ {
+ $allowedAttributes = $this->configurableProductHelper->getAllowAttributes($product);
+ $attributeCodes = [];
+ foreach ($allowedAttributes as $attribute) {
+ $attributeCodes[$attribute->getAttributeId()] = $attribute->getProductAttribute()->getAttributeCode();
+ }
+
+ return $attributeCodes;
+ }
+}
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Options/SelectionUidFormatter.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Options/SelectionUidFormatter.php
new file mode 100644
index 0000000000000..1d13ad75489a1
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Options/SelectionUidFormatter.php
@@ -0,0 +1,60 @@
+configurationHelper->getOptions($cartItem) as $option) {
+ if (isset($option['option_type'])) {
+ //Don't return customizable options in this resolver
+ continue;
+ }
$result[] = [
'id' => $option['option_id'],
'option_label' => $option['label'],
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/OptionsSelectionMetadata.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/OptionsSelectionMetadata.php
new file mode 100644
index 0000000000000..f7d5a96ad2aba
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/OptionsSelectionMetadata.php
@@ -0,0 +1,49 @@
+configurableSelectionMetadata = $configurableSelectionMetadata;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+ {
+ if (!isset($value['model'])) {
+ throw new LocalizedException(__('"model" value should be specified'));
+ }
+
+ $selectedOptions = $args['selectedConfigurableOptionValues'] ?? [];
+ /** @var ProductInterface $product */
+ $product = $value['model'];
+
+ return $this->configurableSelectionMetadata->getAvailableSelections($product, $selectedOptions);
+ }
+}
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/SelectionMediaGallery.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/SelectionMediaGallery.php
new file mode 100644
index 0000000000000..7b3ddc4ac1417
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/SelectionMediaGallery.php
@@ -0,0 +1,45 @@
+getTypeInstance()->getUsedProducts($product, null);
+ foreach ($usedProducts as $usedProduct) {
+ if (in_array($usedProduct->getId(), $availableSelectionProducts)) {
+ foreach ($usedProduct->getMediaGalleryEntries() ?? [] as $key => $entry) {
+ $index = $usedProduct->getId() . '_' . $key;
+ $mediaGalleryEntries[$index] = $entry->getData();
+ $mediaGalleryEntries[$index]['model'] = $usedProduct;
+ if ($entry->getExtensionAttributes() && $entry->getExtensionAttributes()->getVideoContent()) {
+ $mediaGalleryEntries[$index]['video_content']
+ = $entry->getExtensionAttributes()->getVideoContent()->getData();
+ }
+ }
+ }
+ }
+ return $mediaGalleryEntries;
+ }
+}
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Variant.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Variant.php
new file mode 100644
index 0000000000000..625c31a2680c8
--- /dev/null
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Resolver/Variant/Variant.php
@@ -0,0 +1,34 @@
+getData(),
+ [
+ 'model' => $value['variant']['model']
+ ]
+ );
+ } else {
+ return null;
+ }
+ }
+}
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
index b60a660251f4d..cd6d78e5c3ffb 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
@@ -9,6 +9,7 @@
use Magento\Catalog\Api\Data\ProductInterface;
use Magento\Catalog\Model\Product;
+use Magento\ConfigurableProduct\Model\Product\Type\Configurable;
use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\Collection as ChildCollection;
use Magento\ConfigurableProduct\Model\ResourceModel\Product\Type\Configurable\Product\CollectionFactory;
use Magento\Framework\EntityManager\MetadataPool;
@@ -175,19 +176,21 @@ private function fetch(ContextInterface $context = null) : array
}
/**
- * Get attributes code
+ * Get attributes codes for given product
*
- * @param \Magento\Catalog\Model\Product $currentProduct
+ * @param Product $currentProduct
* @return array
*/
private function getAttributesCodes(Product $currentProduct): array
{
$attributeCodes = $this->attributeCodes;
- $allowAttributes = $currentProduct->getTypeInstance()->getConfigurableAttributes($currentProduct);
- foreach ($allowAttributes as $attribute) {
- $productAttribute = $attribute->getProductAttribute();
- if (!\in_array($productAttribute->getAttributeCode(), $attributeCodes)) {
- $attributeCodes[] = $productAttribute->getAttributeCode();
+ if ($currentProduct->getTypeId() == Configurable::TYPE_CODE) {
+ $allowAttributes = $currentProduct->getTypeInstance()->getConfigurableAttributes($currentProduct);
+ foreach ($allowAttributes as $attribute) {
+ $productAttribute = $attribute->getProductAttribute();
+ if (!\in_array($productAttribute->getAttributeCode(), $attributeCodes)) {
+ $attributeCodes[] = $productAttribute->getAttributeCode();
+ }
}
}
diff --git a/app/code/Magento/ConfigurableProductGraphQl/composer.json b/app/code/Magento/ConfigurableProductGraphQl/composer.json
index 295efb65b1978..a6e1d1c822435 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/composer.json
+++ b/app/code/Magento/ConfigurableProductGraphQl/composer.json
@@ -10,6 +10,7 @@
"magento/module-catalog-graph-ql": "*",
"magento/module-quote": "*",
"magento/module-quote-graph-ql": "*",
+ "magento/module-catalog-inventory": "*",
"magento/framework": "*"
},
"license": [
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml b/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml
index 808ca62f7e149..dc672b02e2f96 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml
@@ -43,4 +43,12 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/module.xml b/app/code/Magento/ConfigurableProductGraphQl/etc/module.xml
index f249a417f1046..3aa1658c9388d 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/etc/module.xml
+++ b/app/code/Magento/ConfigurableProductGraphQl/etc/module.xml
@@ -12,6 +12,7 @@
+
+
+ - Magento\Csp\Model\Collector\FetchPolicyMerger
+ - Magento\Csp\Model\Collector\FlagPolicyMerger
+ - Magento\Csp\Model\Collector\PluginTypesPolicyMerger
+ - Magento\Csp\Model\Collector\SandboxPolicyMerger
+
+
+
@@ -24,10 +35,7 @@
- Magento\Csp\Model\Collector\DynamicCollector\Proxy
- - Magento\Csp\Model\Collector\FetchPolicyMerger
- - Magento\Csp\Model\Collector\FlagPolicyMerger
- - Magento\Csp\Model\Collector\PluginTypesPolicyMerger
- - Magento\Csp\Model\Collector\SandboxPolicyMerger
+ - Magento\Csp\Model\Collector\MergerInterface
@@ -46,6 +54,7 @@
Magento\Csp\Model\Collector\CspWhitelistXml\Converter
Magento\Csp\Model\Collector\CspWhitelistXml\SchemaLocator
+ Magento\Csp\Model\Collector\CspWhitelistXml\FileResolver
csp_whitelist.xml
@@ -93,6 +102,7 @@
configured_block_cache
+ Magento\Framework\Serialize\Serializer\Serialize
diff --git a/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php b/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
index d48df02d9de27..400aa56bc68e9 100644
--- a/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
+++ b/app/code/Magento/CurrencySymbol/Model/System/Currencysymbol.php
@@ -292,7 +292,7 @@ protected function _unserializeStoreConfig($configPath, $storeId = null)
*/
protected function getAllowedCurrencies()
{
- $allowedCurrencies = [[]];
+ $allowedCurrencies = [];
$allowedCurrencies[] = explode(
self::ALLOWED_CURRENCIES_CONFIG_SEPARATOR,
$this->_scopeConfig->getValue(
@@ -330,6 +330,6 @@ protected function getAllowedCurrencies()
}
}
}
- return array_unique(array_merge(...$allowedCurrencies));
+ return array_unique(array_merge([], ...$allowedCurrencies));
}
}
diff --git a/app/code/Magento/Customer/Api/SessionCleanerInterface.php b/app/code/Magento/Customer/Api/SessionCleanerInterface.php
index eb24712105f96..d8534f8b34e83 100644
--- a/app/code/Magento/Customer/Api/SessionCleanerInterface.php
+++ b/app/code/Magento/Customer/Api/SessionCleanerInterface.php
@@ -13,7 +13,7 @@
interface SessionCleanerInterface
{
/**
- * Destroy all active customer sessions related to given customer id, including current session.
+ * Destroy all active customer sessions related to given customer except current session.
*
* @param int $customerId
* @return void
diff --git a/app/code/Magento/Customer/Block/Widget/Dob.php b/app/code/Magento/Customer/Block/Widget/Dob.php
index 90ce9ba210ed2..ef2d2cca169f5 100644
--- a/app/code/Magento/Customer/Block/Widget/Dob.php
+++ b/app/code/Magento/Customer/Block/Widget/Dob.php
@@ -7,11 +7,16 @@
use Magento\Customer\Api\CustomerMetadataInterface;
use Magento\Framework\Api\ArrayObjectSearch;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Json\EncoderInterface;
+use Magento\Framework\Locale\Bundle\DataBundle;
+use Magento\Framework\Locale\ResolverInterface;
/**
* Customer date of birth attribute block
*
* @SuppressWarnings(PHPMD.DepthOfInheritance)
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Dob extends AbstractWidget
{
@@ -39,6 +44,18 @@ class Dob extends AbstractWidget
*/
protected $filterFactory;
+ /**
+ * JSON Encoder
+ *
+ * @var EncoderInterface
+ */
+ private $encoder;
+
+ /**
+ * @var ResolverInterface
+ */
+ private $localeResolver;
+
/**
* @param \Magento\Framework\View\Element\Template\Context $context
* @param \Magento\Customer\Helper\Address $addressHelper
@@ -46,6 +63,8 @@ class Dob extends AbstractWidget
* @param \Magento\Framework\View\Element\Html\Date $dateElement
* @param \Magento\Framework\Data\Form\FilterFactory $filterFactory
* @param array $data
+ * @param EncoderInterface|null $encoder
+ * @param ResolverInterface|null $localeResolver
*/
public function __construct(
\Magento\Framework\View\Element\Template\Context $context,
@@ -53,10 +72,14 @@ public function __construct(
CustomerMetadataInterface $customerMetadata,
\Magento\Framework\View\Element\Html\Date $dateElement,
\Magento\Framework\Data\Form\FilterFactory $filterFactory,
- array $data = []
+ array $data = [],
+ ?EncoderInterface $encoder = null,
+ ?ResolverInterface $localeResolver = null
) {
$this->dateElement = $dateElement;
$this->filterFactory = $filterFactory;
+ $this->encoder = $encoder ?? ObjectManager::getInstance()->get(EncoderInterface::class);
+ $this->localeResolver = $localeResolver ?? ObjectManager::getInstance()->get(ResolverInterface::class);
parent::__construct($context, $addressHelper, $customerMetadata, $data);
}
@@ -281,7 +304,7 @@ public function getHtmlExtraParams()
*/
public function getDateFormat()
{
- $dateFormat = $this->_localeDate->getDateFormatWithLongYear();
+ $dateFormat = $this->setTwoDayPlaces($this->_localeDate->getDateFormatWithLongYear());
/** Escape RTL characters which are present in some locales and corrupt formatting */
$escapedDateFormat = preg_replace('/[^MmDdYy\/\.\-]/', '', $dateFormat);
@@ -377,4 +400,45 @@ public function getFirstDay()
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
);
}
+
+ /**
+ * Get translated calendar config json formatted
+ *
+ * @return string
+ */
+ public function getTranslatedCalendarConfigJson(): string
+ {
+ $localeData = (new DataBundle())->get($this->localeResolver->getLocale());
+ $monthsData = $localeData['calendar']['gregorian']['monthNames'];
+ $daysData = $localeData['calendar']['gregorian']['dayNames'];
+
+ return $this->encoder->encode(
+ [
+ 'closeText' => __('Done'),
+ 'prevText' => __('Prev'),
+ 'nextText' => __('Next'),
+ 'currentText' => __('Today'),
+ 'monthNames' => array_values(iterator_to_array($monthsData['format']['wide'])),
+ 'monthNamesShort' => array_values(iterator_to_array($monthsData['format']['abbreviated'])),
+ 'dayNames' => array_values(iterator_to_array($daysData['format']['wide'])),
+ 'dayNamesShort' => array_values(iterator_to_array($daysData['format']['abbreviated'])),
+ 'dayNamesMin' => array_values(iterator_to_array($daysData['format']['short'])),
+ ]
+ );
+ }
+
+ /**
+ * Set 2 places for day value in format string
+ *
+ * @param string $format
+ * @return string
+ */
+ private function setTwoDayPlaces(string $format): string
+ {
+ return preg_replace(
+ '/(?dispatchSuccessEvent($customerCandidateDataObject);
$this->messageManager->addSuccessMessage(__('You saved the account information.'));
+ // logout from current session if password changed.
+ if ($isPasswordChanged) {
+ $this->session->logout();
+ $this->session->start();
+ return $resultRedirect->setPath('customer/account/login');
+ }
return $resultRedirect->setPath('customer/account');
} catch (InvalidEmailOrPasswordException $e) {
$this->messageManager->addErrorMessage($this->escaper->escapeHtml($e->getMessage()));
diff --git a/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php b/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php
index a127f2acf538f..1bb5aea9b1dc9 100644
--- a/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php
+++ b/app/code/Magento/Customer/Controller/Account/ResetPasswordPost.php
@@ -14,9 +14,7 @@
use Magento\Customer\Model\Customer\CredentialsValidator;
/**
- * Class ResetPasswordPost
- *
- * @package Magento\Customer\Controller\Account
+ * Customer reset password controller
*/
class ResetPasswordPost extends \Magento\Customer\Controller\AbstractAccount implements HttpPostActionInterface
{
@@ -91,6 +89,11 @@ public function execute()
$resetPasswordToken,
$password
);
+ // logout from current session if password changed.
+ if ($this->session->isLoggedIn()) {
+ $this->session->logout();
+ $this->session->start();
+ }
$this->session->unsRpToken();
$this->messageManager->addSuccessMessage(__('You updated your password.'));
$resultRedirect->setPath('*/*/login');
diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index.php b/app/code/Magento/Customer/Controller/Adminhtml/Index.php
index 51dc39a2fc658..9595e473c1869 100644
--- a/app/code/Magento/Customer/Controller/Adminhtml/Index.php
+++ b/app/code/Magento/Customer/Controller/Adminhtml/Index.php
@@ -289,9 +289,8 @@ protected function prepareDefaultCustomerTitle(\Magento\Backend\Model\View\Resul
protected function _addSessionErrorMessages($messages)
{
$messages = (array)$messages;
- $session = $this->_getSession();
- $callback = function ($error) use ($session) {
+ $callback = function ($error) {
if (!$error instanceof Error) {
$error = new Error($error);
}
diff --git a/app/code/Magento/Customer/Model/AccountManagement.php b/app/code/Magento/Customer/Model/AccountManagement.php
index d22a10145c7be..67017562e105c 100644
--- a/app/code/Magento/Customer/Model/AccountManagement.php
+++ b/app/code/Magento/Customer/Model/AccountManagement.php
@@ -977,7 +977,6 @@ protected function sendEmailConfirmation(CustomerInterface $customer, $redirectU
$templateType = self::NEW_ACCOUNT_EMAIL_REGISTERED_NO_PASSWORD;
}
$this->getEmailNotification()->newAccount($customer, $templateType, $redirectUrl, $customer->getStoreId());
- $customer->setConfirmation(null);
} catch (MailException $e) {
// If we are not able to send a new account email, this should be ignored
$this->logger->critical($e);
@@ -1615,37 +1614,6 @@ private function getEmailNotification()
}
}
- /**
- * Destroy all active customer sessions by customer id (current session will not be destroyed).
- *
- * Customer sessions which should be deleted are collecting from the "customer_visitor" table considering
- * configured session lifetime.
- *
- * @param string|int $customerId
- * @return void
- */
- private function destroyCustomerSessions($customerId)
- {
- $this->sessionManager->regenerateId();
- $sessionLifetime = $this->scopeConfig->getValue(
- \Magento\Framework\Session\Config::XML_PATH_COOKIE_LIFETIME,
- \Magento\Store\Model\ScopeInterface::SCOPE_STORE
- );
- $dateTime = $this->dateTimeFactory->create();
- $activeSessionsTime = $dateTime->setTimestamp($dateTime->getTimestamp() - $sessionLifetime)
- ->format(DateTime::DATETIME_PHP_FORMAT);
- /** @var \Magento\Customer\Model\ResourceModel\Visitor\Collection $visitorCollection */
- $visitorCollection = $this->visitorCollectionFactory->create();
- $visitorCollection->addFieldToFilter('customer_id', $customerId);
- $visitorCollection->addFieldToFilter('last_visit_at', ['from' => $activeSessionsTime]);
- $visitorCollection->addFieldToFilter('session_id', ['neq' => $this->sessionManager->getSessionId()]);
- /** @var \Magento\Customer\Model\Visitor $visitor */
- foreach ($visitorCollection->getItems() as $visitor) {
- $sessionId = $visitor->getSessionId();
- $this->saveHandler->destroy($sessionId);
- }
- }
-
/**
* Set ignore_validation_flag for reset password flow to skip unnecessary address and customer validation
*
diff --git a/app/code/Magento/Customer/Model/AccountManagementApi.php b/app/code/Magento/Customer/Model/AccountManagementApi.php
new file mode 100644
index 0000000000000..02a05705b57ef
--- /dev/null
+++ b/app/code/Magento/Customer/Model/AccountManagementApi.php
@@ -0,0 +1,31 @@
+setConfirmation(null);
+
+ return $customer;
+ }
+}
diff --git a/app/code/Magento/Customer/Model/Address.php b/app/code/Magento/Customer/Model/Address.php
index 241abbb06f8a1..c89821d5c984a 100644
--- a/app/code/Magento/Customer/Model/Address.php
+++ b/app/code/Magento/Customer/Model/Address.php
@@ -15,8 +15,8 @@
* Customer address model
*
* @api
- * @method int getParentId() getParentId()
- * @method \Magento\Customer\Model\Address setParentId() setParentId(int $parentId)
+ * @method int getParentId()
+ * @method \Magento\Customer\Model\Address setParentId(int $parentId)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @since 100.0.2
*/
diff --git a/app/code/Magento/Customer/Model/Address/CompositeValidator.php b/app/code/Magento/Customer/Model/Address/CompositeValidator.php
index 4c77f10c11de4..62308ba329d03 100644
--- a/app/code/Magento/Customer/Model/Address/CompositeValidator.php
+++ b/app/code/Magento/Customer/Model/Address/CompositeValidator.php
@@ -30,11 +30,11 @@ public function __construct(
*/
public function validate(AbstractAddress $address)
{
- $errors = [[]];
+ $errors = [];
foreach ($this->validators as $validator) {
$errors[] = $validator->validate($address);
}
- return array_merge(...$errors);
+ return array_merge([], ...$errors);
}
}
diff --git a/app/code/Magento/Customer/Model/FileProcessor.php b/app/code/Magento/Customer/Model/FileProcessor.php
index c16faea284296..c596f8c313ab3 100644
--- a/app/code/Magento/Customer/Model/FileProcessor.php
+++ b/app/code/Magento/Customer/Model/FileProcessor.php
@@ -233,7 +233,8 @@ public function moveTemporaryFile($fileName)
);
} catch (\Exception $e) {
throw new \Magento\Framework\Exception\LocalizedException(
- __('Something went wrong while saving the file.')
+ __('Something went wrong while saving the file.'),
+ $e
);
}
diff --git a/app/code/Magento/Customer/Model/ForgotPasswordToken/ConfirmCustomerByToken.php b/app/code/Magento/Customer/Model/ForgotPasswordToken/ConfirmCustomerByToken.php
index 6aadc814a4b9b..1000575805018 100644
--- a/app/code/Magento/Customer/Model/ForgotPasswordToken/ConfirmCustomerByToken.php
+++ b/app/code/Magento/Customer/Model/ForgotPasswordToken/ConfirmCustomerByToken.php
@@ -8,6 +8,8 @@
namespace Magento\Customer\Model\ForgotPasswordToken;
use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Framework\Exception\LocalizedException;
/**
* Confirm customer by reset password token
@@ -25,15 +27,11 @@ class ConfirmCustomerByToken
private $customerRepository;
/**
- * ConfirmByToken constructor.
- *
* @param GetCustomerByToken $getByToken
* @param CustomerRepositoryInterface $customerRepository
*/
- public function __construct(
- GetCustomerByToken $getByToken,
- CustomerRepositoryInterface $customerRepository
- ) {
+ public function __construct(GetCustomerByToken $getByToken, CustomerRepositoryInterface $customerRepository)
+ {
$this->getByToken = $getByToken;
$this->customerRepository = $customerRepository;
}
@@ -42,17 +40,29 @@ public function __construct(
* Confirm customer account my rp_token
*
* @param string $resetPasswordToken
- *
* @return void
- * @throws \Magento\Framework\Exception\LocalizedException
+ * @throws LocalizedException
*/
public function execute(string $resetPasswordToken): void
{
$customer = $this->getByToken->execute($resetPasswordToken);
if ($customer->getConfirmation()) {
- $this->customerRepository->save(
- $customer->setConfirmation(null)
- );
+ $this->resetConfirmation($customer);
}
}
+
+ /**
+ * Reset customer confirmation
+ *
+ * @param CustomerInterface $customer
+ * @return void
+ */
+ private function resetConfirmation(CustomerInterface $customer): void
+ {
+ // skip unnecessary address and customer validation
+ $customer->setData('ignore_validation_flag', true);
+ $customer->setConfirmation(null);
+
+ $this->customerRepository->save($customer);
+ }
}
diff --git a/app/code/Magento/Customer/Model/ForgotPasswordToken/GetCustomerByToken.php b/app/code/Magento/Customer/Model/ForgotPasswordToken/GetCustomerByToken.php
index 211a71d827f7e..6d2274351faee 100644
--- a/app/code/Magento/Customer/Model/ForgotPasswordToken/GetCustomerByToken.php
+++ b/app/code/Magento/Customer/Model/ForgotPasswordToken/GetCustomerByToken.php
@@ -54,7 +54,7 @@ public function __construct(
* @throws NoSuchEntityException
* @throws \Magento\Framework\Exception\LocalizedException
*/
- public function execute(string $resetPasswordToken):CustomerInterface
+ public function execute(string $resetPasswordToken): CustomerInterface
{
$this->searchCriteriaBuilder->addFilter(
'rp_token',
diff --git a/app/code/Magento/Customer/Model/Metadata/Form.php b/app/code/Magento/Customer/Model/Metadata/Form.php
index 85637ebf508b8..81ded6dec071a 100644
--- a/app/code/Magento/Customer/Model/Metadata/Form.php
+++ b/app/code/Magento/Customer/Model/Metadata/Form.php
@@ -363,11 +363,11 @@ public function validateData(array $data)
{
$validator = $this->_getValidator($data);
if (!$validator->isValid(false)) {
- $messages = [[]];
+ $messages = [];
foreach ($validator->getMessages() as $errorMessages) {
$messages[] = (array)$errorMessages;
}
- return array_merge(...$messages);
+ return array_merge([], ...$messages);
}
return true;
}
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsites.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsites.php
index 020067570efb4..1ca1c5622803f 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsites.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Address/Attribute/Source/CountryWithWebsites.php
@@ -84,7 +84,7 @@ public function getAllOptions($withEmpty = true, $defaultValues = false)
$websiteIds = [];
if (!$this->shareConfig->isGlobalScope()) {
- $allowedCountries = [[]];
+ $allowedCountries = [];
foreach ($this->storeManager->getWebsites() as $website) {
$countries = $this->allowedCountriesReader
@@ -96,7 +96,7 @@ public function getAllOptions($withEmpty = true, $defaultValues = false)
}
}
- $allowedCountries = array_unique(array_merge(...$allowedCountries));
+ $allowedCountries = array_unique(array_merge([], ...$allowedCountries));
} else {
$allowedCountries = $this->allowedCountriesReader->getAllowedCountries();
}
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Customer.php b/app/code/Magento/Customer/Model/ResourceModel/Customer.php
index 1477287f79f4b..6ebd6b9410a0c 100644
--- a/app/code/Magento/Customer/Model/ResourceModel/Customer.php
+++ b/app/code/Magento/Customer/Model/ResourceModel/Customer.php
@@ -85,7 +85,7 @@ public function __construct(
$this->accountConfirmation = $accountConfirmation ?: ObjectManager::getInstance()
->get(AccountConfirmation::class);
$this->setType('customer');
- $this->setConnection('customer_read', 'customer_write');
+ $this->setConnection('customer_read');
$this->storeManager = $storeManager;
}
diff --git a/app/code/Magento/Customer/Model/Session/SessionCleaner.php b/app/code/Magento/Customer/Model/Session/SessionCleaner.php
index 1423c94782535..5118c20329aaa 100644
--- a/app/code/Magento/Customer/Model/Session/SessionCleaner.php
+++ b/app/code/Magento/Customer/Model/Session/SessionCleaner.php
@@ -71,13 +71,6 @@ public function __construct(
*/
public function clearFor(int $customerId): void
{
- if ($this->sessionManager->isSessionExists()) {
- //delete old session and move data to the new session
- //use this instead of $this->sessionManager->regenerateId because last one doesn't delete old session
- // phpcs:ignore Magento2.Functions.DiscouragedFunction
- session_regenerate_id(true);
- }
-
$sessionLifetime = $this->scopeConfig->getValue(
Config::XML_PATH_COOKIE_LIFETIME,
ScopeInterface::SCOPE_STORE
@@ -89,6 +82,8 @@ public function clearFor(int $customerId): void
$visitorCollection = $this->visitorCollectionFactory->create();
$visitorCollection->addFieldToFilter('customer_id', $customerId);
$visitorCollection->addFieldToFilter('last_visit_at', ['from' => $activeSessionsTime]);
+ $visitorCollection->addFieldToFilter('session_id', ['neq' => $this->sessionManager->getSessionId()]);
+
/** @var \Magento\Customer\Model\Visitor $visitor */
foreach ($visitorCollection->getItems() as $visitor) {
$sessionId = $visitor->getSessionId();
diff --git a/app/code/Magento/Customer/Model/StoreSwitcher/RedirectDataPostprocessor.php b/app/code/Magento/Customer/Model/StoreSwitcher/RedirectDataPostprocessor.php
new file mode 100644
index 0000000000000..9fb3d6f432c2f
--- /dev/null
+++ b/app/code/Magento/Customer/Model/StoreSwitcher/RedirectDataPostprocessor.php
@@ -0,0 +1,75 @@
+customerRegistry = $customerRegistry;
+ $this->session = $session;
+ $this->logger = $logger;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function process(ContextInterface $context, array $data): void
+ {
+ if (!empty($data['customer_id'])) {
+ try {
+ $customer = $this->customerRegistry->retrieve($data['customer_id']);
+ if (!$this->session->isLoggedIn()
+ && in_array($context->getTargetStore()->getId(), $customer->getSharedStoreIds())
+ ) {
+ $this->session->setCustomerDataAsLoggedIn($customer->getDataModel());
+ }
+ } catch (NoSuchEntityException $e) {
+ $this->logger->error($e);
+ throw new LocalizedException(__('Something went wrong.'), $e);
+ } catch (LocalizedException $e) {
+ $this->logger->error($e);
+ throw new LocalizedException(__('Something went wrong.'), $e);
+ }
+ }
+ }
+}
diff --git a/app/code/Magento/Customer/Model/StoreSwitcher/RedirectDataPreprocessor.php b/app/code/Magento/Customer/Model/StoreSwitcher/RedirectDataPreprocessor.php
new file mode 100644
index 0000000000000..94f7619678df0
--- /dev/null
+++ b/app/code/Magento/Customer/Model/StoreSwitcher/RedirectDataPreprocessor.php
@@ -0,0 +1,70 @@
+customerRegistry = $customerRegistry;
+ $this->session = $session;
+ $this->logger = $logger;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function process(ContextInterface $context, array $data): array
+ {
+ if ($this->session->isLoggedIn()) {
+ try {
+ $customer = $this->customerRegistry->retrieve($this->session->getCustomerId());
+ if (in_array($context->getTargetStore()->getId(), $customer->getSharedStoreIds())) {
+ $data['customer_id'] = (int) $customer->getId();
+ }
+ } catch (Throwable $e) {
+ $this->logger->error($e);
+ }
+ }
+
+ return $data;
+ }
+}
diff --git a/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php b/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php
index fd5004ae0548f..af0a04827d30f 100644
--- a/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php
+++ b/app/code/Magento/Customer/Observer/AfterAddressSaveObserver.php
@@ -130,6 +130,7 @@ public function execute(Observer $observer)
if (!$this->_customerAddress->isVatValidationEnabled($customer->getStore())
|| $this->_coreRegistry->registry(self::VIV_PROCESSED_FLAG)
|| !$this->_canProcessAddress($customerAddress)
+ || $customerAddress->getShouldIgnoreValidation()
) {
return;
}
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminOpenCustomersGridActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminOpenCustomersGridActionGroup.xml
new file mode 100644
index 0000000000000..c1dedfefda309
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminOpenCustomersGridActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ Open the Admin Customers grid page.
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontCustomerHasNoOtherAddressesActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontCustomerHasNoOtherAddressesActionGroup.xml
new file mode 100644
index 0000000000000..1f56ba505128f
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AssertStorefrontCustomerHasNoOtherAddressesActionGroup.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+ Verifies customer has no additional address in address book
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/FillCustomerSignInPopupFormActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/FillCustomerSignInPopupFormActionGroup.xml
index 71c19b6d138d1..b0ff5f001e517 100644
--- a/app/code/Magento/Customer/Test/Mftf/ActionGroup/FillCustomerSignInPopupFormActionGroup.xml
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/FillCustomerSignInPopupFormActionGroup.xml
@@ -15,7 +15,7 @@
-
+
-
+
Goes to the Admin Customers grid page.
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontVerifyCustomerAccountInformationActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontVerifyCustomerAccountInformationActionGroup.xml
new file mode 100644
index 0000000000000..a20ed21a1466f
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/StorefrontVerifyCustomerAccountInformationActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+ Verifies customer information on the Edit Account Information page on the storefront
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml
index d644b581088bc..44ab653259b55 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml
@@ -11,9 +11,11 @@
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerShoppingCartSection/AdminCustomerShoppingCartProductItemSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerShoppingCartSection/AdminCustomerShoppingCartProductItemSection.xml
index 40fc23b6c72c1..eedfe47b7775c 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerShoppingCartSection/AdminCustomerShoppingCartProductItemSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerShoppingCartSection/AdminCustomerShoppingCartProductItemSection.xml
@@ -14,5 +14,6 @@
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminChangeCustomerGenderInCustomersGridTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminChangeCustomerGenderInCustomersGridTest.xml
index 423954a7d9bf7..d1934a82bea0e 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminChangeCustomerGenderInCustomersGridTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminChangeCustomerGenderInCustomersGridTest.xml
@@ -26,8 +26,7 @@
-
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml
index cb003ed837294..7442a32d58b2d 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminCreateCustomerTest.xml
@@ -40,8 +40,9 @@
-
-
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridViaMassActionsTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridViaMassActionsTest.xml
index 57446a1ee0c72..c6e72901b062c 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridViaMassActionsTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteCustomerAddressesFromTheGridViaMassActionsTest.xml
@@ -34,7 +34,7 @@
Step2. On *Customers* page choose customer from preconditions and open it to edit
Step3. On edit customer page open *Addresses* tab and find a grid with the additional addresses
-
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteDefaultBillingCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteDefaultBillingCustomerAddressTest.xml
index f08ea83a70da6..52c8029b8f778 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteDefaultBillingCustomerAddressTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminDeleteDefaultBillingCustomerAddressTest.xml
@@ -33,7 +33,7 @@
Step1. Login to admin and go to Customers > All Customers.
Step2. On *Customers* page choose customer from preconditions and open it to edit
-
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminEditDefaultBillingShippingCustomerAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminEditDefaultBillingShippingCustomerAddressTest.xml
index 6e44fe96b0d7b..72bda91445256 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminEditDefaultBillingShippingCustomerAddressTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminEditDefaultBillingShippingCustomerAddressTest.xml
@@ -30,7 +30,7 @@
Step2. On *Customers* page choose customer from preconditions and open it to edit
Step3. Open *Addresses* tab on edit customer page and press *Add New Address* button
-
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminExactMatchSearchInCustomerGridTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminExactMatchSearchInCustomerGridTest.xml
index ea4b3645d371f..14d569ed9101d 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminExactMatchSearchInCustomerGridTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminExactMatchSearchInCustomerGridTest.xml
@@ -28,12 +28,12 @@
-
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminGridSelectAllOnPageTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminGridSelectAllOnPageTest.xml
new file mode 100644
index 0000000000000..578c6786c1505
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminGridSelectAllOnPageTest.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminSearchCustomerAddressByKeywordTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminSearchCustomerAddressByKeywordTest.xml
index b13a06b9ef858..bac1c665cbe78 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminSearchCustomerAddressByKeywordTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminSearchCustomerAddressByKeywordTest.xml
@@ -34,7 +34,7 @@
Step2. On *Customers* page choose customer from preconditions and open it to edit
Step3. On edit customer page open *Addresses* tab and find a grid with the additional addresses
-
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultBillingAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultBillingAddressTest.xml
index 5ce96a8dcab3c..65dcf572f19fb 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultBillingAddressTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultBillingAddressTest.xml
@@ -30,7 +30,7 @@
Step2. On *Customers* page choose customer from preconditions and open it to edit
Step3. On edit customer page open *Addresses* tab and find a grid with the additional addresses
-
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultShippingAddressTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultShippingAddressTest.xml
index a9832c86562f1..bf76e29b185ba 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultShippingAddressTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminSetCustomerDefaultShippingAddressTest.xml
@@ -30,7 +30,7 @@
Step2. On *Customers* page choose customer from preconditions and open it to edit
Step3. On edit customer page open *Addresses* tab and find a grid with the additional addresses
-
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AdminUpdateCustomerTest/AdminUpdateCustomerInfoFromDefaultToNonDefaultTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AdminUpdateCustomerTest/AdminUpdateCustomerInfoFromDefaultToNonDefaultTest.xml
index 8af07bc2c2d53..fb6793b1751a6 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AdminUpdateCustomerTest/AdminUpdateCustomerInfoFromDefaultToNonDefaultTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AdminUpdateCustomerTest/AdminUpdateCustomerInfoFromDefaultToNonDefaultTest.xml
@@ -27,9 +27,7 @@
@@ -47,9 +45,7 @@
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
index 781d721fd5132..6a157c6312530 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/AllowedCountriesRestrictionApplyOnBackendTest.xml
@@ -116,8 +116,7 @@
diff --git a/app/code/Magento/Customer/Test/Mftf/Test/SearchByEmailInCustomerGridTest.xml b/app/code/Magento/Customer/Test/Mftf/Test/SearchByEmailInCustomerGridTest.xml
index d4351c8bcdc84..b2a78686cdad5 100644
--- a/app/code/Magento/Customer/Test/Mftf/Test/SearchByEmailInCustomerGridTest.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Test/SearchByEmailInCustomerGridTest.xml
@@ -26,12 +26,12 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php b/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php
index 39071f25ea18c..6da31b552c622 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Widget/DobTest.php
@@ -17,8 +17,10 @@
use Magento\Framework\Data\Form\FilterFactory;
use Magento\Framework\Escaper;
use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Json\EncoderInterface;
use Magento\Framework\Locale\Resolver;
use Magento\Framework\Locale\ResolverInterface;
+use Magento\Framework\Stdlib\DateTime\Intl\DateFormatterFactory;
use Magento\Framework\Stdlib\DateTime\Timezone;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
use Magento\Framework\View\Element\Html\Date;
@@ -50,7 +52,7 @@ class DobTest extends TestCase
const YEAR = '2014';
// Value of date('Y', strtotime(self::DATE))
- const DATE_FORMAT = 'M/d/Y';
+ const DATE_FORMAT = 'M/dd/y';
/** Constants used by Dob::setDateInput($code, $html) */
const DAY_HTML =
@@ -90,6 +92,16 @@ class DobTest extends TestCase
*/
private $_locale;
+ /**
+ * @var EncoderInterface
+ */
+ private $encoder;
+
+ /**
+ * @var ResolverInterface
+ */
+ private $localeResolver;
+
/**
* @inheritDoc
*/
@@ -109,17 +121,18 @@ protected function setUp(): void
$cache->expects($this->any())->method('getFrontend')->willReturn($frontendCache);
$objectManager = new ObjectManager($this);
- $localeResolver = $this->getMockForAbstractClass(ResolverInterface::class);
- $localeResolver->expects($this->any())
+ $this->localeResolver = $this->getMockForAbstractClass(ResolverInterface::class);
+ $this->localeResolver->expects($this->any())
->method('getLocale')
->willReturnCallback(
function () {
return $this->_locale;
}
);
+ $localeResolver = $this->localeResolver;
$timezone = $objectManager->getObject(
Timezone::class,
- ['localeResolver' => $localeResolver]
+ ['localeResolver' => $localeResolver, 'dateFormatterFactory' => new DateFormatterFactory()]
);
$this->_locale = Resolver::DEFAULT_LOCALE;
@@ -156,12 +169,17 @@ function () use ($timezone, $localeResolver) {
}
);
+ $this->encoder = $this->getMockForAbstractClass(EncoderInterface::class);
+
$this->_block = new Dob(
$this->context,
$this->createMock(Address::class),
$this->customerMetadata,
$this->createMock(Date::class),
- $this->filterFactory
+ $this->filterFactory,
+ [],
+ $this->encoder,
+ $this->localeResolver
);
}
@@ -355,10 +373,15 @@ public function getDateFormatDataProvider(): array
[
'ar_SA',
preg_replace(
- '/[^MmDdYy\/\.\-]/',
- '',
- (new \IntlDateFormatter('ar_SA', \IntlDateFormatter::SHORT, \IntlDateFormatter::NONE))
- ->getPattern()
+ '/(?create('ar_SA', \IntlDateFormatter::SHORT, \IntlDateFormatter::NONE)
+ ->getPattern()
+ )
)
],
[Resolver::DEFAULT_LOCALE, self::DATE_FORMAT],
@@ -596,4 +619,80 @@ public function testGetHtmlExtraParamsWithRequiredOption()
$this->_block->getHtmlExtraParams()
);
}
+
+ /**
+ * Tests getTranslatedCalendarConfigJson()
+ *
+ * @param string $locale
+ * @param array $expectedArray
+ * @param string $expectedJson
+ * @dataProvider getTranslatedCalendarConfigJsonDataProvider
+ * @return void
+ */
+ public function testGetTranslatedCalendarConfigJson(
+ string $locale,
+ array $expectedArray,
+ string $expectedJson
+ ): void {
+ $this->_locale = $locale;
+
+ $this->encoder->expects($this->once())
+ ->method('encode')
+ ->with($expectedArray)
+ ->willReturn($expectedJson);
+
+ $this->assertEquals(
+ $expectedJson,
+ $this->_block->getTranslatedCalendarConfigJson()
+ );
+ }
+
+ /**
+ * Provider for testGetTranslatedCalendarConfigJson
+ *
+ * @return array
+ */
+ public function getTranslatedCalendarConfigJsonDataProvider()
+ {
+ return [
+ [
+ 'locale' => 'en_US',
+ 'expectedArray' => [
+ 'closeText' => 'Done',
+ 'prevText' => 'Prev',
+ 'nextText' => 'Next',
+ 'currentText' => 'Today',
+ 'monthNames' => ['January', 'February', 'March', 'April', 'May', 'June',
+ 'July', 'August', 'September', 'October', 'November', 'December'],
+ 'monthNamesShort' => ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+ 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
+ 'dayNames' => ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
+ 'dayNamesShort' => ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+ 'dayNamesMin' => ['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'],
+ ],
+ // phpcs:disable Generic.Files.LineLength.TooLong
+ 'expectedJson' => '{"closeText":"Done","prevText":"Prev","nextText":"Next","currentText":"Today","monthNames":["January","February","March","April","May","June","July","August","September","October","November","December"],"monthNamesShort":["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"dayNames":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"dayNamesShort":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"dayNamesMin":["Su","Mo","Tu","We","Th","Fr","Sa"]}'
+ // phpcs:enable Generic.Files.LineLength.TooLong
+ ],
+ [
+ 'locale' => 'de_DE',
+ 'expectedArray' => [
+ 'closeText' => 'Done',
+ 'prevText' => 'Prev',
+ 'nextText' => 'Next',
+ 'currentText' => 'Today',
+ 'monthNames' => ['Januar', 'Februar', 'März', 'April', 'Mai', 'Juni',
+ 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'],
+ 'monthNamesShort' => ['Jan.', 'Feb.', 'März', 'Apr.', 'Mai', 'Juni',
+ 'Juli', 'Aug.', 'Sept.', 'Okt.', 'Nov.', 'Dez.'],
+ 'dayNames' => ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'],
+ 'dayNamesShort' => ['So.', 'Mo.', 'Di.', 'Mi.', 'Do.', 'Fr.', 'Sa.'],
+ 'dayNamesMin' => ['So.', 'Mo.', 'Di.', 'Mi.', 'Do.', 'Fr.', 'Sa.'],
+ ],
+ // phpcs:disable Generic.Files.LineLength.TooLong
+ 'expectedJson' => '{"closeText":"Done","prevText":"Prev","nextText":"Next","currentText":"Today","monthNames":["Januar","Februar","M\u00e4rz","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"],"monthNamesShort":["Jan.","Feb.","M\u00e4rz","Apr.","Mai","Juni","Juli","Aug.","Sept.","Okt.","Nov.","Dez."],"dayNames":["Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag"],"dayNamesShort":["So.","Mo.","Di.","Mi.","Do.","Fr.","Sa."],"dayNamesMin":["So.","Mo.","Di.","Mi.","Do.","Fr.","Sa."]}'
+ // phpcs:enable Generic.Files.LineLength.TooLong
+ ],
+ ];
+ }
}
diff --git a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ViewfileTest.php b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ViewfileTest.php
index 8cb5957cbd672..ea8a37127e85d 100644
--- a/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ViewfileTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Controller/Adminhtml/Index/ViewfileTest.php
@@ -257,11 +257,7 @@ public function testExecuteInvalidFile()
$this->urlDecoderMock->expects($this->once())->method('decode')->with($decodedFile)->willReturn($file);
$fileFactoryMock = $this->createMock(
- FileFactory::class,
- [],
- [],
- '',
- false
+ FileFactory::class
);
$controller = $this->objectManager->getObject(
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/BillingTest.php b/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/BillingTest.php
index cd7154de14858..65f9b62b426c0 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/BillingTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/BillingTest.php
@@ -12,7 +12,6 @@
use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
use Magento\Framework\DataObject;
use PHPUnit\Framework\TestCase;
-use Psr\Log\LoggerInterface;
class BillingTest extends TestCase
{
@@ -23,10 +22,7 @@ class BillingTest extends TestCase
protected function setUp(): void
{
- $logger = $this->getMockBuilder(LoggerInterface::class)
- ->getMock();
- /** @var LoggerInterface $logger */
- $this->testable = new Billing($logger);
+ $this->testable = new Billing();
}
public function testBeforeSave()
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/ShippingTest.php b/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/ShippingTest.php
index 3947a01582313..1f5485309cc19 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/ShippingTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Customer/Attribute/Backend/ShippingTest.php
@@ -12,7 +12,6 @@
use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
use Magento\Framework\DataObject;
use PHPUnit\Framework\TestCase;
-use Psr\Log\LoggerInterface;
class ShippingTest extends TestCase
{
@@ -23,10 +22,7 @@ class ShippingTest extends TestCase
protected function setUp(): void
{
- $logger = $this->getMockBuilder(LoggerInterface::class)
- ->getMock();
- /** @var LoggerInterface $logger */
- $this->testable = new Shipping($logger);
+ $this->testable = new Shipping();
}
public function testBeforeSave()
diff --git a/app/code/Magento/Customer/Test/Unit/Model/FileProcessorTest.php b/app/code/Magento/Customer/Test/Unit/Model/FileProcessorTest.php
index 62964a311af42..e1c771d79694e 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/FileProcessorTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/FileProcessorTest.php
@@ -11,10 +11,13 @@
use Magento\Customer\Api\CustomerMetadataInterface;
use Magento\Customer\Model\FileProcessor;
use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ObjectManager;
use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\File\Mime;
use Magento\Framework\Filesystem;
+use Magento\Framework\Filesystem\Directory\ReadInterface;
use Magento\Framework\Filesystem\Directory\WriteInterface;
+use Magento\Framework\ObjectManagerInterface;
use Magento\Framework\Url\EncoderInterface;
use Magento\Framework\UrlInterface;
use Magento\MediaStorage\Model\File\Uploader;
@@ -363,17 +366,73 @@ public function testMoveTemporaryFile()
$path = CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER . '/' . FileProcessor::TMP_DIR . $filePath;
$newPath = $destinationPath . $filePath;
+ $objectManagerMock = $this->getMockForAbstractClass(ObjectManagerInterface::class);
+ $mockFileSystem = $this->createMock(Filesystem::class);
+ $mockRead = $this->createMock(ReadInterface::class);
+ $objectManagerMock->method('get')->willReturn($mockFileSystem);
+ $mockFileSystem->method('getDirectoryRead')->willReturn($mockRead);
+ $mockRead->method('isExist')->willReturn(false);
+ ObjectManager::setInstance($objectManagerMock);
+
$this->mediaDirectory->expects($this->once())
->method('renameFile')
->with($path, $newPath)
->willReturn(true);
+
$model = $this->getModel(CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER);
$this->assertEquals('/f/i' . $filePath, $model->moveTemporaryFile($filePath));
}
+ public function testMoveTemporaryFileNewFileName()
+ {
+ $filePath = '/filename.ext1';
+
+ $destinationPath = 'customer/f/i';
+
+ $this->mediaDirectory->expects($this->once())
+ ->method('create')
+ ->with($destinationPath)
+ ->willReturn(true);
+ $this->mediaDirectory->expects($this->once())
+ ->method('isWritable')
+ ->with($destinationPath)
+ ->willReturn(true);
+ $this->mediaDirectory->expects($this->once())
+ ->method('getAbsolutePath')
+ ->with($destinationPath)
+ ->willReturn('/' . $destinationPath);
+
+ $path = CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER . '/' . FileProcessor::TMP_DIR . $filePath;
+
+ $objectManagerMock = $this->getMockForAbstractClass(ObjectManagerInterface::class);
+ $mockFileSystem = $this->createMock(Filesystem::class);
+ $mockRead = $this->createMock(ReadInterface::class);
+ $objectManagerMock->method('get')->willReturn($mockFileSystem);
+ $mockFileSystem->method('getDirectoryRead')->willReturn($mockRead);
+ $mockRead->method('isExist')->willReturnOnConsecutiveCalls(true, true, false);
+ ObjectManager::setInstance($objectManagerMock);
+
+ $this->mediaDirectory->expects($this->once())
+ ->method('renameFile')
+ ->with($path, 'customer/f/i/filename_2.ext1')
+ ->willReturn(true);
+
+
+ $model = $this->getModel(CustomerMetadataInterface::ENTITY_TYPE_CUSTOMER);
+ $this->assertEquals('/f/i/filename_2.ext1', $model->moveTemporaryFile($filePath));
+ }
+
public function testMoveTemporaryFileWithException()
{
+ $objectManagerMock = $this->getMockForAbstractClass(ObjectManagerInterface::class);
+ $mockFileSystem = $this->createMock(Filesystem::class);
+ $mockRead = $this->createMock(ReadInterface::class);
+ $objectManagerMock->method($this->logicalOr('get', 'create'))->willReturn($mockFileSystem);
+ $mockFileSystem->method('getDirectoryRead')->willReturn($mockRead);
+ $mockRead->method('isExist')->willReturn(false);
+ ObjectManager::setInstance($objectManagerMock);
+
$this->expectException(LocalizedException::class);
$this->expectExceptionMessage('Something went wrong while saving the file');
diff --git a/app/code/Magento/Customer/Test/Unit/Model/ForgotPasswordToken/ConfirmCustomerByTokenTest.php b/app/code/Magento/Customer/Test/Unit/Model/ForgotPasswordToken/ConfirmCustomerByTokenTest.php
new file mode 100644
index 0000000000000..4a6769e0653ad
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Model/ForgotPasswordToken/ConfirmCustomerByTokenTest.php
@@ -0,0 +1,95 @@
+customerMock = $this->getMockBuilder(CustomerInterface::class)
+ ->disableOriginalConstructor()
+ ->addMethods(['setData'])
+ ->getMockForAbstractClass();
+
+ $this->customerRepositoryMock = $this->createMock(CustomerRepositoryInterface::class);
+
+ $getCustomerByTokenMock = $this->createMock(GetCustomerByToken::class);
+ $getCustomerByTokenMock->method('execute')->willReturn($this->customerMock);
+
+ $this->model = new ConfirmCustomerByToken($getCustomerByTokenMock, $this->customerRepositoryMock);
+ }
+
+ /**
+ * Confirm customer with confirmation
+ *
+ * @return void
+ */
+ public function testExecuteWithConfirmation(): void
+ {
+ $this->customerMock->expects($this->once())
+ ->method('getConfirmation')
+ ->willReturn('GWz2ik7Kts517MXAgrm4DzfcxKayGCm4');
+ $this->customerMock->expects($this->once())
+ ->method('setData')
+ ->with('ignore_validation_flag', true);
+ $this->customerMock->expects($this->once())
+ ->method('setConfirmation')
+ ->with(null);
+ $this->customerRepositoryMock->expects($this->once())
+ ->method('save')
+ ->with($this->customerMock);
+
+ $this->model->execute(self::STUB_RESET_PASSWORD_TOKEN);
+ }
+
+ /**
+ * Confirm customer without confirmation
+ *
+ * @return void
+ */
+ public function testExecuteWithoutConfirmation(): void
+ {
+ $this->customerMock->expects($this->once())
+ ->method('getConfirmation')
+ ->willReturn(null);
+ $this->customerRepositoryMock->expects($this->never())
+ ->method('save');
+
+ $this->model->execute(self::STUB_RESET_PASSWORD_TOKEN);
+ }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Plugin/CustomerRepository/TransactionWrapperTest.php b/app/code/Magento/Customer/Test/Unit/Model/Plugin/CustomerRepository/TransactionWrapperTest.php
index c00b5cce02146..634b0d73219db 100644
--- a/app/code/Magento/Customer/Test/Unit/Model/Plugin/CustomerRepository/TransactionWrapperTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Model/Plugin/CustomerRepository/TransactionWrapperTest.php
@@ -62,7 +62,7 @@ protected function setUp(): void
$this->closureMock = function () use ($customerMock) {
return $customerMock;
};
- $this->rollbackClosureMock = function () use ($customerMock) {
+ $this->rollbackClosureMock = function () {
throw new \Exception(self::ERROR_MSG);
};
diff --git a/app/code/Magento/Customer/Test/Unit/Model/StoreSwitcher/RedirectDataPostprocessorTest.php b/app/code/Magento/Customer/Test/Unit/Model/StoreSwitcher/RedirectDataPostprocessorTest.php
new file mode 100644
index 0000000000000..0be0212652058
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Model/StoreSwitcher/RedirectDataPostprocessorTest.php
@@ -0,0 +1,136 @@
+createMock(CustomerRegistry::class);
+ $this->session = $this->createMock(Session::class);
+ $logger = $this->createMock(LoggerInterface::class);
+ $this->model = new RedirectDataPostprocessor(
+ $customerRegistry,
+ $this->session,
+ $logger
+ );
+
+ $store1 = $this->createConfiguredMock(
+ StoreInterface::class,
+ [
+ 'getCode' => 'en',
+ 'getId' => 1,
+ ]
+ );
+ $store2 = $this->createConfiguredMock(
+ StoreInterface::class,
+ [
+ 'getCode' => 'fr',
+ 'getId' => 2,
+ ]
+ );
+ $this->context = $this->createConfiguredMock(
+ ContextInterface::class,
+ [
+ 'getFromStore' => $store2,
+ 'getTargetStore' => $store1,
+ ]
+ );
+
+ $customerRegistry->method('retrieve')
+ ->willReturnCallback(
+ function ($id) {
+ switch ($id) {
+ case 1:
+ throw new NoSuchEntityException(__('Customer does not exist'));
+ case 2:
+ throw new LocalizedException(__('Something went wrong'));
+ default:
+ $customer = $this->createMock(Customer::class);
+ $customer->method('getSharedStoreIds')
+ ->willReturn(!($id % 2) ? [1, 2] : [2]);
+ $customer->method('getDataModel')
+ ->willReturn(
+ $this->createConfiguredMock(
+ CustomerInterface::class,
+ [
+ 'getId' => $id
+ ]
+ )
+ );
+ return $customer;
+ }
+ }
+ );
+ }
+
+ public function testProcessShouldLoginCustomerIfCustomerIsRegisteredInTargetStore(): void
+ {
+ $data = ['customer_id' => 4];
+ $this->session->expects($this->once())
+ ->method('setCustomerDataAsLoggedIn');
+ $this->model->process($this->context, $data);
+ }
+
+ public function testProcessShouldNotLoginCustomerIfNotRegisteredInTargetStore(): void
+ {
+ $data = ['customer_id' => 3];
+ $this->session->expects($this->never())
+ ->method('setCustomerDataAsLoggedIn');
+ $this->model->process($this->context, $data);
+ }
+
+ public function testProcessShouldThrowExceptionIfCustomerDoesNotExist(): void
+ {
+ $this->expectErrorMessage('Something went wrong.');
+ $data = ['customer_id' => 1];
+ $this->session->expects($this->never())
+ ->method('setCustomerDataAsLoggedIn');
+ $this->model->process($this->context, $data);
+ }
+
+ public function testProcessShouldThrowExceptionIfAnErrorOccur(): void
+ {
+ $this->expectErrorMessage('Something went wrong.');
+ $data = ['customer_id' => 2];
+ $this->session->expects($this->never())
+ ->method('setCustomerDataAsLoggedIn');
+ $this->model->process($this->context, $data);
+ }
+}
diff --git a/app/code/Magento/Customer/Test/Unit/Model/StoreSwitcher/RedirectDataPreprocessorTest.php b/app/code/Magento/Customer/Test/Unit/Model/StoreSwitcher/RedirectDataPreprocessorTest.php
new file mode 100644
index 0000000000000..3d0c9c2e0a630
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Unit/Model/StoreSwitcher/RedirectDataPreprocessorTest.php
@@ -0,0 +1,121 @@
+createMock(CustomerRegistry::class);
+ $logger = $this->createMock(LoggerInterface::class);
+ $this->session = $this->createMock(Session::class);
+ $this->model = new RedirectDataPreprocessor(
+ $customerRegistry,
+ $this->session,
+ $logger
+ );
+
+ $store1 = $this->createConfiguredMock(
+ StoreInterface::class,
+ [
+ 'getCode' => 'en',
+ 'getId' => 1,
+ ]
+ );
+ $store2 = $this->createConfiguredMock(
+ StoreInterface::class,
+ [
+ 'getCode' => 'fr',
+ 'getId' => 2,
+ ]
+ );
+ $this->context = $this->createConfiguredMock(
+ ContextInterface::class,
+ [
+ 'getFromStore' => $store2,
+ 'getTargetStore' => $store1,
+ ]
+ );
+
+ $customerRegistry->method('retrieve')
+ ->willReturnCallback(
+ function ($id) {
+ switch ($id) {
+ case 1:
+ throw new NoSuchEntityException(__('Customer does not exist'));
+ case 2:
+ throw new LocalizedException(__('Something went wrong'));
+ default:
+ $customer = $this->createMock(Customer::class);
+ $customer->method('getSharedStoreIds')
+ ->willReturn(!($id % 2) ? [1, 2] : [2]);
+ $customer->method('getId')
+ ->willReturn($id);
+ return $customer;
+ }
+ }
+ );
+ }
+
+ /**
+ * @dataProvider processDataProvider
+ * @param int|null $customerId
+ * @param array $data
+ */
+ public function testProcess(?int $customerId, array $data): void
+ {
+ $this->session->method('isLoggedIn')
+ ->willReturn(true);
+ $this->session->method('getCustomerId')
+ ->willReturn($customerId);
+ $this->assertEquals($data, $this->model->process($this->context, []));
+ }
+
+ /**
+ * @return array
+ */
+ public function processDataProvider(): array
+ {
+ return [
+ [1, []],
+ [2, []],
+ [3, []],
+ [4, ['customer_id' => 4]]
+ ];
+ }
+}
diff --git a/app/code/Magento/Customer/etc/frontend/di.xml b/app/code/Magento/Customer/etc/frontend/di.xml
index 2a6e36a1ea3d7..31f3e11522e12 100644
--- a/app/code/Magento/Customer/etc/frontend/di.xml
+++ b/app/code/Magento/Customer/etc/frontend/di.xml
@@ -113,4 +113,18 @@
+
+
+
+ - Magento\Customer\Model\StoreSwitcher\RedirectDataPreprocessor
+
+
+
+
+
+
+ - Magento\Customer\Model\StoreSwitcher\RedirectDataPostprocessor
+
+
+
diff --git a/app/code/Magento/Customer/etc/webapi.xml b/app/code/Magento/Customer/etc/webapi.xml
index 38717619406aa..68c8da8744a05 100644
--- a/app/code/Magento/Customer/etc/webapi.xml
+++ b/app/code/Magento/Customer/etc/webapi.xml
@@ -227,7 +227,7 @@
-
diff --git a/app/code/Magento/Customer/etc/webapi_rest/di.xml b/app/code/Magento/Customer/etc/webapi_rest/di.xml
index d07d1a61c3d62..18627b68320ed 100644
--- a/app/code/Magento/Customer/etc/webapi_rest/di.xml
+++ b/app/code/Magento/Customer/etc/webapi_rest/di.xml
@@ -31,4 +31,6 @@
+ true
customer_address_listing.customer_address_listing_data_source
- customer_address_listing.customer_address_listing.customer_address_listing_columns.ids
+ customer_address_listing.customer_address_listing.customer_address_columns.ids
true
customer_address_listing
customer_address_listing
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
index 7f09361e4d505..a4a500b7d1b37 100644
--- a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
@@ -58,6 +58,13 @@ $viewModel = $block->getViewModel();
+
+
+
+
'
);
} catch (\Exception $e) {
foreach ($this->getErrorMessages($errorAggregator) as $errorMessage) {
@@ -101,6 +103,8 @@ protected function addErrorMessages(
}
/**
+ * Get all Error Messages from Import Results
+ *
* @param \Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface $errorAggregator
* @return array
*/
@@ -115,6 +119,8 @@ protected function getErrorMessages(ProcessingErrorAggregatorInterface $errorAgg
}
/**
+ * Get System Generated Exception
+ *
* @param ProcessingErrorAggregatorInterface $errorAggregator
* @return \Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingError[]
*/
@@ -124,6 +130,8 @@ protected function getSystemExceptions(ProcessingErrorAggregatorInterface $error
}
/**
+ * Generate Error Report File
+ *
* @param ProcessingErrorAggregatorInterface $errorAggregator
* @return string
*/
@@ -141,6 +149,8 @@ protected function createErrorReport(ProcessingErrorAggregatorInterface $errorAg
}
/**
+ * Get Import History Url
+ *
* @param string $fileName
* @return string
*/
diff --git a/app/code/Magento/ImportExport/Model/Export/Consumer.php b/app/code/Magento/ImportExport/Model/Export/Consumer.php
index 27019780269c4..955f96fe3de2e 100644
--- a/app/code/Magento/ImportExport/Model/Export/Consumer.php
+++ b/app/code/Magento/ImportExport/Model/Export/Consumer.php
@@ -70,8 +70,8 @@ public function process(ExportInfoInterface $exportInfo)
try {
$data = $this->exportManager->export($exportInfo);
$fileName = $exportInfo->getFileName();
- $directory = $this->filesystem->getDirectoryWrite(DirectoryList::VAR_DIR);
- $directory->writeFile('export/' . $fileName, $data);
+ $directory = $this->filesystem->getDirectoryWrite(DirectoryList::VAR_EXPORT);
+ $directory->writeFile($fileName, $data);
$this->notifier->addMajor(
__('Your export file is ready'),
diff --git a/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php b/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php
index 5ea6227231543..2f8bfdcf70a5e 100644
--- a/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php
+++ b/app/code/Magento/ImportExport/Model/Import/ErrorProcessing/ProcessingErrorAggregator.php
@@ -242,7 +242,7 @@ public function getAllErrors()
}
$errors = array_values($this->items['rows']);
- return array_merge(...$errors);
+ return array_merge([], ...$errors);
}
/**
@@ -253,14 +253,14 @@ public function getAllErrors()
*/
public function getErrorsByCode(array $codes)
{
- $result = [[]];
+ $result = [];
foreach ($codes as $code) {
if (isset($this->items['codes'][$code])) {
$result[] = $this->items['codes'][$code];
}
}
- return array_merge(...$result);
+ return array_merge([], ...$result);
}
/**
diff --git a/app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Import/Frame/ResultTest.php b/app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Import/Frame/ResultTest.php
new file mode 100644
index 0000000000000..218babc2b48f0
--- /dev/null
+++ b/app/code/Magento/ImportExport/Test/Unit/Block/Adminhtml/Import/Frame/ResultTest.php
@@ -0,0 +1,110 @@
+contextMock = $this->createMock(Context::class);
+ $this->encoderMock = $this->getMockBuilder(EncoderInterface::class)
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+
+ $this->escaperMock = $this->createPartialMock(Escaper::class, ['escapeHtml']);
+ $this->contextMock->expects($this->once())->method('getEscaper')->willReturn($this->escaperMock);
+ $this->result = new Result(
+ $this->contextMock,
+ $this->encoderMock
+ );
+ }
+
+ /**
+ * Test error message
+ *
+ * @return void
+ */
+ public function testAddError(): void
+ {
+ $errors = ['first error', 'second error','third error'];
+ $this->escaperMock
+ ->expects($this->exactly(count($errors)))
+ ->method('escapeHtml')
+ ->willReturnOnConsecutiveCalls(...array_values($errors));
+
+ $this->result->addError($errors);
+ $this->assertEquals(count($errors), count($this->result->getMessages()['error']));
+ }
+
+ /**
+ * Test success message
+ *
+ * @return void
+ */
+ public function testAddSuccess(): void
+ {
+ $success = ['first message', 'second message','third message'];
+ $this->escaperMock
+ ->expects($this->exactly(count($success)))
+ ->method('escapeHtml')
+ ->willReturnOnConsecutiveCalls(...array_values($success));
+
+ $this->result->addSuccess($success);
+ $this->assertEquals(count($success), count($this->result->getMessages()['success']));
+ }
+
+ /**
+ * Test Add Notice message
+ *
+ * @return void
+ */
+ public function testAddNotice(): void
+ {
+ $notice = ['notice 1', 'notice 2','notice 3'];
+
+ $this->result->addNotice($notice);
+ $this->assertEquals(count($notice), count($this->result->getMessages()['notice']));
+ }
+}
diff --git a/app/code/Magento/ImportExport/Ui/DataProvider/ExportFileDataProvider.php b/app/code/Magento/ImportExport/Ui/DataProvider/ExportFileDataProvider.php
index 2b5af6ab5ca8d..71614bafd138e 100644
--- a/app/code/Magento/ImportExport/Ui/DataProvider/ExportFileDataProvider.php
+++ b/app/code/Magento/ImportExport/Ui/DataProvider/ExportFileDataProvider.php
@@ -13,6 +13,7 @@
use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\Filesystem;
use Magento\Framework\Filesystem\Io\File;
+use Magento\Framework\Filesystem\Directory\WriteInterface;
/**
* Data provider for export grid.
@@ -29,6 +30,11 @@ class ExportFileDataProvider extends DataProvider
*/
private $file;
+ /**
+ * @var WriteInterface
+ */
+ private $directory;
+
/**
* @var Filesystem
*/
@@ -48,6 +54,7 @@ class ExportFileDataProvider extends DataProvider
* @param array $meta
* @param array $data
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
+ * @throws \Magento\Framework\Exception\FileSystemException
*/
public function __construct(
string $name,
@@ -78,6 +85,7 @@ public function __construct(
);
$this->fileIO = $fileIO ?: ObjectManager::getInstance()->get(File::class);
+ $this->directory = $filesystem->getDirectoryWrite(DirectoryList::VAR_EXPORT);
}
/**
@@ -88,13 +96,12 @@ public function __construct(
*/
public function getData()
{
- $directory = $this->fileSystem->getDirectoryRead(DirectoryList::VAR_DIR);
$emptyResponse = ['items' => [], 'totalRecords' => 0];
- if (!$this->file->isExists($directory->getAbsolutePath() . 'export/')) {
+ if (!$this->directory->isExist($this->directory->getAbsolutePath())) {
return $emptyResponse;
}
- $files = $this->getExportFiles($directory->getAbsolutePath() . 'export/');
+ $files = $this->getExportFiles($this->directory->getAbsolutePath());
if (empty($files)) {
return $emptyResponse;
}
@@ -121,12 +128,15 @@ public function getData()
*/
private function getPathToExportFile($file): string
{
- $directory = $this->fileSystem->getDirectoryRead(DirectoryList::VAR_DIR);
+ $directory = $this->fileSystem->getDirectoryRead(DirectoryList::VAR_EXPORT);
$delimiter = '/';
$cutPath = explode(
$delimiter,
- $directory->getAbsolutePath() . 'export'
+ $directory->getAbsolutePath()
);
+ // remove . from dirname if file path is not absolute in the file system but just a file name
+ $file['dirname'] = $file['dirname'] !== '.' ? $file['dirname'] : '';
+
$filePath = explode(
$delimiter,
$file['dirname']
@@ -148,14 +158,14 @@ private function getPathToExportFile($file): string
private function getExportFiles(string $directoryPath): array
{
$sortedFiles = [];
- $files = $this->file->readDirectoryRecursively($directoryPath);
+ $files = $this->directory->getDriver()->readDirectoryRecursively($directoryPath);
if (empty($files)) {
return [];
}
foreach ($files as $filePath) {
- if ($this->file->isFile($filePath)) {
- //phpcs:ignore Magento2.Functions.DiscouragedFunction
- $sortedFiles[filemtime($filePath)] = $filePath;
+ if ($this->directory->isFile($filePath)) {
+ $fileModificationTime = $this->directory->stat($filePath)['mtime'];
+ $sortedFiles[$fileModificationTime] = $filePath;
}
}
//sort array elements using key value
diff --git a/app/code/Magento/ImportExport/etc/adminhtml/di.xml b/app/code/Magento/ImportExport/etc/adminhtml/di.xml
index 04ee726349123..7b124957d5f57 100644
--- a/app/code/Magento/ImportExport/etc/adminhtml/di.xml
+++ b/app/code/Magento/ImportExport/etc/adminhtml/di.xml
@@ -16,11 +16,13 @@
Magento\Framework\Serialize\Serializer\Json
+
Magento\Framework\Filesystem\Driver\File
+
Magento\Framework\Filesystem\Driver\File
diff --git a/app/code/Magento/ImportExport/i18n/en_US.csv b/app/code/Magento/ImportExport/i18n/en_US.csv
index a4943fe72826f..a91a76612fd9f 100644
--- a/app/code/Magento/ImportExport/i18n/en_US.csv
+++ b/app/code/Magento/ImportExport/i18n/en_US.csv
@@ -127,3 +127,4 @@ Summary,Summary
"File %1 deleted","File %1 deleted"
"Please provide valid export file name","Please provide valid export file name"
"%1 is not a valid file","%1 is not a valid file"
+"Content of uploaded file was changed, please re-upload the file","Content of uploaded file was changed, please re-upload the file"
diff --git a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
index 69779baba381d..d512ce8182ede 100644
--- a/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
+++ b/app/code/Magento/ImportExport/view/adminhtml/templates/import/form/before.phtml
@@ -7,6 +7,10 @@
escapeHtml(
+ __('Content of uploaded file was changed, please re-upload the file')
+);
?>
escapeJs($block->getUrl('*/*/download/', ['filename' => 'entity-name']))}',
+ /**
+ * Loaded file last modified
+ * @type {int|null}
+ */
+ loadedFileLastModified: null,
+
/**
* Reset selected index
* @param {string} elementId
@@ -162,11 +172,50 @@ require([
}
},
+ /**
+ * Refresh loaded file last modified
+ */
+ refreshLoadedFileLastModified: function(e) {
+ if (jQuery(e)[0].files.length > 0) {
+ this.loadedFileLastModified = jQuery(e)[0].files[0].lastModified;
+ } else {
+ this.loadedFileLastModified = null;
+ }
+ },
+
/**
* Post form data to dynamic iframe.
* @param {string} newActionUrl OPTIONAL Change form action to this if specified
*/
postToFrame: function(newActionUrl) {
+ var fileUploader = document.getElementById('{$fieldNameSourceFile}');
+
+ if (fileUploader.files.length > 0) {
+ var file = fileUploader.files[0],
+ ifrElName = this.ifrElemName,
+ reader = new FileReader();
+
+ reader.readAsText(file, "UTF-8");
+
+ reader.onerror = function () {
+ jQuery('body').loader('hide');
+ alert({
+ content: '{$uploaderErrorMessage}'
+ });
+ fileUploader.value = null;
+ jQuery('iframe#' + ifrElName).remove();
+ return;
+ }
+
+ if (file.lastModified !== this.loadedFileLastModified) {
+ alert({
+ content: '{$uploaderErrorMessage}'
+ });
+ fileUploader.value = null;
+ return;
+ }
+ }
+
if (!jQuery('[name="' + this.ifrElemName + '"]').length) {
jQuery('body').append('');
jQuery('iframe#' + this.ifrElemName).attr('display', 'none');
diff --git a/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php b/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
index 775f585519947..d6e6c2f1fc2cb 100644
--- a/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
+++ b/app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php
@@ -6,6 +6,7 @@
namespace Magento\Indexer\Console\Command;
+use Magento\Framework\App\ObjectManager;
use Magento\Framework\App\ObjectManagerFactory;
use Magento\Framework\Console\Cli;
use Magento\Framework\Exception\LocalizedException;
@@ -14,11 +15,13 @@
use Magento\Framework\Indexer\IndexerInterface;
use Magento\Framework\Indexer\IndexerRegistry;
use Magento\Framework\Indexer\StateInterface;
+use Magento\Indexer\Model\Processor\MakeSharedIndexValid;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
/**
* Command to run indexers
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class IndexerReindexCommand extends AbstractIndexerManageCommand
{
@@ -42,18 +45,26 @@ class IndexerReindexCommand extends AbstractIndexerManageCommand
*/
private $dependencyInfoProvider;
+ /**
+ * @var MakeSharedIndexValid|null
+ */
+ private $makeSharedValid;
+
/**
* @param ObjectManagerFactory $objectManagerFactory
* @param IndexerRegistry|null $indexerRegistry
* @param DependencyInfoProvider|null $dependencyInfoProvider
+ * @param MakeSharedIndexValid|null $makeSharedValid
*/
public function __construct(
ObjectManagerFactory $objectManagerFactory,
IndexerRegistry $indexerRegistry = null,
- DependencyInfoProvider $dependencyInfoProvider = null
+ DependencyInfoProvider $dependencyInfoProvider = null,
+ MakeSharedIndexValid $makeSharedValid = null
) {
$this->indexerRegistry = $indexerRegistry;
$this->dependencyInfoProvider = $dependencyInfoProvider;
+ $this->makeSharedValid = $makeSharedValid;
parent::__construct($objectManagerFactory);
}
@@ -74,7 +85,7 @@ protected function configure()
*/
protected function execute(InputInterface $input, OutputInterface $output)
{
- $returnValue = Cli::RETURN_FAILURE;
+ $returnValue = Cli::RETURN_SUCCESS;
foreach ($this->getIndexers($input) as $indexer) {
try {
$this->validateIndexerStatus($indexer);
@@ -88,8 +99,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
// Skip indexers having shared index that was already complete
if (!in_array($sharedIndex, $this->sharedIndexesComplete)) {
$indexer->reindexAll();
- if ($sharedIndex) {
- $this->validateSharedIndex($sharedIndex);
+ if (!empty($sharedIndex) && $this->getMakeSharedValid()->execute($sharedIndex)) {
+ $this->sharedIndexesComplete[] = $sharedIndex;
}
}
$resultTime = microtime(true) - $startTime;
@@ -97,14 +108,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
$output->writeln(
__('has been rebuilt successfully in %time', ['time' => gmdate('H:i:s', $resultTime)])
);
- $returnValue = Cli::RETURN_SUCCESS;
} catch (LocalizedException $e) {
$output->writeln(__('exception: %message', ['message' => $e->getMessage()]));
+ $returnValue = Cli::RETURN_FAILURE;
} catch (\Exception $e) {
$output->writeln('process unknown error:');
$output->writeln($e->getMessage());
$output->writeln($e->getTraceAsString(), OutputInterface::VERBOSITY_DEBUG);
+ $returnValue = Cli::RETURN_FAILURE;
}
}
@@ -124,16 +136,16 @@ protected function getIndexers(InputInterface $input)
return $indexers;
}
- $relatedIndexers = [[]];
- $dependentIndexers = [[]];
+ $relatedIndexers = [];
+ $dependentIndexers = [];
foreach ($indexers as $indexer) {
$relatedIndexers[] = $this->getRelatedIndexerIds($indexer->getId());
$dependentIndexers[] = $this->getDependentIndexerIds($indexer->getId());
}
- $relatedIndexers = $relatedIndexers ? array_unique(array_merge(...$relatedIndexers)) : [];
- $dependentIndexers = $dependentIndexers ? array_merge(...$dependentIndexers) : [];
+ $relatedIndexers = array_unique(array_merge([], ...$relatedIndexers));
+ $dependentIndexers = array_merge([], ...$dependentIndexers);
$invalidRelatedIndexers = [];
foreach ($relatedIndexers as $relatedIndexer) {
@@ -164,12 +176,12 @@ protected function getIndexers(InputInterface $input)
*/
private function getRelatedIndexerIds(string $indexerId): array
{
- $relatedIndexerIds = [[]];
+ $relatedIndexerIds = [];
foreach ($this->getDependencyInfoProvider()->getIndexerIdsToRunBefore($indexerId) as $relatedIndexerId) {
$relatedIndexerIds[] = [$relatedIndexerId];
$relatedIndexerIds[] = $this->getRelatedIndexerIds($relatedIndexerId);
}
- $relatedIndexerIds = $relatedIndexerIds ? array_unique(array_merge(...$relatedIndexerIds)) : [];
+ $relatedIndexerIds = array_unique(array_merge([], ...$relatedIndexerIds));
return $relatedIndexerIds;
}
@@ -182,7 +194,7 @@ private function getRelatedIndexerIds(string $indexerId): array
*/
private function getDependentIndexerIds(string $indexerId): array
{
- $dependentIndexerIds = [[]];
+ $dependentIndexerIds = [];
foreach (array_keys($this->getConfig()->getIndexers()) as $id) {
$dependencies = $this->getDependencyInfoProvider()->getIndexerIdsToRunBefore($id);
if (array_search($indexerId, $dependencies) !== false) {
@@ -190,7 +202,7 @@ private function getDependentIndexerIds(string $indexerId): array
$dependentIndexerIds[] = $this->getDependentIndexerIds($id);
}
}
- $dependentIndexerIds = $dependentIndexerIds ? array_unique(array_merge(...$dependentIndexerIds)) : [];
+ $dependentIndexerIds = array_unique(array_merge([], ...$dependentIndexerIds));
return $dependentIndexerIds;
}
@@ -214,54 +226,6 @@ private function validateIndexerStatus(IndexerInterface $indexer)
}
}
- /**
- * Get indexer ids that have common shared index
- *
- * @param string $sharedIndex
- * @return array
- */
- private function getIndexerIdsBySharedIndex($sharedIndex)
- {
- $indexers = $this->getConfig()->getIndexers();
- $result = [];
- foreach ($indexers as $indexerConfig) {
- if ($indexerConfig['shared_index'] == $sharedIndex) {
- $result[] = $indexerConfig['indexer_id'];
- }
- }
- return $result;
- }
-
- /**
- * Validate indexers by shared index ID
- *
- * @param string $sharedIndex
- * @return $this
- */
- private function validateSharedIndex($sharedIndex)
- {
- if (empty($sharedIndex)) {
- throw new \InvalidArgumentException(
- 'The sharedIndex is an invalid shared index identifier. Verify the identifier and try again.'
- );
- }
- $indexerIds = $this->getIndexerIdsBySharedIndex($sharedIndex);
- if (empty($indexerIds)) {
- return $this;
- }
- foreach ($indexerIds as $indexerId) {
- $indexer = $this->getIndexerRegistry()->get($indexerId);
- /** @var \Magento\Indexer\Model\Indexer\State $state */
- $state = $indexer->getState();
- $state->setStatus(StateInterface::STATUS_WORKING);
- $state->save();
- $state->setStatus(StateInterface::STATUS_VALID);
- $state->save();
- }
- $this->sharedIndexesComplete[] = $sharedIndex;
- return $this;
- }
-
/**
* Get config
*
@@ -277,30 +241,30 @@ private function getConfig()
}
/**
- * Get indexer registry
+ * Get dependency info provider
*
- * @return IndexerRegistry
+ * @return DependencyInfoProvider
* @deprecated 100.2.0
*/
- private function getIndexerRegistry()
+ private function getDependencyInfoProvider()
{
- if (!$this->indexerRegistry) {
- $this->indexerRegistry = $this->getObjectManager()->get(IndexerRegistry::class);
+ if (!$this->dependencyInfoProvider) {
+ $this->dependencyInfoProvider = $this->getObjectManager()->get(DependencyInfoProvider::class);
}
- return $this->indexerRegistry;
+ return $this->dependencyInfoProvider;
}
/**
- * Get dependency info provider
+ * Get MakeSharedIndexValid processor.
*
- * @return DependencyInfoProvider
- * @deprecated 100.2.0
+ * @return MakeSharedIndexValid
*/
- private function getDependencyInfoProvider()
+ private function getMakeSharedValid(): MakeSharedIndexValid
{
- if (!$this->dependencyInfoProvider) {
- $this->dependencyInfoProvider = $this->getObjectManager()->get(DependencyInfoProvider::class);
+ if (!$this->makeSharedValid) {
+ $this->makeSharedValid = $this->getObjectManager()->get(MakeSharedIndexValid::class);
}
- return $this->dependencyInfoProvider;
+
+ return $this->makeSharedValid;
}
}
diff --git a/app/code/Magento/Indexer/Model/Indexer.php b/app/code/Magento/Indexer/Model/Indexer.php
index 2821a46f29416..ac8b9590e58f4 100644
--- a/app/code/Magento/Indexer/Model/Indexer.php
+++ b/app/code/Magento/Indexer/Model/Indexer.php
@@ -13,6 +13,7 @@
use Magento\Framework\Indexer\IndexStructureInterface;
use Magento\Framework\Indexer\StateInterface;
use Magento\Framework\Indexer\StructureFactory;
+use Magento\Framework\Indexer\IndexerInterfaceFactory;
/**
* Indexer model.
@@ -61,6 +62,16 @@ class Indexer extends \Magento\Framework\DataObject implements IndexerInterface
*/
protected $indexersFactory;
+ /**
+ * @var WorkingStateProvider
+ */
+ private $workingStateProvider;
+
+ /**
+ * @var IndexerInterfaceFactory
+ */
+ private $indexerFactory;
+
/**
* @param ConfigInterface $config
* @param ActionFactory $actionFactory
@@ -68,6 +79,8 @@ class Indexer extends \Magento\Framework\DataObject implements IndexerInterface
* @param \Magento\Framework\Mview\ViewInterface $view
* @param Indexer\StateFactory $stateFactory
* @param Indexer\CollectionFactory $indexersFactory
+ * @param WorkingStateProvider $workingStateProvider
+ * @param IndexerInterfaceFactory $indexerFactory
* @param array $data
*/
public function __construct(
@@ -77,6 +90,8 @@ public function __construct(
\Magento\Framework\Mview\ViewInterface $view,
Indexer\StateFactory $stateFactory,
Indexer\CollectionFactory $indexersFactory,
+ WorkingStateProvider $workingStateProvider,
+ IndexerInterfaceFactory $indexerFactory,
array $data = []
) {
$this->config = $config;
@@ -85,6 +100,8 @@ public function __construct(
$this->view = $view;
$this->stateFactory = $stateFactory;
$this->indexersFactory = $indexersFactory;
+ $this->workingStateProvider = $workingStateProvider;
+ $this->indexerFactory = $indexerFactory;
parent::__construct($data);
}
@@ -405,10 +422,20 @@ protected function getStructureInstance()
*/
public function reindexAll()
{
- if ($this->getState()->getStatus() != StateInterface::STATUS_WORKING) {
+ if (!$this->workingStateProvider->isWorking($this->getId())) {
$state = $this->getState();
$state->setStatus(StateInterface::STATUS_WORKING);
$state->save();
+
+ $sharedIndexers = [];
+ $indexerConfig = $this->config->getIndexer($this->getId());
+ if ($indexerConfig['shared_index'] !== null) {
+ $sharedIndexers = $this->getSharedIndexers($indexerConfig['shared_index']);
+ }
+ if (!empty($sharedIndexers)) {
+ $this->suspendSharedViews($sharedIndexers);
+ }
+
if ($this->getView()->isEnabled()) {
$this->getView()->suspend();
}
@@ -416,16 +443,73 @@ public function reindexAll()
$this->getActionInstance()->executeFull();
$state->setStatus(StateInterface::STATUS_VALID);
$state->save();
+ if (!empty($sharedIndexers)) {
+ $this->resumeSharedViews($sharedIndexers);
+ }
$this->getView()->resume();
} catch (\Throwable $exception) {
$state->setStatus(StateInterface::STATUS_INVALID);
$state->save();
+ if (!empty($sharedIndexers)) {
+ $this->resumeSharedViews($sharedIndexers);
+ }
$this->getView()->resume();
throw $exception;
}
}
}
+ /**
+ * Get indexer ids that uses same index
+ *
+ * @param string $sharedIndex
+ * @return array
+ */
+ private function getSharedIndexers(string $sharedIndex) : array
+ {
+ $result = [];
+ foreach (array_keys($this->config->getIndexers()) as $indexerId) {
+ if ($indexerId === $this->getId()) {
+ continue;
+ }
+ $indexerConfig = $this->config->getIndexer($indexerId);
+ if ($indexerConfig['shared_index'] === $sharedIndex) {
+ $indexer = $this->indexerFactory->create();
+ $indexer->load($indexerId);
+ $result[] = $indexer;
+ }
+ }
+ return $result;
+ }
+
+ /**
+ * Suspend views of shared indexers
+ *
+ * @param array $sharedIndexers
+ * @return void
+ */
+ private function suspendSharedViews(array $sharedIndexers) : void
+ {
+ foreach ($sharedIndexers as $indexer) {
+ if ($indexer->getView()->isEnabled()) {
+ $indexer->getView()->suspend();
+ }
+ }
+ }
+
+ /**
+ * Suspend views of shared indexers
+ *
+ * @param array $sharedIndexers
+ * @return void
+ */
+ private function resumeSharedViews(array $sharedIndexers) : void
+ {
+ foreach ($sharedIndexers as $indexer) {
+ $indexer->getView()->resume();
+ }
+ }
+
/**
* Regenerate one row in index by ID
*
diff --git a/app/code/Magento/Indexer/Model/Indexer/CacheCleaner.php b/app/code/Magento/Indexer/Model/Indexer/CacheCleaner.php
index c75a3541ba9c3..1cf7142e07cac 100644
--- a/app/code/Magento/Indexer/Model/Indexer/CacheCleaner.php
+++ b/app/code/Magento/Indexer/Model/Indexer/CacheCleaner.php
@@ -95,6 +95,7 @@ private function cleanCache()
$identities = $this->cacheContext->getIdentities();
if (!empty($identities)) {
$this->appCache->clean($identities);
+ $this->cacheContext->flush();
}
}
}
diff --git a/app/code/Magento/Indexer/Model/Processor.php b/app/code/Magento/Indexer/Model/Processor.php
index 534ea805bb8fc..78b8fa070b155 100644
--- a/app/code/Magento/Indexer/Model/Processor.php
+++ b/app/code/Magento/Indexer/Model/Processor.php
@@ -5,16 +5,23 @@
*/
namespace Magento\Indexer\Model;
+use Magento\Framework\App\ObjectManager;
use Magento\Framework\Indexer\ConfigInterface;
use Magento\Framework\Indexer\IndexerInterface;
use Magento\Framework\Indexer\IndexerInterfaceFactory;
-use Magento\Framework\Indexer\StateInterface;
+use Magento\Framework\Mview\ProcessorInterface;
+use Magento\Indexer\Model\Processor\MakeSharedIndexValid;
/**
* Indexer processor
*/
class Processor
{
+ /**
+ * @var array
+ */
+ private $sharedIndexesComplete = [];
+
/**
* @var ConfigInterface
*/
@@ -31,26 +38,34 @@ class Processor
protected $indexersFactory;
/**
- * @var \Magento\Framework\Mview\ProcessorInterface
+ * @var ProcessorInterface
*/
protected $mviewProcessor;
+ /**
+ * @var MakeSharedIndexValid
+ */
+ protected $makeSharedValid;
+
/**
* @param ConfigInterface $config
* @param IndexerInterfaceFactory $indexerFactory
* @param Indexer\CollectionFactory $indexersFactory
- * @param \Magento\Framework\Mview\ProcessorInterface $mviewProcessor
+ * @param ProcessorInterface $mviewProcessor
+ * @param MakeSharedIndexValid|null $makeSharedValid
*/
public function __construct(
ConfigInterface $config,
IndexerInterfaceFactory $indexerFactory,
Indexer\CollectionFactory $indexersFactory,
- \Magento\Framework\Mview\ProcessorInterface $mviewProcessor
+ ProcessorInterface $mviewProcessor,
+ MakeSharedIndexValid $makeSharedValid = null
) {
$this->config = $config;
$this->indexerFactory = $indexerFactory;
$this->indexersFactory = $indexersFactory;
$this->mviewProcessor = $mviewProcessor;
+ $this->makeSharedValid = $makeSharedValid ?: ObjectManager::getInstance()->get(MakeSharedIndexValid::class);
}
/**
@@ -60,27 +75,21 @@ public function __construct(
*/
public function reindexAllInvalid()
{
- $sharedIndexesComplete = [];
foreach (array_keys($this->config->getIndexers()) as $indexerId) {
/** @var Indexer $indexer */
$indexer = $this->indexerFactory->create();
$indexer->load($indexerId);
$indexerConfig = $this->config->getIndexer($indexerId);
+
if ($indexer->isInvalid()) {
// Skip indexers having shared index that was already complete
$sharedIndex = $indexerConfig['shared_index'] ?? null;
- if (!in_array($sharedIndex, $sharedIndexesComplete)) {
+ if (!in_array($sharedIndex, $this->sharedIndexesComplete)) {
$indexer->reindexAll();
- } else {
- /** @var \Magento\Indexer\Model\Indexer\State $state */
- $state = $indexer->getState();
- $state->setStatus(StateInterface::STATUS_WORKING);
- $state->save();
- $state->setStatus(StateInterface::STATUS_VALID);
- $state->save();
- }
- if ($sharedIndex) {
- $sharedIndexesComplete[] = $sharedIndex;
+
+ if (!empty($sharedIndex) && $this->makeSharedValid->execute($sharedIndex)) {
+ $this->sharedIndexesComplete[] = $sharedIndex;
+ }
}
}
}
diff --git a/app/code/Magento/Indexer/Model/Processor/CleanCache.php b/app/code/Magento/Indexer/Model/Processor/CleanCache.php
index 344fef6ef04ff..d7663171c8a65 100644
--- a/app/code/Magento/Indexer/Model/Processor/CleanCache.php
+++ b/app/code/Magento/Indexer/Model/Processor/CleanCache.php
@@ -5,8 +5,11 @@
*/
namespace Magento\Indexer\Model\Processor;
-use \Magento\Framework\App\CacheInterface;
+use Magento\Framework\App\CacheInterface;
+/**
+ * Clear cache after reindex
+ */
class CleanCache
{
/**
@@ -46,9 +49,7 @@ public function __construct(
public function afterUpdateMview(\Magento\Indexer\Model\Processor $subject)
{
$this->eventManager->dispatch('clean_cache_after_reindex', ['object' => $this->context]);
- if (!empty($this->context->getIdentities())) {
- $this->getCache()->clean($this->context->getIdentities());
- }
+ $this->cleanCache();
}
/**
@@ -61,9 +62,7 @@ public function afterUpdateMview(\Magento\Indexer\Model\Processor $subject)
public function afterReindexAllInvalid(\Magento\Indexer\Model\Processor $subject)
{
$this->eventManager->dispatch('clean_cache_by_tags', ['object' => $this->context]);
- if (!empty($this->context->getIdentities())) {
- $this->getCache()->clean($this->context->getIdentities());
- }
+ $this->cleanCache();
}
/**
@@ -79,4 +78,18 @@ private function getCache()
}
return $this->cache;
}
+
+ /**
+ * Clean cache.
+ *
+ * @return void
+ */
+ private function cleanCache(): void
+ {
+ $identities = $this->context->getIdentities();
+ if (!empty($identities)) {
+ $this->getCache()->clean($identities);
+ $this->context->flush();
+ }
+ }
}
diff --git a/app/code/Magento/Indexer/Model/Processor/MakeSharedIndexValid.php b/app/code/Magento/Indexer/Model/Processor/MakeSharedIndexValid.php
new file mode 100644
index 0000000000000..338891589bf33
--- /dev/null
+++ b/app/code/Magento/Indexer/Model/Processor/MakeSharedIndexValid.php
@@ -0,0 +1,95 @@
+config = $config;
+ $this->indexerRegistry = $indexerRegistry;
+ }
+
+ /**
+ * Validate indexers by shared index ID
+ *
+ * @param string $sharedIndex
+ * @return bool
+ * @throws \Exception
+ */
+ public function execute(string $sharedIndex): bool
+ {
+ if (empty($sharedIndex)) {
+ throw new \InvalidArgumentException(
+ "The '{$sharedIndex}' is an invalid shared index identifier. Verify the identifier and try again.",
+ );
+ }
+
+ $indexerIds = $this->getIndexerIdsBySharedIndex($sharedIndex);
+ if (empty($indexerIds)) {
+ return false;
+ }
+
+ foreach ($indexerIds as $indexerId) {
+ $indexer = $this->indexerRegistry->get($indexerId);
+ /** @var State $state */
+ $state = $indexer->getState();
+ $state->setStatus(StateInterface::STATUS_WORKING);
+ $state->save();
+ $state->setStatus(StateInterface::STATUS_VALID);
+ $state->save();
+ }
+
+ return true;
+ }
+
+ /**
+ * Get indexer ids that have common shared index
+ *
+ * @param string $sharedIndex
+ * @return array
+ */
+ private function getIndexerIdsBySharedIndex(string $sharedIndex): array
+ {
+ $indexers = $this->config->getIndexers();
+
+ $result = [];
+ foreach ($indexers as $indexerConfig) {
+ if ($indexerConfig['shared_index'] == $sharedIndex) {
+ $result[] = $indexerConfig['indexer_id'];
+ }
+ }
+
+ return $result;
+ }
+}
diff --git a/app/code/Magento/Indexer/Model/WorkingStateProvider.php b/app/code/Magento/Indexer/Model/WorkingStateProvider.php
new file mode 100644
index 0000000000000..d77c1b67ecfd7
--- /dev/null
+++ b/app/code/Magento/Indexer/Model/WorkingStateProvider.php
@@ -0,0 +1,45 @@
+stateFactory = $stateFactory;
+ }
+
+ /**
+ * Execute user functions
+ *
+ * @param string $indexerId
+ * @return bool
+ */
+ public function isWorking(string $indexerId) : bool
+ {
+ $state = $this->stateFactory->create();
+ $state->loadByIndexer($indexerId);
+
+ return $state->getStatus() === StateInterface::STATUS_WORKING;
+ }
+}
diff --git a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerReindexCommandTest.php b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerReindexCommandTest.php
index 6d96841bc3dab..8bdceb92b247b 100644
--- a/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerReindexCommandTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerReindexCommandTest.php
@@ -18,6 +18,7 @@
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
use Magento\Indexer\Console\Command\IndexerReindexCommand;
use Magento\Indexer\Model\Config;
+use Magento\Indexer\Model\Processor\MakeSharedIndexValid;
use PHPUnit\Framework\MockObject\MockObject;
use Symfony\Component\Console\Tester\CommandTester;
@@ -49,6 +50,11 @@ class IndexerReindexCommandTest extends AbstractIndexerCommandCommonSetup
*/
private $dependencyInfoProviderMock;
+ /**
+ * @var MakeSharedIndexValid|MockObject
+ */
+ private $makeSharedValidMock;
+
/**
* @var ObjectManagerHelper
*/
@@ -64,12 +70,12 @@ protected function setUp(): void
$this->indexerRegistryMock = $this->getMockBuilder(IndexerRegistry::class)
->disableOriginalConstructor()
->getMock();
- $this->dependencyInfoProviderMock = $this->objectManagerHelper->getObject(
- DependencyInfoProvider::class,
- [
- 'config' => $this->configMock,
- ]
- );
+ $this->makeSharedValidMock = $this->getMockBuilder(MakeSharedIndexValid::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->dependencyInfoProviderMock = $this->objectManagerHelper->getObject(DependencyInfoProvider::class, [
+ 'config' => $this->configMock,
+ ]);
parent::setUp();
}
@@ -174,11 +180,17 @@ public function testExecuteWithIndex(
$emptyIndexer->method('getState')
->willReturn($this->getStateMock(['setStatus', 'save']));
+ $this->makeSharedValidMock = $this->objectManagerHelper->getObject(MakeSharedIndexValid::class, [
+ 'config' => $this->configMock,
+ 'indexerRegistry' => $this->indexerRegistryMock
+ ]);
$this->configureAdminArea();
$this->command = new IndexerReindexCommand(
$this->objectManagerFactory,
- $this->indexerRegistryMock
+ $this->indexerRegistryMock,
+ $this->dependencyInfoProviderMock,
+ $this->makeSharedValidMock
);
$commandTester = new CommandTester($this->command);
diff --git a/app/code/Magento/Indexer/Test/Unit/Model/CacheContextTest.php b/app/code/Magento/Indexer/Test/Unit/Model/CacheContextTest.php
index d0a2dbfe9e8e4..fda36271e5d44 100644
--- a/app/code/Magento/Indexer/Test/Unit/Model/CacheContextTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Model/CacheContextTest.php
@@ -10,6 +10,9 @@
use Magento\Framework\Indexer\CacheContext;
use PHPUnit\Framework\TestCase;
+/**
+ * Test indexer cache context
+ */
class CacheContextTest extends TestCase
{
/**
@@ -38,20 +41,62 @@ public function testRegisterEntities()
}
/**
- * test getIdentities
+ * Test getIdentities
+ *
+ * @param array $entities
+ * @param array $tags
+ * @param array $expected
+ * @dataProvider getIdentitiesDataProvider
*/
- public function testGetIdentities()
+ public function testGetIdentities(array $entities, array $tags = [], array $expected = []): void
{
- $expectedIdentities = [
- 'product_1', 'product_2', 'product_3', 'category_5', 'category_6', 'category_7',
- ];
- $productTag = 'product';
- $categoryTag = 'category';
+ foreach ($entities as $entity => $ids) {
+ $this->context->registerEntities($entity, $ids);
+ }
+ $this->context->registerTags($tags);
+ $this->assertEquals($expected, $this->context->getIdentities());
+ }
+
+ /**
+ * Test that flush() clears all data
+ */
+ public function testFlush(): void
+ {
+ $productTag = 'cat_p';
+ $categoryTag = 'cat_c';
+ $additionalTags = ['cat_c_p'];
$productIds = [1, 2, 3];
$categoryIds = [5, 6, 7];
$this->context->registerEntities($productTag, $productIds);
$this->context->registerEntities($categoryTag, $categoryIds);
- $actualIdentities = $this->context->getIdentities();
- $this->assertEquals($expectedIdentities, $actualIdentities);
+ $this->context->registerTags($additionalTags);
+ $this->assertNotEmpty($this->context->getIdentities());
+ $this->context->flush();
+ $this->assertEmpty($this->context->getIdentities());
+ }
+
+ /**
+ * @return array[]
+ */
+ public function getIdentitiesDataProvider(): array
+ {
+ return [
+ 'should return entities and tags' => [
+ [
+ 'cat_p' => [1, 2, 3],
+ 'cat_c' => [5, 6, 7]
+ ],
+ ['cat_c_p1', 'cat_c_p2'],
+ ['cat_p_1', 'cat_p_2', 'cat_p_3', 'cat_c_5', 'cat_c_6', 'cat_c_7', 'cat_c_p1', 'cat_c_p2']
+ ],
+ 'should return unique values' => [
+ [
+ 'cat_p' => [1, 2, 3, 1, 3],
+ 'cat_c' => [5, 6, 7, 6]
+ ],
+ ['cat_c_p1', 'cat_c_p2'],
+ ['cat_p_1', 'cat_p_2', 'cat_p_3', 'cat_c_5', 'cat_c_6', 'cat_c_7', 'cat_c_p1', 'cat_c_p2']
+ ]
+ ];
}
}
diff --git a/app/code/Magento/Indexer/Test/Unit/Model/Indexer/CacheCleanerTest.php b/app/code/Magento/Indexer/Test/Unit/Model/Indexer/CacheCleanerTest.php
new file mode 100644
index 0000000000000..0839dbfb13373
--- /dev/null
+++ b/app/code/Magento/Indexer/Test/Unit/Model/Indexer/CacheCleanerTest.php
@@ -0,0 +1,129 @@
+action = $this->getMockForAbstractClass(ActionInterface::class);
+ $this->cacheContext = $this->createMock(CacheContext::class);
+ $this->eventManager = $this->createMock(Manager::class);
+ $this->cache = $this->getMockForAbstractClass(CacheInterface::class);
+ $this->model = new CacheCleaner(
+ $this->eventManager,
+ $this->cacheContext,
+ $this->cache
+ );
+ }
+
+ /**
+ * @param array $tags
+ * @param bool $isCacheClean
+ * @dataProvider cacheTagsDataProvider
+ */
+ public function testAfterExecuteFull(array $tags, bool $isCacheClean = true): void
+ {
+ $this->expectCacheClean($tags, $isCacheClean);
+ $this->model->afterExecuteFull($this->action);
+ }
+
+ /**
+ * @param array $tags
+ * @param bool $isCacheClean
+ * @dataProvider cacheTagsDataProvider
+ */
+ public function testAfterExecuteList(array $tags, bool $isCacheClean = true): void
+ {
+ $this->expectCacheClean($tags, $isCacheClean);
+ $this->model->afterExecuteList($this->action);
+ }
+
+ /**
+ * @param array $tags
+ * @param bool $isCacheClean
+ * @dataProvider cacheTagsDataProvider
+ */
+ public function testAfterExecuteRow(array $tags, bool $isCacheClean = true): void
+ {
+ $this->expectCacheClean($tags, $isCacheClean);
+ $this->model->afterExecuteRow($this->action);
+ }
+
+ /**
+ * @return array[]
+ */
+ public function cacheTagsDataProvider(): array
+ {
+ return [
+ [[], false],
+ [['cat_c_1', 'cat_c_2'], true]
+ ];
+ }
+
+ /**
+ * @param array $tags
+ * @param bool $isCacheClean
+ */
+ private function expectCacheClean(array $tags, bool $isCacheClean = true): void
+ {
+ $this->eventManager->expects($this->once())
+ ->method('dispatch')
+ ->with(
+ 'clean_cache_by_tags',
+ ['object' => $this->cacheContext]
+ );
+
+ $this->cacheContext->expects($this->atLeastOnce())
+ ->method('getIdentities')
+ ->willReturn($tags);
+
+ $this->cache->expects($this->exactly($isCacheClean ? 1 : 0))
+ ->method('clean')
+ ->with($tags);
+
+ $this->cacheContext->expects($this->exactly($isCacheClean ? 1 : 0))
+ ->method('flush');
+ }
+}
diff --git a/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php b/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php
index 662856e2187d5..bcdfbea78b0b3 100644
--- a/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Model/IndexerTest.php
@@ -12,11 +12,13 @@
use Magento\Framework\Indexer\ConfigInterface;
use Magento\Framework\Indexer\StateInterface;
use Magento\Framework\Indexer\StructureFactory;
+use Magento\Framework\Indexer\IndexerInterfaceFactory;
use Magento\Framework\Mview\ViewInterface;
use Magento\Indexer\Model\Indexer;
use Magento\Indexer\Model\Indexer\CollectionFactory;
use Magento\Indexer\Model\Indexer\State;
use Magento\Indexer\Model\Indexer\StateFactory;
+use Magento\Indexer\Model\WorkingStateProvider;
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
@@ -55,8 +57,21 @@ class IndexerTest extends TestCase
*/
protected $indexFactoryMock;
+ /**
+ * @var WorkingStateProvider|MockObject
+ */
+ private $workingStateProvider;
+
+ /**
+ * @var IndexerInterfaceFactory|MockObject
+ */
+ private $indexerFactoryMock;
+
protected function setUp(): void
{
+ $this->workingStateProvider = $this->getMockBuilder(WorkingStateProvider::class)
+ ->disableOriginalConstructor()
+ ->getMock();
$this->configMock = $this->getMockForAbstractClass(
ConfigInterface::class,
[],
@@ -70,6 +85,10 @@ protected function setUp(): void
ActionFactory::class,
['create']
);
+ $this->indexerFactoryMock = $this->createPartialMock(
+ IndexerInterfaceFactory::class,
+ ['create']
+ );
$this->viewMock = $this->getMockForAbstractClass(
ViewInterface::class,
[],
@@ -99,7 +118,9 @@ protected function setUp(): void
$structureFactory,
$this->viewMock,
$this->stateFactoryMock,
- $this->indexFactoryMock
+ $this->indexFactoryMock,
+ $this->workingStateProvider,
+ $this->indexerFactoryMock
);
}
@@ -211,7 +232,7 @@ public function testReindexAll()
$stateMock->expects($this->never())->method('setIndexerId');
$stateMock->expects($this->once())->method('getId')->willReturn(1);
$stateMock->expects($this->exactly(2))->method('setStatus')->willReturnSelf();
- $stateMock->expects($this->once())->method('getStatus')->willReturn('idle');
+ $stateMock->expects($this->any())->method('getStatus')->willReturn('idle');
$stateMock->expects($this->exactly(2))->method('save')->willReturnSelf();
$this->stateFactoryMock->expects($this->once())->method('create')->willReturn($stateMock);
@@ -251,7 +272,7 @@ public function testReindexAllWithException()
$stateMock->expects($this->never())->method('setIndexerId');
$stateMock->expects($this->once())->method('getId')->willReturn(1);
$stateMock->expects($this->exactly(2))->method('setStatus')->willReturnSelf();
- $stateMock->expects($this->once())->method('getStatus')->willReturn('idle');
+ $stateMock->expects($this->any())->method('getStatus')->willReturn('idle');
$stateMock->expects($this->exactly(2))->method('save')->willReturnSelf();
$this->stateFactoryMock->expects($this->once())->method('create')->willReturn($stateMock);
@@ -296,7 +317,7 @@ public function testReindexAllWithError()
$stateMock->expects($this->never())->method('setIndexerId');
$stateMock->expects($this->once())->method('getId')->willReturn(1);
$stateMock->expects($this->exactly(2))->method('setStatus')->willReturnSelf();
- $stateMock->expects($this->once())->method('getStatus')->willReturn('idle');
+ $stateMock->expects($this->any())->method('getStatus')->willReturn('idle');
$stateMock->expects($this->exactly(2))->method('save')->willReturnSelf();
$this->stateFactoryMock->expects($this->once())->method('create')->willReturn($stateMock);
@@ -336,7 +357,8 @@ protected function getIndexerData()
'view_id' => 'view_test',
'action_class' => 'Some\Class\Name',
'title' => 'Indexer public name',
- 'description' => 'Indexer public description'
+ 'description' => 'Indexer public description',
+ 'shared_index' => null
];
}
@@ -346,7 +368,7 @@ protected function getIndexerData()
protected function loadIndexer($indexId)
{
$this->configMock->expects(
- $this->once()
+ $this->any()
)->method(
'getIndexer'
)->with(
diff --git a/app/code/Magento/Indexer/Test/Unit/Model/Processor/CleanCacheTest.php b/app/code/Magento/Indexer/Test/Unit/Model/Processor/CleanCacheTest.php
index a4b734f8ebc83..4c37f4c767fb9 100644
--- a/app/code/Magento/Indexer/Test/Unit/Model/Processor/CleanCacheTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Model/Processor/CleanCacheTest.php
@@ -17,6 +17,9 @@
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
+/**
+ * Test cache clean plugin
+ */
class CleanCacheTest extends TestCase
{
/**
@@ -103,6 +106,9 @@ public function testAfterUpdateMview()
->method('clean')
->with($tags);
+ $this->contextMock->expects($this->once())
+ ->method('flush');
+
$this->plugin->afterUpdateMview($this->subjectMock);
}
}
diff --git a/app/code/Magento/Indexer/Test/Unit/Model/ProcessorTest.php b/app/code/Magento/Indexer/Test/Unit/Model/ProcessorTest.php
index 7a06fb745ba89..bbb74812d99a3 100644
--- a/app/code/Magento/Indexer/Test/Unit/Model/ProcessorTest.php
+++ b/app/code/Magento/Indexer/Test/Unit/Model/ProcessorTest.php
@@ -9,6 +9,7 @@
use Magento\Framework\Indexer\ConfigInterface;
use Magento\Framework\Indexer\IndexerInterfaceFactory;
+use Magento\Framework\Indexer\IndexerRegistry;
use Magento\Framework\Indexer\StateInterface;
use Magento\Framework\Mview\ProcessorInterface;
use Magento\Indexer\Model\Indexer;
@@ -16,6 +17,7 @@
use Magento\Indexer\Model\Indexer\CollectionFactory;
use Magento\Indexer\Model\Indexer\State;
use Magento\Indexer\Model\Processor;
+use Magento\Indexer\Model\Processor\MakeSharedIndexValid;
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
@@ -71,15 +73,26 @@ protected function setUp(): void
'',
false
);
+
+ $indexerRegistryMock = $this->getIndexRegistryMock([]);
+ $makeSharedValidMock = new MakeSharedIndexValid(
+ $this->configMock,
+ $indexerRegistryMock
+ );
+
$this->model = new Processor(
$this->configMock,
$this->indexerFactoryMock,
$this->indexersFactoryMock,
- $this->viewProcessorMock
+ $this->viewProcessorMock,
+ $makeSharedValidMock
);
}
- public function testReindexAllInvalid()
+ /**
+ * @return void
+ */
+ public function testReindexAllInvalid(): void
{
$indexers = ['indexer1' => [], 'indexer2' => []];
@@ -121,7 +134,68 @@ public function testReindexAllInvalid()
$this->model->reindexAllInvalid();
}
- public function testReindexAll()
+ /**
+ * @dataProvider sharedIndexDataProvider
+ * @param array $indexers
+ * @param array $indexerStates
+ * @param array $expectedReindexAllCalls
+ * @param array $executedSharedIndexers
+ */
+ public function testReindexAllInvalidWithSharedIndex(
+ array $indexers,
+ array $indexerStates,
+ array $expectedReindexAllCalls,
+ array $executedSharedIndexers
+ ): void {
+ $this->configMock->expects($this->any())->method('getIndexers')->willReturn($indexers);
+ $this->configMock
+ ->method('getIndexer')
+ ->willReturnMap(
+ array_map(
+ function ($elem) {
+ return [$elem['indexer_id'], $elem];
+ },
+ $indexers
+ )
+ );
+ $indexerMocks = [];
+ foreach ($indexers as $indexerData) {
+ $stateMock = $this->createPartialMock(State::class, ['getStatus', '__wakeup']);
+ $stateMock->expects($this->any())
+ ->method('getStatus')
+ ->willReturn($indexerStates[$indexerData['indexer_id']]);
+ $indexerMock = $this->createPartialMock(Indexer::class, ['load', 'getState', 'reindexAll']);
+ $indexerMock->expects($this->any())->method('getState')->willReturn($stateMock);
+ $indexerMock->expects($expectedReindexAllCalls[$indexerData['indexer_id']])->method('reindexAll');
+
+ $this->indexerFactoryMock->expects($this->at(count($indexerMocks)))
+ ->method('create')
+ ->willReturn($indexerMock);
+
+ $indexerMocks[] = $indexerMock;
+ }
+ $indexerRegistryMock = $this->getIndexRegistryMock($executedSharedIndexers);
+
+ $makeSharedValidMock = new MakeSharedIndexValid(
+ $this->configMock,
+ $indexerRegistryMock
+ );
+ $model = new Processor(
+ $this->configMock,
+ $this->indexerFactoryMock,
+ $this->indexersFactoryMock,
+ $this->viewProcessorMock,
+ $makeSharedValidMock
+ );
+ $model->reindexAllInvalid();
+ }
+
+ /**
+ * Reindex all test
+ *
+ * return void
+ */
+ public function testReindexAll(): void
{
$indexerMock = $this->createMock(Indexer::class);
$indexerMock->expects($this->exactly(2))->method('reindexAll');
@@ -134,15 +208,136 @@ public function testReindexAll()
$this->model->reindexAll();
}
+ /**
+ * Update mview test
+ *
+ * @return void
+ */
public function testUpdateMview()
{
$this->viewProcessorMock->expects($this->once())->method('update')->with('indexer')->willReturnSelf();
$this->model->updateMview();
}
+ /**
+ * Clear change log test
+ *
+ * @return void
+ */
public function testClearChangelog()
{
$this->viewProcessorMock->expects($this->once())->method('clearChangelog')->with('indexer')->willReturnSelf();
$this->model->clearChangelog();
}
+
+ /**
+ * @return array
+ */
+ public function sharedIndexDataProvider()
+ {
+ return [
+ 'Without dependencies' => [
+ 'indexers' => [
+ 'indexer_1' => [
+ 'indexer_id' => 'indexer_1',
+ 'title' => 'Title_indexer_1',
+ 'shared_index' => null,
+ 'dependencies' => [],
+ ],
+ 'indexer_2' => [
+ 'indexer_id' => 'indexer_2',
+ 'title' => 'Title_indexer_2',
+ 'shared_index' => 'with_indexer_3',
+ 'dependencies' => [],
+ ],
+ 'indexer_3' => [
+ 'indexer_id' => 'indexer_3',
+ 'title' => 'Title_indexer_3',
+ 'shared_index' => 'with_indexer_3',
+ 'dependencies' => [],
+ ],
+ ],
+ 'indexer_states' => [
+ 'indexer_1' => StateInterface::STATUS_INVALID,
+ 'indexer_2' => StateInterface::STATUS_VALID,
+ 'indexer_3' => StateInterface::STATUS_VALID,
+ ],
+ 'expected_reindex_all_calls' => [
+ 'indexer_1' => $this->once(),
+ 'indexer_2' => $this->never(),
+ 'indexer_3' => $this->never(),
+ ],
+ 'executed_shared_indexers' => [],
+ ],
+ 'With dependencies and some indexers is invalid' => [
+ 'indexers' => [
+ 'indexer_1' => [
+ 'indexer_id' => 'indexer_1',
+ 'title' => 'Title_indexer_1',
+ 'shared_index' => null,
+ 'dependencies' => ['indexer_2', 'indexer_3'],
+ ],
+ 'indexer_2' => [
+ 'indexer_id' => 'indexer_2',
+ 'title' => 'Title_indexer_2',
+ 'shared_index' => 'with_indexer_3',
+ 'dependencies' => [],
+ ],
+ 'indexer_3' => [
+ 'indexer_id' => 'indexer_3',
+ 'title' => 'Title_indexer_3',
+ 'shared_index' => 'with_indexer_3',
+ 'dependencies' => [],
+ ],
+ 'indexer_4' => [
+ 'indexer_id' => 'indexer_4',
+ 'title' => 'Title_indexer_4',
+ 'shared_index' => null,
+ 'dependencies' => ['indexer_1'],
+ ],
+ ],
+ 'indexer_states' => [
+ 'indexer_1' => StateInterface::STATUS_INVALID,
+ 'indexer_2' => StateInterface::STATUS_VALID,
+ 'indexer_3' => StateInterface::STATUS_INVALID,
+ 'indexer_4' => StateInterface::STATUS_VALID,
+ ],
+ 'expected_reindex_all_calls' => [
+ 'indexer_1' => $this->once(),
+ 'indexer_2' => $this->never(),
+ 'indexer_3' => $this->once(),
+ 'indexer_4' => $this->never(),
+ ],
+ 'executed_shared_indexers' => [['indexer_2'], ['indexer_3']],
+ ],
+ ];
+ }
+
+ /**
+ * @param array $executedSharedIndexers
+ * @return IndexerRegistry|MockObject
+ */
+ private function getIndexRegistryMock(array $executedSharedIndexers)
+ {
+ /** @var MockObject|IndexerRegistry $indexerRegistryMock */
+ $indexerRegistryMock = $this->getMockBuilder(IndexerRegistry::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $emptyIndexer = $this->createPartialMock(Indexer::class, ['load', 'getState', 'reindexAll']);
+ /** @var MockObject|StateInterface $state */
+ $state = $this->getMockBuilder(StateInterface::class)
+ ->setMethods(['setStatus', 'save'])
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+ $state->method('getStatus')
+ ->willReturn(StateInterface::STATUS_INVALID);
+ $emptyIndexer->method('getState')->willReturn($state);
+ $indexerRegistryMock
+ ->expects($this->exactly(count($executedSharedIndexers)))
+ ->method('get')
+ ->withConsecutive(...$executedSharedIndexers)
+ ->willReturn($emptyIndexer);
+
+ return $indexerRegistryMock;
+ }
}
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Integration/Activate/Permissions/Tab/Webapi.php b/app/code/Magento/Integration/Block/Adminhtml/Integration/Activate/Permissions/Tab/Webapi.php
index 2d323fea34e7d..b6ea810666b9b 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Integration/Activate/Permissions/Tab/Webapi.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Integration/Activate/Permissions/Tab/Webapi.php
@@ -222,13 +222,13 @@ public function isTreeEmpty()
*/
protected function _getAllResourceIds(array $resources)
{
- $resourceIds = [[]];
+ $resourceIds = [];
foreach ($resources as $resource) {
$resourceIds[] = [$resource['id']];
if (isset($resource['children'])) {
$resourceIds[] = $this->_getAllResourceIds($resource['children']);
}
}
- return array_merge(...$resourceIds);
+ return array_merge([], ...$resourceIds);
}
}
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Link.php b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Link.php
index 9a406945f3b96..76667f6060853 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Link.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Widget/Grid/Column/Renderer/Link.php
@@ -81,8 +81,9 @@ public function isDisabled()
}
/**
- * Return URL pattern for action associated with the link e.g. "(star)(slash)(star)(slash)activate" ->
- * will be translated to http://.../admin/integration/activate/id/X
+ * Return URL pattern for action associated with the link e.g. "(star)(slash)(star)(slash)activate"
+ *
+ * Will be translated to http://.../admin/integration/activate/id/X
*
* @return string
*/
@@ -164,6 +165,6 @@ protected function _getDataAttributes()
*/
protected function _getUrl(DataObject $row)
{
- return $this->isDisabled($row) ? '#' : $this->getUrl($this->getUrlPattern(), ['id' => $row->getId()]);
+ return $this->isDisabled() ? '#' : $this->getUrl($this->getUrlPattern(), ['id' => $row->getId()]);
}
}
diff --git a/app/code/Magento/Integration/Model/Oauth/Consumer.php b/app/code/Magento/Integration/Model/Oauth/Consumer.php
index 4442be310b967..b436defcd0cfa 100644
--- a/app/code/Magento/Integration/Model/Oauth/Consumer.php
+++ b/app/code/Magento/Integration/Model/Oauth/Consumer.php
@@ -13,15 +13,15 @@
* @api
* @author Magento Core Team
* @method string getName()
- * @method Consumer setName() setName(string $name)
- * @method Consumer setKey() setKey(string $key)
- * @method Consumer setSecret() setSecret(string $secret)
- * @method Consumer setCallbackUrl() setCallbackUrl(string $url)
- * @method Consumer setCreatedAt() setCreatedAt(string $date)
+ * @method Consumer setName(string $name)
+ * @method Consumer setKey(string $key)
+ * @method Consumer setSecret(string $secret)
+ * @method Consumer setCallbackUrl(string $url)
+ * @method Consumer setCreatedAt(string $date)
* @method string getUpdatedAt()
- * @method Consumer setUpdatedAt() setUpdatedAt(string $date)
+ * @method Consumer setUpdatedAt(string $date)
* @method string getRejectedCallbackUrl()
- * @method Consumer setRejectedCallbackUrl() setRejectedCallbackUrl(string $rejectedCallbackUrl)
+ * @method Consumer setRejectedCallbackUrl(string $rejectedCallbackUrl)
* @since 100.0.2
*/
class Consumer extends \Magento\Framework\Model\AbstractModel implements ConsumerInterface
@@ -112,7 +112,7 @@ public function beforeSave()
}
/**
- * {@inheritdoc}
+ * @inheritDoc
*/
public function validate()
{
@@ -158,7 +158,7 @@ public function loadByKey($key)
}
/**
- * {@inheritdoc}
+ * @inheritDoc
*/
public function getKey()
{
@@ -166,7 +166,7 @@ public function getKey()
}
/**
- * {@inheritdoc}
+ * @inheritDoc
*/
public function getSecret()
{
@@ -174,7 +174,7 @@ public function getSecret()
}
/**
- * {@inheritdoc}
+ * @inheritDoc
*/
public function getCallbackUrl()
{
@@ -182,7 +182,7 @@ public function getCallbackUrl()
}
/**
- * {@inheritdoc}
+ * @inheritDoc
*/
public function getCreatedAt()
{
@@ -190,7 +190,7 @@ public function getCreatedAt()
}
/**
- * {@inheritdoc}
+ * @inheritDoc
*/
public function isValidForTokenExchange()
{
diff --git a/app/code/Magento/Integration/Model/Oauth/Token.php b/app/code/Magento/Integration/Model/Oauth/Token.php
index 53d9ec300a862..7a3580b8bd402 100644
--- a/app/code/Magento/Integration/Model/Oauth/Token.php
+++ b/app/code/Magento/Integration/Model/Oauth/Token.php
@@ -15,27 +15,27 @@
*
* @method string getName() Consumer name (joined from consumer table)
* @method int getConsumerId()
- * @method Token setConsumerId() setConsumerId(int $consumerId)
+ * @method Token setConsumerId(int $consumerId)
* @method int getAdminId()
- * @method Token setAdminId() setAdminId(int $adminId)
+ * @method Token setAdminId(int $adminId)
* @method int getCustomerId()
- * @method Token setCustomerId() setCustomerId(int $customerId)
+ * @method Token setCustomerId(int $customerId)
* @method int getUserType()
- * @method Token setUserType() setUserType(int $userType)
+ * @method Token setUserType(int $userType)
* @method string getType()
- * @method Token setType() setType(string $type)
+ * @method Token setType(string $type)
* @method string getCallbackUrl()
- * @method Token setCallbackUrl() setCallbackUrl(string $callbackUrl)
+ * @method Token setCallbackUrl(string $callbackUrl)
* @method string getCreatedAt()
- * @method Token setCreatedAt() setCreatedAt(string $createdAt)
+ * @method Token setCreatedAt(string $createdAt)
* @method string getToken()
- * @method Token setToken() setToken(string $token)
+ * @method Token setToken(string $token)
* @method string getSecret()
- * @method Token setSecret() setSecret(string $tokenSecret)
+ * @method Token setSecret(string $tokenSecret)
* @method int getRevoked()
- * @method Token setRevoked() setRevoked(int $revoked)
+ * @method Token setRevoked(int $revoked)
* @method int getAuthorized()
- * @method Token setAuthorized() setAuthorized(int $authorized)
+ * @method Token setAuthorized(int $authorized)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @api
* @since 100.0.2
@@ -200,7 +200,7 @@ public function createAdminToken($userId)
public function createCustomerToken($userId)
{
$this->setCustomerId($userId);
- return $this->saveAccessToken(UserContextInterface::USER_TYPE_CUSTOMER, $userId);
+ return $this->saveAccessToken(UserContextInterface::USER_TYPE_CUSTOMER);
}
/**
diff --git a/app/code/Magento/Integration/Test/Mftf/Page/AdminConfigServicesOauthPage.xml b/app/code/Magento/Integration/Test/Mftf/Page/AdminConfigServicesOauthPage.xml
new file mode 100644
index 0000000000000..85f20c3617e1d
--- /dev/null
+++ b/app/code/Magento/Integration/Test/Mftf/Page/AdminConfigServicesOauthPage.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Integration/Test/Mftf/Section/AdminConfigAccessTokenExpirationSection.xml b/app/code/Magento/Integration/Test/Mftf/Section/AdminConfigAccessTokenExpirationSection.xml
new file mode 100644
index 0000000000000..0f18c1e75979e
--- /dev/null
+++ b/app/code/Magento/Integration/Test/Mftf/Section/AdminConfigAccessTokenExpirationSection.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Integration/Test/Mftf/Test/AdminConfigSaveEmptySettingsTest.xml b/app/code/Magento/Integration/Test/Mftf/Test/AdminConfigSaveEmptySettingsTest.xml
new file mode 100644
index 0000000000000..89a0fb4c1f026
--- /dev/null
+++ b/app/code/Magento/Integration/Test/Mftf/Test/AdminConfigSaveEmptySettingsTest.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Integration/etc/adminhtml/system.xml b/app/code/Magento/Integration/etc/adminhtml/system.xml
index 6ef569a1d8a2f..3d465a9642805 100644
--- a/app/code/Magento/Integration/etc/adminhtml/system.xml
+++ b/app/code/Magento/Integration/etc/adminhtml/system.xml
@@ -16,12 +16,12 @@
We will disable this feature if the value is empty.
- required-entry validate-zero-or-greater validate-number
+ validate-zero-or-greater validate-number
We will disable this feature if the value is empty.
- required-entry validate-zero-or-greater validate-number
+ validate-zero-or-greater validate-number
diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/ActionGroup/StorefrontAssertAppliedFilterActionGroup.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/ActionGroup/StorefrontAssertAppliedFilterActionGroup.xml
new file mode 100644
index 0000000000000..92fea20a83157
--- /dev/null
+++ b/app/code/Magento/LayeredNavigation/Test/Mftf/ActionGroup/StorefrontAssertAppliedFilterActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+ Asserts applied filter label and value on storefront category page.
+
+
+
+
+
diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/ActionGroup/StorefrontFilterCategoryPageByAttributeOptionActionGroup.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/ActionGroup/StorefrontFilterCategoryPageByAttributeOptionActionGroup.xml
new file mode 100644
index 0000000000000..f6fe2b20185e6
--- /dev/null
+++ b/app/code/Magento/LayeredNavigation/Test/Mftf/ActionGroup/StorefrontFilterCategoryPageByAttributeOptionActionGroup.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+ Filters storefront category page by given filterable attribute and attribute option.
+
+
+
+
+
diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Section/LayeredNavigationSection/StorefrontLayeredNavigationSection.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Section/LayeredNavigationSection/StorefrontLayeredNavigationSection.xml
index d3a3005c296b2..d8a103116ef06 100644
--- a/app/code/Magento/LayeredNavigation/Test/Mftf/Section/LayeredNavigationSection/StorefrontLayeredNavigationSection.xml
+++ b/app/code/Magento/LayeredNavigation/Test/Mftf/Section/LayeredNavigationSection/StorefrontLayeredNavigationSection.xml
@@ -9,5 +9,7 @@
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/LayeredNavigation/Test/Mftf/Test/StorefrontDropdownAttributeInLayeredNavigationTest.xml b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/StorefrontDropdownAttributeInLayeredNavigationTest.xml
new file mode 100644
index 0000000000000..0cd115d3febeb
--- /dev/null
+++ b/app/code/Magento/LayeredNavigation/Test/Mftf/Test/StorefrontDropdownAttributeInLayeredNavigationTest.xml
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml
index 6b65d184b462a..83f40ab4911e7 100644
--- a/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml
+++ b/app/code/Magento/LayeredNavigation/view/frontend/templates/layer/filter.phtml
@@ -4,10 +4,10 @@
* See COPYING.txt for license details.
*/
-// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
?>
getData('product_layer_view_model');
?>
@@ -16,28 +16,29 @@ $viewModel = $block->getData('product_layer_view_model');
-
getCount() > 0): ?>
-
- getLabel() ?>
- shouldDisplayProductCountOnLayer()): ?>
- getCount() ?>
-
- getCount() == 1):
- ?> escapeHtml(__('item')) ?>escapeUrl($filterItem->getUrl()) ?>"
+ rel="nofollow"
+ >getLabel() ?>shouldDisplayProductCountOnLayer()): ?>getCount() ?>getCount() == 1): ?>
+ escapeHtml(__('item')) ?> escapeHtml(__('item')) ?>escapeHtml(__('item')) ?>
-
-
+
- getLabel() ?>
- shouldDisplayProductCountOnLayer()): ?>
- getCount() ?>
-
- getCount() == 1):
- ?>escapeHtml(__('items')) ?>escapeHtml(__('items')) ?>
+ getLabel() ?>shouldDisplayProductCountOnLayer()): ?>getCount() ?>getCount() == 1): ?>
+ escapeHtml(__('items')) ?>escapeHtml(__('items')) ?>
diff --git a/app/code/Magento/LoginAsCustomer/Model/ResourceModel/GetAuthenticationDataBySecret.php b/app/code/Magento/LoginAsCustomer/Model/ResourceModel/GetAuthenticationDataBySecret.php
index 078eb93405299..0c417f78800a2 100644
--- a/app/code/Magento/LoginAsCustomer/Model/ResourceModel/GetAuthenticationDataBySecret.php
+++ b/app/code/Magento/LoginAsCustomer/Model/ResourceModel/GetAuthenticationDataBySecret.php
@@ -7,9 +7,11 @@
namespace Magento\LoginAsCustomer\Model\ResourceModel;
+use Magento\Framework\App\ObjectManager;
use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Framework\Encryption\EncryptorInterface;
use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Stdlib\DateTime\DateTime;
use Magento\LoginAsCustomerApi\Api\ConfigInterface;
use Magento\LoginAsCustomerApi\Api\Data\AuthenticationDataInterface;
use Magento\LoginAsCustomerApi\Api\Data\AuthenticationDataInterfaceFactory;
@@ -40,22 +42,30 @@ class GetAuthenticationDataBySecret implements GetAuthenticationDataBySecretInte
*/
private $authenticationDataFactory;
+ /**
+ * @var EncryptorInterface
+ */
+ private $encryptor;
+
/**
* @param ResourceConnection $resourceConnection
* @param DateTime $dateTime
* @param ConfigInterface $config
* @param AuthenticationDataInterfaceFactory $authenticationDataFactory
+ * @param EncryptorInterface|null $encryptor
*/
public function __construct(
ResourceConnection $resourceConnection,
DateTime $dateTime,
ConfigInterface $config,
- AuthenticationDataInterfaceFactory $authenticationDataFactory
+ AuthenticationDataInterfaceFactory $authenticationDataFactory,
+ ?EncryptorInterface $encryptor = null
) {
$this->resourceConnection = $resourceConnection;
$this->dateTime = $dateTime;
$this->config = $config;
$this->authenticationDataFactory = $authenticationDataFactory;
+ $this->encryptor = $encryptor ?? ObjectManager::getInstance()->get(EncryptorInterface::class);
}
/**
@@ -71,9 +81,11 @@ public function execute(string $secret): AuthenticationDataInterface
$this->dateTime->gmtTimestamp() - $this->config->getAuthenticationDataExpirationTime()
);
+ $hash = $this->encryptor->hash($secret);
+
$select = $connection->select()
->from(['main_table' => $tableName])
- ->where('main_table.secret = ?', $secret)
+ ->where('main_table.secret = ?', $hash)
->where('main_table.created_at > ?', $timePoint);
$data = $connection->fetchRow($select);
diff --git a/app/code/Magento/LoginAsCustomer/Model/ResourceModel/SaveAuthenticationData.php b/app/code/Magento/LoginAsCustomer/Model/ResourceModel/SaveAuthenticationData.php
index d120b0eae392e..10d110c8ddf0b 100644
--- a/app/code/Magento/LoginAsCustomer/Model/ResourceModel/SaveAuthenticationData.php
+++ b/app/code/Magento/LoginAsCustomer/Model/ResourceModel/SaveAuthenticationData.php
@@ -7,9 +7,11 @@
namespace Magento\LoginAsCustomer\Model\ResourceModel;
+use Magento\Framework\App\ObjectManager;
use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\Stdlib\DateTime\DateTime;
+use Magento\Framework\Encryption\EncryptorInterface;
use Magento\Framework\Math\Random;
+use Magento\Framework\Stdlib\DateTime\DateTime;
use Magento\LoginAsCustomerApi\Api\Data\AuthenticationDataInterface;
use Magento\LoginAsCustomerApi\Api\SaveAuthenticationDataInterface;
@@ -18,6 +20,11 @@
*/
class SaveAuthenticationData implements SaveAuthenticationDataInterface
{
+ /**
+ * @var EncryptorInterface
+ */
+ private $encryptor;
+
/**
* @var ResourceConnection
*/
@@ -37,15 +44,18 @@ class SaveAuthenticationData implements SaveAuthenticationDataInterface
* @param ResourceConnection $resourceConnection
* @param DateTime $dateTime
* @param Random $random
+ * @param EncryptorInterface $encryptor
*/
public function __construct(
ResourceConnection $resourceConnection,
DateTime $dateTime,
- Random $random
+ Random $random,
+ ?EncryptorInterface $encryptor = null
) {
$this->resourceConnection = $resourceConnection;
$this->dateTime = $dateTime;
$this->random = $random;
+ $this->encryptor = $encryptor ?? ObjectManager::getInstance()->get(EncryptorInterface::class);
}
/**
@@ -57,16 +67,18 @@ public function execute(AuthenticationDataInterface $authenticationData): string
$tableName = $this->resourceConnection->getTableName('login_as_customer');
$secret = $this->random->getRandomString(64);
+ $hash = $this->encryptor->hash($secret);
$connection->insert(
$tableName,
[
'customer_id' => $authenticationData->getCustomerId(),
'admin_id' => $authenticationData->getAdminId(),
- 'secret' => $secret,
+ 'secret' => $hash,
'created_at' => $this->dateTime->gmtDate(),
]
);
+
return $secret;
}
}
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup.xml
index 8db34a05252ee..dc953061ca433 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/ActionGroup/AdminLoginAsCustomerLoginFromCustomerPageManualChooseActionGroup.xml
@@ -14,15 +14,15 @@
+
+
+ Verify Login as Customer Login action is works properly from Order page with manual Store View choose.
+
+
+
+
+
+
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerConfirmationModalSection.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerConfirmationModalSection.xml
index f400ba02a5392..96a9ed6a77f90 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerConfirmationModalSection.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Section/AdminLoginAsCustomerConfirmationModalSection.xml
@@ -9,6 +9,6 @@
-
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
index de9790894015c..1175103395427 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerAutoDetectionTest.xml
@@ -11,7 +11,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseStoreCodeInUrlTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseStoreCodeInUrlTest.xml
index 27aee2061f204..4f888e33ac801 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseStoreCodeInUrlTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseStoreCodeInUrlTest.xml
@@ -11,7 +11,7 @@
-
+
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
index da966fdcc1291..5f706a814eb71 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminLoginAsCustomerManualChooseTest.xml
@@ -11,16 +11,13 @@
-
+
+
+
+
+
-
-
+
@@ -58,7 +67,7 @@
-
diff --git a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml
index ea06263901b9e..02a96df93eae4 100644
--- a/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml
+++ b/app/code/Magento/LoginAsCustomer/Test/Mftf/Test/AdminUIShownIfLoginAsCustomerEnabledTest.xml
@@ -23,13 +23,18 @@
stepKey="enableLoginAsCustomer"/>
+
+
+
+
+
+
@@ -59,10 +69,7 @@
-
+
-
storeOptions = $storeOptions;
$this->config = $config;
$this->json = $json;
+ $this->options = $options ?? ObjectManager::getInstance()->get(Options::class);
}
/**
@@ -65,14 +75,14 @@ public function getJsLayout()
$showStoreViewOptions = $this->config->isStoreManualChoiceEnabled();
$layout['components']['lac-confirmation-popup']['title'] = $showStoreViewOptions
- ? __('Login as Customer: Select Store View')
+ ? __('Login as Customer: Select Store')
: __('You are about to Login as Customer');
$layout['components']['lac-confirmation-popup']['content'] =
__('Actions taken while in "Login as Customer" will affect actual customer data.');
$layout['components']['lac-confirmation-popup']['showStoreViewOptions'] = $showStoreViewOptions;
$layout['components']['lac-confirmation-popup']['storeViewOptions'] = $showStoreViewOptions
- ? $this->storeOptions->toOptionArray()
+ ? $this->options->toOptionArray()
: [];
return $this->json->serialize($layout);
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php b/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
index 39a7055ed65bb..e80c3700349df 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Controller/Adminhtml/Login/Login.php
@@ -11,6 +11,7 @@
use Magento\Backend\App\Action\Context;
use Magento\Backend\Model\Auth\Session;
use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Model\Config\Share;
use Magento\Framework\App\Action\HttpGetActionInterface;
use Magento\Framework\App\ObjectManager;
use Magento\Framework\Controller\Result\Redirect;
@@ -27,6 +28,7 @@
use Magento\LoginAsCustomerApi\Api\SaveAuthenticationDataInterface;
use Magento\LoginAsCustomerApi\Api\SetLoggedAsCustomerCustomerIdInterface;
use Magento\Store\Model\StoreManagerInterface;
+use Magento\Store\Model\StoreSwitcher\ManageStoreCookie;
/**
* Login as customer action
@@ -83,6 +85,16 @@ class Login extends Action implements HttpGetActionInterface
*/
private $url;
+ /**
+ * @var Share
+ */
+ private $share;
+
+ /**
+ * @var ManageStoreCookie
+ */
+ private $manageStoreCookie;
+
/**
* @var SetLoggedAsCustomerCustomerIdInterface
*/
@@ -103,6 +115,8 @@ class Login extends Action implements HttpGetActionInterface
* @param SaveAuthenticationDataInterface $saveAuthenticationData
* @param DeleteAuthenticationDataForUserInterface $deleteAuthenticationDataForUser
* @param Url $url
+ * @param Share $share
+ * @param ManageStoreCookie $manageStoreCookie
* @param SetLoggedAsCustomerCustomerIdInterface $setLoggedAsCustomerCustomerId
* @param IsLoginAsCustomerEnabledForCustomerInterface $isLoginAsCustomerEnabled
*
@@ -118,6 +132,8 @@ public function __construct(
SaveAuthenticationDataInterface $saveAuthenticationData,
DeleteAuthenticationDataForUserInterface $deleteAuthenticationDataForUser,
Url $url,
+ ?Share $share = null,
+ ?ManageStoreCookie $manageStoreCookie = null,
?SetLoggedAsCustomerCustomerIdInterface $setLoggedAsCustomerCustomerId = null,
?IsLoginAsCustomerEnabledForCustomerInterface $isLoginAsCustomerEnabled = null
) {
@@ -131,6 +147,8 @@ public function __construct(
$this->saveAuthenticationData = $saveAuthenticationData;
$this->deleteAuthenticationDataForUser = $deleteAuthenticationDataForUser;
$this->url = $url;
+ $this->share = $share ?? ObjectManager::getInstance()->get(Share::class);
+ $this->manageStoreCookie = $manageStoreCookie ?? ObjectManager::getInstance()->get(ManageStoreCookie::class);
$this->setLoggedAsCustomerCustomerId = $setLoggedAsCustomerCustomerId
?? ObjectManager::getInstance()->get(SetLoggedAsCustomerCustomerIdInterface::class);
$this->isLoginAsCustomerEnabled = $isLoginAsCustomerEnabled
@@ -173,9 +191,11 @@ public function execute(): ResultInterface
if ($this->config->isStoreManualChoiceEnabled()) {
$storeId = (int)$this->_request->getParam('store_id');
if (empty($storeId)) {
- $this->messageManager->addNoticeMessage(__('Please select a Store View to login in.'));
+ $this->messageManager->addNoticeMessage(__('Please select a Store to login in.'));
return $resultRedirect->setPath('customer/index/edit', ['id' => $customerId]);
}
+ } elseif ($this->share->isGlobalScope()) {
+ $storeId = (int)$this->storeManager->getDefaultStoreView()->getId();
} else {
$storeId = (int)$customer->getStoreId();
}
@@ -211,10 +231,17 @@ public function execute(): ResultInterface
*/
private function getLoginProceedRedirectUrl(string $secret, int $storeId): string
{
- $store = $this->storeManager->getStore($storeId);
+ $targetStore = $this->storeManager->getStore($storeId);
- return $this->url
- ->setScope($store)
+ $redirectUrl = $this->url
+ ->setScope($targetStore)
->getUrl('loginascustomer/login/index', ['secret' => $secret, '_nosid' => true]);
+
+ if (!$targetStore->isUseStoreInUrl()) {
+ $fromStore = $this->storeManager->getStore();
+ $redirectUrl = $this->manageStoreCookie->switch($fromStore, $targetStore, $redirectUrl);
+ }
+
+ return $redirectUrl;
}
}
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
new file mode 100644
index 0000000000000..791ed35519850
--- /dev/null
+++ b/app/code/Magento/LoginAsCustomerAdminUi/Ui/Customer/Component/ConfirmationPopup/Options.php
@@ -0,0 +1,262 @@
+customerRepository = $customerRepository;
+ $this->escaper = $escaper;
+ $this->request = $request;
+ $this->share = $share;
+ $this->systemStore = $systemStore;
+ $this->orderRepository = $orderRepository
+ ?? ObjectManager::getInstance()->get(OrderRepositoryInterface::class);
+ $this->invoiceRepository = $invoiceRepository
+ ?? ObjectManager::getInstance()->get(InvoiceRepositoryInterface::class);
+ $this->shipmentRepository = $shipmentRepository
+ ?? ObjectManager::getInstance()->get(ShipmentRepositoryInterface::class);
+ $this->creditmemoRepository = $creditmemoRepository
+ ?? ObjectManager::getInstance()->get(CreditmemoRepositoryInterface::class);
+ }
+
+ /**
+ * @inheritdoc
+ *
+ * @throws LocalizedException
+ */
+ public function toOptionArray(): array
+ {
+ if ($this->options !== null) {
+ return $this->options;
+ }
+
+ $customerId = $this->getCustomerId();
+ $this->options = $this->generateCurrentOptions($customerId);
+
+ return $this->options;
+ }
+
+ /**
+ * Sanitize website/store option name.
+ *
+ * @param string $name
+ *
+ * @return string
+ */
+ private function sanitizeName(string $name): string
+ {
+ $matches = [];
+ preg_match('/\$[:]*{(.)*}/', $name, $matches);
+ if (count($matches) > 0) {
+ $name = $this->escaper->escapeHtml($this->escaper->escapeJs($name));
+ } else {
+ $name = $this->escaper->escapeHtml($name);
+ }
+
+ return $name;
+ }
+
+ /**
+ * Generate current options.
+ *
+ * @param int $customerId
+ * @return array
+ */
+ private function generateCurrentOptions(int $customerId): array
+ {
+ $options = [];
+ if ($customerId) {
+ $customer = $this->customerRepository->getById($customerId);
+ $websiteCollection = $this->systemStore->getWebsiteCollection();
+ /** @var Website $website */
+ foreach ($websiteCollection as $website) {
+ $groups = $this->fillStoreGroupOptions($website, $customer);
+ if (!empty($groups)) {
+ $code = $website->getCode();
+ $name = $this->sanitizeName($website->getName());
+ $options[$code]['label'] = $name;
+ $options[$code]['value'] = $groups;
+ }
+ }
+ }
+
+ return $options;
+ }
+
+ /**
+ * Fill Store Group options array.
+ *
+ * @param Website $website
+ * @param CustomerInterface $customer
+ * @return array
+ */
+ private function fillStoreGroupOptions(Website $website, CustomerInterface $customer): array
+ {
+ $groups = [];
+ $groupCollection = $this->systemStore->getGroupCollection();
+ $isGlobalScope = $this->share->isGlobalScope();
+ $customerWebsiteId = $customer->getWebsiteId();
+ $customerStoreId = $customer->getStoreId();
+ $websiteId = $website->getId();
+ /** @var Group $group */
+ foreach ($groupCollection as $group) {
+ if ($group->getWebsiteId() == $websiteId) {
+ $storeViewIds = $group->getStoreIds();
+ if (!empty($storeViewIds)) {
+ $code = $group->getCode();
+ $name = $this->sanitizeName($group->getName());
+ $groups[$code]['label'] = str_repeat(' ', 4) . $name;
+ $groups[$code]['value'] = array_values($storeViewIds)[0];
+ $groups[$code]['disabled'] = !$isGlobalScope && $customerWebsiteId !== $websiteId;
+ $groups[$code]['selected'] = in_array($customerStoreId, $storeViewIds) ? true : false;
+ }
+ }
+ }
+
+ return $groups;
+ }
+
+ /**
+ * Get Customer id from request param.
+ *
+ * @return int
+ * @throws LocalizedException
+ */
+ private function getCustomerId(): int
+ {
+ $customerId = $this->request->getParam('id');
+ if ($customerId) {
+ return (int)$customerId;
+ }
+ try {
+ $orderId = $this->getOrderId();
+ } catch (LocalizedException $exception) {
+ throw new LocalizedException(__('Unable to get Customer ID.'));
+ }
+
+ return (int)$this->orderRepository->get($orderId)->getCustomerId();
+ }
+
+ /**
+ * Get Order id from request param
+ *
+ * @return int
+ * @throws LocalizedException
+ */
+ private function getOrderId(): int
+ {
+ $orderId = $this->request->getParam('order_id');
+ if ($orderId) {
+ return (int)$orderId;
+ }
+ $shipmentId = $this->request->getParam('shipment_id');
+ $creditmemoId = $this->request->getParam('creditmemo_id');
+ $invoiceId = $this->request->getParam('invoice_id');
+ if ($invoiceId) {
+ return (int)$this->invoiceRepository->get($invoiceId)->getOrderId();
+ } elseif ($shipmentId) {
+ return (int)$this->shipmentRepository->get($shipmentId)->getOrderId();
+ } elseif ($creditmemoId) {
+ return (int)$this->creditmemoRepository->get($creditmemoId)->getOrderId();
+ }
+ throw new LocalizedException(__('Unable to get Order ID.'));
+ }
+}
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/composer.json b/app/code/Magento/LoginAsCustomerAdminUi/composer.json
index 8bbe0e2bd6c9e..b6291226827a8 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/composer.json
+++ b/app/code/Magento/LoginAsCustomerAdminUi/composer.json
@@ -8,6 +8,7 @@
"magento/module-login-as-customer-frontend-ui": "*",
"magento/module-backend": "*",
"magento/module-customer": "*",
+ "magento/module-sales": "*",
"magento/module-store": "*"
},
"suggest": {
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/etc/adminhtml/system.xml b/app/code/Magento/LoginAsCustomerAdminUi/etc/adminhtml/system.xml
index 580f478f32780..fb8d990e5bab2 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/etc/adminhtml/system.xml
+++ b/app/code/Magento/LoginAsCustomerAdminUi/etc/adminhtml/system.xml
@@ -23,7 +23,7 @@
Magento\LoginAsCustomerAdminUi\Model\Config\Source\StoreViewLogin
diff --git a/app/code/Magento/LoginAsCustomerAdminUi/view/adminhtml/web/template/confirmation-popup/store-view-ptions.html b/app/code/Magento/LoginAsCustomerAdminUi/view/adminhtml/web/template/confirmation-popup/store-view-ptions.html
index ed1f991245e70..916a5583abe57 100644
--- a/app/code/Magento/LoginAsCustomerAdminUi/view/adminhtml/web/template/confirmation-popup/store-view-ptions.html
+++ b/app/code/Magento/LoginAsCustomerAdminUi/view/adminhtml/web/template/confirmation-popup/store-view-ptions.html
@@ -18,10 +18,10 @@
<% _.each(data.storeViewOptions, function(website) { %>
<% _.each(website.value, function(group) { %>
-
- <% _.each(group.value, function(storeview) { %>
-
- <% }); %>
+
<% }); %>
<% }); %>
diff --git a/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php b/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php
index b98ea203057b1..520a1168b688f 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php
+++ b/app/code/Magento/LoginAsCustomerAssistance/Block/Adminhtml/NotAllowedPopup.php
@@ -13,8 +13,6 @@
/**
* Pop-up for Login as Customer button then Login as Customer is not allowed.
- *
- * @api
*/
class NotAllowedPopup extends Template
{
diff --git a/app/code/Magento/LoginAsCustomerAssistance/etc/acl.xml b/app/code/Magento/LoginAsCustomerAssistance/etc/acl.xml
index 2c16b5a9125df..fd16eb2e51b03 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/etc/acl.xml
+++ b/app/code/Magento/LoginAsCustomerAssistance/etc/acl.xml
@@ -10,7 +10,7 @@
-
+
diff --git a/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/web/js/not-allowed-popup.js b/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/web/js/not-allowed-popup.js
index 59d8dd4a7ed49..2e54a249c5be6 100644
--- a/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/web/js/not-allowed-popup.js
+++ b/app/code/Magento/LoginAsCustomerAssistance/view/adminhtml/web/js/not-allowed-popup.js
@@ -35,7 +35,7 @@ define([
modalClass: 'confirm lac-confirm',
buttons: [
{
- text: $t('Cancel'),
+ text: $t('Close'),
class: 'action-secondary action-dismiss',
/**
diff --git a/app/code/Magento/Marketplace/Test/Unit/Controller/Partners/IndexTest.php b/app/code/Magento/Marketplace/Test/Unit/Controller/Partners/IndexTest.php
index ae4042536eb0c..3f44c5616d597 100644
--- a/app/code/Magento/Marketplace/Test/Unit/Controller/Partners/IndexTest.php
+++ b/app/code/Magento/Marketplace/Test/Unit/Controller/Partners/IndexTest.php
@@ -93,7 +93,7 @@ public function getControllerIndexMock($methods = null)
*/
public function getLayoutFactoryMock($methods = null)
{
- return $this->createPartialMock(LayoutFactory::class, $methods, []);
+ return $this->createPartialMock(LayoutFactory::class, $methods);
}
/**
@@ -109,7 +109,7 @@ public function getLayoutMock()
*/
public function getResponseMock($methods = null)
{
- return $this->createPartialMock(Response::class, $methods, []);
+ return $this->createPartialMock(Response::class, $methods);
}
/**
@@ -117,7 +117,7 @@ public function getResponseMock($methods = null)
*/
public function getRequestMock($methods = null)
{
- return $this->createPartialMock(Http::class, $methods, []);
+ return $this->createPartialMock(Http::class, $methods);
}
/**
diff --git a/app/code/Magento/Marketplace/Test/Unit/Model/PartnersTest.php b/app/code/Magento/Marketplace/Test/Unit/Model/PartnersTest.php
index 76bb7be6e8b19..59928f40ca599 100644
--- a/app/code/Magento/Marketplace/Test/Unit/Model/PartnersTest.php
+++ b/app/code/Magento/Marketplace/Test/Unit/Model/PartnersTest.php
@@ -140,7 +140,7 @@ public function getPartnersBlockMock($methods = null)
*/
public function getPartnersModelMock($methods)
{
- return $this->createPartialMock(Partners::class, $methods, []);
+ return $this->createPartialMock(Partners::class, $methods);
}
/**
@@ -150,7 +150,7 @@ public function getPartnersModelMock($methods)
*/
public function getCurlMock($methods)
{
- return $this->createPartialMock(Curl::class, $methods, []);
+ return $this->createPartialMock(Curl::class, $methods);
}
/**
@@ -160,6 +160,6 @@ public function getCurlMock($methods)
*/
public function getCacheMock($methods)
{
- return $this->createPartialMock(Cache::class, $methods, []);
+ return $this->createPartialMock(Cache::class, $methods);
}
}
diff --git a/app/code/Magento/MediaContentApi/Model/Composite/GetAssetIdsByContentField.php b/app/code/Magento/MediaContentApi/Model/Composite/GetAssetIdsByContentField.php
index 61df8504b4c77..946550dc70a4d 100644
--- a/app/code/Magento/MediaContentApi/Model/Composite/GetAssetIdsByContentField.php
+++ b/app/code/Magento/MediaContentApi/Model/Composite/GetAssetIdsByContentField.php
@@ -42,9 +42,8 @@ public function execute(string $field, string $value): array
$ids = [];
/** @var GetAssetIdsByContentFieldInterface $fieldHandler */
foreach ($this->fieldHandlers[$field] as $fieldHandler) {
- // phpcs:ignore Magento2.Performance.ForeachArrayMerge
- $ids = array_merge($ids, $fieldHandler->execute($value));
+ $ids[] = $fieldHandler->execute($value);
}
- return array_unique($ids);
+ return array_unique(array_merge([], ...$ids));
}
}
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup.xml
index e21fa89965391..32065da7bb1e7 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertMediaGalleryFilterPlaceHolderGridActionGroup.xml
@@ -15,6 +15,8 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiEditCategoryGridPageTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiEditCategoryGridPageTest.xml
index 2a606d8ab6a9e..739b25d1ce0ed 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiEditCategoryGridPageTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiEditCategoryGridPageTest.xml
@@ -7,16 +7,19 @@
-->
-
+
+ Use AdminMediaGalleryCatalogUiEditCategoryFromGridPageTest instead
+
-
@@ -50,6 +52,8 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
index a66009e9d2045..02d96b725603f 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiUsedInProductFilterTest.xml
@@ -7,16 +7,19 @@
-->
-
+
+ Use AdminMediaGalleryCatalogUiUsedInProductFilterOnTest instead
+
-
-
+
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
index f9ffda43d2547..a3f1bd7c01136 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest.xml
@@ -7,16 +7,19 @@
-->
-
+
+ Use AdminMediaGalleryCatalogUiVerifyUsedInLinkCategoryGridTest instead
+
@@ -42,6 +44,10 @@
+
@@ -51,6 +57,8 @@
-
diff --git a/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkedCategoryGridTest.xml b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkedCategoryGridTest.xml
new file mode 100644
index 0000000000000..8e197b740bb11
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Test/AdminMediaGalleryCatalogUiVerifyUsedInLinkedCategoryGridTest.xml
@@ -0,0 +1,102 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/ActionGroup/FillOutCustomCMSPageContentActionGroup.xml b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/ActionGroup/FillOutCustomCMSPageContentActionGroup.xml
index f0938016d12f1..e0ec79394fdda 100644
--- a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/ActionGroup/FillOutCustomCMSPageContentActionGroup.xml
+++ b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/ActionGroup/FillOutCustomCMSPageContentActionGroup.xml
@@ -10,7 +10,7 @@
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
- Fills out the Page details (Page Title, Content and URL Key)
+ DEPRECATED. Use AdminCmsPageFillOutBasicFieldsActionGroup and other AGs from CMS module. Fills out the Page details (Page Title, Content and URL Key)
diff --git a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertImageUsedInLinkBlocksGridTest.xml b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertImageUsedInLinkBlocksGridTest.xml
new file mode 100644
index 0000000000000..530605bb7e233
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertImageUsedInLinkBlocksGridTest.xml
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkBlocksGridTest.xml b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkBlocksGridTest.xml
index a0cd04fad54c5..b360d958aee33 100644
--- a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkBlocksGridTest.xml
+++ b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkBlocksGridTest.xml
@@ -7,16 +7,19 @@
-->
-
+
+ Use AdminMediaGalleryAssertImageUsedInLinkBlocksGridTest instead
+
+
+
+
+
@@ -41,26 +54,33 @@
+
+
+
+
+
-
+
-
-
+
-
-
+ Use AdminMediaGalleryAssertUsedInLinkedPagesGridTest instead
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
+
-
+
+
+
-
-
diff --git a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkedPagesGridTest.xml b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkedPagesGridTest.xml
new file mode 100644
index 0000000000000..4e589faef9a1f
--- /dev/null
+++ b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryAssertUsedInLinkedPagesGridTest.xml
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryCmsUiUsedInPagesFilterTest.xml b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryCmsUiUsedInPagesFilterTest.xml
index e72e65cf8de90..7254e95d619f5 100644
--- a/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryCmsUiUsedInPagesFilterTest.xml
+++ b/app/code/Magento/MediaGalleryCmsUi/Test/Mftf/Test/AdminMediaGalleryCmsUiUsedInPagesFilterTest.xml
@@ -9,9 +9,6 @@
-
-
-
+
diff --git a/app/code/Magento/MediaGalleryRenditions/Model/Config.php b/app/code/Magento/MediaGalleryRenditions/Model/Config.php
index d1a48904d1f13..6622ef36dffd7 100644
--- a/app/code/Magento/MediaGalleryRenditions/Model/Config.php
+++ b/app/code/Magento/MediaGalleryRenditions/Model/Config.php
@@ -18,7 +18,8 @@
class Config
{
private const TABLE_CORE_CONFIG_DATA = 'core_config_data';
- private const XML_PATH_ENABLED = 'system/media_gallery/enabled';
+ private const XML_PATH_MEDIA_GALLERY_ENABLED = 'system/media_gallery/enabled';
+ private const XML_PATH_ENABLED = 'system/media_gallery_renditions/enabled';
private const XML_PATH_MEDIA_GALLERY_RENDITIONS_WIDTH_PATH = 'system/media_gallery_renditions/width';
private const XML_PATH_MEDIA_GALLERY_RENDITIONS_HEIGHT_PATH = 'system/media_gallery_renditions/height';
@@ -49,6 +50,16 @@ public function __construct(
*
* @return bool
*/
+ public function isMediaGalleryEnabled(): bool
+ {
+ return $this->scopeConfig->isSetFlag(self::XML_PATH_MEDIA_GALLERY_ENABLED);
+ }
+
+ /**
+ * Should the renditions be inserted in the content instead of original image
+ *
+ * @return bool
+ */
public function isEnabled(): bool
{
return $this->scopeConfig->isSetFlag(self::XML_PATH_ENABLED);
diff --git a/app/code/Magento/MediaGalleryRenditions/Plugin/SetRenditionPath.php b/app/code/Magento/MediaGalleryRenditions/Plugin/SetRenditionPath.php
index ec2012c528ef1..2fc49950463ea 100644
--- a/app/code/Magento/MediaGalleryRenditions/Plugin/SetRenditionPath.php
+++ b/app/code/Magento/MediaGalleryRenditions/Plugin/SetRenditionPath.php
@@ -91,7 +91,7 @@ public function beforeExecute(
$storeId
];
- if (!$this->config->isEnabled()) {
+ if (!$this->config->isEnabled() || !$this->config->isMediaGalleryEnabled()) {
return $arguments;
}
diff --git a/app/code/Magento/MediaGalleryRenditions/Plugin/UpdateRenditionsOnConfigChange.php b/app/code/Magento/MediaGalleryRenditions/Plugin/UpdateRenditionsOnConfigChange.php
index 9cf969c16782f..6fcb37398f3ad 100644
--- a/app/code/Magento/MediaGalleryRenditions/Plugin/UpdateRenditionsOnConfigChange.php
+++ b/app/code/Magento/MediaGalleryRenditions/Plugin/UpdateRenditionsOnConfigChange.php
@@ -8,6 +8,7 @@
namespace Magento\MediaGalleryRenditions\Plugin;
use Magento\Framework\App\Config\Value;
+use Magento\MediaGalleryRenditions\Model\Config;
use Magento\MediaGalleryRenditions\Model\Queue\ScheduleRenditionsUpdate;
/**
@@ -15,6 +16,7 @@
*/
class UpdateRenditionsOnConfigChange
{
+ private const XML_PATH_MEDIA_GALLERY_RENDITIONS_ENABLE_PATH = 'system/media_gallery_renditions/enabled';
private const XML_PATH_MEDIA_GALLERY_RENDITIONS_WIDTH_PATH = 'system/media_gallery_renditions/width';
private const XML_PATH_MEDIA_GALLERY_RENDITIONS_HEIGHT_PATH = 'system/media_gallery_renditions/height';
@@ -24,10 +26,17 @@ class UpdateRenditionsOnConfigChange
private $scheduleRenditionsUpdate;
/**
+ * @var Config
+ */
+ private $config;
+
+ /**
+ * @param Config $config
* @param ScheduleRenditionsUpdate $scheduleRenditionsUpdate
*/
- public function __construct(ScheduleRenditionsUpdate $scheduleRenditionsUpdate)
+ public function __construct(Config $config, ScheduleRenditionsUpdate $scheduleRenditionsUpdate)
{
+ $this->config = $config;
$this->scheduleRenditionsUpdate = $scheduleRenditionsUpdate;
}
@@ -41,7 +50,13 @@ public function __construct(ScheduleRenditionsUpdate $scheduleRenditionsUpdate)
*/
public function afterSave(Value $config, Value $result): Value
{
- if ($this->isRenditionsValue($result) && $result->isValueChanged()) {
+ if ($this->isRenditionsEnabled($result)) {
+ $this->scheduleRenditionsUpdate->execute();
+
+ return $result;
+ }
+
+ if ($this->config->isEnabled() && $this->isRenditionsValue($result) && $result->isValueChanged()) {
$this->scheduleRenditionsUpdate->execute();
}
@@ -59,4 +74,17 @@ private function isRenditionsValue(Value $value): bool
return $value->getPath() === self::XML_PATH_MEDIA_GALLERY_RENDITIONS_WIDTH_PATH
|| $value->getPath() === self::XML_PATH_MEDIA_GALLERY_RENDITIONS_HEIGHT_PATH;
}
+
+ /**
+ * Determine if media gallery renditions is enabled based on configuration value
+ *
+ * @param Value $value
+ * @return bool
+ */
+ private function isRenditionsEnabled(Value $value): bool
+ {
+ return $value->getPath() === self::XML_PATH_MEDIA_GALLERY_RENDITIONS_ENABLE_PATH
+ && $value->isValueChanged()
+ && $value->getValue();
+ }
}
diff --git a/app/code/Magento/MediaGalleryRenditions/Test/Mftf/ActionGroup/AdminRenditionsSetImageSizeActionGroup.xml b/app/code/Magento/MediaGalleryRenditions/Test/Mftf/ActionGroup/AdminRenditionsSetImageSizeActionGroup.xml
new file mode 100644
index 0000000000000..b841d064aab7e
--- /dev/null
+++ b/app/code/Magento/MediaGalleryRenditions/Test/Mftf/ActionGroup/AdminRenditionsSetImageSizeActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/MediaGalleryRenditions/Test/Mftf/Test/AdminMediaGalleryInsertImageLargeFileSizeTest.xml b/app/code/Magento/MediaGalleryRenditions/Test/Mftf/Test/AdminMediaGalleryInsertImageLargeFileSizeTest.xml
new file mode 100644
index 0000000000000..2d80b490e2d9b
--- /dev/null
+++ b/app/code/Magento/MediaGalleryRenditions/Test/Mftf/Test/AdminMediaGalleryInsertImageLargeFileSizeTest.xml
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/MediaGalleryRenditions/Test/Mftf/Test/AdminMediaGalleryInsertLargeImageFileSizeTest.xml b/app/code/Magento/MediaGalleryRenditions/Test/Mftf/Test/AdminMediaGalleryInsertLargeImageFileSizeTest.xml
new file mode 100644
index 0000000000000..061f062eabe6b
--- /dev/null
+++ b/app/code/Magento/MediaGalleryRenditions/Test/Mftf/Test/AdminMediaGalleryInsertLargeImageFileSizeTest.xml
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+ Use AdminMediaGalleryInsertImageLargeFileSizeTest instead
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/MediaGalleryRenditions/etc/adminhtml/system.xml b/app/code/Magento/MediaGalleryRenditions/etc/adminhtml/system.xml
index 64f338d53a283..f36f628cb122f 100644
--- a/app/code/Magento/MediaGalleryRenditions/etc/adminhtml/system.xml
+++ b/app/code/Magento/MediaGalleryRenditions/etc/adminhtml/system.xml
@@ -9,14 +9,22 @@
-
-
-
+
+
+
+ Magento\Config\Model\Config\Source\Yesno
+
+ Resize images to improve performance and decrease the file size. When you use an image from Media Gallery on the storefront, the smaller image is generated and placed instead of the original.
+ Changing these settings will update all generated images.
+
+
validate-zero-or-greater validate-digits
+ Enter the maximum width of an image in pixels.
-
-
+
+
validate-zero-or-greater validate-digits
+ Enter the maximum height of an image in pixels.
diff --git a/app/code/Magento/MediaGalleryRenditions/etc/config.xml b/app/code/Magento/MediaGalleryRenditions/etc/config.xml
index 58c5aa1f11fd2..871571a049875 100644
--- a/app/code/Magento/MediaGalleryRenditions/etc/config.xml
+++ b/app/code/Magento/MediaGalleryRenditions/etc/config.xml
@@ -9,9 +9,15 @@
+ 1
1000
1000
+
+
+ .renditions
+
+
diff --git a/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php b/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
index b4c360c3e0538..19c2569695d56 100644
--- a/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
+++ b/app/code/Magento/MediaGallerySynchronization/Model/CreateAssetFromFile.php
@@ -10,7 +10,6 @@
use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\Exception\FileSystemException;
use Magento\Framework\Filesystem;
-use Magento\Framework\Filesystem\Directory\ReadInterface;
use Magento\Framework\Filesystem\Driver\File;
use Magento\MediaGalleryApi\Api\Data\AssetInterface;
use Magento\MediaGalleryApi\Api\Data\AssetInterfaceFactory;
@@ -74,19 +73,37 @@ public function __construct(
public function execute(string $path): AssetInterface
{
$absolutePath = $this->getMediaDirectory()->getAbsolutePath($path);
- $file = $this->getFileInfo->execute($absolutePath);
- [$width, $height] = getimagesize($absolutePath);
+ $driver = $this->getMediaDirectory()->getDriver();
+
+ if ($driver instanceof Filesystem\ExtendedDriverInterface) {
+ $meta = $driver->getMetadata($absolutePath);
+ } else {
+ /**
+ * SPL file info is not compatible with remote storages and must not be used.
+ */
+ $file = $this->getFileInfo->execute($absolutePath);
+ [$width, $height] = getimagesize($absolutePath);
+ $meta = [
+ 'size' => $file->getSize(),
+ 'extension' => $file->getExtension(),
+ 'basename' => $file->getBasename(),
+ 'extra' => [
+ 'image-width' => $width,
+ 'image-height' => $height
+ ]
+ ];
+ }
return $this->assetFactory->create(
[
'id' => null,
'path' => $path,
- 'title' => $file->getBasename(),
- 'width' => $width,
- 'height' => $height,
+ 'title' => $meta['basename'],
+ 'width' => $meta['extra']['image-width'],
+ 'height' => $meta['extra']['image-height'],
'hash' => $this->getHash($path),
- 'size' => $file->getSize(),
- 'contentType' => 'image/' . $file->getExtension(),
+ 'size' => $meta['size'],
+ 'contentType' => 'image/' . $meta['extension'],
'source' => 'Local'
]
);
@@ -105,12 +122,12 @@ private function getHash(string $path): string
}
/**
- * Retrieve media directory instance with read access
+ * Retrieve media directory instance with write access
*
- * @return ReadInterface
+ * @return Filesystem\Directory\WriteInterface
*/
- private function getMediaDirectory(): ReadInterface
+ private function getMediaDirectory(): Filesystem\Directory\WriteInterface
{
- return $this->filesystem->getDirectoryRead(DirectoryList::MEDIA);
+ return $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
}
}
diff --git a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/GetTree.php b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/GetTree.php
index d4885cae055dd..d9a38895e1fa0 100644
--- a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/GetTree.php
+++ b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Directories/GetTree.php
@@ -11,7 +11,7 @@
use Magento\Framework\App\Action\HttpGetActionInterface;
use Magento\Framework\Controller\Result\Json;
use Magento\Framework\Controller\ResultFactory;
-use Magento\MediaGalleryUi\Model\Directories\GetFolderTree;
+use Magento\MediaGalleryUi\Model\Directories\GetDirectoryTree;
use Psr\Log\LoggerInterface;
/**
@@ -33,25 +33,25 @@ class GetTree extends Action implements HttpGetActionInterface
private $logger;
/**
- * @var GetFolderTree
+ * @var GetDirectoryTree
*/
- private $getFolderTree;
+ private $getDirectoryTree;
/**
* Constructor
*
* @param Action\Context $context
* @param LoggerInterface $logger
- * @param GetFolderTree $getFolderTree
+ * @param GetDirectoryTree $getDirectoryTree
*/
public function __construct(
Action\Context $context,
LoggerInterface $logger,
- GetFolderTree $getFolderTree
+ GetDirectoryTree $getDirectoryTree
) {
parent::__construct($context);
$this->logger = $logger;
- $this->getFolderTree = $getFolderTree;
+ $this->getDirectoryTree = $getDirectoryTree;
}
/**
* @inheritdoc
@@ -59,7 +59,9 @@ public function __construct(
public function execute()
{
try {
- $responseContent[] = $this->getFolderTree->execute();
+ $responseContent = [
+ $this->getDirectoryTree->execute()
+ ];
$responseCode = self::HTTP_OK;
} catch (\Exception $exception) {
$this->logger->critical($exception);
diff --git a/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/OnInsert.php b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/OnInsert.php
new file mode 100644
index 0000000000000..b92724f64148e
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Controller/Adminhtml/Image/OnInsert.php
@@ -0,0 +1,74 @@
+resultJsonFactory = $resultJsonFactory;
+ $this->getInsertImageData = $getInsertImageData;
+ }
+
+ /**
+ * Return a content (just a link or an html block) for inserting image to the content
+ *
+ * @return ResultInterface
+ */
+ public function execute()
+ {
+ $data = $this->getRequest()->getParams();
+ $insertImageData = $this->getInsertImageData->execute(
+ $data['filename'],
+ (bool)$data['force_static_path'],
+ (bool)$data['as_is'],
+ isset($data['store']) ? (int)$data['store'] : null
+ );
+
+ return $this->resultJsonFactory->create()->setData([
+ 'content' => $insertImageData->getContent(),
+ 'size' => $insertImageData->getSize(),
+ 'type' => $insertImageData->getType(),
+ ]);
+ }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php b/app/code/Magento/MediaGalleryUi/Model/Directories/GetDirectoryTree.php
similarity index 99%
rename from app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php
rename to app/code/Magento/MediaGalleryUi/Model/Directories/GetDirectoryTree.php
index c22165ba4e51f..35e34a7e5532c 100644
--- a/app/code/Magento/MediaGalleryUi/Model/Directories/GetFolderTree.php
+++ b/app/code/Magento/MediaGalleryUi/Model/Directories/GetDirectoryTree.php
@@ -16,7 +16,7 @@
/**
* Build media gallery folder tree structure by path
*/
-class GetFolderTree
+class GetDirectoryTree
{
/**
* @var Filesystem
diff --git a/app/code/Magento/MediaGalleryUi/Model/InsertImageData.php b/app/code/Magento/MediaGalleryUi/Model/InsertImageData.php
new file mode 100644
index 0000000000000..f70ed8e308c99
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/InsertImageData.php
@@ -0,0 +1,102 @@
+content = $content;
+ $this->size = $size;
+ $this->type = $type;
+ }
+
+ /**
+ * Returns a content (just a link or an html block) for inserting image to the content
+ *
+ * @return string
+ */
+ public function getContent(): string
+ {
+ return $this->content;
+ }
+
+ /**
+ * Returns size of requested file
+ *
+ * @return int
+ */
+ public function getSize(): int
+ {
+ return $this->size;
+ }
+
+ /**
+ * Returns MIME type of requested file
+ *
+ * @return string
+ */
+ public function getType(): string
+ {
+ return $this->type;
+ }
+
+ /**
+ * Get extension attributes
+ *
+ * @return \Magento\MediaGalleryUi\Model\InsertImageDataExtensionInterface|null
+ */
+ public function getExtensionAttributes(): ?InsertImageDataExtensionInterface
+ {
+ return $this->extensionAttributes;
+ }
+
+ /**
+ * Set extension attributes
+ *
+ * @param \Magento\MediaGalleryUi\Model\InsertImageDataExtensionInterface $extensionAttributes
+ * @return void
+ */
+ public function setExtensionAttributes(InsertImageDataExtensionInterface $extensionAttributes): void
+ {
+ $this->extensionAttributes = $extensionAttributes;
+ }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Model/InsertImageData/GetInsertImageData.php b/app/code/Magento/MediaGalleryUi/Model/InsertImageData/GetInsertImageData.php
new file mode 100644
index 0000000000000..6f1d399784139
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/InsertImageData/GetInsertImageData.php
@@ -0,0 +1,158 @@
+getInsertImageContent = $getInsertImageContent;
+ $this->filesystem = $fileSystem;
+ $this->mime = $mime;
+ $this->insertImageDataFactory = $insertImageDataFactory;
+ $this->imagesHelper = $imagesHelper;
+ }
+
+ /**
+ * Returns image data object
+ *
+ * @param string $encodedFilename
+ * @param bool $forceStaticPath
+ * @param bool $renderAsTag
+ * @param int|null $storeId
+ * @return InsertImageDataInterface
+ */
+ public function execute(
+ string $encodedFilename,
+ bool $forceStaticPath,
+ bool $renderAsTag,
+ ?int $storeId = null
+ ): InsertImageDataInterface {
+ $content = $this->getInsertImageContent->execute(
+ $encodedFilename,
+ $forceStaticPath,
+ $renderAsTag,
+ $storeId
+ );
+ $relativePath = $this->getImageRelativePath($content);
+ $size = $forceStaticPath ? $this->getSize($relativePath) : 0;
+ $type = $forceStaticPath ? $this->getType($relativePath) : '';
+ return $this->insertImageDataFactory->create([
+ 'content' => $content,
+ 'size' => $size,
+ 'type' => $type
+ ]);
+ }
+
+ /**
+ * Retrieve size of requested file
+ *
+ * @param string $path
+ * @return int
+ */
+ private function getSize(string $path): int
+ {
+ $directory = $this->getMediaDirectory();
+
+ return $directory->isExist($path) ? $directory->stat($path)['size'] : 0;
+ }
+
+ /**
+ * Retrieve MIME type of requested file
+ *
+ * @param string $path
+ * @return string
+ */
+ public function getType(string $path): string
+ {
+ $fileExist = $this->getMediaDirectory()->isExist($path);
+
+ return $fileExist ? $this->mime->getMimeType($this->getMediaDirectory()->getAbsolutePath($path)) : '';
+ }
+
+ /**
+ * Retrieve pub directory read interface instance
+ *
+ * @return ReadInterface
+ */
+ private function getMediaDirectory(): ReadInterface
+ {
+ if ($this->mediaDirectory === null) {
+ $this->mediaDirectory = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA);
+ }
+
+ return $this->mediaDirectory;
+ }
+
+ /**
+ * Retrieves image relative path
+ *
+ * @param string $content
+ * @return string
+ */
+ private function getImageRelativePath(string $content): string
+ {
+ // phpcs:ignore Magento2.Functions.DiscouragedFunction
+ $mediaPath = parse_url($this->imagesHelper->getCurrentUrl(), PHP_URL_PATH);
+ return substr($content, strlen($mediaPath));
+ }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Model/InsertImageDataInterface.php b/app/code/Magento/MediaGalleryUi/Model/InsertImageDataInterface.php
new file mode 100644
index 0000000000000..063d76292d625
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Model/InsertImageDataInterface.php
@@ -0,0 +1,55 @@
+
+
+
+
+
+ Validates that the provided image has correct file size in category content section.
+
+
+
+
+
+ {{fileSize}}
+ imageSize
+
+
+
+
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertImagesDeletedInBulkActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertImagesDeletedInBulkActionGroup.xml
index ca503b7357300..6ffa8f4647341 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertImagesDeletedInBulkActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertImagesDeletedInBulkActionGroup.xml
@@ -15,6 +15,6 @@
-
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertMassActionModeDetailsActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertMassActionModeDetailsActionGroup.xml
index efcf40cd2b644..761333fdbb151 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertMassActionModeDetailsActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryAssertMassActionModeDetailsActionGroup.xml
@@ -15,7 +15,7 @@
-
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryCloseViewDetailsActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryCloseViewDetailsActionGroup.xml
index 3754eb319da44..effb574853bb7 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryCloseViewDetailsActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryCloseViewDetailsActionGroup.xml
@@ -10,10 +10,10 @@
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
- Closes View Details panel
+ Closes View Details panel of Media Gallery image.
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeletedAllImagesActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeletedAllImagesActionGroup.xml
new file mode 100644
index 0000000000000..4aa460327578a
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryDeletedAllImagesActionGroup.xml
@@ -0,0 +1,26 @@
+
+
+
+
+ Open Media Gallery page and delete all images
+
+
+ {{AdminMediaGalleryGridSection.noDataMessage}}
+ {{AdminEnhancedMediaGalleryMassActionSection.deleteImages}}
+ {{AdminEnhancedMediaGalleryMassActionSection.massActionCheckboxAll}}
+ {{AdminEnhancedMediaGalleryMassActionSection.deleteSelected}}
+ {{AdminEnhancedMediaGalleryDeleteModalSection.confirmDelete}}
+ {{AdminMediaGalleryMessagesSection.success}}
+ been successfully deleted
+
+
+
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEnableMassActionModeActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEnableMassActionModeActionGroup.xml
index 5e5c89637c6a1..15ef00c41a6e4 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEnableMassActionModeActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminEnhancedMediaGalleryEnableMassActionModeActionGroup.xml
@@ -13,7 +13,10 @@
Activate massaction mode by click on Delete Selected..
+ Edit image from the View Details panel
-
-
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryExpandFolderActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryExpandFolderActionGroup.xml
new file mode 100644
index 0000000000000..f10aed54c8447
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryExpandFolderActionGroup.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryFolderDeleteActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryFolderDeleteActionGroup.xml
index f7e8f551e681f..398003c7f2b02 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryFolderDeleteActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryFolderDeleteActionGroup.xml
@@ -9,8 +9,8 @@
-
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryFolderSelectActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryFolderSelectActionGroup.xml
index b8ed1d4f1cd25..5751b8ec323da 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryFolderSelectActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryFolderSelectActionGroup.xml
@@ -9,11 +9,15 @@
+
+ Wait for folder name appeared in tree and then click it.
+
-
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryRenditionsEnableActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryRenditionsEnableActionGroup.xml
new file mode 100644
index 0000000000000..b64247a708242
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminMediaGalleryRenditionsEnableActionGroup.xml
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromPageNoEditorActionGroup.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromPageNoEditorActionGroup.xml
index 0b2540de5288e..287b6219115f2 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromPageNoEditorActionGroup.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AdminOpenMediaGalleryFromPageNoEditorActionGroup.xml
@@ -9,8 +9,9 @@
-
Opens Enhanced MediaGallery from category page by tyniMce4 image icon
-
-
+ magento-logo_2.png
+ png
+
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdobeStockConfigData.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdobeStockConfigData.xml
index e8f394a006104..9ac743f2f9983 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdobeStockConfigData.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Data/AdobeStockConfigData.xml
@@ -15,4 +15,12 @@
system/media_gallery/enabled
0
+
+ system/media_gallery_renditions/enabled
+ 1
+
+
+ system/media_gallery_renditions/enabled
+ 0
+
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Helper/MediaGalleryUiHelper.php b/app/code/Magento/MediaGalleryUi/Test/Mftf/Helper/MediaGalleryUiHelper.php
new file mode 100644
index 0000000000000..4059a8460bb51
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Helper/MediaGalleryUiHelper.php
@@ -0,0 +1,77 @@
+getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
+ /** @var FacebookWebDriver $webDriver */
+ $webDriver = $magentoWebDriver->webDriver;
+ $rows = $webDriver->findElements(WebDriverBy::cssSelector($emptyRow));
+ while (empty($rows)) {
+ $magentoWebDriver->click($deleteImagesButton);
+ $magentoWebDriver->waitForPageLoad(30);
+ $magentoWebDriver->waitForElementVisible($deleteSelectedButton, 10);
+
+ // Check all images
+ /** @var RemoteWebElement[] $images */
+ $imagesCheckboxes = $webDriver->findElements(WebDriverBy::cssSelector($checkImage));
+ /** @var RemoteWebElement $image */
+ foreach ($imagesCheckboxes as $imageCheckbox) {
+ $imageCheckbox->click();
+ }
+
+ $magentoWebDriver->waitForPageLoad(30);
+ $magentoWebDriver->click($deleteSelectedButton);
+ $magentoWebDriver->waitForPageLoad(30);
+ $magentoWebDriver->waitForElementVisible($modalAcceptButton, 10);
+ $magentoWebDriver->click($modalAcceptButton);
+ $magentoWebDriver->waitForPageLoad(60);
+ $magentoWebDriver->waitForElementVisible($successMessageContainer, 10);
+ $magentoWebDriver->see($successMessage, $successMessageContainer);
+
+ $rows = $webDriver->findElements(WebDriverBy::cssSelector($emptyRow));
+ }
+ } catch (\Exception $e) {
+ $this->fail($e->getMessage());
+ }
+ }
+}
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminConfigSystemSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminConfigSystemSection.xml
index b7900f6664c62..f3ab74470e4e4 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminConfigSystemSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminConfigSystemSection.xml
@@ -11,6 +11,8 @@
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryEditDetailsSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryEditDetailsSection.xml
index b0bed4563003e..351367055e62b 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryEditDetailsSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryEditDetailsSection.xml
@@ -16,6 +16,7 @@
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml
index 07f2dc23530e1..9018ccb4ddd69 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminEnhancedMediaGalleryMassActionSection.xml
@@ -13,5 +13,6 @@
+
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryFolderSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryFolderSection.xml
index 4c9e6bf362194..be12829229663 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryFolderSection.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryFolderSection.xml
@@ -12,11 +12,15 @@
-
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryMessagesSection.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryMessagesSection.xml
new file mode 100644
index 0000000000000..659fb51080225
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Section/AdminMediaGalleryMessagesSection.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiDisabledSuite.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiDisabledSuite.xml
index 727fbde3f17b6..d5f2abe965575 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiDisabledSuite.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiDisabledSuite.xml
@@ -9,6 +9,17 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiSuite.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiSuite.xml
index 4749fc4a885b0..e81dc807d0f48 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiSuite.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Suite/MediaGalleryUiSuite.xml
@@ -15,6 +15,7 @@
+
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryDuplicatedImagesTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryDuplicatedImagesTest.xml
index 52f3a8079e962..e87354de41761 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryDuplicatedImagesTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminEnhancedMediaGalleryDuplicatedImagesTest.xml
@@ -51,5 +51,6 @@
+
-
+
+ Use AdminEnhancedMediaGalleryVerifyFilterByAssetTest instead
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryAddCategoryImageTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryAddCategoryImageTest.xml
index 30f1412a5b08d..d3925fcb265e1 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryAddCategoryImageTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryAddCategoryImageTest.xml
@@ -39,6 +39,14 @@
+
+
+
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageWithWarningPopupTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageWithWarningPopupTest.xml
index 6ae8ed7047434..84dd84a22d3c3 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageWithWarningPopupTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDeleteImageWithWarningPopupTest.xml
@@ -33,6 +33,8 @@
@@ -43,11 +45,13 @@
-
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDisabledContentFilterTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDisabledContentFilterTest.xml
index 5926b115afccf..6b174e8c43c97 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDisabledContentFilterTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryDisabledContentFilterTest.xml
@@ -9,9 +9,6 @@
-
-
+
+
+
+
@@ -57,12 +64,14 @@
-
-
+
-
+
+
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryEditImageDetailsFromGridTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryEditImageDetailsFromGridTest.xml
new file mode 100644
index 0000000000000..91a17a7c1167c
--- /dev/null
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryEditImageDetailsFromGridTest.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryEditImageDetailsTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryEditImageDetailsTest.xml
index 960443998d010..34c3159ab769e 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryEditImageDetailsTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryEditImageDetailsTest.xml
@@ -7,16 +7,19 @@
-->
-
+
+ Use AdminMediaGalleryEditImageDetailsFromGridTest instead
+
@@ -56,7 +58,7 @@
-
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
index 684db1d4a2627..fa43e4e17d406 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGalleryUploadCategoryImageTest.xml
@@ -37,8 +37,8 @@
-
+
-
+
+
+
-
+
+
+
+
+
@@ -36,5 +54,6 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml
index 58c6f32b8d72f..039e9212945e2 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml
+++ b/app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminStandaloneMediaGalleryEditImageDetailsTest.xml
@@ -7,16 +7,19 @@
-->
-
+
+ Use AdminStandaloneMediaGalleryEditImageDetailsFromDialogTest instead
+
-
+
+
+
-
+
+
+
+
+
@@ -36,5 +54,6 @@
+
diff --git a/app/code/Magento/MediaGalleryUi/Test/Unit/Model/UploadImageTest.php b/app/code/Magento/MediaGalleryUi/Test/Unit/Model/UploadImageTest.php
index fc8a0756a7b55..4946cd1092ff7 100644
--- a/app/code/Magento/MediaGalleryUi/Test/Unit/Model/UploadImageTest.php
+++ b/app/code/Magento/MediaGalleryUi/Test/Unit/Model/UploadImageTest.php
@@ -129,7 +129,7 @@ public function executeDataProvider(): array
[
'targetFolder' => 'media/catalog',
'type' => 'image',
- 'absolutePath' => 'root/pub/media/catalog/test-image.jpeg'
+ 'absolutePath' => 'root/media/catalog/test-image.jpeg'
]
];
}
diff --git a/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Columns/Url.php b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Columns/Url.php
index 0d48a0d0ff0e1..a55c6397a31fa 100644
--- a/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Columns/Url.php
+++ b/app/code/Magento/MediaGalleryUi/Ui/Component/Listing/Columns/Url.php
@@ -115,8 +115,8 @@ public function prepare(): void
(array)$this->getData('config'),
[
'allowedActions' => $this->getAllowedActions(),
- 'onInsertUrl' => $this->urlInterface->getUrl('cms/wysiwyg_images/oninsert'),
- 'storeId' => $this->storeManager->getStore()->getId()
+ 'onInsertUrl' => $this->urlInterface->getUrl('media_gallery/image/oninsert'),
+ 'storeId' => $this->storeManager->getStore()->getId(),
]
)
);
diff --git a/app/code/Magento/MediaGalleryUi/etc/di.xml b/app/code/Magento/MediaGalleryUi/etc/di.xml
index 6ed3a98bbf03a..964ac92399738 100644
--- a/app/code/Magento/MediaGalleryUi/etc/di.xml
+++ b/app/code/Magento/MediaGalleryUi/etc/di.xml
@@ -7,6 +7,7 @@
-->
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details.phtml b/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details.phtml
index 5df5c1a6c4cbd..783ff5a9c05bd 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details.phtml
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details.phtml
@@ -22,15 +22,8 @@ use Magento\Framework\Escaper;
title: 'escapeHtmlAttr(__('Image Details')); ?>'
}
}">
-
+
- getChildHtml('form_additional_info') ?>
+
+
+
-
-
+
+
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
index 99040706e50ac..5e58f94683ec1 100644
--- a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -259,8 +259,12 @@ $formData = $block->getFormData();
autocomplete="off">
+
+
getViewModel();
addressGetStreetLines(); $_i < $_n; $_i++): ?>
-
-
+
-
-
-
+
@@ -51,22 +44,10 @@ use Magento\Framework\Escaper;
"modalSelector": ".media-gallery-image-details-modal",
"modalWindowSelector": ".media-gallery-image-details",
"mediaGridMessages": "media_gallery_listing.media_gallery_listing.messages"
- }
- }
- }
- },
- "#media-gallery-image-details-messages": {
- "Magento_Ui/js/core/app": {
- "components": {
+ },
"mediaGalleryImageDetailsMessages": {
"component": "Magento_MediaGalleryUi/js/grid/messages"
- }
- }
- }
- },
- "#media-gallery-image-actions": {
- "Magento_Ui/js/core/app": {
- "components": {
+ },
"mediaGalleryImageActions": {
"component": "Magento_MediaGalleryUi/js/image/image-actions",
"modalSelector": ".media-gallery-image-details-modal",
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details_standalone.phtml b/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details_standalone.phtml
index fdae0a549606c..a4a096939eea4 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details_standalone.phtml
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_details_standalone.phtml
@@ -18,15 +18,8 @@
title: 'escapeHtmlAttr(__('Image Details')); ?>'
}
}">
-
-
-
+
-
-
-
+
@@ -47,22 +40,7 @@
"modalSelector": ".media-gallery-image-details-modal",
"modalWindowSelector": ".media-gallery-image-details",
"mediaGridMessages": "standalone_media_gallery_listing.standalone_media_gallery_listing.messages"
- }
- }
- }
- },
- "#media-gallery-image-details-messages": {
- "Magento_Ui/js/core/app": {
- "components": {
- "mediaGalleryImageDetailsMessages": {
- "component": "Magento_MediaGalleryUi/js/grid/messages"
- }
- }
- }
- },
- "#media-gallery-image-actions": {
- "Magento_Ui/js/core/app": {
- "components": {
+ },
"mediaGalleryImageActions": {
"component": "Magento_MediaGalleryUi/js/image/image-actions",
"modalSelector": ".media-gallery-image-details-modal",
@@ -70,6 +48,9 @@
"mediaGalleryImageDetailsName": "mediaGalleryImageDetails",
"imageModelName" : "standalone_media_gallery_listing.standalone_media_gallery_listing.media_gallery_columns.thumbnail_url",
"actionsList": getActionsJson() ?>
+ },
+ "mediaGalleryImageDetailsMessages": {
+ "component": "Magento_MediaGalleryUi/js/grid/messages"
}
}
}
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_edit_details.phtml b/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_edit_details.phtml
index c2b7e66cc89bd..bda0dccb9ae4b 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_edit_details.phtml
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_edit_details.phtml
@@ -20,15 +20,8 @@ use Magento\Backend\Block\Template;
title: 'escapeHtmlAttr(__('Edit Image')); ?>'
}
}">
-
-
-
+
-
-
-
+
@@ -50,25 +43,10 @@ use Magento\Backend\Block\Template;
"imageEditDetailsUrl": "escapeJs($block->getData('imageEditDetailsUrl')); ?>",
"saveDetailsUrl": "escapeJs($block->getData('saveDetailsUrl')); ?>",
"mediaGridMessages": "standalone_media_gallery_listing.standalone_media_gallery_listing.messages"
- }
- }
- },
- "Magento_MediaGalleryUi/js/validation/validate-image-title": {},
- "Magento_MediaGalleryUi/js/validation/validate-image-description": {},
- "Magento_MediaGalleryUi/js/validation/validate-image-keyword": {}
- },
- "#media-gallery-image-edit-details-messages": {
- "Magento_Ui/js/core/app": {
- "components": {
+ },
"mediaGalleryEditDetailsMessages": {
"component": "Magento_MediaGalleryUi/js/grid/messages"
- }
- }
- }
- },
- "#media-gallery-edit-image-actions": {
- "Magento_Ui/js/core/app": {
- "components": {
+ },
"mediaGalleryImageEditActions": {
"component": "Magento_MediaGalleryUi/js/image/image-actions",
"modalSelector": ".media-gallery-edit-image-details-modal",
@@ -91,7 +69,10 @@ use Magento\Backend\Block\Template;
]
}
}
- }
+ },
+ "Magento_MediaGalleryUi/js/validation/validate-image-title": {},
+ "Magento_MediaGalleryUi/js/validation/validate-image-description": {},
+ "Magento_MediaGalleryUi/js/validation/validate-image-keyword": {}
}
}
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_edit_details_standalone.phtml b/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_edit_details_standalone.phtml
index ec48ed8bb9053..9a8f01b1c2939 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_edit_details_standalone.phtml
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/templates/image_edit_details_standalone.phtml
@@ -20,15 +20,8 @@ use Magento\Backend\Block\Template;
title: 'escapeHtmlAttr(__('Edit Image')); ?>'
}
}">
-
+
+
+
+
+
+
+ 13.00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/PageCache/Model/Config.php b/app/code/Magento/PageCache/Model/Config.php
index bf144cc46637e..10ae41be21d4d 100644
--- a/app/code/Magento/PageCache/Model/Config.php
+++ b/app/code/Magento/PageCache/Model/Config.php
@@ -121,7 +121,7 @@ public function __construct(
*/
public function getType()
{
- return (int)$this->_scopeConfig->getValue(self::XML_PAGECACHE_TYPE);
+ return $this->_scopeConfig->getValue(self::XML_PAGECACHE_TYPE);
}
/**
diff --git a/app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php b/app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php
index 1b64f3b635c03..6aff8aef2c2d9 100644
--- a/app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php
+++ b/app/code/Magento/PageCache/Model/Layout/LayoutPlugin.php
@@ -84,7 +84,7 @@ public function afterGenerateElements(Layout $subject)
public function afterGetOutput(Layout $subject, $result)
{
if ($subject->isCacheable() && $this->config->isEnabled()) {
- $tags = [[]];
+ $tags = [];
$isVarnish = $this->config->getType() === Config::VARNISH;
foreach ($subject->getAllBlocks() as $block) {
@@ -96,7 +96,7 @@ public function afterGetOutput(Layout $subject, $result)
$tags[] = $block->getIdentities();
}
}
- $tags = array_unique(array_merge(...$tags));
+ $tags = array_unique(array_merge([], ...$tags));
$tags = $this->pageCacheTagsPreprocessor->process($tags);
$this->response->setHeader('X-Magento-Tags', implode(',', $tags));
}
diff --git a/app/code/Magento/PageCache/Test/Mftf/Test/AdminFrontendAreaSessionMustNotAffectAdminAreaTest.xml b/app/code/Magento/PageCache/Test/Mftf/Test/AdminFrontendAreaSessionMustNotAffectAdminAreaTest.xml
index 1c280acd63a7b..e026bee87dcd4 100644
--- a/app/code/Magento/PageCache/Test/Mftf/Test/AdminFrontendAreaSessionMustNotAffectAdminAreaTest.xml
+++ b/app/code/Magento/PageCache/Test/Mftf/Test/AdminFrontendAreaSessionMustNotAffectAdminAreaTest.xml
@@ -76,10 +76,10 @@
+
+
+ Goes to the 'Configuration' page for 'Payment Methods'. Disables PayPal Express Checkout solution. Clicks on Save.
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalExpressCheckoutEnableActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalExpressCheckoutEnableActionGroup.xml
new file mode 100644
index 0000000000000..b6b44abd7b794
--- /dev/null
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/AdminPayPalExpressCheckoutEnableActionGroup.xml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+ Goes to the 'Configuration' page for 'Payment Methods'. Fills in the provided Sample PayPal credentials and other details. Clicks on Save.
+
+
+
+
+
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/SampleConfigPayPalExpressCheckoutActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/SampleConfigPayPalExpressCheckoutActionGroup.xml
index 23d956c8e9b8f..a7ccf0a19263b 100644
--- a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/SampleConfigPayPalExpressCheckoutActionGroup.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/SampleConfigPayPalExpressCheckoutActionGroup.xml
@@ -8,7 +8,7 @@
-
+
Goes to the 'Configuration' page for 'Payment Methods'. Fills in the provided Sample PayPal credentials and other details. Clicks on Save.
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdomTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdomTest.xml
index ebdfb9e91ecf1..a616c0bb2c68b 100644
--- a/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdomTest.xml
+++ b/app/code/Magento/Paypal/Test/Mftf/Test/AdminConfigPaymentsConflictResolutionForPayPalTest/AdminConfigPaymentsConflictResolutionForPayPalInUnitedKingdomTest.xml
@@ -19,7 +19,7 @@
+
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php
index 42b99ae8e7459..69aa9b99bc9e7 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Api/NvpTest.php
@@ -305,8 +305,7 @@ public function testGetDebugReplacePrivateDataKeys()
/**
* Tests case if obtained response with code 10415 'Transaction has already
- * been completed for this token'. It must does not throws the exception and
- * must returns response array.
+ * been completed for this token'. It must throw the ProcessableException.
*/
public function testCallTransactionHasBeenCompleted()
{
@@ -317,15 +316,10 @@ public function testCallTransactionHasBeenCompleted()
->method('read')
->willReturn($response);
$this->model->setProcessableErrors($processableErrors);
- $this->customLoggerMock->expects($this->once())
- ->method('debug');
- $expectedResponse = [
- 'ACK' => 'Failure',
- 'L_ERRORCODE0' => '10415',
- 'L_SHORTMESSAGE0' => 'Message.',
- 'L_LONGMESSAGE0' => 'Long Message.'
- ];
- $this->assertEquals($expectedResponse, $this->model->call('some method', ['data' => 'some data']));
+ $this->expectExceptionMessageMatches('/PayPal gateway has rejected request/');
+ $this->expectException(ProcessableException::class);
+
+ $this->model->call('DoExpressCheckout', ['data' => 'some data']);
}
}
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/PaymentSectionModifierTest.php b/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/PaymentSectionModifierTest.php
index dc54b71324a9b..a6a18418e92ac 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/PaymentSectionModifierTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/Config/Structure/PaymentSectionModifierTest.php
@@ -162,14 +162,14 @@ public function testMovedToTargetSpecialGroup()
*/
private function fetchAllAvailableGroups($structure)
{
- $availableGroups = [[]];
+ $availableGroups = [];
foreach ($structure as $group => $data) {
$availableGroups[] = [$group];
if (isset($data['children'])) {
$availableGroups[] = $this->fetchAllAvailableGroups($data['children']);
}
}
- $availableGroups = array_merge(...$availableGroups);
+ $availableGroups = array_merge([], ...$availableGroups);
$availableGroups = array_values(array_unique($availableGroups));
sort($availableGroups);
return $availableGroups;
diff --git a/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php b/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php
index 8cf2fb91a8452..14dcc4fc4229d 100644
--- a/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php
+++ b/app/code/Magento/Paypal/Test/Unit/Model/ExpressTest.php
@@ -53,6 +53,7 @@ class ExpressTest extends TestCase
ApiProcessableException::API_MAXIMUM_AMOUNT_FILTER_DECLINE,
ApiProcessableException::API_OTHER_FILTER_DECLINE,
ApiProcessableException::API_ADDRESS_MATCH_FAIL,
+ ApiProcessableException::API_TRANSACTION_HAS_BEEN_COMPLETED
];
/**
diff --git a/app/code/Magento/Paypal/i18n/en_US.csv b/app/code/Magento/Paypal/i18n/en_US.csv
index 8db6285dc157e..a8f26b422dc7c 100644
--- a/app/code/Magento/Paypal/i18n/en_US.csv
+++ b/app/code/Magento/Paypal/i18n/en_US.csv
@@ -737,3 +737,4 @@ User,User
"Please enter at least 0 and at most 65535","Please enter at least 0 and at most 65535"
"Order is suspended as an account verification transaction is suspected to be fraudulent.","Order is suspended as an account verification transaction is suspected to be fraudulent."
"Payment can't be accepted since transaction was rejected by merchant.","Payment can't be accepted since transaction was rejected by merchant."
+"A successful payment transaction has already been completed. Please, check if the order has been placed.","A successful payment transaction has already been completed. Please, check if the order has been placed."
diff --git a/app/code/Magento/Persistent/Model/QuoteManager.php b/app/code/Magento/Persistent/Model/QuoteManager.php
index b6504d528fbe4..35b07ebdb7c44 100644
--- a/app/code/Magento/Persistent/Model/QuoteManager.php
+++ b/app/code/Magento/Persistent/Model/QuoteManager.php
@@ -5,6 +5,7 @@
*/
namespace Magento\Persistent\Model;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
use Magento\Customer\Api\Data\GroupInterface;
use Magento\Framework\App\ObjectManager;
use Magento\Persistent\Helper\Data;
@@ -64,6 +65,11 @@ class QuoteManager
*/
private $cartExtensionFactory;
+ /**
+ * @var CustomerInterfaceFactory
+ */
+ private $customerDataFactory;
+
/**
* @param \Magento\Persistent\Helper\Session $persistentSession
* @param Data $persistentData
@@ -71,6 +77,7 @@ class QuoteManager
* @param CartRepositoryInterface $quoteRepository
* @param CartExtensionFactory|null $cartExtensionFactory
* @param ShippingAssignmentProcessor|null $shippingAssignmentProcessor
+ * @param CustomerInterfaceFactory|null $customerDataFactory
*/
public function __construct(
\Magento\Persistent\Helper\Session $persistentSession,
@@ -78,7 +85,8 @@ public function __construct(
\Magento\Checkout\Model\Session $checkoutSession,
CartRepositoryInterface $quoteRepository,
?CartExtensionFactory $cartExtensionFactory = null,
- ?ShippingAssignmentProcessor $shippingAssignmentProcessor = null
+ ?ShippingAssignmentProcessor $shippingAssignmentProcessor = null,
+ ?CustomerInterfaceFactory $customerDataFactory = null
) {
$this->persistentSession = $persistentSession;
$this->persistentData = $persistentData;
@@ -88,6 +96,8 @@ public function __construct(
?? ObjectManager::getInstance()->get(CartExtensionFactory::class);
$this->shippingAssignmentProcessor = $shippingAssignmentProcessor
?? ObjectManager::getInstance()->get(ShippingAssignmentProcessor::class);
+ $this->customerDataFactory = $customerDataFactory
+ ?? ObjectManager::getInstance()->get(CustomerInterfaceFactory::class);
}
/**
@@ -109,14 +119,11 @@ public function setGuest($checkQuote = false)
$quote->getPaymentsCollection()->walk('delete');
$quote->getAddressesCollection()->walk('delete');
$this->_setQuotePersistent = false;
+ $this->cleanCustomerData($quote);
$quote->setIsActive(true)
- ->setCustomerId(null)
- ->setCustomerEmail(null)
- ->setCustomerFirstname(null)
- ->setCustomerLastname(null)
- ->setCustomerGroupId(GroupInterface::NOT_LOGGED_IN_ID)
->setIsPersistent(false)
->removeAllAddresses();
+
//Create guest addresses
$quote->getShippingAddress();
$quote->getBillingAddress();
@@ -129,6 +136,27 @@ public function setGuest($checkQuote = false)
$this->persistentSession->setSession(null);
}
+ /**
+ * Clear customer data in quote
+ *
+ * @param Quote $quote
+ */
+ private function cleanCustomerData($quote)
+ {
+ /**
+ * Set empty customer object in quote to avoid restore customer id
+ * @see Quote::beforeSave()
+ */
+ if ($quote->getCustomerId()) {
+ $quote->setCustomer($this->customerDataFactory->create());
+ }
+ $quote->setCustomerId(null)
+ ->setCustomerEmail(null)
+ ->setCustomerFirstname(null)
+ ->setCustomerLastname(null)
+ ->setCustomerGroupId(GroupInterface::NOT_LOGGED_IN_ID);
+ }
+
/**
* Emulate guest cart with persistent cart
*
diff --git a/app/code/Magento/Persistent/Observer/MakePersistentQuoteGuestObserver.php b/app/code/Magento/Persistent/Observer/MakePersistentQuoteGuestObserver.php
index f2f9b96fa82e4..98c9c3df27852 100644
--- a/app/code/Magento/Persistent/Observer/MakePersistentQuoteGuestObserver.php
+++ b/app/code/Magento/Persistent/Observer/MakePersistentQuoteGuestObserver.php
@@ -1,16 +1,14 @@
_persistentSession = $persistentSession;
$this->_persistentData = $persistentData;
$this->_customerSession = $customerSession;
- $this->quoteManager = $quoteManager;
+ $this->checkoutSession = $checkoutSession;
}
/**
@@ -74,7 +72,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
if (($this->_persistentSession->isPersistent() && !$this->_customerSession->isLoggedIn())
|| $this->_persistentData->isShoppingCartPersist()
) {
- $this->quoteManager->setGuest(true);
+ $this->checkoutSession->clearQuote()->clearStorage();
}
}
}
diff --git a/app/code/Magento/Persistent/Observer/RemoveGuestPersistenceOnEmptyCartObserver.php b/app/code/Magento/Persistent/Observer/RemoveGuestPersistenceOnEmptyCartObserver.php
index fe754711c910b..efc9ecd4c1a59 100644
--- a/app/code/Magento/Persistent/Observer/RemoveGuestPersistenceOnEmptyCartObserver.php
+++ b/app/code/Magento/Persistent/Observer/RemoveGuestPersistenceOnEmptyCartObserver.php
@@ -10,6 +10,8 @@
/**
* Observer to remove persistent session if guest empties persistent cart previously created and added to by customer.
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
*/
class RemoveGuestPersistenceOnEmptyCartObserver implements ObserverInterface
{
@@ -96,6 +98,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
}
if (!$cart || $cart->getItemsCount() == 0) {
+ $this->customerSession->setCustomerId(null)
+ ->setCustomerGroupId(null);
$this->quoteManager->setGuest();
}
}
diff --git a/app/code/Magento/Persistent/Test/Mftf/Test/CheckShoppingCartBehaviorAfterSessionExpiredTest.xml b/app/code/Magento/Persistent/Test/Mftf/Test/CheckShoppingCartBehaviorAfterSessionExpiredTest.xml
index 18e19c4276548..5b023e12bc55d 100644
--- a/app/code/Magento/Persistent/Test/Mftf/Test/CheckShoppingCartBehaviorAfterSessionExpiredTest.xml
+++ b/app/code/Magento/Persistent/Test/Mftf/Test/CheckShoppingCartBehaviorAfterSessionExpiredTest.xml
@@ -55,8 +55,8 @@
-
-
+
diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php b/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
index bbc199c91263a..112accbae8070 100644
--- a/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
+++ b/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php
@@ -140,10 +140,9 @@ public function collectRates(RateRequest $request)
$freePackageValue += $item->getBaseRowTotal();
}
}
- $oldValue = $request->getPackageValue();
- $newPackageValue = $oldValue - $freePackageValue;
- $request->setPackageValue($newPackageValue);
- $request->setPackageValueWithDiscount($newPackageValue);
+
+ $request->setPackageValue($request->getPackageValue() - $freePackageValue);
+ $request->setPackageValueWithDiscount($request->getPackageValueWithDiscount() - $freePackageValue);
}
if (!$request->getConditionName()) {
diff --git a/app/code/Magento/OfflineShipping/Test/Mftf/Test/SalesRuleDiscountIsAppliedOnPackageValueForTableRateTest.xml b/app/code/Magento/OfflineShipping/Test/Mftf/Test/SalesRuleDiscountIsAppliedOnPackageValueForTableRateTest.xml
new file mode 100644
index 0000000000000..d225e5fa28f97
--- /dev/null
+++ b/app/code/Magento/OfflineShipping/Test/Mftf/Test/SalesRuleDiscountIsAppliedOnPackageValueForTableRateTest.xml
@@ -0,0 +1,101 @@
+
+
+
-
+
-
-
-
+
@@ -50,25 +43,10 @@ use Magento\Backend\Block\Template;
"imageEditDetailsUrl": "escapeJs($block->getData('imageEditDetailsUrl')); ?>",
"saveDetailsUrl": "escapeJs($block->getData('saveDetailsUrl')); ?>",
"mediaGridMessages": "standalone_media_gallery_listing.standalone_media_gallery_listing.messages"
- }
- }
- },
- "Magento_MediaGalleryUi/js/validation/validate-image-title": {},
- "Magento_MediaGalleryUi/js/validation/validate-image-description": {},
- "Magento_MediaGalleryUi/js/validation/validate-image-keyword": {}
- },
- "#media-gallery-image-edit-details-messages": {
- "Magento_Ui/js/core/app": {
- "components": {
+ },
"mediaGalleryEditDetailsMessages": {
"component": "Magento_MediaGalleryUi/js/grid/messages"
- }
- }
- }
- },
- "#media-gallery-edit-image-actions": {
- "Magento_Ui/js/core/app": {
- "components": {
+ },
"mediaGalleryImageEditActions": {
"component": "Magento_MediaGalleryUi/js/image/image-actions",
"modalSelector": ".media-gallery-edit-image-details-modal",
@@ -91,7 +69,10 @@ use Magento\Backend\Block\Template;
]
}
}
- }
+ },
+ "Magento_MediaGalleryUi/js/validation/validate-image-title": {},
+ "Magento_MediaGalleryUi/js/validation/validate-image-description": {},
+ "Magento_MediaGalleryUi/js/validation/validate-image-keyword": {}
}
}
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image/insertImageAction.js b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image/insertImageAction.js
index f72a05b6d2709..322b29c92ca5b 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image/insertImageAction.js
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/grid/columns/image/insertImageAction.js
@@ -47,13 +47,13 @@ define([
showLoader: true
}).done($.proxy(function (data) {
if (targetElement.is('textarea')) {
- this.insertAtCursor(targetElement.get(0), data);
+ this.insertAtCursor(targetElement.get(0), data.content);
targetElement.focus();
$(targetElement).change();
} else {
- targetElement.val(data)
- .data('size', record.size)
- .data('mime-type', record['content_type'])
+ targetElement.val(data.content)
+ .data('size', data.size)
+ .data('mime-type', data.type)
.trigger('change');
}
}, this));
diff --git a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/actions.html b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/actions.html
index 8ecaf0bd2a019..3a80116c9225e 100644
--- a/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/actions.html
+++ b/app/code/Magento/MediaGalleryUi/view/adminhtml/web/template/image/actions.html
@@ -4,9 +4,16 @@
* See COPYING.txt for license details.
*/
-->
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $grabTextFromProductsSubtotalField
+ $grabTextFromCartSubtotalField
+
+
+
diff --git a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/OverviewTest.php b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/OverviewTest.php
index 7da77030f308a..2d044afd32c70 100644
--- a/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/OverviewTest.php
+++ b/app/code/Magento/Multishipping/Test/Unit/Block/Checkout/OverviewTest.php
@@ -8,6 +8,7 @@
namespace Magento\Multishipping\Test\Unit\Block\Checkout;
+use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\Pricing\PriceCurrencyInterface;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
use Magento\Framework\UrlInterface;
@@ -67,6 +68,11 @@ class OverviewTest extends TestCase
*/
private $urlBuilderMock;
+ /**
+ * @var MockObject
+ */
+ private $scopeConfigMock;
+
protected function setUp(): void
{
$objectManager = new ObjectManager($this);
@@ -85,6 +91,7 @@ protected function setUp(): void
$this->createMock(Multishipping::class);
$this->quoteMock = $this->createMock(Quote::class);
$this->urlBuilderMock = $this->getMockForAbstractClass(UrlInterface::class);
+ $this->scopeConfigMock = $this->getMockForAbstractClass(ScopeConfigInterface::class);
$this->model = $objectManager->getObject(
Overview::class,
[
@@ -92,7 +99,8 @@ protected function setUp(): void
'totalsCollector' => $this->totalsCollectorMock,
'totalsReader' => $this->totalsReaderMock,
'multishipping' => $this->checkoutMock,
- 'urlBuilder' => $this->urlBuilderMock
+ 'urlBuilder' => $this->urlBuilderMock,
+ '_scopeConfig' => $this->scopeConfigMock
]
);
}
@@ -187,4 +195,44 @@ public function testGetVirtualProductEditUrl()
$this->urlBuilderMock->expects($this->once())->method('getUrl')->with('checkout/cart', [])->willReturn($url);
$this->assertEquals($url, $this->model->getVirtualProductEditUrl());
}
+
+ /**
+ * Test sort total information
+ *
+ * @return void
+ */
+ public function testSortCollectors(): void
+ {
+ $sorts = [
+ 'discount' => 40,
+ 'subtotal' => 10,
+ 'tax' => 20,
+ 'shipping' => 30,
+ ];
+
+ $this->scopeConfigMock->method('getValue')
+ ->with('sales/totals_sort', 'stores')
+ ->willReturn($sorts);
+
+ $totalsNotSorted = [
+ 'subtotal' => [],
+ 'shipping' => [],
+ 'tax' => [],
+ ];
+
+ $totalsExpected = [
+ 'subtotal' => [],
+ 'tax' => [],
+ 'shipping' => [],
+ ];
+
+ $method = new \ReflectionMethod($this->model, 'sortTotals');
+ $method->setAccessible(true);
+ $result = $method->invoke($this->model, $totalsNotSorted);
+
+ $this->assertEquals(
+ $totalsExpected,
+ $result
+ );
+ }
}
diff --git a/app/code/Magento/Multishipping/Test/Unit/Model/DisableMultishippingTest.php b/app/code/Magento/Multishipping/Test/Unit/Model/DisableMultishippingTest.php
new file mode 100644
index 0000000000000..9882f8d1441aa
--- /dev/null
+++ b/app/code/Magento/Multishipping/Test/Unit/Model/DisableMultishippingTest.php
@@ -0,0 +1,116 @@
+quoteMock = $this->getMockBuilder(CartInterface::class)
+ ->addMethods(['getIsMultiShipping', 'setIsMultiShipping'])
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+ $this->disableMultishippingModel = new DisableMultishipping();
+ }
+
+ /**
+ * Test 'execute' method if 'MultiShipping' mode is enabled.
+ *
+ * @param bool $hasShippingAssignments
+ * @return void
+ * @dataProvider executeWithMultishippingModeEnabledDataProvider
+ */
+ public function testExecuteWithMultishippingModeEnabled(bool $hasShippingAssignments): void
+ {
+ $shippingAssignments = $hasShippingAssignments ? ['example_shipping_assigment'] : null;
+
+ $this->quoteMock->expects($this->once())
+ ->method('getIsMultiShipping')
+ ->willReturn(true);
+
+ $this->quoteMock->expects($this->once())
+ ->method('setIsMultiShipping')
+ ->with(0);
+
+ /** @var CartExtensionInterface|MockObject $extensionAttributesMock */
+ $extensionAttributesMock = $this->getMockBuilder(CartExtensionInterface::class)
+ ->addMethods(['getShippingAssignments', 'setShippingAssignments'])
+ ->disableOriginalConstructor()
+ ->getMockForAbstractClass();
+
+ $extensionAttributesMock->expects($this->once())
+ ->method('getShippingAssignments')
+ ->willReturn($shippingAssignments);
+
+ $extensionAttributesMock->expects($hasShippingAssignments ? $this->once() : $this->never())
+ ->method('setShippingAssignments')
+ ->with([])
+ ->willReturnSelf();
+
+ $this->quoteMock->expects($this->once())
+ ->method('getExtensionAttributes')
+ ->willReturn($extensionAttributesMock);
+
+ $this->assertTrue($this->disableMultishippingModel->execute($this->quoteMock));
+ }
+
+ /**
+ * DataProvider for testExecuteWithMultishippingModeEnabled().
+ *
+ * @return array
+ */
+ public function executeWithMultishippingModeEnabledDataProvider(): array
+ {
+ return [
+ 'check_with_shipping_assignments' => [true],
+ 'check_without_shipping_assignments' => [false]
+ ];
+ }
+
+ /**
+ * Test 'execute' method if 'Multishipping' mode is disabled.
+ *
+ * @return void
+ */
+ public function testExecuteWithMultishippingModeDisabled(): void
+ {
+ $this->quoteMock->expects($this->once())
+ ->method('getIsMultiShipping')
+ ->willReturn(false);
+
+ $this->quoteMock->expects($this->never())
+ ->method('setIsMultiShipping');
+
+ $this->quoteMock->expects($this->never())
+ ->method('getExtensionAttributes');
+
+ $this->assertFalse($this->disableMultishippingModel->execute($this->quoteMock));
+ }
+}
diff --git a/app/code/Magento/Multishipping/Test/Unit/Plugin/DisableMultishippingModeTest.php b/app/code/Magento/Multishipping/Test/Unit/Plugin/DisableMultishippingModeTest.php
index fb16bd251706c..64cbcbf147d48 100644
--- a/app/code/Magento/Multishipping/Test/Unit/Plugin/DisableMultishippingModeTest.php
+++ b/app/code/Magento/Multishipping/Test/Unit/Plugin/DisableMultishippingModeTest.php
@@ -10,10 +10,9 @@
use Magento\Checkout\Controller\Index\Index;
use Magento\Checkout\Model\Cart;
+use Magento\Multishipping\Model\DisableMultishipping as DisableMultishippingModel;
use Magento\Multishipping\Plugin\DisableMultishippingMode;
-use Magento\Quote\Api\Data\CartExtensionInterface;
-use Magento\Quote\Api\Data\ShippingAssignmentInterface;
-use Magento\Quote\Model\Quote;
+use Magento\Quote\Api\Data\CartInterface;
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
@@ -23,15 +22,20 @@
class DisableMultishippingModeTest extends TestCase
{
/**
- * @var MockObject
+ * @var Cart|MockObject
*/
private $cartMock;
/**
- * @var MockObject
+ * @var CartInterface|MockObject
*/
private $quoteMock;
+ /**
+ * @var DisableMultishippingModel|MockObject
+ */
+ private $disableMultishippingMock;
+
/**
* @var DisableMultishippingMode
*/
@@ -43,43 +47,40 @@ class DisableMultishippingModeTest extends TestCase
protected function setUp(): void
{
$this->cartMock = $this->createMock(Cart::class);
- $this->quoteMock = $this->getMockBuilder(Quote::class)
- ->addMethods(['setIsMultiShipping', 'getIsMultiShipping'])
- ->onlyMethods(['__wakeUp', 'getExtensionAttributes'])
+ $this->quoteMock = $this->getMockBuilder(CartInterface::class)
+ ->addMethods(['setTotalsCollectedFlag', 'getTotalsCollectedFlag'])
->disableOriginalConstructor()
- ->getMock();
+ ->getMockForAbstractClass();
$this->cartMock->expects($this->once())
->method('getQuote')
->willReturn($this->quoteMock);
- $this->object = new DisableMultishippingMode($this->cartMock);
+ $this->disableMultishippingMock = $this->createMock(DisableMultishippingModel::class);
+ $this->object = new DisableMultishippingMode(
+ $this->cartMock,
+ $this->disableMultishippingMock
+ );
}
/**
- * Tests turn off multishipping on multishipping quote.
+ * Test 'Disable Multishipping' plugin if 'Multishipping' mode is changed.
*
+ * @param bool $totalsCollectedBefore
* @return void
+ * @dataProvider pluginWithChangedMultishippingModeDataProvider
*/
- public function testExecuteTurnsOffMultishippingModeOnMultishippingQuote(): void
+ public function testPluginWithChangedMultishippingMode(bool $totalsCollectedBefore): void
{
$subject = $this->createMock(Index::class);
- $extensionAttributes = $this->getMockBuilder(CartExtensionInterface::class)
- ->disableOriginalConstructor()
- ->setMethods(['setShippingAssignments', 'getShippingAssignments'])
- ->getMockForAbstractClass();
- $extensionAttributes->method('getShippingAssignments')
- ->willReturn(
- $this->getMockForAbstractClass(ShippingAssignmentInterface::class)
- );
- $extensionAttributes->expects($this->once())
- ->method('setShippingAssignments')
- ->with([]);
- $this->quoteMock->method('getExtensionAttributes')
- ->willReturn($extensionAttributes);
+ $this->disableMultishippingMock->expects($this->once())
+ ->method('execute')
+ ->with($this->quoteMock)
+ ->willReturn(true);
$this->quoteMock->expects($this->once())
- ->method('getIsMultiShipping')->willReturn(1);
- $this->quoteMock->expects($this->once())
- ->method('setIsMultiShipping')
- ->with(0);
+ ->method('getTotalsCollectedFlag')
+ ->willReturn($totalsCollectedBefore);
+ $this->quoteMock->expects($totalsCollectedBefore ? $this->never() : $this->once())
+ ->method('setTotalsCollectedFlag')
+ ->with(false);
$this->cartMock->expects($this->once())
->method('saveQuote');
@@ -87,16 +88,37 @@ public function testExecuteTurnsOffMultishippingModeOnMultishippingQuote(): void
}
/**
- * Tests turn off multishipping on non-multishipping quote.
+ * DataProvider for testPluginWithChangedMultishippingMode().
+ *
+ * @return array
+ */
+ public function pluginWithChangedMultishippingModeDataProvider(): array
+ {
+ return [
+ 'check_when_totals_are_collected' => [true],
+ 'check_when_totals_are_not_collected' => [false]
+ ];
+ }
+
+ /**
+ * Test 'Disable Multishipping' plugin if 'Multishipping' mode is NOT changed.
*
* @return void
*/
- public function testExecuteTurnsOffMultishippingModeOnNotMultishippingQuote(): void
+ public function testPluginWithNotChangedMultishippingMode(): void
{
$subject = $this->createMock(Index::class);
- $this->quoteMock->expects($this->once())->method('getIsMultiShipping')->willReturn(0);
- $this->quoteMock->expects($this->never())->method('setIsMultiShipping');
- $this->cartMock->expects($this->never())->method('saveQuote');
+ $this->disableMultishippingMock->expects($this->once())
+ ->method('execute')
+ ->with($this->quoteMock)
+ ->willReturn(false);
+ $this->quoteMock->expects($this->never())
+ ->method('getTotalsCollectedFlag');
+ $this->quoteMock->expects($this->never())
+ ->method('setTotalsCollectedFlag');
+ $this->cartMock->expects($this->never())
+ ->method('saveQuote');
+
$this->object->beforeExecute($subject);
}
}
diff --git a/app/code/Magento/Multishipping/composer.json b/app/code/Magento/Multishipping/composer.json
index 85f60985fe1b0..8834603562332 100644
--- a/app/code/Magento/Multishipping/composer.json
+++ b/app/code/Magento/Multishipping/composer.json
@@ -15,7 +15,8 @@
"magento/module-sales": "*",
"magento/module-store": "*",
"magento/module-tax": "*",
- "magento/module-theme": "*"
+ "magento/module-theme": "*",
+ "magento/module-captcha": "*"
},
"type": "magento2-module",
"license": [
diff --git a/app/code/Magento/Multishipping/etc/frontend/di.xml b/app/code/Magento/Multishipping/etc/frontend/di.xml
index 481b95280a4a4..c4fc42e92a2c6 100644
--- a/app/code/Magento/Multishipping/etc/frontend/di.xml
+++ b/app/code/Magento/Multishipping/etc/frontend/di.xml
@@ -48,4 +48,7 @@
+
+
diff --git a/app/code/Magento/Multishipping/etc/frontend/events.xml b/app/code/Magento/Multishipping/etc/frontend/events.xml
new file mode 100644
index 0000000000000..219e358528ca2
--- /dev/null
+++ b/app/code/Magento/Multishipping/etc/frontend/events.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
index 3b72679bfc34e..35032b874374d 100644
--- a/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
+++ b/app/code/Magento/Multishipping/view/frontend/templates/checkout/overview.phtml
@@ -213,6 +213,7 @@ $checkoutHelper = $block->getData('checkoutHelper');
-
-
+
+
diff --git a/app/code/Magento/MediaStorage/App/Media.php b/app/code/Magento/MediaStorage/App/Media.php
index ca5ff458c52e9..34c20aab40bcb 100644
--- a/app/code/Magento/MediaStorage/App/Media.php
+++ b/app/code/Magento/MediaStorage/App/Media.php
@@ -11,6 +11,7 @@
use Closure;
use Exception;
use LogicException;
+use Magento\Catalog\Model\Config\CatalogMediaConfig;
use Magento\Catalog\Model\View\Asset\PlaceholderFactory;
use Magento\Framework\App;
use Magento\Framework\App\Area;
@@ -18,6 +19,7 @@
use Magento\Framework\App\ResponseInterface;
use Magento\Framework\App\State;
use Magento\Framework\AppInterface;
+use Magento\Framework\Exception\NotFoundException;
use Magento\Framework\Filesystem;
use Magento\Framework\Filesystem\Directory\WriteInterface;
use Magento\Framework\Filesystem\Driver\File;
@@ -103,6 +105,11 @@ class Media implements AppInterface
*/
private $imageResize;
+ /**
+ * @var string
+ */
+ private $mediaUrlFormat;
+
/**
* @param ConfigFactory $configFactory
* @param SynchronizationFactory $syncFactory
@@ -116,6 +123,8 @@ class Media implements AppInterface
* @param State $state
* @param ImageResize $imageResize
* @param File $file
+ * @param CatalogMediaConfig $catalogMediaConfig
+ * @throws \Magento\Framework\Exception\FileSystemException
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
@@ -130,12 +139,19 @@ public function __construct(
PlaceholderFactory $placeholderFactory,
State $state,
ImageResize $imageResize,
- File $file
+ File $file,
+ CatalogMediaConfig $catalogMediaConfig = null
) {
$this->response = $response;
$this->isAllowed = $isAllowed;
- $this->directoryPub = $filesystem->getDirectoryWrite(DirectoryList::PUB);
- $this->directoryMedia = $filesystem->getDirectoryWrite(DirectoryList::MEDIA);
+ $this->directoryPub = $filesystem->getDirectoryWrite(
+ DirectoryList::PUB,
+ Filesystem\DriverPool::FILE
+ );
+ $this->directoryMedia = $filesystem->getDirectoryWrite(
+ DirectoryList::MEDIA,
+ Filesystem\DriverPool::FILE
+ );
$mediaDirectory = trim($mediaDirectory);
if (!empty($mediaDirectory)) {
// phpcs:ignore Magento2.Functions.DiscouragedFunction
@@ -148,6 +164,9 @@ public function __construct(
$this->placeholderFactory = $placeholderFactory;
$this->appState = $state;
$this->imageResize = $imageResize;
+
+ $catalogMediaConfig = $catalogMediaConfig ?: App\ObjectManager::getInstance()->get(CatalogMediaConfig::class);
+ $this->mediaUrlFormat = $catalogMediaConfig->getMediaUrlFormat();
}
/**
@@ -174,10 +193,8 @@ public function launch(): ResponseInterface
}
try {
- /** @var Synchronization $sync */
- $sync = $this->syncFactory->create(['directory' => $this->directoryPub]);
- $sync->synchronize($this->relativeFileName);
- $this->imageResize->resizeFromImageName($this->getOriginalImage($this->relativeFileName));
+ $this->createLocalCopy();
+
if ($this->directoryPub->isReadable($this->relativeFileName)) {
$this->response->setFilePath($this->directoryPub->getAbsolutePath($this->relativeFileName));
} else {
@@ -190,6 +207,25 @@ public function launch(): ResponseInterface
return $this->response;
}
+ /**
+ * Create local copy of file and perform resizing if necessary.
+ *
+ * @throws NotFoundException
+ */
+ private function createLocalCopy(): void
+ {
+ $this->syncFactory->create(['directory' => $this->directoryPub])
+ ->synchronize($this->relativeFileName);
+
+ if ($this->directoryPub->isReadable($this->relativeFileName)) {
+ return;
+ }
+
+ if ($this->mediaUrlFormat === CatalogMediaConfig::HASH) {
+ $this->imageResize->resizeFromImageName($this->getOriginalImage($this->relativeFileName));
+ }
+ }
+
/**
* Check if media directory changed
*
@@ -219,7 +255,7 @@ private function setPlaceholderImage(): void
*/
private function getOriginalImage(string $resizedImagePath): string
{
- return preg_replace('|^.*((?:/[^/]+){3})$|', '$1', $resizedImagePath);
+ return preg_replace('|^.*?((?:/([^/])/([^/])/\2\3)?/?[^/]+$)|', '$1', $resizedImagePath);
}
/**
diff --git a/app/code/Magento/MediaStorage/Model/File/Storage.php b/app/code/Magento/MediaStorage/Model/File/Storage.php
index 861f2d82c7e7b..f5ebda4a8d55c 100644
--- a/app/code/Magento/MediaStorage/Model/File/Storage.php
+++ b/app/code/Magento/MediaStorage/Model/File/Storage.php
@@ -83,12 +83,17 @@ class Storage extends AbstractModel
protected $_databaseFactory;
/**
- * Filesystem instance
- *
* @var Filesystem
+ *
+ * @deprecated
*/
protected $filesystem;
+ /**
+ * @var Filesystem\Directory\ReadInterface
+ */
+ private $localMediaDirectory;
+
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
@@ -125,6 +130,11 @@ public function __construct(
$this->_fileFactory = $fileFactory;
$this->_databaseFactory = $databaseFactory;
$this->filesystem = $filesystem;
+
+ $this->localMediaDirectory = $filesystem->getDirectoryRead(
+ DirectoryList::MEDIA,
+ Filesystem\DriverPool::FILE
+ );
parent::__construct($context, $registry, $resource, $resourceCollection, $data);
}
@@ -286,7 +296,7 @@ public function synchronize($storage)
public function getScriptConfig()
{
$config = [];
- $config['media_directory'] = $this->filesystem->getDirectoryRead(DirectoryList::MEDIA)->getAbsolutePath();
+ $config['media_directory'] = $this->localMediaDirectory->getAbsolutePath();
$allowedResources = $this->_coreConfig->getValue(self::XML_PATH_MEDIA_RESOURCE_WHITELIST, 'default');
foreach ($allowedResources as $allowedResource) {
diff --git a/app/code/Magento/MediaStorage/Test/Unit/App/MediaTest.php b/app/code/Magento/MediaStorage/Test/Unit/App/MediaTest.php
index 7f70f5ba48e5c..068732a7225cd 100644
--- a/app/code/Magento/MediaStorage/Test/Unit/App/MediaTest.php
+++ b/app/code/Magento/MediaStorage/Test/Unit/App/MediaTest.php
@@ -10,21 +10,23 @@
use Exception;
use LogicException;
+use Magento\Catalog\Model\Config\CatalogMediaConfig;
use Magento\Catalog\Model\View\Asset\Placeholder;
use Magento\Catalog\Model\View\Asset\PlaceholderFactory;
use Magento\Framework\App\Bootstrap;
use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\State;
use Magento\Framework\Filesystem;
use Magento\Framework\Filesystem\Directory\Read;
use Magento\Framework\Filesystem\Directory\WriteInterface;
use Magento\Framework\Filesystem\DriverPool;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
use Magento\MediaStorage\App\Media;
use Magento\MediaStorage\Model\File\Storage\Config;
use Magento\MediaStorage\Model\File\Storage\ConfigFactory;
use Magento\MediaStorage\Model\File\Storage\Response;
use Magento\MediaStorage\Model\File\Storage\Synchronization;
use Magento\MediaStorage\Model\File\Storage\SynchronizationFactory;
+use Magento\MediaStorage\Service\ImageResize;
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
@@ -80,122 +82,106 @@ class MediaTest extends TestCase
private $directoryMediaMock;
/**
- * @var \Magento\Framework\Filesystem\Directory\Read|MockObject
+ * @var Read|MockObject
*/
private $directoryPubMock;
+ /**
+ * @inheritDoc
+ */
protected function setUp(): void
{
$this->configMock = $this->createMock(Config::class);
$this->sync = $this->createMock(Synchronization::class);
- $this->configFactoryMock = $this->createPartialMock(
- ConfigFactory::class,
- ['create']
- );
- $this->configFactoryMock->expects($this->any())
- ->method('create')
+ $this->configFactoryMock = $this->createPartialMock(ConfigFactory::class, ['create']);
+ $this->responseMock = $this->createMock(Response::class);
+ $this->syncFactoryMock = $this->createPartialMock(SynchronizationFactory::class, ['create']);
+ $this->filesystemMock = $this->createMock(Filesystem::class);
+ $this->directoryPubMock = $this->getMockForAbstractClass(WriteInterface::class);
+ $this->directoryMediaMock = $this->getMockForAbstractClass(WriteInterface::class);
+
+ $this->configFactoryMock->method('create')
->willReturn($this->configMock);
- $this->syncFactoryMock = $this->createPartialMock(
- SynchronizationFactory::class,
- ['create']
- );
- $this->syncFactoryMock->expects($this->any())
- ->method('create')
+ $this->syncFactoryMock->method('create')
->willReturn($this->sync);
-
- $this->filesystemMock = $this->createMock(Filesystem::class);
- $this->directoryPubMock = $this->getMockForAbstractClass(
- WriteInterface::class,
- [],
- '',
- false,
- true,
- true,
- ['isReadable', 'getAbsolutePath']
- );
- $this->directoryMediaMock = $this->getMockForAbstractClass(
- WriteInterface::class,
- [],
- '',
- false,
- true,
- true,
- ['getAbsolutePath']
- );
- $this->filesystemMock->expects($this->any())
- ->method('getDirectoryWrite')
+ $this->filesystemMock->method('getDirectoryWrite')
->willReturnMap([
[DirectoryList::PUB, DriverPool::FILE, $this->directoryPubMock],
[DirectoryList::MEDIA, DriverPool::FILE, $this->directoryMediaMock],
]);
-
- $this->responseMock = $this->createMock(Response::class);
}
- protected function tearDown(): void
+ public function testProcessRequestCreatesConfigFileMediaDirectoryIsNotProvided(): void
{
- unset($this->mediaModel);
- }
-
- public function testProcessRequestCreatesConfigFileMediaDirectoryIsNotProvided()
- {
- $this->mediaModel = $this->getMediaModel();
-
$filePath = '/absolute/path/to/test/file.png';
- $this->directoryMediaMock->expects($this->once())
+ $this->directoryMediaMock->expects(self::once())
->method('getAbsolutePath')
->with(null)
->willReturn(self::MEDIA_DIRECTORY);
- $this->directoryPubMock->expects($this->once())
+ $this->directoryPubMock->expects(self::once())
->method('getAbsolutePath')
->with(self::RELATIVE_FILE_PATH)
->willReturn($filePath);
- $this->configMock->expects($this->once())->method('save');
- $this->sync->expects($this->once())->method('synchronize')->with(self::RELATIVE_FILE_PATH);
- $this->directoryPubMock->expects($this->once())
+ $this->configMock->expects(self::once())
+ ->method('save');
+ $this->sync->expects(self::once())
+ ->method('synchronize')
+ ->with(self::RELATIVE_FILE_PATH);
+ $this->directoryPubMock->expects(self::exactly(2))
->method('isReadable')
->with(self::RELATIVE_FILE_PATH)
->willReturn(true);
- $this->responseMock->expects($this->once())->method('setFilePath')->with($filePath);
- $this->mediaModel->launch();
+ $this->responseMock->expects(self::once())
+ ->method('setFilePath')
+ ->with($filePath);
+
+ $this->createMediaModel()->launch();
}
- public function testProcessRequestReturnsFileIfItsProperlySynchronized()
+ public function testProcessRequestReturnsFileIfItsProperlySynchronized(): void
{
- $this->mediaModel = $this->getMediaModel();
+ $this->mediaModel = $this->createMediaModel();
$filePath = '/absolute/path/to/test/file.png';
- $this->sync->expects($this->once())->method('synchronize')->with(self::RELATIVE_FILE_PATH);
- $this->directoryMediaMock->expects($this->once())
+ $this->sync->expects(self::once())
+ ->method('synchronize')
+ ->with(self::RELATIVE_FILE_PATH);
+ $this->directoryMediaMock->expects(self::once())
->method('getAbsolutePath')
->with(null)
->willReturn(self::MEDIA_DIRECTORY);
- $this->directoryPubMock->expects($this->once())
+ $this->directoryPubMock->expects(self::exactly(2))
->method('isReadable')
->with(self::RELATIVE_FILE_PATH)
->willReturn(true);
- $this->directoryPubMock->expects($this->once())
+ $this->directoryPubMock->expects(self::once())
->method('getAbsolutePath')
->with(self::RELATIVE_FILE_PATH)
->willReturn($filePath);
- $this->responseMock->expects($this->once())->method('setFilePath')->with($filePath);
- $this->assertSame($this->responseMock, $this->mediaModel->launch());
+ $this->responseMock->expects(self::once())
+ ->method('setFilePath')
+ ->with($filePath);
+
+ self::assertSame($this->responseMock, $this->mediaModel->launch());
}
- public function testProcessRequestReturnsNotFoundIfFileIsNotSynchronized()
+ public function testProcessRequestReturnsNotFoundIfFileIsNotSynchronized(): void
{
- $this->mediaModel = $this->getMediaModel();
+ $this->mediaModel = $this->createMediaModel();
- $this->sync->expects($this->once())->method('synchronize')->with(self::RELATIVE_FILE_PATH);
- $this->directoryMediaMock->expects($this->once())
+ $this->sync->expects(self::once())
+ ->method('synchronize')
+ ->with(self::RELATIVE_FILE_PATH);
+ $this->directoryMediaMock->expects(self::once())
->method('getAbsolutePath')
->with(null)
->willReturn(self::MEDIA_DIRECTORY);
- $this->directoryPubMock->expects($this->once())
+ $this->directoryPubMock->expects(self::exactly(2))
->method('isReadable')
->with(self::RELATIVE_FILE_PATH)
->willReturn(false);
- $this->assertSame($this->responseMock, $this->mediaModel->launch());
+
+ self::assertSame($this->responseMock, $this->mediaModel->launch());
}
/**
@@ -204,7 +190,7 @@ public function testProcessRequestReturnsNotFoundIfFileIsNotSynchronized()
*
* @dataProvider catchExceptionDataProvider
*/
- public function testCatchException($isDeveloper, $setBodyCalls)
+ public function testCatchException(bool $isDeveloper, int $setBodyCalls): void
{
/** @var Bootstrap|MockObject $bootstrap */
$bootstrap = $this->createMock(Bootstrap::class);
@@ -212,41 +198,39 @@ public function testCatchException($isDeveloper, $setBodyCalls)
/** @var Exception|MockObject $exception */
$exception = $this->createMock(Exception::class);
- $this->responseMock->expects($this->once())
+ $this->responseMock->expects(self::once())
->method('setHttpResponseCode')
->with(404);
- $bootstrap->expects($this->once())
+ $bootstrap->expects(self::once())
->method('isDeveloperMode')
->willReturn($isDeveloper);
- $this->responseMock->expects($this->exactly($setBodyCalls))
+ $this->responseMock->expects(self::exactly($setBodyCalls))
->method('setBody');
- $this->responseMock->expects($this->once())
+ $this->responseMock->expects(self::once())
->method('sendResponse');
- $this->mediaModel = $this->getMediaModel();
-
- $this->mediaModel->catchException($bootstrap, $exception);
+ $this->createMediaModel()->catchException($bootstrap, $exception);
}
- public function testExceptionWhenIsAllowedReturnsFalse()
+ public function testExceptionWhenIsAllowedReturnsFalse(): void
{
- $this->mediaModel = $this->getMediaModel(false);
- $this->directoryMediaMock->expects($this->once())
+ $this->directoryMediaMock->expects(self::once())
->method('getAbsolutePath')
->with(null)
->willReturn(self::MEDIA_DIRECTORY);
- $this->configMock->expects($this->once())->method('save');
+ $this->configMock->expects(self::once())
+ ->method('save');
$this->expectException(LogicException::class);
$this->expectExceptionMessage('The path is not allowed: ' . self::RELATIVE_FILE_PATH);
- $this->mediaModel->launch();
+ $this->createMediaModel(false)->launch();
}
/**
* @return array
*/
- public function catchExceptionDataProvider()
+ public function catchExceptionDataProvider(): array
{
return [
'default mode' => [false, 0],
@@ -260,35 +244,30 @@ public function catchExceptionDataProvider()
* @param bool $isAllowed
* @return Media
*/
- protected function getMediaModel(bool $isAllowed = true): Media
+ protected function createMediaModel(bool $isAllowed = true): Media
{
- $objectManager = new ObjectManager($this);
-
$isAllowedCallback = function () use ($isAllowed) {
return $isAllowed;
};
- /** @var Media $mediaClass */
- $mediaClass = $objectManager->getObject(
- Media::class,
- [
- 'configFactory' => $this->configFactoryMock,
- 'syncFactory' => $this->syncFactoryMock,
- 'response' => $this->responseMock,
- 'isAllowed' => $isAllowedCallback,
- 'mediaDirectory' => false,
- 'configCacheFile' => self::CACHE_FILE_PATH,
- 'relativeFileName' => self::RELATIVE_FILE_PATH,
- 'filesystem' => $this->filesystemMock,
- 'placeholderFactory' => $this->createConfiguredMock(
- PlaceholderFactory::class,
- [
- 'create' => $this->createMock(Placeholder::class)
- ]
- ),
- ]
- );
+ $placeholderFactory = $this->createMock(PlaceholderFactory::class);
+ $placeholderFactory->method('create')
+ ->willReturn($this->createMock(Placeholder::class));
- return $mediaClass;
+ return new Media(
+ $this->configFactoryMock,
+ $this->syncFactoryMock,
+ $this->responseMock,
+ $isAllowedCallback,
+ false,
+ self::CACHE_FILE_PATH,
+ self::RELATIVE_FILE_PATH,
+ $this->filesystemMock,
+ $placeholderFactory,
+ $this->createMock(State::class),
+ $this->createMock(ImageResize::class),
+ $this->createMock(Filesystem\Driver\File::class),
+ $this->createMock(CatalogMediaConfig::class)
+ );
}
}
diff --git a/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php b/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php
index fd61f96b300d6..472d1cc631290 100644
--- a/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php
+++ b/app/code/Magento/MessageQueue/Model/Cron/ConsumersRunner.php
@@ -131,7 +131,7 @@ public function run()
];
if ($maxMessages) {
- $arguments[] = '--max-messages=' . $maxMessages;
+ $arguments[] = '--max-messages=' . min($consumer->getMaxMessages() ?? $maxMessages, $maxMessages);
}
$command = $php . ' ' . BP . '/bin/magento queue:consumers:start %s %s'
diff --git a/app/code/Magento/Multishipping/Block/Checkout/Overview.php b/app/code/Magento/Multishipping/Block/Checkout/Overview.php
index 1ea2dc2618778..e4d2efd50de5a 100644
--- a/app/code/Magento/Multishipping/Block/Checkout/Overview.php
+++ b/app/code/Magento/Multishipping/Block/Checkout/Overview.php
@@ -6,10 +6,14 @@
namespace Magento\Multishipping\Block\Checkout;
+use Magento\Captcha\Block\Captcha;
+use Magento\Checkout\Model\CaptchaPaymentProcessingRateLimiter;
use Magento\Framework\Pricing\PriceCurrencyInterface;
use Magento\Quote\Model\Quote\Address;
use Magento\Checkout\Helper\Data as CheckoutHelper;
use Magento\Framework\App\ObjectManager;
+use Magento\Quote\Model\Quote\Address\Total\Collector;
+use Magento\Store\Model\ScopeInterface;
/**
* Multishipping checkout overview information
@@ -123,6 +127,20 @@ protected function _prepareLayout()
$this->pageConfig->getTitle()->set(
__('Review Order - %1', $this->pageConfig->getTitle()->getDefault())
);
+ if (!$this->getChildBlock('captcha')) {
+ $this->addChild(
+ 'captcha',
+ Captcha::class,
+ [
+ 'cacheable' => false,
+ 'after' => '-',
+ 'form_id' => CaptchaPaymentProcessingRateLimiter::CAPTCHA_FORM,
+ 'image_width' => 230,
+ 'image_height' => 230
+ ]
+ );
+ }
+
return parent::_prepareLayout();
}
@@ -429,9 +447,12 @@ public function getBillingAddressTotals()
*/
public function renderTotals($totals, $colspan = null)
{
- //check if the shipment is multi shipment
+ // check if the shipment is multi shipment
$totals = $this->getMultishippingTotals($totals);
+ // sort totals by configuration settings
+ $totals = $this->sortTotals($totals);
+
if ($colspan === null) {
$colspan = 3;
}
@@ -481,4 +502,38 @@ protected function _getRowItemRenderer($type)
}
return $renderer;
}
+
+ /**
+ * Sort total information based on configuration settings.
+ *
+ * @param array $totals
+ * @return array
+ */
+ private function sortTotals($totals): array
+ {
+ $sortedTotals = [];
+ $sorts = $this->_scopeConfig->getValue(
+ Collector::XML_PATH_SALES_TOTALS_SORT,
+ ScopeInterface::SCOPE_STORES
+ );
+
+ $sorted = [];
+ foreach ($sorts as $code => $sortOrder) {
+ $sorted[$sortOrder] = $code;
+ }
+ ksort($sorted);
+
+ foreach ($sorted as $code) {
+ if (isset($totals[$code])) {
+ $sortedTotals[$code] = $totals[$code];
+ }
+ }
+
+ $notSorted = array_diff(array_keys($totals), array_keys($sortedTotals));
+ foreach ($notSorted as $code) {
+ $sortedTotals[$code] = $totals[$code];
+ }
+
+ return $sortedTotals;
+ }
}
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
index 762b0f5cca59c..f4dfd60d81980 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
@@ -10,6 +10,8 @@
use Magento\Checkout\Api\AgreementsValidatorInterface;
use Magento\Customer\Api\AccountManagementInterface;
use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Checkout\Api\PaymentProcessingRateLimiterInterface;
+use Magento\Framework\App\ObjectManager;
use Magento\Customer\Model\Session;
use Magento\Framework\App\Action\Context;
use Magento\Framework\App\Action\HttpPostActionInterface;
@@ -21,12 +23,15 @@
use Psr\Log\LoggerInterface;
/**
+ * Placing orders.
+ *
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class OverviewPost extends Checkout implements HttpPostActionInterface
{
/**
* @var Validator
+ * @deprecated Form key validation is handled on the framework level.
*/
protected $formKeyValidator;
@@ -45,6 +50,11 @@ class OverviewPost extends Checkout implements HttpPostActionInterface
*/
private $session;
+ /**
+ * @var PaymentProcessingRateLimiterInterface
+ */
+ private $paymentRateLimiter;
+
/**
* @param Context $context
* @param Session $customerSession
@@ -54,6 +64,7 @@ class OverviewPost extends Checkout implements HttpPostActionInterface
* @param LoggerInterface $logger
* @param AgreementsValidatorInterface $agreementValidator
* @param SessionManagerInterface $session
+ * @param PaymentProcessingRateLimiterInterface|null $paymentRateLimiter
*/
public function __construct(
Context $context,
@@ -63,12 +74,15 @@ public function __construct(
Validator $formKeyValidator,
LoggerInterface $logger,
AgreementsValidatorInterface $agreementValidator,
- SessionManagerInterface $session
+ SessionManagerInterface $session,
+ ?PaymentProcessingRateLimiterInterface $paymentRateLimiter = null
) {
$this->formKeyValidator = $formKeyValidator;
$this->logger = $logger;
$this->agreementsValidator = $agreementValidator;
$this->session = $session;
+ $this->paymentRateLimiter = $paymentRateLimiter
+ ?? ObjectManager::getInstance()->get(PaymentProcessingRateLimiterInterface::class);
parent::__construct(
$context,
@@ -86,15 +100,12 @@ public function __construct(
*/
public function execute()
{
- if (!$this->formKeyValidator->validate($this->getRequest())) {
- $this->_forward('backToAddresses');
- return;
- }
- if (!$this->_validateMinimumAmount()) {
- return;
- }
-
try {
+ $this->paymentRateLimiter->limit();
+ if (!$this->_validateMinimumAmount()) {
+ return;
+ }
+
if (!$this->agreementsValidator->isValid(array_keys($this->getRequest()->getPost('agreement', [])))) {
$this->messageManager->addErrorMessage(
__('Please agree to all Terms and Conditions before placing the order.')
diff --git a/app/code/Magento/Multishipping/Model/DisableMultishipping.php b/app/code/Magento/Multishipping/Model/DisableMultishipping.php
new file mode 100644
index 0000000000000..a871cee715538
--- /dev/null
+++ b/app/code/Magento/Multishipping/Model/DisableMultishipping.php
@@ -0,0 +1,38 @@
+getIsMultiShipping()) {
+ $quote->setIsMultiShipping(0);
+ $extensionAttributes = $quote->getExtensionAttributes();
+ if ($extensionAttributes && $extensionAttributes->getShippingAssignments()) {
+ $extensionAttributes->setShippingAssignments([]);
+ }
+
+ $modeChanged = true;
+ }
+
+ return $modeChanged;
+ }
+}
diff --git a/app/code/Magento/Multishipping/Observer/DisableMultishippingObserver.php b/app/code/Magento/Multishipping/Observer/DisableMultishippingObserver.php
new file mode 100644
index 0000000000000..a72bce87965a4
--- /dev/null
+++ b/app/code/Magento/Multishipping/Observer/DisableMultishippingObserver.php
@@ -0,0 +1,46 @@
+disableMultishipping = $disableMultishipping;
+ }
+
+ /**
+ * Disable Multishipping mode before saving Quote.
+ *
+ * @param EventObserver $observer
+ * @return void
+ */
+ public function execute(EventObserver $observer): void
+ {
+ /** @var CartInterface $quote */
+ $quote = $observer->getEvent()->getCart()->getQuote();
+ $this->disableMultishipping->execute($quote);
+ }
+}
diff --git a/app/code/Magento/Multishipping/Plugin/DisableMultishippingMode.php b/app/code/Magento/Multishipping/Plugin/DisableMultishippingMode.php
index fff2346d76240..f4e6928173f60 100644
--- a/app/code/Magento/Multishipping/Plugin/DisableMultishippingMode.php
+++ b/app/code/Magento/Multishipping/Plugin/DisableMultishippingMode.php
@@ -9,6 +9,7 @@
use Magento\Checkout\Model\Cart;
use Magento\Framework\App\Action\Action;
+use Magento\Multishipping\Model\DisableMultishipping;
/**
* Turns Off Multishipping mode for Quote.
@@ -20,13 +21,21 @@ class DisableMultishippingMode
*/
private $cart;
+ /**
+ * @var DisableMultishipping
+ */
+ private $disableMultishipping;
+
/**
* @param Cart $cart
+ * @param DisableMultishipping $disableMultishipping
*/
public function __construct(
- Cart $cart
+ Cart $cart,
+ DisableMultishipping $disableMultishipping
) {
$this->cart = $cart;
+ $this->disableMultishipping = $disableMultishipping;
}
/**
@@ -36,16 +45,16 @@ public function __construct(
* @return void
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
- public function beforeExecute(Action $subject)
+ public function beforeExecute(Action $subject): void
{
$quote = $this->cart->getQuote();
- if ($quote->getIsMultiShipping()) {
- $quote->setIsMultiShipping(0);
- $extensionAttributes = $quote->getExtensionAttributes();
- if ($extensionAttributes && $extensionAttributes->getShippingAssignments()) {
- $extensionAttributes->setShippingAssignments([]);
- }
+ $modChanged = $this->disableMultishipping->execute($quote);
+ if ($modChanged) {
+ $totalsCollectedBefore = $quote->getTotalsCollectedFlag();
$this->cart->saveQuote();
+ if (!$totalsCollectedBefore) {
+ $quote->setTotalsCollectedFlag(false);
+ }
}
}
}
diff --git a/app/code/Magento/Multishipping/Test/Mftf/Section/MultishippingSection/MultishippingSection.xml b/app/code/Magento/Multishipping/Test/Mftf/Section/MultishippingSection/MultishippingSection.xml
index 9c89ffa3cd405..1b2f0c31b2cf3 100644
--- a/app/code/Magento/Multishipping/Test/Mftf/Section/MultishippingSection/MultishippingSection.xml
+++ b/app/code/Magento/Multishipping/Test/Mftf/Section/MultishippingSection/MultishippingSection.xml
@@ -15,5 +15,6 @@
+
+
+
-
-
-
-
-
+ getHtmlId() . rand(); ?>
+ monthly
0.5
- http://store.com/pub/media/catalog/product/cache/c9e0b0ef589f3508e5ba515cde53c5ff/i/m/image1.png
+ http://store.com/media/catalog/product/cache/c9e0b0ef589f3508e5ba515cde53c5ff/i/m/image1.png
Product & > title < "
Copyright © caption ™ & > title < "
- http://store.com/pub/media/catalog/product/cache/c9e0b0ef589f3508e5ba515cde53c5ff/i/m/image_no_caption.png
+ http://store.com/media/catalog/product/cache/c9e0b0ef589f3508e5ba515cde53c5ff/i/m/image_no_caption.png
Product & > title < "
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-single.xml b/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-single.xml
index 93b9e159d4b04..f9913d5070fbd 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-single.xml
+++ b/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-single.xml
@@ -31,18 +31,18 @@
monthly
0.5
- http://store.com/pub/media/catalog/product/cache/c9e0b0ef589f3508e5ba515cde53c5ff/i/m/image1.png
+ http://store.com/media/catalog/product/cache/c9e0b0ef589f3508e5ba515cde53c5ff/i/m/image1.png
Product & > title < "
Copyright © caption ™ & > title < "
- http://store.com/pub/media/catalog/product/cache/c9e0b0ef589f3508e5ba515cde53c5ff/i/m/image_no_caption.png
+ http://store.com/media/catalog/product/cache/c9e0b0ef589f3508e5ba515cde53c5ff/i/m/image_no_caption.png
Product & > title < "
diff --git a/app/code/Magento/Sitemap/etc/config.xml b/app/code/Magento/Sitemap/etc/config.xml
index 36b2cc2207422..614421b9dd752 100644
--- a/app/code/Magento/Sitemap/etc/config.xml
+++ b/app/code/Magento/Sitemap/etc/config.xml
@@ -57,5 +57,12 @@
+
+
+
+ sitemap
+
+
+
diff --git a/app/code/Magento/Sitemap/etc/di.xml b/app/code/Magento/Sitemap/etc/di.xml
index 4c4a5f98f737a..4771da2f11144 100644
--- a/app/code/Magento/Sitemap/etc/di.xml
+++ b/app/code/Magento/Sitemap/etc/di.xml
@@ -52,4 +52,16 @@
Magento\Sitemap\Model\ItemProvider\CmsPageConfigReader
+
+
+
+ -
+
-
+
- true
+ - media[/\\]+sitemap[/\\]*$
+
+
+
+
+
diff --git a/app/code/Magento/Store/Controller/Store/Redirect.php b/app/code/Magento/Store/Controller/Store/Redirect.php
index 45924b5b0d28a..c20e3b31e09b1 100644
--- a/app/code/Magento/Store/Controller/Store/Redirect.php
+++ b/app/code/Magento/Store/Controller/Store/Redirect.php
@@ -21,10 +21,14 @@
use Magento\Store\Model\Store;
use Magento\Store\Model\StoreManagerInterface;
use Magento\Store\Model\StoreResolver;
+use Magento\Store\Model\StoreSwitcher\ContextInterfaceFactory;
use Magento\Store\Model\StoreSwitcher\HashGenerator;
+use Magento\Store\Model\StoreSwitcher\RedirectDataGenerator;
/**
* Builds correct url to target store (group) and performs redirect.
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Redirect extends Action implements HttpGetActionInterface, HttpPostActionInterface
{
@@ -47,6 +51,14 @@ class Redirect extends Action implements HttpGetActionInterface, HttpPostActionI
* @var StoreManagerInterface
*/
private $storeManager;
+ /**
+ * @var RedirectDataGenerator|null
+ */
+ private $redirectDataGenerator;
+ /**
+ * @var ContextInterfaceFactory|null
+ */
+ private $contextFactory;
/**
* @param Context $context
@@ -55,8 +67,11 @@ class Redirect extends Action implements HttpGetActionInterface, HttpPostActionI
* @param Generic $session
* @param SidResolverInterface $sidResolver
* @param HashGenerator $hashGenerator
- * @param StoreManagerInterface $storeManager
+ * @param StoreManagerInterface|null $storeManager
+ * @param RedirectDataGenerator|null $redirectDataGenerator
+ * @param ContextInterfaceFactory|null $contextFactory
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
Context $context,
@@ -65,13 +80,19 @@ public function __construct(
Generic $session,
SidResolverInterface $sidResolver,
HashGenerator $hashGenerator,
- StoreManagerInterface $storeManager = null
+ StoreManagerInterface $storeManager = null,
+ ?RedirectDataGenerator $redirectDataGenerator = null,
+ ?ContextInterfaceFactory $contextFactory = null
) {
parent::__construct($context);
$this->storeRepository = $storeRepository;
$this->storeResolver = $storeResolver;
$this->hashGenerator = $hashGenerator;
$this->storeManager = $storeManager ?: ObjectManager::getInstance()->get(StoreManagerInterface::class);
+ $this->redirectDataGenerator = $redirectDataGenerator
+ ?: ObjectManager::getInstance()->get(RedirectDataGenerator::class);
+ $this->contextFactory = $contextFactory
+ ?: ObjectManager::getInstance()->get(ContextInterfaceFactory::class);
}
/**
@@ -85,7 +106,6 @@ public function execute()
$currentStore = $this->storeRepository->getById($this->storeResolver->getCurrentStoreId());
$targetStoreCode = $this->_request->getParam(StoreResolver::PARAM_NAME);
$fromStoreCode = $this->_request->getParam('___from_store');
- $error = null;
if ($targetStoreCode === null) {
return $this->_redirect($currentStore->getBaseUrl());
@@ -97,30 +117,33 @@ public function execute()
/** @var Store $targetStore */
$targetStore = $this->storeRepository->get($targetStoreCode);
$this->storeManager->setCurrentStore($targetStore);
- } catch (NoSuchEntityException $e) {
- $error = __("Requested store is not found ({$fromStoreCode})");
- }
-
- if ($error !== null) {
- $this->messageManager->addErrorMessage($error);
- $this->_redirect->redirect($this->_response, $currentStore->getBaseUrl());
- } else {
$encodedUrl = $this->_request->getParam(ActionInterface::PARAM_NAME_URL_ENCODED);
+ $redirectData = $this->redirectDataGenerator->generate(
+ $this->contextFactory->create(
+ [
+ 'fromStore' => $fromStore,
+ 'targetStore' => $targetStore,
+ 'redirectUrl' => $this->_redirect->getRedirectUrl()
+ ]
+ )
+ );
$query = [
'___from_store' => $fromStore->getCode(),
StoreResolverInterface::PARAM_NAME => $targetStoreCode,
ActionInterface::PARAM_NAME_URL_ENCODED => $encodedUrl,
+ 'data' => $redirectData->getData(),
+ 'time_stamp' => $redirectData->getTimestamp(),
+ 'signature' => $redirectData->getSignature(),
];
-
- $customerHash = $this->hashGenerator->generateHash($fromStore);
- $query = array_merge($query, $customerHash);
-
$arguments = [
'_nosid' => true,
'_query' => $query
];
$this->_redirect->redirect($this->_response, 'stores/store/switch', $arguments);
+ } catch (NoSuchEntityException $e) {
+ $this->messageManager->addErrorMessage(__("Requested store is not found ({$fromStoreCode})"));
+ $this->_redirect->redirect($this->_response, $currentStore->getBaseUrl());
}
return null;
diff --git a/app/code/Magento/Store/Model/ScopeResolver.php b/app/code/Magento/Store/Model/ScopeResolver.php
new file mode 100644
index 0000000000000..330ef29c8ac10
--- /dev/null
+++ b/app/code/Magento/Store/Model/ScopeResolver.php
@@ -0,0 +1,147 @@
+scopeTree = $scopeTree;
+ }
+
+ /**
+ * Check is some scope belongs to other scope
+ *
+ * @param string $baseScope
+ * @param int $baseScopeId
+ * @param string $requestedScope
+ * @param int $requestedScopeId
+ * @return bool
+ */
+ public function isBelongsToScope(
+ string $baseScope,
+ int $baseScopeId,
+ string $requestedScope,
+ int $requestedScopeId
+ ) : bool {
+ /* All scopes belongs to All Store Views */
+ if ($baseScope === ScopeConfigInterface::SCOPE_TYPE_DEFAULT) {
+ return true;
+ }
+
+ $scopeNode = $this->getScopeNode($baseScope, $baseScopeId, [$this->scopeTree->get()]);
+ if (empty($scopeNode)) {
+ return false;
+ }
+
+ return $this->isBelongsToScopeRecurse($requestedScope, $requestedScopeId, [$scopeNode]);
+ }
+
+ /**
+ * Check is Belongs some scope to other scope (internal recurse)
+ *
+ * @param string $requestedScope
+ * @param int $requestedScopeId
+ * @param array $tree
+ * @return bool
+ */
+ private function isBelongsToScopeRecurse(
+ string $requestedScope,
+ int $requestedScopeId,
+ array $tree
+ ) : bool {
+ foreach ($tree as $node) {
+ if ($this->isScopeEquals($node['scope'], $requestedScope) && (int)$node['scope_id'] === $requestedScopeId) {
+ return true;
+ }
+ if (!empty($node['scopes'])) {
+ $isBelongsToChild = $this->isBelongsToScopeRecurse(
+ $requestedScope,
+ $requestedScopeId,
+ $node['scopes']
+ );
+ if ($isBelongsToChild) {
+ return $isBelongsToChild;
+ }
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Get tree by scope
+ *
+ * @param string $scope
+ * @param int $scopeId
+ * @param array $tree
+ * @return array
+ */
+ private function getScopeNode(string $scope, int $scopeId, array $tree): array
+ {
+ foreach ($tree as $node) {
+ if ($this->isScopeEquals($node['scope'], $scope) && (int)$node['scope_id'] === $scopeId) {
+ return $node;
+ }
+ if (!empty($node['scopes'])) {
+ $found = $this->getScopeNode($scope, $scopeId, $node['scopes']);
+ if (!empty($found)) {
+ return $found;
+ }
+ }
+ }
+
+ return [];
+ }
+
+ /**
+ * Is scope equals with normalize names
+ *
+ * @param string $firstScope
+ * @param string $secondScope
+ * @return bool
+ */
+ private function isScopeEquals(string $firstScope, string $secondScope): bool
+ {
+ return $this->normalizeScopeName($firstScope) === $this->normalizeScopeName($secondScope);
+ }
+
+ /**
+ * Normalize scope name
+ *
+ * @param string $scope
+ * @return string
+ */
+ private function normalizeScopeName(string $scope): string
+ {
+ switch ($scope) {
+ case ScopeInterface::SCOPE_STORES:
+ return ScopeInterface::SCOPE_STORE;
+ case ScopeInterface::SCOPE_WEBSITES:
+ return ScopeInterface::SCOPE_WEBSITE;
+ case ScopeInterface::SCOPE_GROUPS:
+ return ScopeInterface::SCOPE_GROUP;
+ default:
+ return $scope;
+ }
+ }
+}
diff --git a/app/code/Magento/Store/Model/StoreSwitcher/Context.php b/app/code/Magento/Store/Model/StoreSwitcher/Context.php
new file mode 100644
index 0000000000000..c67dc3d67b01a
--- /dev/null
+++ b/app/code/Magento/Store/Model/StoreSwitcher/Context.php
@@ -0,0 +1,68 @@
+fromStore = $fromStore;
+ $this->targetStore = $targetStore;
+ $this->redirectUrl = $redirectUrl;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getFromStore(): StoreInterface
+ {
+ return $this->fromStore;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getTargetStore(): StoreInterface
+ {
+ return $this->targetStore;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getRedirectUrl(): string
+ {
+ return $this->redirectUrl;
+ }
+}
diff --git a/app/code/Magento/Store/Model/StoreSwitcher/ContextInterface.php b/app/code/Magento/Store/Model/StoreSwitcher/ContextInterface.php
new file mode 100644
index 0000000000000..a18c7cc9ccc27
--- /dev/null
+++ b/app/code/Magento/Store/Model/StoreSwitcher/ContextInterface.php
@@ -0,0 +1,37 @@
+hashGenerator = $hashGenerator;
$this->request = $request;
+ $this->postprocessor = $postprocessor;
+ $this->dataSerializer = $dataSerializer;
$this->messageManager = $messageManager;
- $this->customerSession = $customerSession;
- $this->customerRepository = $customerRepository;
+ $this->contextFactory = $contextFactory;
+ $this->dataFactory = $dataFactory;
+ $this->dataValidator = $dataValidator;
+ $this->logger = $logger;
}
/**
@@ -85,41 +96,39 @@ public function __construct(
*/
public function switch(StoreInterface $fromStore, StoreInterface $targetStore, string $redirectUrl): string
{
- $customerId = $this->request->getParam('customer_id');
-
- if ($customerId) {
- $fromStoreCode = (string)$this->request->getParam('___from_store');
- $timeStamp = (string)$this->request->getParam('time_stamp');
- $signature = (string)$this->request->getParam('signature');
-
- $error = null;
+ $timestamp = (int) $this->request->getParam('time_stamp');
+ $signature = (string) $this->request->getParam('signature');
+ $data = (string) $this->request->getParam('data');
+ $context = $this->contextFactory->create(
+ [
+ 'fromStore' => $fromStore,
+ 'targetStore' => $targetStore,
+ 'redirectUrl' => $redirectUrl
+ ]
+ );
+ $redirectDataObject = $this->dataFactory->create(
+ [
+ 'signature' => $signature,
+ 'timestamp' => $timestamp,
+ 'data' => $data
+ ]
+ );
- $data = new HashData(
- [
- "customer_id" => $customerId,
- "time_stamp" => $timeStamp,
- "___from_store" => $fromStoreCode
- ]
- );
-
- if ($redirectUrl && $this->hashGenerator->validateHash($signature, $data)) {
- try {
- $customer = $this->customerRepository->getById($customerId);
- if (!$this->customerSession->isLoggedIn()) {
- $this->customerSession->setCustomerDataAsLoggedIn($customer);
- }
- } catch (NoSuchEntityException $e) {
- $error = __('The requested customer does not exist.');
- } catch (LocalizedException $e) {
- $error = __('There was an error retrieving the customer record.');
- }
+ try {
+ if ($redirectUrl && $this->dataValidator->validate($context, $redirectDataObject)) {
+ $this->postprocessor->process($context, $this->dataSerializer->unserialize($data));
} else {
- $error = __('The requested store cannot be found. Please check the request and try again.');
- }
-
- if ($error !== null) {
- $this->messageManager->addErrorMessage($error);
+ throw new LocalizedException(
+ __('The requested store cannot be found. Please check the request and try again.')
+ );
}
+ } catch (LocalizedException $exception) {
+ $this->messageManager->addErrorMessage($exception->getMessage());
+ } catch (\Throwable $exception) {
+ $this->logger->error($exception);
+ $this->messageManager->addErrorMessage(
+ __('Something went wrong.')
+ );
}
return $redirectUrl;
diff --git a/app/code/Magento/Store/Model/StoreSwitcher/RedirectData.php b/app/code/Magento/Store/Model/StoreSwitcher/RedirectData.php
new file mode 100644
index 0000000000000..58185ea3d712a
--- /dev/null
+++ b/app/code/Magento/Store/Model/StoreSwitcher/RedirectData.php
@@ -0,0 +1,66 @@
+signature = $signature;
+ $this->data = $data;
+ $this->timestamp = $timestamp;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getSignature(): string
+ {
+ return $this->signature;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getData(): string
+ {
+ return $this->data;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getTimestamp(): int
+ {
+ return $this->timestamp;
+ }
+}
diff --git a/app/code/Magento/Store/Model/StoreSwitcher/RedirectDataCacheSerializer.php b/app/code/Magento/Store/Model/StoreSwitcher/RedirectDataCacheSerializer.php
new file mode 100644
index 0000000000000..5360d403d1388
--- /dev/null
+++ b/app/code/Magento/Store/Model/StoreSwitcher/RedirectDataCacheSerializer.php
@@ -0,0 +1,96 @@
+cache = $cache;
+ $this->json = $json;
+ $this->random = $random;
+ $this->logger = $logger;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function serialize(array $data): string
+ {
+ $token = $this->random->getRandomString(self::CACHE_ID_LENGTH);
+ $cacheKey = self::CACHE_KEY_PREFIX . $token;
+ $this->cache->save($this->json->serialize($data), $cacheKey, [], self::CACHE_LIFE_TIME);
+
+ return $token;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function unserialize(string $data): array
+ {
+ if (strlen($data) !== self::CACHE_ID_LENGTH) {
+ throw new InvalidArgumentException("Invalid cache key '$data' supplied.");
+ }
+
+ $cacheKey = self::CACHE_KEY_PREFIX . $data;
+ $json = $this->cache->load($cacheKey);
+ if (!$json) {
+ throw new InvalidArgumentException('Couldn\'t retrieve data from cache.');
+ }
+ $result = $this->json->unserialize($json);
+ try {
+ $this->cache->remove($cacheKey);
+ } catch (Throwable $exception) {
+ $this->logger->error($exception);
+ }
+
+ return $result;
+ }
+}
diff --git a/app/code/Magento/Store/Model/StoreSwitcher/RedirectDataGenerator.php b/app/code/Magento/Store/Model/StoreSwitcher/RedirectDataGenerator.php
new file mode 100644
index 0000000000000..3ff0375a0c348
--- /dev/null
+++ b/app/code/Magento/Store/Model/StoreSwitcher/RedirectDataGenerator.php
@@ -0,0 +1,95 @@
+preprocessor = $preprocessor;
+ $this->dataSerializer = $dataSerializer;
+ $this->dataFactory = $dataFactory;
+ $this->encryptor = $encryptor;
+ $this->logger = $logger;
+ }
+
+ /**
+ * Collect data to be redirected to the target store
+ *
+ * @param ContextInterface $context
+ * @return RedirectDataInterface
+ */
+ public function generate(ContextInterface $context): RedirectDataInterface
+ {
+ $data = $this->preprocessor->process($context, []);
+ try {
+ $dataStr = $this->dataSerializer->serialize($data);
+ } catch (\Throwable $exception) {
+ $this->logger->error($exception);
+ $dataStr = '';
+ }
+ $timestamp = time();
+ $token = implode(
+ ',',
+ [
+ $dataStr,
+ $timestamp,
+ $context->getFromStore()->getCode(),
+ $context->getTargetStore()->getCode(),
+ ]
+ );
+ $signature = $this->encryptor->hash($token, Encryptor::HASH_VERSION_SHA256);
+
+ return $this->dataFactory->create(
+ [
+ 'data' => $dataStr,
+ 'timestamp' => $timestamp,
+ 'signature' => $signature
+ ]
+ );
+ }
+}
diff --git a/app/code/Magento/Store/Model/StoreSwitcher/RedirectDataInterface.php b/app/code/Magento/Store/Model/StoreSwitcher/RedirectDataInterface.php
new file mode 100644
index 0000000000000..f7fc066634b63
--- /dev/null
+++ b/app/code/Magento/Store/Model/StoreSwitcher/RedirectDataInterface.php
@@ -0,0 +1,35 @@
+processors = $processors;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function process(ContextInterface $context, array $data): void
+ {
+ foreach ($this->processors as $processor) {
+ $processor->process($context, $data);
+ }
+ }
+}
diff --git a/app/code/Magento/Store/Model/StoreSwitcher/RedirectDataPostprocessorInterface.php b/app/code/Magento/Store/Model/StoreSwitcher/RedirectDataPostprocessorInterface.php
new file mode 100644
index 0000000000000..de117915e23da
--- /dev/null
+++ b/app/code/Magento/Store/Model/StoreSwitcher/RedirectDataPostprocessorInterface.php
@@ -0,0 +1,22 @@
+processors = $processors;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function process(ContextInterface $context, array $data): array
+ {
+ foreach ($this->processors as $processor) {
+ $data = $processor->process($context, $data);
+ }
+
+ return $data;
+ }
+}
diff --git a/app/code/Magento/Store/Model/StoreSwitcher/RedirectDataPreprocessorInterface.php b/app/code/Magento/Store/Model/StoreSwitcher/RedirectDataPreprocessorInterface.php
new file mode 100644
index 0000000000000..d28a7dd776ab7
--- /dev/null
+++ b/app/code/Magento/Store/Model/StoreSwitcher/RedirectDataPreprocessorInterface.php
@@ -0,0 +1,23 @@
+encryptor = $encryptor;
+ }
+
+ /**
+ * Validate data redirected from origin store
+ *
+ * @param ContextInterface $context
+ * @param RedirectDataInterface $redirectData
+ * @return bool
+ */
+ public function validate(ContextInterface $context, RedirectDataInterface $redirectData)
+ {
+ $timeStamp = $redirectData->getTimestamp();
+ $signature = $redirectData->getSignature();
+ $value = implode(
+ ',',
+ [
+ $redirectData->getData(),
+ $timeStamp,
+ $context->getFromStore()->getCode(),
+ $context->getTargetStore()->getCode()
+ ]
+ );
+ return time() - $timeStamp <= self::TIMEOUT
+ && $this->encryptor->validateHash($value, $signature);
+ }
+}
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminOpenFirstRowInStoresGridActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminOpenFirstRowInStoresGridActionGroup.xml
new file mode 100644
index 0000000000000..a3be7b0d8a8c4
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminOpenFirstRowInStoresGridActionGroup.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminOpenStoreInFirstRowInStoresGridActionGroup.xml b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminOpenStoreInFirstRowInStoresGridActionGroup.xml
new file mode 100644
index 0000000000000..6af4a4f159a7e
--- /dev/null
+++ b/app/code/Magento/Store/Test/Mftf/ActionGroup/AdminOpenStoreInFirstRowInStoresGridActionGroup.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAcceptAlertAndVerifyStoreViewFormTest.xml b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAcceptAlertAndVerifyStoreViewFormTest.xml
index 09a33d5eb86a6..40a912617ee0b 100644
--- a/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAcceptAlertAndVerifyStoreViewFormTest.xml
+++ b/app/code/Magento/Store/Test/Mftf/Test/AdminUpdateStoreGroupAcceptAlertAndVerifyStoreViewFormTest.xml
@@ -51,8 +51,8 @@
-
-
-
+
phpt
pht
+ xml
diff --git a/app/code/Magento/Store/etc/di.xml b/app/code/Magento/Store/etc/di.xml
index 2da9e91e1fddd..ccfec562ba103 100644
--- a/app/code/Magento/Store/etc/di.xml
+++ b/app/code/Magento/Store/etc/di.xml
@@ -26,6 +26,11 @@
diff --git a/app/code/Magento/Swatches/Helper/Data.php b/app/code/Magento/Swatches/Helper/Data.php
index d2cd1baca894b..dd257de331b91 100644
--- a/app/code/Magento/Swatches/Helper/Data.php
+++ b/app/code/Magento/Swatches/Helper/Data.php
@@ -310,7 +310,7 @@ private function addFilterByParent(ProductCollection $productCollection, $parent
* Method getting full media gallery for current Product
*
* Array structure: [
- * ['image'] => 'http://url/pub/media/catalog/product/2/0/blabla.jpg',
+ * ['image'] => 'http://url/media/catalog/product/2/0/blabla.jpg',
* ['mediaGallery'] => [
* galleryImageId1 => simpleProductImage1.jpg,
* galleryImageId2 => simpleProductImage2.jpg,
diff --git a/app/code/Magento/Swatches/Helper/Media.php b/app/code/Magento/Swatches/Helper/Media.php
index f3694515ecb26..6787fba534893 100644
--- a/app/code/Magento/Swatches/Helper/Media.php
+++ b/app/code/Magento/Swatches/Helper/Media.php
@@ -6,8 +6,9 @@
namespace Magento\Swatches\Helper;
use Magento\Catalog\Helper\Image;
-use Magento\Framework\App\Area;
+use Magento\Catalog\Model\Config\CatalogMediaConfig;
use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ObjectManager;
/**
* Helper to move images from tmp to catalog directory
@@ -72,6 +73,11 @@ class Media extends \Magento\Framework\App\Helper\AbstractHelper
*/
private $imageConfig;
+ /**
+ * @var string
+ */
+ private $mediaUrlFormat;
+
/**
* @param \Magento\Catalog\Model\Product\Media\Config $mediaConfig
* @param \Magento\Framework\Filesystem $filesystem
@@ -80,6 +86,8 @@ class Media extends \Magento\Framework\App\Helper\AbstractHelper
* @param \Magento\Framework\Image\Factory $imageFactory
* @param \Magento\Theme\Model\ResourceModel\Theme\Collection $themeCollection
* @param \Magento\Framework\View\ConfigInterface $configInterface
+ * @param CatalogMediaConfig $catalogMediaConfig
+ * @throws \Magento\Framework\Exception\FileSystemException
*/
public function __construct(
\Magento\Catalog\Model\Product\Media\Config $mediaConfig,
@@ -88,7 +96,8 @@ public function __construct(
\Magento\Store\Model\StoreManagerInterface $storeManager,
\Magento\Framework\Image\Factory $imageFactory,
\Magento\Theme\Model\ResourceModel\Theme\Collection $themeCollection,
- \Magento\Framework\View\ConfigInterface $configInterface
+ \Magento\Framework\View\ConfigInterface $configInterface,
+ CatalogMediaConfig $catalogMediaConfig = null
) {
$this->mediaConfig = $mediaConfig;
$this->fileStorageDb = $fileStorageDb;
@@ -97,6 +106,9 @@ public function __construct(
$this->imageFactory = $imageFactory;
$this->themeCollection = $themeCollection;
$this->viewConfig = $configInterface;
+
+ $catalogMediaConfig = $catalogMediaConfig ?: ObjectManager::getInstance()->get(CatalogMediaConfig::class);
+ $this->mediaUrlFormat = $catalogMediaConfig->getMediaUrlFormat();
}
/**
@@ -106,17 +118,35 @@ public function __construct(
*/
public function getSwatchAttributeImage($swatchType, $file)
{
- $generationPath = $swatchType . '/' . $this->getFolderNameSize($swatchType) . $file;
- $absoluteImagePath = $this->mediaDirectory
- ->getAbsolutePath($this->getSwatchMediaPath() . '/' . $generationPath);
- if (!file_exists($absoluteImagePath)) {
- try {
- $this->generateSwatchVariations($file);
- } catch (\Exception $e) {
- return '';
+ $basePath = $this->getSwatchMediaUrl();
+
+ if ($this->mediaUrlFormat === CatalogMediaConfig::HASH) {
+ $generationPath = $swatchType . '/' . $this->getFolderNameSize($swatchType) . $file;
+ $absoluteImagePath = $this->mediaDirectory
+ ->getAbsolutePath($this->getSwatchMediaPath() . '/' . $generationPath);
+ if (!$this->mediaDirectory->isExist(($absoluteImagePath))) {
+ try {
+ $this->generateSwatchVariations($file);
+ } catch (\Exception $e) {
+ return '';
+ }
}
+
+ return $basePath . '/' . $generationPath;
}
- return $this->getSwatchMediaUrl() . '/' . $generationPath;
+
+ return $basePath . '/' . $this->getRelativeTransformationParametersPath($swatchType, $file);
+ }
+
+ private function getRelativeTransformationParametersPath($swatchType, $file)
+ {
+ $imageConfig = $this->getImageConfig();
+ return $this->prepareFile($file) . '?' . http_build_query([
+ 'width' => $imageConfig[$swatchType]['width'],
+ 'height' => $imageConfig[$swatchType]['height'],
+ 'store' => $this->storeManager->getStore()->getCode(),
+ 'image-type' => $swatchType
+ ]);
}
/**
@@ -156,7 +186,7 @@ public function moveImageFromTmp($file)
/**
* Check whether file to move exists. Getting unique name
*
- * @param $file
+ * @param string $file
* @return string
*/
protected function getUniqueFileName($file)
@@ -167,14 +197,19 @@ protected function getUniqueFileName($file)
$file
);
} else {
- $destFile = dirname($file) . '/' . \Magento\MediaStorage\Model\File\Uploader::getNewFileName(
- $this->mediaDirectory->getAbsolutePath($this->getAttributeSwatchPath($file))
+ $destFile = rtrim(dirname($file), '/.') . '/' . \Magento\MediaStorage\Model\File\Uploader::getNewFileName(
+ $this->getOriginalFilePath($file)
);
}
return $destFile;
}
+ private function getOriginalFilePath($file)
+ {
+ return $this->mediaDirectory->getAbsolutePath($this->getAttributeSwatchPath($file));
+ }
+
/**
* Generate swatch thumb and small swatch image
*
@@ -183,16 +218,19 @@ protected function getUniqueFileName($file)
*/
public function generateSwatchVariations($imageUrl)
{
- $absoluteImagePath = $this->mediaDirectory->getAbsolutePath($this->getAttributeSwatchPath($imageUrl));
- foreach ($this->swatchImageTypes as $swatchType) {
- $imageConfig = $this->getImageConfig();
- $swatchNamePath = $this->generateNamePath($imageConfig, $imageUrl, $swatchType);
- $image = $this->imageFactory->create($absoluteImagePath);
- $this->setupImageProperties($image);
- $image->resize($imageConfig[$swatchType]['width'], $imageConfig[$swatchType]['height']);
- $this->setupImageProperties($image, true);
- $image->save($swatchNamePath['path_for_save'], $swatchNamePath['name']);
+ if ($this->mediaUrlFormat === CatalogMediaConfig::HASH) {
+ $absoluteImagePath = $this->getOriginalFilePath($imageUrl);
+ foreach ($this->swatchImageTypes as $swatchType) {
+ $imageConfig = $this->getImageConfig();
+ $swatchNamePath = $this->generateNamePath($imageConfig, $imageUrl, $swatchType);
+ $image = $this->imageFactory->create($absoluteImagePath);
+ $this->setupImageProperties($image);
+ $image->resize($imageConfig[$swatchType]['width'], $imageConfig[$swatchType]['height']);
+ $this->setupImageProperties($image, true);
+ $image->save($swatchNamePath['path_for_save'], $swatchNamePath['name']);
+ }
}
+
return $this;
}
@@ -281,7 +319,7 @@ protected function prepareFileName($imageUrl)
}
/**
- * Url type http://url/pub/media/attribute/swatch/
+ * Url type http://url/media/attribute/swatch/
*
* @return string
*/
diff --git a/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php b/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php
index 0acd7ef315700..f584cc4738faf 100644
--- a/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php
+++ b/app/code/Magento/Swatches/Model/Plugin/EavAttribute.php
@@ -352,7 +352,7 @@ protected function processTextualSwatch(Attribute $attribute)
}
$defaultSwatchValue = reset($storeValues);
foreach ($storeValues as $storeId => $value) {
- if (!$value) {
+ if ($value === null || $value === '') {
$value = $defaultSwatchValue;
}
$swatch = $this->loadSwatchIfExists($optionId, $storeId);
@@ -378,8 +378,9 @@ protected function processTextualSwatch(Attribute $attribute)
*/
protected function getAttributeOptionId($optionId)
{
- if (substr($optionId, 0, 6) == self::BASE_OPTION_TITLE || substr($optionId, 0, 3) == self::API_OPTION_PREFIX) {
- $optionId = isset($this->dependencyArray[$optionId]) ? $this->dependencyArray[$optionId] : null;
+ if (strpos((string)$optionId, self::BASE_OPTION_TITLE) === 0 ||
+ strpos((string)$optionId, self::API_OPTION_PREFIX) === 0) {
+ $optionId = $this->dependencyArray[$optionId] ?? null;
}
return $optionId;
}
diff --git a/app/code/Magento/Swatches/Test/Mftf/ActionGroup/AddVisualSwatchToProductWithOutCreatedActionGroup.xml b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/AddVisualSwatchToProductWithOutCreatedActionGroup.xml
new file mode 100644
index 0000000000000..604ef606e94e5
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/AddVisualSwatchToProductWithOutCreatedActionGroup.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+ Does not create an attribute. Adds the provided Visual Swatch Attribute and Options (2) to a Product on the Admin Product creation/edit page. Clicks on Save. Validates that the Success Message is present.
+
+
+
+
+
+
diff --git a/app/code/Magento/Swatches/Test/Mftf/ActionGroup/StorefrontSelectVisualSwatchOptionOnCategoryPageActionGroup.xml b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/StorefrontSelectVisualSwatchOptionOnCategoryPageActionGroup.xml
new file mode 100644
index 0000000000000..5722210abf211
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/ActionGroup/StorefrontSelectVisualSwatchOptionOnCategoryPageActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontCategoryPageProductInfoSection.xml b/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontCategoryPageProductInfoSection.xml
new file mode 100644
index 0000000000000..5f321c7f17603
--- /dev/null
+++ b/app/code/Magento/Swatches/Test/Mftf/Section/StorefrontCategoryPageProductInfoSection.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Swatches/Test/Mftf/Test/AdminDisablingSwatchTooltipsTest.xml b/app/code/Magento/Swatches/Test/Mftf/Test/AdminDisablingSwatchTooltipsTest.xml
index b48f181c8d199..85481f6fd4d5f 100644
--- a/app/code/Magento/Swatches/Test/Mftf/Test/AdminDisablingSwatchTooltipsTest.xml
+++ b/app/code/Magento/Swatches/Test/Mftf/Test/AdminDisablingSwatchTooltipsTest.xml
@@ -153,8 +153,8 @@
- 1
+
+
+
+ attribute
+
+
+
diff --git a/app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php b/app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php
index 939facd02c02d..612573ff493ad 100644
--- a/app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php
+++ b/app/code/Magento/Tax/Model/Calculation/AbstractAggregateCalculator.php
@@ -21,7 +21,7 @@ protected function calculateWithTaxInPrice(QuoteDetailsItemInterface $item, $qua
$this->taxClassManagement->getTaxClassId($item->getTaxClassKey())
);
$rate = $this->calculationTool->getRate($taxRateRequest);
- $storeRate = $storeRate = $this->calculationTool->getStoreRate($taxRateRequest, $this->storeId);
+ $storeRate = $this->calculationTool->getStoreRate($taxRateRequest, $this->storeId);
$discountTaxCompensationAmount = 0;
$applyTaxAfterDiscount = $this->config->applyTaxAfterDiscount($this->storeId);
diff --git a/app/code/Magento/Tax/Model/Calculation/UnitBaseCalculator.php b/app/code/Magento/Tax/Model/Calculation/UnitBaseCalculator.php
index ed469e822d937..655fcc9749cb3 100644
--- a/app/code/Magento/Tax/Model/Calculation/UnitBaseCalculator.php
+++ b/app/code/Magento/Tax/Model/Calculation/UnitBaseCalculator.php
@@ -10,7 +10,15 @@
class UnitBaseCalculator extends AbstractCalculator
{
/**
- * {@inheritdoc}
+ * Determines the rounding operation type and rounds the amount
+ *
+ * @param float $amount
+ * @param string $rate
+ * @param bool $direction
+ * @param string $type
+ * @param bool $round
+ * @param QuoteDetailsItemInterface $item
+ * @return float|string
*/
protected function roundAmount(
$amount,
@@ -31,7 +39,12 @@ protected function roundAmount(
}
/**
- * {@inheritdoc}
+ * Calculate tax details for quote item with tax in price with given quantity
+ *
+ * @param QuoteDetailsItemInterface $item
+ * @param int $quantity
+ * @param bool $round
+ * @return \Magento\Tax\Api\Data\TaxDetailsItemInterface
*/
protected function calculateWithTaxInPrice(QuoteDetailsItemInterface $item, $quantity, $round = true)
{
@@ -39,7 +52,7 @@ protected function calculateWithTaxInPrice(QuoteDetailsItemInterface $item, $qua
$this->taxClassManagement->getTaxClassId($item->getTaxClassKey())
);
$rate = $this->calculationTool->getRate($taxRateRequest);
- $storeRate = $storeRate = $this->calculationTool->getStoreRate($taxRateRequest, $this->storeId);
+ $storeRate = $this->calculationTool->getStoreRate($taxRateRequest, $this->storeId);
// Calculate $priceInclTax
$applyTaxAfterDiscount = $this->config->applyTaxAfterDiscount($this->storeId);
@@ -104,7 +117,12 @@ protected function calculateWithTaxInPrice(QuoteDetailsItemInterface $item, $qua
}
/**
- * {@inheritdoc}
+ * Calculate tax details for quote item with tax not in price with given quantity
+ *
+ * @param QuoteDetailsItemInterface $item
+ * @param int $quantity
+ * @param bool $round
+ * @return \Magento\Tax\Api\Data\TaxDetailsItemInterface
*/
protected function calculateWithTaxNotInPrice(QuoteDetailsItemInterface $item, $quantity, $round = true)
{
diff --git a/app/code/Magento/Tax/Model/Plugin/OrderSave.php b/app/code/Magento/Tax/Model/Plugin/OrderSave.php
index 38952eec02ca1..b46c5b51a9db2 100644
--- a/app/code/Magento/Tax/Model/Plugin/OrderSave.php
+++ b/app/code/Magento/Tax/Model/Plugin/OrderSave.php
@@ -50,11 +50,14 @@ public function afterSave(
}
/**
+ * Save order tax
+ *
* @param \Magento\Sales\Api\Data\OrderInterface $order
* @return $this
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
* @SuppressWarnings(PHPMD.NPathComplexity)
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+ * phpcs:disable Generic.Metrics.NestingLevel.TooHigh
*/
protected function saveOrderTax(\Magento\Sales\Api\Data\OrderInterface $order)
{
@@ -176,7 +179,9 @@ protected function saveOrderTax(\Magento\Sales\Api\Data\OrderInterface $order)
} elseif (isset($quoteItemId['associated_item_id'])) {
//This item is associated with a product item
$item = $order->getItemByQuoteItemId($quoteItemId['associated_item_id']);
- $associatedItemId = $item->getId();
+ if ($item !== null && $item->getId()) {
+ $associatedItemId = $item->getId();
+ }
}
$data = [
diff --git a/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rate/Collection.php b/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rate/Collection.php
index 7863b70f6626a..d34e863d56c54 100644
--- a/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rate/Collection.php
+++ b/app/code/Magento/Tax/Model/ResourceModel/Calculation/Rate/Collection.php
@@ -206,7 +206,7 @@ public function getOptionRates()
{
$size = self::TAX_RULES_CHUNK_SIZE;
$page = 1;
- $rates = [[]];
+ $rates = [];
do {
$offset = $size * ($page - 1);
$this->getSelect()->reset();
@@ -222,6 +222,6 @@ public function getOptionRates()
$page++;
} while ($this->getSize() > $offset);
- return array_merge(...$rates);
+ return array_merge([], ...$rates);
}
}
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
index c7cc4ded1bf07..a9acef7c178da 100644
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
@@ -367,7 +367,7 @@ public function mapItems(
$priceIncludesTax,
$useBaseCurrency
);
- $itemDataObjects[] = $parentItemDataObject;
+ $itemDataObjects[] = [$parentItemDataObject];
foreach ($item->getChildren() as $child) {
$childItemDataObject = $this->mapItem(
$itemDataObjectFactory,
@@ -376,31 +376,29 @@ public function mapItems(
$useBaseCurrency,
$parentItemDataObject->getCode()
);
- $itemDataObjects[] = $childItemDataObject;
+ $itemDataObjects[] = [$childItemDataObject];
$extraTaxableItems = $this->mapItemExtraTaxables(
$itemDataObjectFactory,
$item,
$priceIncludesTax,
$useBaseCurrency
);
- //phpcs:ignore Magento2.Performance.ForeachArrayMerge
- $itemDataObjects = array_merge($itemDataObjects, $extraTaxableItems);
+ $itemDataObjects[] = $extraTaxableItems;
}
} else {
$itemDataObject = $this->mapItem($itemDataObjectFactory, $item, $priceIncludesTax, $useBaseCurrency);
- $itemDataObjects[] = $itemDataObject;
+ $itemDataObjects[] = [$itemDataObject];
$extraTaxableItems = $this->mapItemExtraTaxables(
$itemDataObjectFactory,
$item,
$priceIncludesTax,
$useBaseCurrency
);
- //phpcs:ignore Magento2.Performance.ForeachArrayMerge
- $itemDataObjects = array_merge($itemDataObjects, $extraTaxableItems);
+ $itemDataObjects[] = $extraTaxableItems;
}
}
- return $itemDataObjects;
+ return array_merge([], ...$itemDataObjects);
}
/**
diff --git a/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml b/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml
index fde43cd10e3ea..fd0cb31fd8655 100644
--- a/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml
+++ b/app/code/Magento/Tax/Test/Mftf/Data/TaxRuleData.xml
@@ -123,4 +123,17 @@
TaxNameZeroRate
+
+ TaxRule
+ 0
+ 0
+
+ - 3
+
+
+ - 2
+
+
+ false
+
diff --git a/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php b/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php
index 2925ebef958b6..d98bd4a0722ee 100644
--- a/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php
+++ b/app/code/Magento/Tax/Test/Unit/Model/Plugin/OrderSaveTest.php
@@ -175,50 +175,51 @@ public function verifyItemTaxes($expectedItemTaxes)
}
/**
+ * Test for order afterSave
+ *
* @dataProvider afterSaveDataProvider
+ * @param array $appliedTaxes
+ * @param array $itemAppliedTaxes
+ * @param array $expectedTaxes
+ * @param array $expectedItemTaxes
+ * @param int|null $itemId
+ * @return void
*/
public function testAfterSave(
- $appliedTaxes,
- $itemAppliedTaxes,
- $expectedTaxes,
- $expectedItemTaxes
- ) {
+ array $appliedTaxes,
+ array $itemAppliedTaxes,
+ array $expectedTaxes,
+ array $expectedItemTaxes,
+ ?int $itemId
+ ): void {
$orderMock = $this->setupOrderMock();
$extensionAttributeMock = $this->setupExtensionAttributeMock();
- $extensionAttributeMock->expects($this->any())
- ->method('getConvertingFromQuote')
+ $extensionAttributeMock->method('getConvertingFromQuote')
->willReturn(true);
- $extensionAttributeMock->expects($this->any())
- ->method('getAppliedTaxes')
+ $extensionAttributeMock->method('getAppliedTaxes')
->willReturn($appliedTaxes);
- $extensionAttributeMock->expects($this->any())
- ->method('getItemAppliedTaxes')
+ $extensionAttributeMock->method('getItemAppliedTaxes')
->willReturn($itemAppliedTaxes);
$orderItemMock = $this->getMockBuilder(\Magento\Sales\Model\Order\Item::class)
->disableOriginalConstructor()
->setMethods(['getId'])
->getMock();
- $orderItemMock->expects($this->atLeastOnce())
- ->method('getId')
- ->willReturn(self::ORDER_ITEM_ID);
- $orderMock->expects($this->once())
- ->method('getAppliedTaxIsSaved')
+ $orderItemMock->method('getId')
+ ->willReturn($itemId);
+ $orderMock->method('getAppliedTaxIsSaved')
->willReturn(false);
- $orderMock->expects($this->once())
- ->method('getExtensionAttributes')
+ $orderMock->method('getExtensionAttributes')
->willReturn($extensionAttributeMock);
- $orderMock->expects($this->atLeastOnce())
- ->method('getItemByQuoteItemId')
+ $itemByQuoteId = $itemId ? $orderItemMock : $itemId;
+ $orderMock->method('getItemByQuoteItemId')
->with(self::ITEMID)
- ->willReturn($orderItemMock);
- $orderMock->expects($this->atLeastOnce())
- ->method('getEntityId')
+ ->willReturn($itemByQuoteId);
+ $orderMock->method('getEntityId')
->willReturn(self::ORDERID);
- $orderMock->expects($this->once())
- ->method('setAppliedTaxIsSaved')
+ $orderMock->method('setAppliedTaxIsSaved')
->with(true);
$this->verifyOrderTaxes($expectedTaxes);
@@ -228,10 +229,12 @@ public function testAfterSave(
}
/**
+ * After save data provider
+ *
* @return array
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
- public function afterSaveDataProvider()
+ public function afterSaveDataProvider(): array
{
return [
//one item with shipping
@@ -485,6 +488,257 @@ public function afterSaveDataProvider()
'taxable_item_type' => 'shipping',
],
],
+ 'item_id' => self::ORDER_ITEM_ID,
+ ],
+ 'associated_item_with_empty_order_quote_item' => [
+ 'applied_taxes' => [
+ [
+ 'amount' => 0.66,
+ 'base_amount' => 0.66,
+ 'percent' => 11,
+ 'id' => 'ILUS',
+ 'extension_attributes' => [
+ 'rates' => [
+ [
+ 'percent' => 6,
+ 'code' => 'IL',
+ 'title' => 'IL',
+ ],
+ [
+ 'percent' => 5,
+ 'code' => 'US',
+ 'title' => 'US',
+ ],
+ ]
+ ],
+ ],
+ [
+ 'amount' => 0.2,
+ 'base_amount' => 0.2,
+ 'percent' => 3.33,
+ 'id' => 'CityTax',
+ 'extension_attributes' => [
+ 'rates' => [
+ [
+ 'percent' => 3,
+ 'code' => 'CityTax',
+ 'title' => 'CityTax',
+ ],
+ ]
+ ],
+ ],
+ ],
+ 'item_applied_taxes' => [
+ //item tax, three tax rates
+ [
+ //first two taxes are combined
+ 'item_id' => null,
+ 'type' => 'product',
+ 'associated_item_id' => self::ITEMID,
+ 'applied_taxes' => [
+ [
+ 'amount' => 0.11,
+ 'base_amount' => 0.11,
+ 'percent' => 11,
+ 'id' => 'ILUS',
+ 'extension_attributes' => [
+ 'rates' => [
+ [
+ 'percent' => 6,
+ 'code' => 'IL',
+ 'title' => 'IL',
+ ],
+ [
+ 'percent' => 5,
+ 'code' => 'US',
+ 'title' => 'US',
+ ],
+ ]
+ ],
+ ],
+ //city tax
+ [
+ 'amount' => 0.03,
+ 'base_amount' => 0.03,
+ 'percent' => 3.33,
+ 'id' => 'CityTax',
+ 'extension_attributes' => [
+ 'rates' => [
+ [
+ 'percent' => 3,
+ 'code' => 'CityTax',
+ 'title' => 'CityTax',
+ ],
+ ]
+ ],
+ ],
+ ],
+ ],
+ //shipping tax
+ [
+ //first two taxes are combined
+ 'item_id' => null,
+ 'type' => 'shipping',
+ 'associated_item_id' => null,
+ 'applied_taxes' => [
+ [
+ 'amount' => 0.55,
+ 'base_amount' => 0.55,
+ 'percent' => 11,
+ 'id' => 'ILUS',
+ 'extension_attributes' => [
+ 'rates' => [
+ [
+ 'percent' => 6,
+ 'code' => 'IL',
+ 'title' => 'IL',
+ ],
+ [
+ 'percent' => 5,
+ 'code' => 'US',
+ 'title' => 'US',
+ ],
+ ]
+ ],
+ ],
+ //city tax
+ [
+ 'amount' => 0.17,
+ 'base_amount' => 0.17,
+ 'percent' => 3.33,
+ 'id' => 'CityTax',
+ 'extension_attributes' => [
+ 'rates' => [
+ [
+ 'percent' => 3,
+ 'code' => 'CityTax',
+ 'title' => 'CityTax',
+ ],
+ ]
+ ],
+ ],
+ ],
+ ],
+ ],
+ 'expected_order_taxes' => [
+ //state tax
+ '35' => [
+ 'order_id' => self::ORDERID,
+ 'code' => 'IL',
+ 'title' => 'IL',
+ 'hidden' => 0,
+ 'percent' => 6,
+ 'priority' => 0,
+ 'position' => 0,
+ 'amount' => 0.66,
+ 'base_amount' => 0.66,
+ 'process' => 0,
+ 'base_real_amount' => 0.36,
+ ],
+ //federal tax
+ '36' => [
+ 'order_id' => self::ORDERID,
+ 'code' => 'US',
+ 'title' => 'US',
+ 'hidden' => 0,
+ 'percent' => 5,
+ 'priority' => 0,
+ 'position' => 0,
+ 'amount' => 0.66, //combined amount
+ 'base_amount' => 0.66,
+ 'process' => 0,
+ 'base_real_amount' => 0.3, //portion for specific rate
+ ],
+ //city tax
+ '37' => [
+ 'order_id' => self::ORDERID,
+ 'code' => 'CityTax',
+ 'title' => 'CityTax',
+ 'hidden' => 0,
+ 'percent' => 3,
+ 'priority' => 0,
+ 'position' => 0,
+ 'amount' => 0.2, //combined amount
+ 'base_amount' => 0.2,
+ 'process' => 0,
+ 'base_real_amount' => 0.18018018018018, //this number is meaningless since this is single rate
+ ],
+ ],
+ 'expected_item_taxes' => [
+ [
+ //state tax for item
+ 'item_id' => null,
+ 'tax_id' => '35',
+ 'tax_percent' => 6,
+ 'associated_item_id' => null,
+ 'amount' => 0.11,
+ 'base_amount' => 0.11,
+ 'real_amount' => 0.06,
+ 'real_base_amount' => 0.06,
+ 'taxable_item_type' => 'product',
+ ],
+ [
+ //state tax for shipping
+ 'item_id' => null,
+ 'tax_id' => '35',
+ 'tax_percent' => 6,
+ 'associated_item_id' => null,
+ 'amount' => 0.55,
+ 'base_amount' => 0.55,
+ 'real_amount' => 0.3,
+ 'real_base_amount' => 0.3,
+ 'taxable_item_type' => 'shipping',
+ ],
+ [
+ //federal tax for item
+ 'item_id' => null,
+ 'tax_id' => '36',
+ 'tax_percent' => 5,
+ 'associated_item_id' => null,
+ 'amount' => 0.11,
+ 'base_amount' => 0.11,
+ 'real_amount' => 0.05,
+ 'real_base_amount' => 0.05,
+ 'taxable_item_type' => 'product',
+ ],
+ [
+ //federal tax for shipping
+ 'item_id' => null,
+ 'tax_id' => '36',
+ 'tax_percent' => 5,
+ 'associated_item_id' => null,
+ 'amount' => 0.55,
+ 'base_amount' => 0.55,
+ 'real_amount' => 0.25,
+ 'real_base_amount' => 0.25,
+ 'taxable_item_type' => 'shipping',
+ ],
+ [
+ //city tax for item
+ 'item_id' => null,
+ 'tax_id' => '37',
+ 'tax_percent' => 3.33,
+ 'associated_item_id' => null,
+ 'amount' => 0.03,
+ 'base_amount' => 0.03,
+ 'real_amount' => 0.03,
+ 'real_base_amount' => 0.03,
+ 'taxable_item_type' => 'product',
+ ],
+ [
+ //city tax for shipping
+ 'item_id' => null,
+ 'tax_id' => '37',
+ 'tax_percent' => 3.33,
+ 'associated_item_id' => null,
+ 'amount' => 0.17,
+ 'base_amount' => 0.17,
+ 'real_amount' => 0.17,
+ 'real_base_amount' => 0.17,
+ 'taxable_item_type' => 'shipping',
+ ],
+ ],
+ 'item_id' => null,
],
];
}
diff --git a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportPost.php b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportPost.php
index 844cfc535cfb2..f23fe8ffae7ae 100644
--- a/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportPost.php
+++ b/app/code/Magento/TaxImportExport/Controller/Adminhtml/Rate/ExportPost.php
@@ -81,7 +81,10 @@ public function execute()
$content .= $rate->toString($template) . "\n";
}
- return $this->fileFactory->create('tax_rates.csv', $content, DirectoryList::VAR_DIR);
+ // pass 'rm' parameter to delete a file after download
+ $fileContent = ['type' => 'string', 'value' => $content, 'rm' => true];
+
+ return $this->fileFactory->create('tax_rates.csv', $fileContent, DirectoryList::VAR_DIR);
}
/**
diff --git a/app/code/Magento/TaxImportExport/Test/Unit/Controller/Adminhtml/Rate/ExportPostTest.php b/app/code/Magento/TaxImportExport/Test/Unit/Controller/Adminhtml/Rate/ExportPostTest.php
index 0c8d0cf80544b..f4d31f3e421eb 100644
--- a/app/code/Magento/TaxImportExport/Test/Unit/Controller/Adminhtml/Rate/ExportPostTest.php
+++ b/app/code/Magento/TaxImportExport/Test/Unit/Controller/Adminhtml/Rate/ExportPostTest.php
@@ -101,10 +101,11 @@ public function testExecute()
]);
$rateCollectionMock->expects($this->once())->method('joinCountryTable')->willReturnSelf();
$rateCollectionMock->expects($this->once())->method('joinRegionTable')->willReturnSelf();
+ $fileContent = ['type' => 'string', 'value' => $content, 'rm' => true];
$this->fileFactoryMock
->expects($this->once())
->method('create')
- ->with('tax_rates.csv', $content, DirectoryList::VAR_DIR);
+ ->with('tax_rates.csv', $fileContent, DirectoryList::VAR_DIR);
$this->controller->execute();
}
}
diff --git a/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml b/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml
index 79d833771768d..35b2ce454d3c1 100644
--- a/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml
+++ b/app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml
@@ -74,7 +74,7 @@ script;
diff --git a/app/code/Magento/Theme/Test/Unit/Block/Adminhtml/Design/Config/Edit/SaveButtonTest.php b/app/code/Magento/Theme/Test/Unit/Block/Adminhtml/Design/Config/Edit/SaveButtonTest.php
index 65e2b934741ee..b7f2def1c0fbd 100644
--- a/app/code/Magento/Theme/Test/Unit/Block/Adminhtml/Design/Config/Edit/SaveButtonTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Block/Adminhtml/Design/Config/Edit/SaveButtonTest.php
@@ -7,10 +7,7 @@
namespace Magento\Theme\Test\Unit\Block\Adminhtml\Design\Config\Edit;
-use Magento\Backend\Block\Widget\Context;
-use Magento\Framework\UrlInterface;
use Magento\Theme\Block\Adminhtml\Design\Config\Edit\SaveButton;
-use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
class SaveButtonTest extends TestCase
@@ -20,16 +17,9 @@ class SaveButtonTest extends TestCase
*/
protected $block;
- /**
- * @var Context|MockObject
- */
- protected $context;
-
protected function setUp(): void
{
- $this->initContext();
-
- $this->block = new SaveButton($this->context);
+ $this->block = new SaveButton();
}
public function testGetButtonData()
@@ -41,18 +31,4 @@ public function testGetButtonData()
$this->assertArrayHasKey('data_attribute', $result);
$this->assertIsArray($result['data_attribute']);
}
-
- protected function initContext()
- {
- $this->urlBuilder = $this->getMockBuilder(UrlInterface::class)
- ->disableOriginalConstructor()
- ->getMockForAbstractClass();
-
- $this->context = $this->getMockBuilder(Context::class)
- ->disableOriginalConstructor()
- ->getMock();
- $this->context->expects($this->any())
- ->method('getUrlBuilder')
- ->willReturn($this->urlBuilder);
- }
}
diff --git a/app/code/Magento/Theme/Test/Unit/Block/Html/Header/LogoTest.php b/app/code/Magento/Theme/Test/Unit/Block/Html/Header/LogoTest.php
index 0bbf35e244241..1978362810763 100644
--- a/app/code/Magento/Theme/Test/Unit/Block/Html/Header/LogoTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Block/Html/Header/LogoTest.php
@@ -35,7 +35,7 @@ public function testGetLogoSrc()
)->method(
'getBaseUrl'
)->willReturn(
- 'http://localhost/pub/media/'
+ 'http://localhost/media/'
);
$mediaDirectory->expects($this->any())->method('isFile')->willReturn(true);
@@ -53,7 +53,7 @@ public function testGetLogoSrc()
];
$block = $objectManager->getObject(Logo::class, $arguments);
- $this->assertEquals('http://localhost/pub/media/logo/default/image.gif', $block->getLogoSrc());
+ $this->assertEquals('http://localhost/media/logo/default/image.gif', $block->getLogoSrc());
}
/**
diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/SaveTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/SaveTest.php
index b2641d304fb84..f14b176e95e5c 100644
--- a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/SaveTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/SaveTest.php
@@ -57,7 +57,7 @@ public function testSaveAction()
->with('js_order')
->willReturn($jsOrder);
- $this->_request->expects($this->once(5))->method('getPostValue')->willReturn(true);
+ $this->_request->expects($this->once())->method('getPostValue')->willReturn(true);
$themeMock = $this->getMockBuilder(Theme::class)
->addMethods(['setCustomization'])
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
index 78a56013ae042..691a94e37e932 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Backend/FileTest.php
@@ -195,7 +195,7 @@ public function testAfterLoad()
$this->urlBuilder->expects($this->once())
->method('getBaseUrl')
->with(['_type' => UrlInterface::URL_TYPE_MEDIA])
- ->willReturn('http://magento2.com/pub/media/');
+ ->willReturn('http://magento2.com/media/');
$this->mediaDirectory->expects($this->once())
->method('getRelativePath')
->with('value')
@@ -212,7 +212,7 @@ public function testAfterLoad()
$this->assertEquals(
[
[
- 'url' => 'http://magento2.com/pub/media/design/file/' . $value,
+ 'url' => 'http://magento2.com/media/design/file/' . $value,
'file' => $value,
'size' => 234234,
'exists' => true,
@@ -241,7 +241,7 @@ public function testBeforeSave(string $fileName)
'scope_id' => 1,
'value' => [
[
- 'url' => 'http://magento2.com/pub/media/tmp/image/' . $fileName,
+ 'url' => 'http://magento2.com/media/tmp/image/' . $fileName,
'file' => $fileName,
'size' => 234234,
]
@@ -314,7 +314,7 @@ public function testBeforeSaveWithExistingFile()
[
'value' => [
[
- 'url' => 'http://magento2.com/pub/media/tmp/image/' . $value,
+ 'url' => 'http://magento2.com/media/tmp/image/' . $value,
'file' => $value,
'size' => 234234,
'exists' => true
@@ -358,7 +358,7 @@ public function getRelativeMediaPathDataProvider(): array
{
return [
'Normal path' => ['pub/media/', 'filename.jpg'],
- 'Complex path' => ['some_path/pub/media/', 'filename.jpg'],
+ 'Complex path' => ['some_path/media/', 'filename.jpg'],
];
}
}
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Design/Config/FileUploader/FileProcessorTest.php b/app/code/Magento/Theme/Test/Unit/Model/Design/Config/FileUploader/FileProcessorTest.php
index ab7d622801f63..c16d7a49a7e6f 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Design/Config/FileUploader/FileProcessorTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Design/Config/FileUploader/FileProcessorTest.php
@@ -111,7 +111,7 @@ public function testSaveToTmp()
$this->store->expects($this->once())
->method('getBaseUrl')
->with(UrlInterface::URL_TYPE_MEDIA)
- ->willReturn('http://magento2.com/pub/media/');
+ ->willReturn('http://magento2.com/media/');
$this->directoryWrite->expects($this->once())
->method('getAbsolutePath')
->with('tmp/' . FileProcessor::FILE_DIR)
@@ -160,7 +160,7 @@ public function testSaveToTmp()
'name' => 'file.jpg',
'size' => '234234',
'type' => 'image/jpg',
- 'url' => 'http://magento2.com/pub/media/tmp/' . FileProcessor::FILE_DIR . '/file.jpg'
+ 'url' => 'http://magento2.com/media/tmp/' . FileProcessor::FILE_DIR . '/file.jpg'
],
$this->fileProcessor->saveToTmp($fieldCode)
);
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Favicon/FaviconTest.php b/app/code/Magento/Theme/Test/Unit/Model/Favicon/FaviconTest.php
index 77cf71f75ac28..0ccaf9e65b675 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Favicon/FaviconTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Favicon/FaviconTest.php
@@ -105,7 +105,7 @@ public function testGetFaviconFileNegative()
public function testGetFaviconFile()
{
$scopeConfigValue = 'path';
- $urlToMediaDir = 'http://magento.url/pub/media/';
+ $urlToMediaDir = 'http://magento.url/media/';
$expectedFile = ImageFavicon::UPLOAD_DIR . '/' . $scopeConfigValue;
$expectedUrl = $urlToMediaDir . $expectedFile;
diff --git a/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php b/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php
index ff9a4302f49c0..753a05eda21bb 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/Indexer/Design/ConfigTest.php
@@ -10,82 +10,196 @@
*/
namespace Magento\Theme\Test\Unit\Model\Indexer\Design;
+use Magento\Framework\App\ResourceConnection;
use Magento\Framework\Data\Collection;
use Magento\Framework\Indexer\FieldsetInterface;
use Magento\Framework\Indexer\FieldsetPool;
use Magento\Framework\Indexer\HandlerInterface;
use Magento\Framework\Indexer\HandlerPool;
use Magento\Framework\Indexer\IndexStructureInterface;
-use Magento\Framework\Indexer\SaveHandler\IndexerInterface;
+use Magento\Framework\Indexer\SaveHandler\Batch;
use Magento\Framework\Indexer\SaveHandlerFactory;
+use Magento\Framework\Indexer\ScopeResolver\FlatScopeResolver;
+use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver;
use Magento\Framework\Indexer\StructureFactory;
+use Magento\Theme\Model\Data\Design\Config as DesignConfig;
use Magento\Theme\Model\Indexer\Design\Config;
+use Magento\Theme\Model\ResourceModel\Design\Config\Scope\CollectionFactory;
+use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
+use Magento\Theme\Model\Indexer\Design\IndexerHandler;
+use Magento\Framework\DB\Adapter\AdapterInterface;
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
class ConfigTest extends TestCase
{
- /** @var Config */
- protected $model;
+ /**
+ * @var AdapterInterface|MockObject
+ */
+ private $adapter;
+ /**
+ * @var ResourceConnection|MockObject
+ */
+ private $resourceConnection;
+ /**
+ * @var Batch|MockObject
+ */
+ private $batch;
+ /**
+ * @var IndexStructureInterface|MockObject
+ */
+ private $indexerStructure;
+ /**
+ * @var IndexScopeResolver|MockObject
+ */
+ private $indexScopeResolver;
+ /**
+ * @var FlatScopeResolver|MockObject
+ */
+ private $flatScopeResolver;
+ /**
+ * @var SaveHandlerFactory|MockObject
+ */
+ private $saveHandlerFactory;
+ /**
+ * @var StructureFactory|MockObject
+ */
+ private $structureFactory;
+ /**
+ * @var FieldsetInterface|MockObject
+ */
+ private $indexerFieldset;
+ /**
+ * @var FieldsetPool|MockObject
+ */
+ private $fieldsetPool;
+ /**
+ * @var HandlerInterface|MockObject
+ */
+ private $indexerHandler;
+ /**
+ * @var HandlerPool|MockObject
+ */
+ private $handlerPool;
+ /**
+ * @var Collection|MockObject
+ */
+ private $collection;
+ /**
+ * @var CollectionFactory|MockObject
+ */
+ private $collectionFactory;
protected function setUp(): void
{
- $indexerStructure = $this->getMockBuilder(IndexStructureInterface::class)
+ $this->indexerStructure = $this->getMockBuilder(IndexStructureInterface::class)
->getMockForAbstractClass();
- $structureFactory = $this->getMockBuilder(StructureFactory::class)
+ $this->structureFactory = $this->getMockBuilder(StructureFactory::class)
->disableOriginalConstructor()
->getMock();
- $structureFactory->expects($this->any())
- ->method('create')
- ->willReturn($indexerStructure);
-
- $indexer = $this->getMockBuilder(IndexerInterface::class)
+ $this->resourceConnection = $this->getMockBuilder(ResourceConnection::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->adapter = $this->getMockBuilder(AdapterInterface::class)
->getMockForAbstractClass();
- $saveHandlerFactory = $this->getMockBuilder(SaveHandlerFactory::class)
+ $this->batch = $this->getMockBuilder(Batch::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->indexScopeResolver = $this->getMockBuilder(IndexScopeResolver::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->flatScopeResolver = $this->getMockBuilder(FlatScopeResolver::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->saveHandlerFactory = $this->getMockBuilder(SaveHandlerFactory::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->fieldsetPool = $this->getMockBuilder(FieldsetPool::class)
->disableOriginalConstructor()
->getMock();
- $saveHandlerFactory->expects($this->any())
+ $this->collection = $this->getMockBuilder(Collection::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->collectionFactory = $this->getMockBuilder(CollectionFactory::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->indexerHandler = $this->getMockBuilder(HandlerInterface::class)
+ ->getMockForAbstractClass();
+ $this->handlerPool = $this->getMockBuilder(HandlerPool::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->indexerFieldset = $this->getMockBuilder(FieldsetInterface::class)
+ ->getMockForAbstractClass();
+ }
+
+ /**
+ * Generate flat index table name from design config grid index ID
+ *
+ * @return string
+ */
+ private function getFlatIndexTableName(): string
+ {
+ return DesignConfig::DESIGN_CONFIG_GRID_INDEXER_ID . '_flat';
+ }
+
+ /**
+ * Initialize and return Design Config Indexer Model
+ *
+ * @return Config
+ */
+ private function getDesignConfigIndexerModel(): Config
+ {
+ $this->structureFactory->expects($this->any())
+ ->method('create')
+ ->willReturn($this->indexerStructure);
+ $this->resourceConnection
+ ->expects($this->any())
+ ->method('getConnection')
+ ->willReturn($this->adapter);
+ $this->flatScopeResolver->expects($this->any())
+ ->method('resolve')
+ ->willReturn($this->getFlatIndexTableName());
+
+ $indexer = new IndexerHandler(
+ $this->indexerStructure,
+ $this->resourceConnection,
+ $this->batch,
+ $this->indexScopeResolver,
+ $this->flatScopeResolver,
+ [
+ 'fieldsets' => [],
+ 'indexer_id' => DesignConfig::DESIGN_CONFIG_GRID_INDEXER_ID
+ ]
+ );
+
+ $this->saveHandlerFactory->expects($this->any())
->method('create')
->willReturn($indexer);
- $indexerFieldset = $this->getMockBuilder(FieldsetInterface::class)
- ->getMockForAbstractClass();
- $indexerFieldset->expects($this->any())
+ $this->indexerFieldset->expects($this->any())
->method('addDynamicData')
->willReturnArgument(0);
- $fieldsetPool = $this->getMockBuilder(FieldsetPool::class)
- ->disableOriginalConstructor()
- ->getMock();
- $fieldsetPool->expects($this->any())
+
+ $this->fieldsetPool->expects($this->any())
->method('get')
- ->willReturn($indexerFieldset);
+ ->willReturn($this->indexerFieldset);
- $indexerHandler = $this->getMockBuilder(HandlerInterface::class)
- ->getMockForAbstractClass();
- $handlerPool = $this->getMockBuilder(HandlerPool::class)
- ->disableOriginalConstructor()
- ->getMock();
- $handlerPool->expects($this->any())
+ $this->handlerPool->expects($this->any())
->method('get')
- ->willReturn($indexerHandler);
+ ->willReturn($this->indexerHandler);
- $collection = $this->getMockBuilder(Collection::class)
- ->disableOriginalConstructor()
- ->getMock();
- $collectionFactory =
- $this->getMockBuilder(\Magento\Theme\Model\ResourceModel\Design\Config\Scope\CollectionFactory::class)
- ->disableOriginalConstructor()
- ->setMethods(['create'])
- ->getMock();
- $collectionFactory->expects($this->any())
+ $this->collectionFactory->expects($this->any())
->method('create')
- ->willReturn($collection);
-
- $this->model = new Config(
- $structureFactory,
- $saveHandlerFactory,
- $fieldsetPool,
- $handlerPool,
- $collectionFactory,
+ ->willReturn($this->collection);
+
+ return new Config(
+ $this->structureFactory,
+ $this->saveHandlerFactory,
+ $this->fieldsetPool,
+ $this->handlerPool,
+ $this->collectionFactory,
[
'fieldsets' => ['test_fieldset' => [
'fields' => [
@@ -102,7 +216,7 @@ protected function setUp(): void
'handler' => null,
],
],
- 'provider' => $indexerFieldset,
+ 'provider' => $this->indexerFieldset,
]
],
'saveHandler' => 'saveHandlerClass',
@@ -111,9 +225,46 @@ protected function setUp(): void
);
}
- public function testExecuteFull()
+ public function testFullReindex()
{
- $result = $this->model->executeFull();
- $this->assertNull($result);
+ $this->adapter->expects($this->any())
+ ->method('isTableExists')
+ ->willReturn(true);
+ $this->indexerStructure->expects($this->never())->method('create')
+ ->with(DesignConfig::DESIGN_CONFIG_GRID_INDEXER_ID);
+ $this->adapter->expects($this->once())->method('delete')
+ ->with($this->getFlatIndexTableName());
+ $this->batch->expects($this->any())
+ ->method('getItems')->willReturn([]);
+
+ $this->getDesignConfigIndexerModel()->executeFull();
+ }
+
+ public function testFullReindexWithFlatTableCreate()
+ {
+ $this->adapter->expects($this->any())->method('isTableExists')
+ ->willReturn(false);
+ $this->indexerStructure->expects($this->once())->method('create')
+ ->with(DesignConfig::DESIGN_CONFIG_GRID_INDEXER_ID);
+ $this->adapter->expects($this->never())->method('delete')
+ ->with($this->getFlatIndexTableName());
+ $this->batch->expects($this->any())->method('getItems')
+ ->willReturn([]);
+
+ $this->getDesignConfigIndexerModel()->executeFull();
+ }
+
+ public function testPartialReindex()
+ {
+ $this->adapter->expects($this->any())->method('isTableExists')
+ ->willReturn(true);
+ $this->indexerStructure->expects($this->never())->method('create')
+ ->with(DesignConfig::DESIGN_CONFIG_GRID_INDEXER_ID);
+ $this->adapter->expects($this->once())->method('delete')
+ ->with($this->getFlatIndexTableName(), ['entity_id IN(?)' => [1, 2, 3]]);
+ $this->batch->expects($this->any())->method('getItems')
+ ->willReturn([[1, 2, 3]]);
+
+ $this->getDesignConfigIndexerModel()->executeList([1, 2, 3]);
}
}
diff --git a/app/code/Magento/Theme/Test/Unit/Model/PageLayout/Config/BuilderTest.php b/app/code/Magento/Theme/Test/Unit/Model/PageLayout/Config/BuilderTest.php
index d9eccdb871222..2e2117b79e5ab 100644
--- a/app/code/Magento/Theme/Test/Unit/Model/PageLayout/Config/BuilderTest.php
+++ b/app/code/Magento/Theme/Test/Unit/Model/PageLayout/Config/BuilderTest.php
@@ -10,8 +10,11 @@
*/
namespace Magento\Theme\Test\Unit\Model\PageLayout\Config;
+use Magento\Framework\App\Cache\Type\Layout;
+use Magento\Framework\Serialize\SerializerInterface;
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
use Magento\Framework\View\PageLayout\Config;
+use Magento\Framework\View\PageLayout\ConfigFactory;
use Magento\Framework\View\PageLayout\File\Collector\Aggregated;
use Magento\Theme\Model\PageLayout\Config\Builder;
use Magento\Theme\Model\ResourceModel\Theme\Collection;
@@ -27,7 +30,7 @@ class BuilderTest extends TestCase
protected $builder;
/**
- * @var \Magento\Framework\View\PageLayout\ConfigFactory|MockObject
+ * @var ConfigFactory|MockObject
*/
protected $configFactory;
@@ -41,6 +44,15 @@ class BuilderTest extends TestCase
*/
protected $themeCollection;
+ /**
+ * @var Layout|MockObject
+ */
+ protected $cacheModel;
+ /**
+ * @var SerializerInterface|MockObject
+ */
+ protected $serializer;
+
/**
* SetUp method
*
@@ -48,19 +60,24 @@ class BuilderTest extends TestCase
*/
protected function setUp(): void
{
- $this->configFactory = $this->getMockBuilder(\Magento\Framework\View\PageLayout\ConfigFactory::class)
+ $this->configFactory = $this->getMockBuilder(ConfigFactory::class)
->disableOriginalConstructor()
->setMethods(['create'])
->getMock();
- $this->fileCollector = $this->getMockBuilder(
- Aggregated::class
- )->disableOriginalConstructor()
+ $this->fileCollector = $this->getMockBuilder(Aggregated::class)
+ ->disableOriginalConstructor()
->getMock();
$this->themeCollection = $this->getMockBuilder(Collection::class)
->disableOriginalConstructor()
->getMock();
+ $this->cacheModel = $this->getMockBuilder(Layout::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->serializer = $this->getMockForAbstractClass(SerializerInterface::class);
+
$this->themeCollection->expects($this->once())
->method('setItemObjectClass')
->with(Data::class)
@@ -72,7 +89,9 @@ protected function setUp(): void
[
'configFactory' => $this->configFactory,
'fileCollector' => $this->fileCollector,
- 'themeCollection' => $this->themeCollection
+ 'themeCollection' => $this->themeCollection,
+ 'cacheModel' => $this->cacheModel,
+ 'serializer' => $this->serializer,
]
);
}
@@ -84,8 +103,10 @@ protected function setUp(): void
*/
public function testGetPageLayoutsConfig()
{
+ $this->cacheModel->clean();
$files1 = ['content layouts_1.xml', 'content layouts_2.xml'];
$files2 = ['content layouts_3.xml', 'content layouts_4.xml'];
+ $configFiles = array_merge($files1, $files2);
$theme1 = $this->getMockBuilder(Data::class)
->disableOriginalConstructor()
@@ -113,9 +134,17 @@ public function testGetPageLayoutsConfig()
$this->configFactory->expects($this->once())
->method('create')
- ->with(['configFiles' => array_merge($files1, $files2)])
+ ->with(['configFiles' => $configFiles])
->willReturn($config);
+ $this->serializer->expects($this->once())
+ ->method('serialize')
+ ->with($configFiles);
+
+ $this->cacheModel->expects($this->once())
+ ->method('save')
+ ->willReturnSelf();
+
$this->assertSame($config, $this->builder->getPageLayoutsConfig());
}
}
diff --git a/app/code/Magento/Theme/etc/indexer.xml b/app/code/Magento/Theme/etc/indexer.xml
index 7ed25878e383c..8cc8971024e48 100644
--- a/app/code/Magento/Theme/etc/indexer.xml
+++ b/app/code/Magento/Theme/etc/indexer.xml
@@ -17,7 +17,7 @@
getFormHtml() ?>
renderStyleAsTag(
'display:none',
- 'div#new_video_' . /* @noEscape */ $block->getNewVideoBlockName()
+ 'div#' . $videoBlockId
) ?>
getChildHtml('new-video') ?>
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js b/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js
index 5756356d4ff24..cb56a085304a7 100644
--- a/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js
+++ b/app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js
@@ -129,7 +129,9 @@ define([
* Abstract destroying command
*/
destroy: function () {
- this._player.destroy();
+ if (this._player) {
+ this._player.destroy();
+ }
},
/**
@@ -288,7 +290,10 @@ define([
*/
destroy: function () {
this.stop();
- this._player.destroy();
+
+ if (this._player) {
+ this._player.destroy();
+ }
}
});
diff --git a/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js b/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js
index 9cc731dde4b0c..562bff2e1d472 100644
--- a/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js
+++ b/app/code/Magento/ProductVideo/view/adminhtml/web/js/new-video-dialog.js
@@ -580,7 +580,13 @@ define([
* @private
*/
_onImageLoaded: function (result, file, oldFile, callback) {
- var data = JSON.parse(result);
+ var data;
+
+ try {
+ data = JSON.parse(result);
+ } catch (e) {
+ data = result;
+ }
if (this.element.find('#video_url').parent().find('.image-upload-error').length > 0) {
this.element.find('.image-upload-error').remove();
diff --git a/app/code/Magento/Quote/Model/Cart/BuyRequest/BuyRequestBuilder.php b/app/code/Magento/Quote/Model/Cart/BuyRequest/BuyRequestBuilder.php
index 13b19e4f79c9a..7e8b4d916334f 100644
--- a/app/code/Magento/Quote/Model/Cart/BuyRequest/BuyRequestBuilder.php
+++ b/app/code/Magento/Quote/Model/Cart/BuyRequest/BuyRequestBuilder.php
@@ -56,6 +56,6 @@ public function build(CartItem $cartItem): DataObject
$requestData[] = $provider->execute($cartItem);
}
- return $this->dataObjectFactory->create(['data' => array_merge(...$requestData)]);
+ return $this->dataObjectFactory->create(['data' => array_merge([], ...$requestData)]);
}
}
diff --git a/app/code/Magento/Quote/Model/Cart/Totals/ItemConverter.php b/app/code/Magento/Quote/Model/Cart/Totals/ItemConverter.php
index 678c92250f531..ccc4735ad1763 100644
--- a/app/code/Magento/Quote/Model/Cart/Totals/ItemConverter.php
+++ b/app/code/Magento/Quote/Model/Cart/Totals/ItemConverter.php
@@ -68,7 +68,7 @@ public function __construct(
}
/**
- * Converts a specified rate model to a shipping method data object.
+ * Converts a specified quote item model to a totals item data object.
*
* @param \Magento\Quote\Model\Quote\Item $item
* @return \Magento\Quote\Api\Data\TotalsItemInterface
diff --git a/app/code/Magento/Quote/Model/Quote/Address.php b/app/code/Magento/Quote/Model/Quote/Address.php
index 5476915d9d649..aee86eb1f8935 100644
--- a/app/code/Magento/Quote/Model/Quote/Address.php
+++ b/app/code/Magento/Quote/Model/Quote/Address.php
@@ -139,6 +139,8 @@ class Address extends AbstractAddress implements
const ADDRESS_TYPE_BILLING = 'billing';
const ADDRESS_TYPE_SHIPPING = 'shipping';
+
+ private const CACHED_ITEMS_ALL = 'cached_items_all';
/**
* Prefix of model events
@@ -636,8 +638,7 @@ public function getItemsCollection()
public function getAllItems()
{
// We calculate item list once and cache it in three arrays - all items
- $key = 'cached_items_all';
- if (!$this->hasData($key)) {
+ if (!$this->hasData(self::CACHED_ITEMS_ALL)) {
$quoteItems = $this->getQuote()->getItemsCollection();
$addressItems = $this->getItemsCollection();
@@ -676,10 +677,10 @@ public function getAllItems()
}
// Cache calculated lists
- $this->setData('cached_items_all', $items);
+ $this->setData(self::CACHED_ITEMS_ALL, $items);
}
- $items = $this->getData($key);
+ $items = $this->getData(self::CACHED_ITEMS_ALL);
return $items;
}
diff --git a/app/code/Magento/Quote/Model/QuoteIdMask.php b/app/code/Magento/Quote/Model/QuoteIdMask.php
index 47b02db7650df..8fa0b1fbba80c 100644
--- a/app/code/Magento/Quote/Model/QuoteIdMask.php
+++ b/app/code/Magento/Quote/Model/QuoteIdMask.php
@@ -10,7 +10,7 @@
* QuoteIdMask model
*
* @method string getMaskedId()
- * @method QuoteIdMask setMaskedId()
+ * @method QuoteIdMask setMaskedId(string $id)
*/
class QuoteIdMask extends \Magento\Framework\Model\AbstractModel
{
diff --git a/app/code/Magento/Quote/Model/QuoteManagement.php b/app/code/Magento/Quote/Model/QuoteManagement.php
index b0aef022dcd25..1d4b8feba07f5 100644
--- a/app/code/Magento/Quote/Model/QuoteManagement.php
+++ b/app/code/Magento/Quote/Model/QuoteManagement.php
@@ -8,6 +8,7 @@
namespace Magento\Quote\Model;
use Magento\Authorization\Model\UserContextInterface;
+use Magento\Customer\Api\Data\GroupInterface;
use Magento\Framework\App\ObjectManager;
use Magento\Framework\Event\ManagerInterface as EventManager;
use Magento\Framework\Exception\CouldNotSaveException;
@@ -396,7 +397,8 @@ public function placeOrder($cartId, PaymentInterface $paymentMethod = null)
}
}
$quote->setCustomerIsGuest(true);
- $quote->setCustomerGroupId(\Magento\Customer\Api\Data\GroupInterface::NOT_LOGGED_IN_ID);
+ $groupId = $quote->getCustomer()->getGroupId() ?: GroupInterface::NOT_LOGGED_IN_ID;
+ $quote->setCustomerGroupId($groupId);
}
$remoteAddress = $this->remoteAddress->getRemoteAddress();
diff --git a/app/code/Magento/Quote/Model/QuoteRepository.php b/app/code/Magento/Quote/Model/QuoteRepository.php
index 0dd2b00a596ea..1533194023e3e 100644
--- a/app/code/Magento/Quote/Model/QuoteRepository.php
+++ b/app/code/Magento/Quote/Model/QuoteRepository.php
@@ -25,7 +25,7 @@
use Magento\Store\Model\StoreManagerInterface;
/**
- * Quote repository.
+ * Repository for quote entity.
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
@@ -146,10 +146,16 @@ public function get($cartId, array $sharedStoreIds = [])
public function getForCustomer($customerId, array $sharedStoreIds = [])
{
if (!isset($this->quotesByCustomerId[$customerId])) {
- $quote = $this->loadQuote('loadByCustomer', 'customerId', $customerId, $sharedStoreIds);
- $this->getLoadHandler()->load($quote);
- $this->quotesById[$quote->getId()] = $quote;
- $this->quotesByCustomerId[$customerId] = $quote;
+ $customerQuote = $this->loadQuote('loadByCustomer', 'customerId', $customerId, $sharedStoreIds);
+ $customerQuoteId = $customerQuote->getId();
+ //prevent loading quote items for same quote
+ if (isset($this->quotesById[$customerQuoteId])) {
+ $customerQuote = $this->quotesById[$customerQuoteId];
+ } else {
+ $this->getLoadHandler()->load($customerQuote);
+ }
+ $this->quotesById[$customerQuoteId] = $customerQuote;
+ $this->quotesByCustomerId[$customerId] = $customerQuote;
}
return $this->quotesByCustomerId[$customerId];
}
diff --git a/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php b/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
index c19dbc2c429ae..d938ad7d638f1 100644
--- a/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
+++ b/app/code/Magento/Quote/Observer/Frontend/Quote/Address/CollectTotalsObserver.php
@@ -5,7 +5,16 @@
*/
namespace Magento\Quote\Observer\Frontend\Quote\Address;
+use Magento\Customer\Api\AddressRepositoryInterface;
+use Magento\Customer\Api\Data\CustomerInterfaceFactory;
+use Magento\Customer\Api\GroupManagementInterface;
+use Magento\Customer\Helper\Address;
+use Magento\Customer\Model\Session;
+use Magento\Customer\Model\Vat;
+use Magento\Framework\Event\Observer;
use Magento\Framework\Event\ObserverInterface;
+use Magento\Quote\Api\Data\ShippingAssignmentInterface;
+use Magento\Quote\Model\Quote;
/**
* Handle customer VAT number on collect_totals_before event of quote address.
@@ -15,22 +24,22 @@
class CollectTotalsObserver implements ObserverInterface
{
/**
- * @var \Magento\Customer\Api\AddressRepositoryInterface
+ * @var AddressRepositoryInterface
*/
private $addressRepository;
/**
- * @var \Magento\Customer\Model\Session
+ * @var Session
*/
private $customerSession;
/**
- * @var \Magento\Customer\Helper\Address
+ * @var Address
*/
protected $customerAddressHelper;
/**
- * @var \Magento\Customer\Model\Vat
+ * @var Vat
*/
protected $customerVat;
@@ -40,36 +49,36 @@ class CollectTotalsObserver implements ObserverInterface
protected $vatValidator;
/**
- * @var \Magento\Customer\Api\Data\CustomerInterfaceFactory
+ * @var CustomerInterfaceFactory
*/
protected $customerDataFactory;
/**
* Group Management
*
- * @var \Magento\Customer\Api\GroupManagementInterface
+ * @var GroupManagementInterface
*/
protected $groupManagement;
/**
* Initialize dependencies.
*
- * @param \Magento\Customer\Helper\Address $customerAddressHelper
- * @param \Magento\Customer\Model\Vat $customerVat
+ * @param Address $customerAddressHelper
+ * @param Vat $customerVat
* @param VatValidator $vatValidator
- * @param \Magento\Customer\Api\Data\CustomerInterfaceFactory $customerDataFactory
- * @param \Magento\Customer\Api\GroupManagementInterface $groupManagement
- * @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
- * @param \Magento\Customer\Model\Session $customerSession
+ * @param CustomerInterfaceFactory $customerDataFactory
+ * @param GroupManagementInterface $groupManagement
+ * @param AddressRepositoryInterface $addressRepository
+ * @param Session $customerSession
*/
public function __construct(
- \Magento\Customer\Helper\Address $customerAddressHelper,
- \Magento\Customer\Model\Vat $customerVat,
+ Address $customerAddressHelper,
+ Vat $customerVat,
VatValidator $vatValidator,
- \Magento\Customer\Api\Data\CustomerInterfaceFactory $customerDataFactory,
- \Magento\Customer\Api\GroupManagementInterface $groupManagement,
- \Magento\Customer\Api\AddressRepositoryInterface $addressRepository,
- \Magento\Customer\Model\Session $customerSession
+ CustomerInterfaceFactory $customerDataFactory,
+ GroupManagementInterface $groupManagement,
+ AddressRepositoryInterface $addressRepository,
+ Session $customerSession
) {
$this->customerVat = $customerVat;
$this->customerAddressHelper = $customerAddressHelper;
@@ -83,25 +92,23 @@ public function __construct(
/**
* Handle customer VAT number if needed on collect_totals_before event of quote address
*
- * @param \Magento\Framework\Event\Observer $observer
+ * @param Observer $observer
* @return void
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
- public function execute(\Magento\Framework\Event\Observer $observer)
+ public function execute(Observer $observer)
{
- /** @var \Magento\Quote\Api\Data\ShippingAssignmentInterface $shippingAssignment */
+ /** @var ShippingAssignmentInterface $shippingAssignment */
$shippingAssignment = $observer->getShippingAssignment();
- /** @var \Magento\Quote\Model\Quote $quote */
+ /** @var Quote $quote */
$quote = $observer->getQuote();
- /** @var \Magento\Quote\Model\Quote\Address $address */
+ /** @var Quote\Address $address */
$address = $shippingAssignment->getShipping()->getAddress();
$customer = $quote->getCustomer();
$storeId = $customer->getStoreId();
- if ($customer->getDisableAutoGroupChange()
- || false == $this->vatValidator->isEnabled($address, $storeId)
- ) {
+ if ($customer->getDisableAutoGroupChange() || !$this->vatValidator->isEnabled($address, $storeId)) {
return;
}
$customerCountryCode = $address->getCountryId();
@@ -135,6 +142,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
$quote->setCustomerGroupId($groupId);
$this->customerSession->setCustomerGroupId($groupId);
$customer->setGroupId($groupId);
+ $customer->setEmail($customer->getEmail() ?: $quote->getCustomerEmail());
$quote->setCustomer($customer);
}
}
diff --git a/app/code/Magento/Quote/Plugin/UpdateQuoteItemStore.php b/app/code/Magento/Quote/Plugin/UpdateQuoteItemStore.php
deleted file mode 100644
index 19a7e03264d8a..0000000000000
--- a/app/code/Magento/Quote/Plugin/UpdateQuoteItemStore.php
+++ /dev/null
@@ -1,72 +0,0 @@
-quoteRepository = $quoteRepository;
- $this->checkoutSession = $checkoutSession;
- }
-
- /**
- * Update store id in active quote after store view switching.
- *
- * @param StoreSwitcherInterface $subject
- * @param string $result
- * @param StoreInterface $fromStore store where we came from
- * @param StoreInterface $targetStore store where to go to
- * @param string $redirectUrl original url requested for redirect after switching
- * @return string url to be redirected after switching
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- */
- public function afterSwitch(
- StoreSwitcherInterface $subject,
- $result,
- StoreInterface $fromStore,
- StoreInterface $targetStore,
- string $redirectUrl
- ): string {
- $quote = $this->checkoutSession->getQuote();
- if ($quote->getIsActive()) {
- $quote->setStoreId(
- $targetStore->getId()
- );
- $quote->getItemsCollection(false);
- $this->quoteRepository->save($quote);
- }
- return $result;
- }
-}
diff --git a/app/code/Magento/Quote/Setup/Patch/Data/WishlistDataCleanUp.php b/app/code/Magento/Quote/Setup/Patch/Data/WishlistDataCleanUp.php
new file mode 100644
index 0000000000000..3d66f53ff6c6d
--- /dev/null
+++ b/app/code/Magento/Quote/Setup/Patch/Data/WishlistDataCleanUp.php
@@ -0,0 +1,154 @@
+json = $json;
+ $this->queryGenerator = $queryGenerator;
+ $this->quoteSetupFactory = $quoteSetupFactory;
+ $this->logger = $logger;
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function apply()
+ {
+ try {
+ $this->cleanQuoteItemOptionTable();
+ } catch (\Throwable $e) {
+ $this->logger->warning(
+ 'Quote module WishlistDataCleanUp patch experienced an error and could not be completed.'
+ . ' Please submit a support ticket or email us at security@magento.com.'
+ );
+
+ return $this;
+ }
+
+ return $this;
+ }
+
+ /**
+ * Remove login data from quote_item_option table.
+ *
+ * @throws LocalizedException
+ */
+ private function cleanQuoteItemOptionTable()
+ {
+ $quoteSetup = $this->quoteSetupFactory->create();
+ $tableName = $quoteSetup->getTable('quote_item_option');
+ $select = $quoteSetup
+ ->getConnection()
+ ->select()
+ ->from(
+ $tableName,
+ ['option_id', 'value']
+ )
+ ->where(
+ 'value LIKE ?',
+ '%login%'
+ );
+ $iterator = $this->queryGenerator->generate('option_id', $select, self::BATCH_SIZE);
+ $rowErrorFlag = false;
+ foreach ($iterator as $selectByRange) {
+ $optionRows = $quoteSetup->getConnection()->fetchAll($selectByRange);
+ foreach ($optionRows as $optionRow) {
+ try {
+ $rowValue = $this->json->unserialize($optionRow['value']);
+ if (is_array($rowValue)
+ && array_key_exists('login', $rowValue)
+ ) {
+ unset($rowValue['login']);
+ }
+ $rowValue = $this->json->serialize($rowValue);
+ $quoteSetup->getConnection()->update(
+ $tableName,
+ ['value' => $rowValue],
+ ['option_id = ?' => $optionRow['option_id']]
+ );
+ } catch (\Throwable $e) {
+ $rowErrorFlag = true;
+ continue;
+ }
+ }
+ }
+ if ($rowErrorFlag) {
+ $this->logger->warning(
+ 'Data clean up could not be completed due to unexpected data format in the table "'
+ . $tableName
+ . '". Please submit a support ticket or email us at security@magento.com.'
+ );
+ }
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public static function getDependencies()
+ {
+ return [
+ ConvertSerializedDataToJson::class
+ ];
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getAliases()
+ {
+ return [];
+ }
+}
diff --git a/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml b/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml
index 80af412439338..ee5f2fccfe203 100644
--- a/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml
+++ b/app/code/Magento/Quote/Test/Mftf/Test/StorefrontGuestCheckoutDisabledProductTest.xml
@@ -124,8 +124,8 @@
Magento\Checkout\Model\Session\Proxy
-
-
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
index 83c1d03f132db..f2dd6389d2c4a 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/AddSimpleProductToCart.php
@@ -16,7 +16,7 @@
use Magento\QuoteGraphQl\Model\Cart\BuyRequest\BuyRequestBuilder;
/**
- * Add simple product to cart
+ * Add simple product to cart mutation
*/
class AddSimpleProductToCart
{
@@ -52,6 +52,7 @@ public function __construct(
*/
public function execute(Quote $cart, array $cartItemData): void
{
+ $cartItemData['model'] = $cart;
$sku = $this->extractSku($cartItemData);
try {
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/BuyRequest/BuyRequestBuilder.php b/app/code/Magento/QuoteGraphQl/Model/Cart/BuyRequest/BuyRequestBuilder.php
index c14cc1324732c..c4909eef31287 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/BuyRequest/BuyRequestBuilder.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/BuyRequest/BuyRequestBuilder.php
@@ -45,11 +45,11 @@ public function __construct(
*/
public function build(array $cartItemData): DataObject
{
- $requestData = [[]];
+ $requestData = [];
foreach ($this->providers as $provider) {
$requestData[] = $provider->execute($cartItemData);
}
- return $this->dataObjectFactory->create(['data' => array_merge(...$requestData)]);
+ return $this->dataObjectFactory->create(['data' => array_merge([], ...$requestData)]);
}
}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php
index 4deb794761efb..81a30216f0035 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetPaymentMethodOnCart.php
@@ -7,6 +7,9 @@
namespace Magento\QuoteGraphQl\Model\Cart;
+use Magento\Checkout\Api\Exception\PaymentProcessingRateLimitExceededException;
+use Magento\Checkout\Api\PaymentProcessingRateLimiterInterface;
+use Magento\Framework\App\ObjectManager;
use Magento\Framework\Exception\LocalizedException;
use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
@@ -18,7 +21,7 @@
use Magento\QuoteGraphQl\Model\Cart\Payment\AdditionalDataProviderPool;
/**
- * Set payment method on cart
+ * Saves related payment method info for a cart.
*/
class SetPaymentMethodOnCart
{
@@ -37,19 +40,28 @@ class SetPaymentMethodOnCart
*/
private $additionalDataProviderPool;
+ /**
+ * @var PaymentProcessingRateLimiterInterface
+ */
+ private $paymentRateLimiter;
+
/**
* @param PaymentMethodManagementInterface $paymentMethodManagement
* @param PaymentInterfaceFactory $paymentFactory
* @param AdditionalDataProviderPool $additionalDataProviderPool
+ * @param PaymentProcessingRateLimiterInterface|null $paymentRateLimiter
*/
public function __construct(
PaymentMethodManagementInterface $paymentMethodManagement,
PaymentInterfaceFactory $paymentFactory,
- AdditionalDataProviderPool $additionalDataProviderPool
+ AdditionalDataProviderPool $additionalDataProviderPool,
+ ?PaymentProcessingRateLimiterInterface $paymentRateLimiter = null
) {
$this->paymentMethodManagement = $paymentMethodManagement;
$this->paymentFactory = $paymentFactory;
$this->additionalDataProviderPool = $additionalDataProviderPool;
+ $this->paymentRateLimiter = $paymentRateLimiter
+ ?? ObjectManager::getInstance()->get(PaymentProcessingRateLimiterInterface::class);
}
/**
@@ -62,6 +74,12 @@ public function __construct(
*/
public function execute(Quote $cart, array $paymentData): void
{
+ try {
+ $this->paymentRateLimiter->limit();
+ } catch (PaymentProcessingRateLimitExceededException $exception) {
+ throw new GraphQlInputException(__($exception->getMessage()), $exception);
+ }
+
if (!isset($paymentData['code']) || empty($paymentData['code'])) {
throw new GraphQlInputException(__('Required parameter "code" for "payment_method" is missing.'));
}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
index e959c19a7cbe4..71740488c4cea 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
@@ -7,9 +7,11 @@
namespace Magento\QuoteGraphQl\Model\Cart;
+use Magento\Framework\App\ObjectManager;
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
use Magento\GraphQl\Model\Query\ContextInterface;
use Magento\Quote\Api\Data\CartInterface;
+use Magento\Quote\Model\QuoteRepository;
/**
* Set single shipping address for a specified shopping cart
@@ -26,16 +28,25 @@ class SetShippingAddressesOnCart implements SetShippingAddressesOnCartInterface
*/
private $getShippingAddress;
+ /**
+ * @var QuoteRepository
+ */
+ private $quoteRepository;
+
/**
* @param AssignShippingAddressToCart $assignShippingAddressToCart
* @param GetShippingAddress $getShippingAddress
+ * @param QuoteRepository|null $quoteRepository
*/
public function __construct(
AssignShippingAddressToCart $assignShippingAddressToCart,
- GetShippingAddress $getShippingAddress
+ GetShippingAddress $getShippingAddress,
+ QuoteRepository $quoteRepository = null
) {
$this->assignShippingAddressToCart = $assignShippingAddressToCart;
$this->getShippingAddress = $getShippingAddress;
+ $this->quoteRepository = $quoteRepository
+ ?? ObjectManager::getInstance()->get(QuoteRepository::class);
}
/**
@@ -70,5 +81,7 @@ public function execute(ContextInterface $context, CartInterface $cart, array $s
throw $e;
}
$this->assignShippingAddressToCart->execute($cart, $shippingAddress);
+ // trigger quote re-evaluation after address change
+ $this->quoteRepository->save($cart);
}
}
diff --git a/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/Processor/ItemDataCompositeProcessor.php b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/Processor/ItemDataCompositeProcessor.php
new file mode 100644
index 0000000000000..73a22471584ec
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/Processor/ItemDataCompositeProcessor.php
@@ -0,0 +1,45 @@
+itemDataProcessors = $itemDataProcessors;
+ }
+
+ /**
+ * Process cart item data
+ *
+ * @param array $cartItemData
+ * @param ContextInterface $context
+ * @return array
+ */
+ public function process(array $cartItemData, ContextInterface $context): array
+ {
+ foreach ($this->itemDataProcessors as $itemDataProcessor) {
+ $cartItemData = $itemDataProcessor->process($cartItemData, $context);
+ }
+
+ return $cartItemData;
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/Processor/ItemDataProcessorInterface.php b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/Processor/ItemDataProcessorInterface.php
new file mode 100644
index 0000000000000..33f40bd28c1d3
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Model/CartItem/DataProvider/Processor/ItemDataProcessorInterface.php
@@ -0,0 +1,25 @@
+getCartForUser = $getCartForUser;
$this->addProductsToCartService = $addProductsToCart;
+ $this->itemDataProcessor = $itemDataProcessor;
}
/**
@@ -68,6 +78,9 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
$cartItems = [];
foreach ($cartItemsData as $cartItemData) {
+ if (!$this->itemIsAllowedToCart($cartItemData, $context)) {
+ continue;
+ }
$cartItems[] = (new CartItemFactory())->create($cartItemData);
}
@@ -90,4 +103,21 @@ function (Error $error) {
)
];
}
+
+ /**
+ * Check if the item can be added to cart
+ *
+ * @param array $cartItemData
+ * @param ContextInterface $context
+ * @return bool
+ */
+ private function itemIsAllowedToCart(array $cartItemData, ContextInterface $context): bool
+ {
+ $cartItemData = $this->itemDataProcessor->process($cartItemData, $context);
+ if (isset($cartItemData['grant_checkout']) && $cartItemData['grant_checkout'] === false) {
+ return false;
+ }
+
+ return true;
+ }
}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartPrices.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartPrices.php
index 6a57a7662af09..66cc9ed11ed9f 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartPrices.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartPrices.php
@@ -45,6 +45,12 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
/** @var Quote $quote */
$quote = $value['model'];
+ /**
+ * To calculate a right discount value
+ * before calculate totals
+ * need to reset Cart Fixed Rules in the quote
+ */
+ $quote->setCartFixedRules([]);
$cartTotals = $this->totalsCollector->collectQuoteTotals($quote);
$currency = $quote->getQuoteCurrencyCode();
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/MergeCarts.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/MergeCarts.php
index d77d19df55603..297fd25be1fae 100644
--- a/app/code/Magento/QuoteGraphQl/Model/Resolver/MergeCarts.php
+++ b/app/code/Magento/QuoteGraphQl/Model/Resolver/MergeCarts.php
@@ -7,17 +7,24 @@
namespace Magento\QuoteGraphQl\Model\Resolver;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\CouldNotSaveException;
use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
use Magento\Framework\GraphQl\Query\ResolverInterface;
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
-use Magento\Quote\Api\CartRepositoryInterface;
use Magento\GraphQl\Model\Query\ContextInterface;
-use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\Cart\CustomerCartResolver;
+use Magento\Quote\Model\QuoteIdToMaskedQuoteIdInterface;
+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
/**
* Merge Carts Resolver
+ *
+ * @SuppressWarnings(PHPMD.LongVariable)
*/
class MergeCarts implements ResolverInterface
{
@@ -31,44 +38,95 @@ class MergeCarts implements ResolverInterface
*/
private $cartRepository;
+ /**
+ * @var CustomerCartResolver
+ */
+ private $customerCartResolver;
+
+ /**
+ * @var QuoteIdToMaskedQuoteIdInterface
+ */
+ private $quoteIdToMaskedQuoteId;
+
/**
* @param GetCartForUser $getCartForUser
* @param CartRepositoryInterface $cartRepository
+ * @param CustomerCartResolver|null $customerCartResolver
+ * @param QuoteIdToMaskedQuoteIdInterface|null $quoteIdToMaskedQuoteId
*/
public function __construct(
GetCartForUser $getCartForUser,
- CartRepositoryInterface $cartRepository
+ CartRepositoryInterface $cartRepository,
+ CustomerCartResolver $customerCartResolver = null,
+ QuoteIdToMaskedQuoteIdInterface $quoteIdToMaskedQuoteId = null
) {
$this->getCartForUser = $getCartForUser;
$this->cartRepository = $cartRepository;
+ $this->customerCartResolver = $customerCartResolver
+ ?: ObjectManager::getInstance()->get(CustomerCartResolver::class);
+ $this->quoteIdToMaskedQuoteId = $quoteIdToMaskedQuoteId
+ ?: ObjectManager::getInstance()->get(QuoteIdToMaskedQuoteIdInterface::class);
}
/**
* @inheritdoc
*/
- public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
- {
+ public function resolve(
+ Field $field,
+ $context,
+ ResolveInfo $info,
+ array $value = null,
+ array $args = null
+ ) {
if (empty($args['source_cart_id'])) {
- throw new GraphQlInputException(__('Required parameter "source_cart_id" is missing'));
- }
-
- if (empty($args['destination_cart_id'])) {
- throw new GraphQlInputException(__('Required parameter "destination_cart_id" is missing'));
+ throw new GraphQlInputException(__(
+ 'Required parameter "source_cart_id" is missing'
+ ));
}
/** @var ContextInterface $context */
if (false === $context->getExtensionAttributes()->getIsCustomer()) {
- throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
+ throw new GraphQlAuthorizationException(__(
+ 'The current customer isn\'t authorized.'
+ ));
+ }
+ $currentUserId = $context->getUserId();
+
+ if (!isset($args['destination_cart_id'])) {
+ try {
+ $cart = $this->customerCartResolver->resolve($currentUserId);
+ } catch (CouldNotSaveException $exception) {
+ throw new GraphQlNoSuchEntityException(
+ __('Could not create empty cart for customer'),
+ $exception
+ );
+ }
+ $customerMaskedCartId = $this->quoteIdToMaskedQuoteId->execute(
+ (int) $cart->getId()
+ );
+ } else {
+ if (empty($args['destination_cart_id'])) {
+ throw new GraphQlInputException(__(
+ 'The parameter "destination_cart_id" cannot be empty'
+ ));
+ }
}
$guestMaskedCartId = $args['source_cart_id'];
- $customerMaskedCartId = $args['destination_cart_id'];
+ $customerMaskedCartId = $customerMaskedCartId ?? $args['destination_cart_id'];
- $currentUserId = $context->getUserId();
$storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
// passing customerId as null enforces source cart should always be a guestcart
- $guestCart = $this->getCartForUser->execute($guestMaskedCartId, null, $storeId);
- $customerCart = $this->getCartForUser->execute($customerMaskedCartId, $currentUserId, $storeId);
+ $guestCart = $this->getCartForUser->execute(
+ $guestMaskedCartId,
+ null,
+ $storeId
+ );
+ $customerCart = $this->getCartForUser->execute(
+ $customerMaskedCartId,
+ $currentUserId,
+ $storeId
+ );
$customerCart->merge($guestCart);
$guestCart->setIsActive(false);
$this->cartRepository->save($customerCart);
diff --git a/app/code/Magento/QuoteGraphQl/Test/Unit/Model/Cart/SetPaymentMethodOnCartTest.php b/app/code/Magento/QuoteGraphQl/Test/Unit/Model/Cart/SetPaymentMethodOnCartTest.php
new file mode 100644
index 0000000000000..281e1233d8bbe
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/Test/Unit/Model/Cart/SetPaymentMethodOnCartTest.php
@@ -0,0 +1,61 @@
+rateLimiterMock = $this->getMockForAbstractClass(PaymentProcessingRateLimiterInterface::class);
+ $this->model = $objectManager->getObject(
+ SetPaymentMethodOnCart::class,
+ ['paymentRateLimiter' => $this->rateLimiterMock]
+ );
+ }
+
+ /**
+ * Verify that the method is rate-limited.
+ *
+ * @return void
+ */
+ public function testLimited(): void
+ {
+ $this->rateLimiterMock->method('limit')
+ ->willThrowException(new PaymentProcessingRateLimitExceededException(__($message = 'Error')));
+ $this->expectException(GraphQlInputException::class);
+ $this->expectExceptionMessage($message);
+
+ $this->model->execute($this->createMock(Quote::class), []);
+ }
+}
diff --git a/app/code/Magento/QuoteGraphQl/etc/di.xml b/app/code/Magento/QuoteGraphQl/etc/di.xml
index d230df253221b..35b52dd495c5a 100644
--- a/app/code/Magento/QuoteGraphQl/etc/di.xml
+++ b/app/code/Magento/QuoteGraphQl/etc/di.xml
@@ -7,6 +7,7 @@
-->
diff --git a/app/code/Magento/QuoteGraphQl/etc/graphql/events.xml b/app/code/Magento/QuoteGraphQl/etc/graphql/events.xml
new file mode 100644
index 0000000000000..1e9822bbf3ef8
--- /dev/null
+++ b/app/code/Magento/QuoteGraphQl/etc/graphql/events.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
index 4e0e7ce5732be..cc9d1803b3e31 100644
--- a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -20,7 +20,7 @@ type Mutation {
setPaymentMethodOnCart(input: SetPaymentMethodOnCartInput): SetPaymentMethodOnCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\SetPaymentMethodOnCart")
setGuestEmailOnCart(input: SetGuestEmailOnCartInput): SetGuestEmailOnCartOutput @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\SetGuestEmailOnCart")
setPaymentMethodAndPlaceOrder(input: SetPaymentMethodAndPlaceOrderInput): PlaceOrderOutput @deprecated(reason: "Should use setPaymentMethodOnCart and placeOrder mutations in single request.") @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\SetPaymentAndPlaceOrder")
- mergeCarts(source_cart_id: String!, destination_cart_id: String!): Cart! @doc(description:"Merges the source cart into the destination cart") @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\MergeCarts")
+ mergeCarts(source_cart_id: String!, destination_cart_id: String): Cart! @doc(description:"Merges the source cart into the destination cart") @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\MergeCarts")
placeOrder(input: PlaceOrderInput): PlaceOrderOutput @resolver(class: "\\Magento\\QuoteGraphQl\\Model\\Resolver\\PlaceOrder")
addProductsToCart(cartId: String!, cartItems: [CartItemInput!]!): AddProductsToCartOutput @doc(description:"Add any type of product to the cart") @resolver(class: "Magento\\QuoteGraphQl\\Model\\Resolver\\AddProductsToCart")
}
diff --git a/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/AbstractLikedProducts.php b/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/AbstractLikedProducts.php
index e14d8bde6be74..fac7b23d408e3 100644
--- a/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/AbstractLikedProducts.php
+++ b/app/code/Magento/RelatedProductGraphQl/Model/Resolver/Batch/AbstractLikedProducts.php
@@ -89,8 +89,7 @@ private function findRelations(array $products, array $loadAttributes, int $link
if (!$relations) {
return [];
}
- $relatedIds = array_values($relations);
- $relatedIds = array_unique(array_merge(...$relatedIds));
+ $relatedIds = array_unique(array_merge([], ...array_values($relations)));
//Loading products data.
$this->searchCriteriaBuilder->addFilter('entity_id', $relatedIds, 'in');
$relatedSearchResult = $this->productDataProvider->getList(
@@ -142,7 +141,7 @@ public function resolve(ContextInterface $context, Field $field, array $requests
$products[] = $request->getValue()['model'];
$fields[] = $this->productFieldsSelector->getProductFieldsFromInfo($request->getInfo(), $this->getNode());
}
- $fields = array_unique(array_merge(...$fields));
+ $fields = array_unique(array_merge([], ...$fields));
//Finding relations.
$related = $this->findRelations($products, $fields, $this->getLinkType());
diff --git a/app/code/Magento/ReleaseNotification/etc/di.xml b/app/code/Magento/ReleaseNotification/etc/di.xml
index a4c434ff7f623..118f9346bb643 100644
--- a/app/code/Magento/ReleaseNotification/etc/di.xml
+++ b/app/code/Magento/ReleaseNotification/etc/di.xml
@@ -10,8 +10,8 @@
- - 1
- - 1
+ - 1
+ - 1
diff --git a/app/code/Magento/RemoteStorage/Console/Command/RemoteStorageSynchronizeCommand.php b/app/code/Magento/RemoteStorage/Console/Command/RemoteStorageSynchronizeCommand.php
new file mode 100644
index 0000000000000..a53a203b6d550
--- /dev/null
+++ b/app/code/Magento/RemoteStorage/Console/Command/RemoteStorageSynchronizeCommand.php
@@ -0,0 +1,83 @@
+synchronizer = $synchronizer;
+ $this->config = $config;
+
+ parent::__construct(self::NAME);
+ }
+
+ /**
+ * @inheritDoc
+ */
+ protected function configure(): void
+ {
+ $this->setDescription('Synchronize media files with remote storage.');
+ }
+
+ /**
+ * Run synchronization.
+ *
+ * @param InputInterface $input
+ * @param OutputInterface $output
+ * @return int
+ * @throws LocalizedException
+ */
+ public function execute(InputInterface $input, OutputInterface $output): int
+ {
+ if (!$this->config->isEnabled()) {
+ $output->writeln('Remote storage is not enabled. ');
+
+ return Cli::RETURN_FAILURE;
+ }
+
+ $output->writeln('Uploading media files to remote storage. ');
+
+ foreach ($this->synchronizer->execute() as $file) {
+ $output->writeln('- ' . $file);
+ }
+
+ $output->writeln('End of upload. ');
+
+ return Cli::RETURN_SUCCESS;
+ }
+}
diff --git a/app/code/Magento/RemoteStorage/Driver/DriverException.php b/app/code/Magento/RemoteStorage/Driver/DriverException.php
new file mode 100644
index 0000000000000..b35a7e7c4d4da
--- /dev/null
+++ b/app/code/Magento/RemoteStorage/Driver/DriverException.php
@@ -0,0 +1,17 @@
+pool = $pool;
+ }
+
+ /**
+ * Check if factory exists.
+ *
+ * @param string $name
+ * @return bool
+ */
+ public function has(string $name): bool
+ {
+ return isset($this->pool[$name]);
+ }
+
+ /**
+ * Retrieve factory.
+ *
+ * @param string $name
+ * @return DriverFactoryInterface
+ *
+ * @throws RuntimeException
+ */
+ public function get(string $name): DriverFactoryInterface
+ {
+ if (!$this->has($name)) {
+ throw new RuntimeException(__('Driver "%1" does not exist', $name));
+ }
+
+ return $this->pool[$name];
+ }
+}
diff --git a/app/code/Magento/RemoteStorage/Driver/DriverPool.php b/app/code/Magento/RemoteStorage/Driver/DriverPool.php
new file mode 100644
index 0000000000000..0c085da78ddac
--- /dev/null
+++ b/app/code/Magento/RemoteStorage/Driver/DriverPool.php
@@ -0,0 +1,93 @@
+config = $config;
+ $this->driverFactoryPool = $driverFactoryPool;
+
+ parent::__construct($extraTypes);
+ }
+
+ /**
+ * Retrieves remote driver.
+ *
+ * @param string $code
+ * @return DriverInterface
+ * @throws DriverException
+ * @throws FileSystemException
+ * @throws RuntimeException
+ */
+ public function getDriver($code = self::REMOTE): DriverInterface
+ {
+ if ($code === self::REMOTE) {
+ if (isset($this->pool[$code])) {
+ return $this->pool[$code];
+ }
+
+ $driver = $this->config->getDriver();
+
+ if ($driver && $this->driverFactoryPool->has($driver)) {
+ return $this->pool[$code] = $this->driverFactoryPool->get($driver)->create(
+ $this->config->getConfig(),
+ $this->config->getPrefix()
+ );
+ }
+
+ throw new RuntimeException(__('Remote driver is not available.'));
+ }
+
+ return parent::getDriver($code);
+ }
+}
diff --git a/app/code/Magento/RemoteStorage/Driver/RemoteDriverInterface.php b/app/code/Magento/RemoteStorage/Driver/RemoteDriverInterface.php
new file mode 100644
index 0000000000000..fc108bb388cb5
--- /dev/null
+++ b/app/code/Magento/RemoteStorage/Driver/RemoteDriverInterface.php
@@ -0,0 +1,23 @@
+isEnabled = $config->isEnabled();
+ $this->driverPool = $driverPool;
+ $this->directoryCodes = $directoryCodes;
+
+ parent::__construct($directoryList, $readFactory, $writeFactory);
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getDirectoryRead($directoryCode, $driverCode = DriverPool::REMOTE)
+ {
+ $hasCode = !$this->directoryCodes || in_array($directoryCode, $this->directoryCodes, true);
+
+ if ($driverCode === DriverPool::REMOTE && $hasCode && $this->isEnabled) {
+ $code = $directoryCode . '_' . $driverCode;
+
+ if (!array_key_exists($code, $this->readInstances)) {
+ $uri = $this->getUri($directoryCode) ?: '/';
+
+ $this->readInstances[$code] = $this->readFactory->create(
+ $this->driverPool->getDriver()->getAbsolutePath('', $uri),
+ $driverCode
+ );
+ }
+
+ return $this->readInstances[$code];
+ }
+
+ return parent::getDirectoryRead($directoryCode);
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getDirectoryWrite($directoryCode, $driverCode = DriverPool::REMOTE)
+ {
+ $hasCode = !$this->directoryCodes || in_array($directoryCode, $this->directoryCodes, true);
+
+ if ($driverCode === DriverPool::REMOTE && $hasCode && $this->isEnabled) {
+ $code = $directoryCode . '_' . $driverCode;
+
+ if (!array_key_exists($code, $this->writeInstances)) {
+ $uri = $this->getUri($directoryCode) ?: '/';
+
+ $this->writeInstances[$code] = $this->writeFactory->create(
+ $this->driverPool->getDriver()->getAbsolutePath('', $uri),
+ $driverCode
+ );
+ }
+
+ return $this->writeInstances[$code];
+ }
+
+ return parent::getDirectoryWrite($directoryCode);
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getDirectoryReadByPath($path, $driverCode = DriverPool::REMOTE)
+ {
+ if ($driverCode === DriverPool::REMOTE && $this->isEnabled) {
+ return $this->readFactory->create(
+ $this->driverPool->getDriver()->getAbsolutePath('', $path),
+ $driverCode
+ );
+ }
+
+ return parent::getDirectoryReadByPath($path);
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getDirectoryCodes(): array
+ {
+ return $this->directoryCodes;
+ }
+}
diff --git a/app/code/Magento/RemoteStorage/FilesystemInterface.php b/app/code/Magento/RemoteStorage/FilesystemInterface.php
new file mode 100644
index 0000000000000..42669200c0caf
--- /dev/null
+++ b/app/code/Magento/RemoteStorage/FilesystemInterface.php
@@ -0,0 +1,19 @@
+" or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
\ No newline at end of file
diff --git a/app/code/Magento/RemoteStorage/LICENSE_AFL.txt b/app/code/Magento/RemoteStorage/LICENSE_AFL.txt
new file mode 100644
index 0000000000000..f39d641b18a19
--- /dev/null
+++ b/app/code/Magento/RemoteStorage/LICENSE_AFL.txt
@@ -0,0 +1,48 @@
+
+Academic Free License ("AFL") v. 3.0
+
+This Academic Free License (the "License") applies to any original work of authorship (the "Original Work") whose owner (the "Licensor") has placed the following licensing notice adjacent to the copyright notice for the Original Work:
+
+Licensed under the Academic Free License version 3.0
+
+ 1. Grant of Copyright License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, for the duration of the copyright, to do the following:
+
+ 1. to reproduce the Original Work in copies, either alone or as part of a collective work;
+
+ 2. to translate, adapt, alter, transform, modify, or arrange the Original Work, thereby creating derivative works ("Derivative Works") based upon the Original Work;
+
+ 3. to distribute or communicate copies of the Original Work and Derivative Works to the public, under any license of your choice that does not contradict the terms and conditions, including Licensor's reserved rights and remedies, in this Academic Free License;
+
+ 4. to perform the Original Work publicly; and
+
+ 5. to display the Original Work publicly.
+
+ 2. Grant of Patent License. Licensor grants You a worldwide, royalty-free, non-exclusive, sublicensable license, under patent claims owned or controlled by the Licensor that are embodied in the Original Work as furnished by the Licensor, for the duration of the patents, to make, use, sell, offer for sale, have made, and import the Original Work and Derivative Works.
+
+ 3. Grant of Source Code License. The term "Source Code" means the preferred form of the Original Work for making modifications to it and all available documentation describing how to modify the Original Work. Licensor agrees to provide a machine-readable copy of the Source Code of the Original Work along with each copy of the Original Work that Licensor distributes. Licensor reserves the right to satisfy this obligation by placing a machine-readable copy of the Source Code in an information repository reasonably calculated to permit inexpensive and convenient access by You for as long as Licensor continues to distribute the Original Work.
+
+ 4. Exclusions From License Grant. Neither the names of Licensor, nor the names of any contributors to the Original Work, nor any of their trademarks or service marks, may be used to endorse or promote products derived from this Original Work without express prior permission of the Licensor. Except as expressly stated herein, nothing in this License grants any license to Licensor's trademarks, copyrights, patents, trade secrets or any other intellectual property. No patent license is granted to make, use, sell, offer for sale, have made, or import embodiments of any patent claims other than the licensed claims defined in Section 2. No license is granted to the trademarks of Licensor even if such marks are included in the Original Work. Nothing in this License shall be interpreted to prohibit Licensor from licensing under terms different from this License any Original Work that Licensor otherwise would have a right to license.
+
+ 5. External Deployment. The term "External Deployment" means the use, distribution, or communication of the Original Work or Derivative Works in any way such that the Original Work or Derivative Works may be used by anyone other than You, whether those works are distributed or communicated to those persons or made available as an application intended for use over a network. As an express condition for the grants of license hereunder, You must treat any External Deployment by You of the Original Work or a Derivative Work as a distribution under section 1(c).
+
+ 6. Attribution Rights. You must retain, in the Source Code of any Derivative Works that You create, all copyright, patent, or trademark notices from the Source Code of the Original Work, as well as any notices of licensing and any descriptive text identified therein as an "Attribution Notice." You must cause the Source Code for any Derivative Works that You create to carry a prominent Attribution Notice reasonably calculated to inform recipients that You have modified the Original Work.
+
+ 7. Warranty of Provenance and Disclaimer of Warranty. Licensor warrants that the copyright in and to the Original Work and the patent rights granted herein by Licensor are owned by the Licensor or are sublicensed to You under the terms of this License with the permission of the contributor(s) of those copyrights and patent rights. Except as expressly stated in the immediately preceding sentence, the Original Work is provided under this License on an "AS IS" BASIS and WITHOUT WARRANTY, either express or implied, including, without limitation, the warranties of non-infringement, merchantability or fitness for a particular purpose. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No license to the Original Work is granted by this License except under this disclaimer.
+
+ 8. Limitation of Liability. Under no circumstances and under no legal theory, whether in tort (including negligence), contract, or otherwise, shall the Licensor be liable to anyone for any indirect, special, incidental, or consequential damages of any character arising as a result of this License or the use of the Original Work including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses. This limitation of liability shall not apply to the extent applicable law prohibits such limitation.
+
+ 9. Acceptance and Termination. If, at any time, You expressly assented to this License, that assent indicates your clear and irrevocable acceptance of this License and all of its terms and conditions. If You distribute or communicate copies of the Original Work or a Derivative Work, You must make a reasonable effort under the circumstances to obtain the express assent of recipients to the terms of this License. This License conditions your rights to undertake the activities listed in Section 1, including your right to create Derivative Works based upon the Original Work, and doing so without honoring these terms and conditions is prohibited by copyright law and international treaty. Nothing in this License is intended to affect copyright exceptions and limitations (including "fair use" or "fair dealing"). This License shall terminate immediately and You may no longer exercise any of the rights granted to You by this License upon your failure to honor the conditions in Section 1(c).
+
+ 10. Termination for Patent Action. This License shall terminate automatically and You may no longer exercise any of the rights granted to You by this License as of the date You commence an action, including a cross-claim or counterclaim, against Licensor or any licensee alleging that the Original Work infringes a patent. This termination provision shall not apply for an action alleging patent infringement by combinations of the Original Work with other software or hardware.
+
+ 11. Jurisdiction, Venue and Governing Law. Any action or suit relating to this License may be brought only in the courts of a jurisdiction wherein the Licensor resides or in which Licensor conducts its primary business, and under the laws of that jurisdiction excluding its conflict-of-law provisions. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any use of the Original Work outside the scope of this License or after its termination shall be subject to the requirements and penalties of copyright or patent law in the appropriate jurisdiction. This section shall survive the termination of this License.
+
+ 12. Attorneys' Fees. In any action to enforce the terms of this License or seeking damages relating thereto, the prevailing party shall be entitled to recover its costs and expenses, including, without limitation, reasonable attorneys' fees and costs incurred in connection with such action, including any appeal of such action. This section shall survive the termination of this License.
+
+ 13. Miscellaneous. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable.
+
+ 14. Definition of "You" in This License. "You" throughout this License, whether in upper or lower case, means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, "You" includes any entity that controls, is controlled by, or is under common control with you. For purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+ 15. Right to Use. You may use the Original Work in all ways not otherwise restricted or conditioned by this License or by law, and Licensor promises not to interfere with or be responsible for such uses by You.
+
+ 16. Modification of This License. This License is Copyright © 2005 Lawrence Rosen. Permission is granted to copy, distribute, or communicate this License without modification. Nothing in this License permits You to modify this License as applied to the Original Work or to Derivative Works. However, You may modify the text of this License and copy, distribute or communicate your modified version (the "Modified License") and apply it to other original works of authorship subject to the following conditions: (i) You may not indicate in any way that your Modified License is the "Academic Free License" or "AFL" and you may not use those names in the name of your Modified License; (ii) You must replace the notice specified in the first paragraph above with the notice "Licensed under " or with a notice of your own that is not confusingly similar to the notice in this License; and (iii) You may not claim that your original works are open source software unless your Modified License has been approved by Open Source Initiative (OSI) and You comply with its license review and certification process.
diff --git a/app/code/Magento/RemoteStorage/Model/Config.php b/app/code/Magento/RemoteStorage/Model/Config.php
new file mode 100644
index 0000000000000..41fbfdde15bd0
--- /dev/null
+++ b/app/code/Magento/RemoteStorage/Model/Config.php
@@ -0,0 +1,96 @@
+config = $config;
+ }
+
+ /**
+ * Retrieve driver name.
+ *
+ * @return string
+ * @throws FileSystemException
+ * @throws RuntimeException
+ */
+ public function getDriver(): string
+ {
+ return $this->config->get(DriverPool::PATH_DRIVER, BaseDriverPool::FILE);
+ }
+
+ /**
+ * Check if remote FS is enabled.
+ *
+ * @return bool
+ * @throws FileSystemException
+ * @throws RuntimeException
+ */
+ public function isEnabled(): bool
+ {
+ $driver = $this->getDriver();
+
+ return $driver && $driver !== BaseDriverPool::FILE;
+ }
+
+ /**
+ * Retrieves config.
+ *
+ * @return array
+ * @throws FileSystemException
+ * @throws RuntimeException
+ */
+ public function getConfig(): array
+ {
+ return (array)$this->config->get(DriverPool::PATH_CONFIG, []);
+ }
+
+ /**
+ * Retrieves prefix.
+ *
+ * @return string
+ *
+ * @throws FileSystemException
+ * @throws RuntimeException
+ */
+ public function getPrefix(): string
+ {
+ return (string)$this->config->get(DriverPool::PATH_PREFIX, '');
+ }
+
+ /**
+ * Retrieves value for exposing URLs.
+ *
+ * @return bool
+ * @throws FileSystemException
+ * @throws RuntimeException
+ */
+ public function getExposeUrls(): bool
+ {
+ return (bool)$this->config->get(DriverPool::PATH_EXPOSE_URLS, false);
+ }
+}
diff --git a/app/code/Magento/RemoteStorage/Model/Synchronizer.php b/app/code/Magento/RemoteStorage/Model/Synchronizer.php
new file mode 100644
index 0000000000000..4276c7a1a2ffd
--- /dev/null
+++ b/app/code/Magento/RemoteStorage/Model/Synchronizer.php
@@ -0,0 +1,104 @@
+filesystem = $filesystem;
+ }
+
+ /**
+ * File upload.
+ *
+ * @return Generator
+ * @throws FileSystemException
+ * @throws ValidatorException
+ */
+ public function execute(): Generator
+ {
+ foreach ($this->filesystem->getDirectoryCodes() as $directoryCode) {
+ $directory = $this->filesystem->getDirectoryWrite($directoryCode, DriverPool::FILE);
+ $remoteDirectory = $this->filesystem->getDirectoryWrite($directoryCode, RemoteDriverPool::REMOTE);
+
+ yield from $this->copyRecursive($directory, $remoteDirectory, $directory->getAbsolutePath());
+ }
+ }
+
+ /**
+ * Recursive file upload.
+ *
+ * @param WriteInterface $directory
+ * @param WriteInterface $remoteDirectory
+ * @param string $path
+ * @param string $pattern
+ * @param int $flags
+ * @return Generator
+ * @throws FileSystemException
+ */
+ private function copyRecursive(
+ WriteInterface $directory,
+ WriteInterface $remoteDirectory,
+ string $path,
+ string $pattern = '*.*',
+ int $flags = Glob::GLOB_NOSORT
+ ): Generator {
+ $path = rtrim($path, '/');
+ $localDriver = $directory->getDriver();
+ $remoteDriver = $remoteDirectory->getDriver();
+
+ foreach (Glob::glob($path . '/' . $pattern, $flags) as $file) {
+ /**
+ * Extracting relative path in local system to apply it for remote system.
+ */
+ $relativeFile = $directory->getRelativePath($file);
+ $destination = $remoteDirectory->getAbsolutePath($relativeFile);
+
+ if (!$remoteDirectory->isExist($destination)) {
+ $localDriver->copy($file, $destination, $remoteDriver);
+
+ yield $relativeFile;
+ }
+ }
+
+ foreach (Glob::glob($path . '/{,.}[!.,!..]*',
+ $flags | Glob::GLOB_ONLYDIR | Glob::GLOB_BRACE) as $childDirectory) {
+ $relativeDirectory = $directory->getRelativePath($childDirectory);
+ $destinationDirectory = $remoteDirectory->getAbsolutePath($relativeDirectory);
+
+ if (!$remoteDirectory->isDirectory($destinationDirectory)) {
+ $remoteDriver->createDirectory($destinationDirectory);
+
+ yield $relativeDirectory;
+ }
+
+ yield from $this->copyRecursive($directory, $remoteDirectory, $childDirectory, $pattern, $flags);
+ }
+ }
+}
diff --git a/app/code/Magento/RemoteStorage/Plugin/Image.php b/app/code/Magento/RemoteStorage/Plugin/Image.php
new file mode 100644
index 0000000000000..013e3fd23e168
--- /dev/null
+++ b/app/code/Magento/RemoteStorage/Plugin/Image.php
@@ -0,0 +1,257 @@
+tmpDirectoryWrite = $filesystem->getDirectoryWrite(DirectoryList::TMP);
+ $this->remoteDirectoryWrite = $targetDirectory->getDirectoryWrite(DirectoryList::ROOT);
+ $this->isEnabled = $config->isEnabled();
+ $this->ioFile = $ioFile;
+ $this->logger = $logger;
+ }
+
+ /**
+ * Copy file from remote server to tmp directory of Magento
+ *
+ * @param AbstractAdapter $subject
+ * @param string $filename
+ * @return array
+ * @throws FileSystemException
+ *
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function beforeOpen(AbstractAdapter $subject, $filename): array
+ {
+ if ($this->isEnabled) {
+ $filename = $this->copyFileToTmp($filename);
+ }
+ return [$filename];
+ }
+
+ /**
+ * Copy import file locally to validate
+ *
+ * @param AbstractAdapter $subject
+ * @param string $filePath
+ * @return string[]
+ * @throws FileSystemException
+ *
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function beforeValidateUploadFile(AbstractAdapter $subject, $filePath): array
+ {
+ if ($this->isEnabled) {
+ $filePath = $this->copyFileToTmp($filePath);
+ }
+ return [$filePath];
+ }
+
+ /**
+ * Copy watermark locally before adding it an image
+ *
+ * @param AbstractAdapter $subject
+ * @param string $filePath
+ * @return string[]
+ * @throws FileSystemException
+ *
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function beforeWatermark(AbstractAdapter $subject, $filePath): array
+ {
+ if ($this->isEnabled) {
+ $filePath = $this->copyFileToTmp($filePath);
+ }
+ return [$filePath];
+ }
+
+ /**
+ * Get filesystem tmp path for file and provide it to save() function
+ *
+ * @param AbstractAdapter $subject
+ * @param callable $proceed
+ * @param string|null $destination
+ * @param string|null $newName
+ * @return void
+ * @throws FileSystemException
+ */
+ public function aroundSave(
+ AbstractAdapter $subject,
+ callable $proceed,
+ $destination = null,
+ $newName = null
+ ): void {
+ if ($this->isEnabled) {
+ $relativePath = $this->remoteDirectoryWrite->getRelativePath($destination);
+ $tmpPath = $this->tmpDirectoryWrite->getAbsolutePath($relativePath);
+
+ $proceed($tmpPath, $newName);
+
+ $this->tmpDirectoryWrite->getDriver()->rename(
+ $this->prepareDestination($subject, $tmpPath, $newName),
+ $this->prepareDestination($subject, $destination, $newName),
+ $this->remoteDirectoryWrite->getDriver()
+ );
+ } else {
+ $proceed($destination, $newName);
+ }
+ }
+
+ /**
+ * Remove created tmp files
+ */
+ public function __destruct()
+ {
+ try {
+ foreach ($this->tmpFiles as $tmpFile) {
+ $this->tmpDirectoryWrite->delete($tmpFile);
+ }
+ } catch (\Exception $e) {
+ $this->logger->error($e->getMessage());
+ }
+ }
+
+ /**
+ * Move files from storage to tmp folder
+ *
+ * @param string $filePath
+ * @return string
+ * @throws FileSystemException
+ */
+ private function copyFileToTmp(string $filePath): string
+ {
+ if ($this->fileExistsInTmp($filePath)) {
+ return $filePath;
+ }
+ $absolutePath = $this->remoteDirectoryWrite->getAbsolutePath($filePath);
+ if ($this->remoteDirectoryWrite->isFile($absolutePath)) {
+ $this->tmpDirectoryWrite->create();
+ $tmpPath = $this->storeTmpName($filePath);
+ $content = $this->remoteDirectoryWrite->getDriver()->fileGetContents($filePath);
+ $filePath = $this->tmpDirectoryWrite->getDriver()->filePutContents($tmpPath, $content)
+ ? $tmpPath
+ : $filePath;
+ }
+ return $filePath;
+ }
+
+ /**
+ * Store created tmp image path
+ *
+ * @param string $filePath
+ * @return string
+ */
+ private function storeTmpName(string $filePath): string
+ {
+ // phpcs:ignore Magento2.Functions.DiscouragedFunction
+ $tmpPath = $this->tmpDirectoryWrite->getAbsolutePath() . basename($filePath);
+
+ $this->tmpFiles[$filePath] = $tmpPath;
+
+ return $tmpPath;
+ }
+
+ /**
+ * Check is file exist in tmp folder
+ *
+ * @param string $filePath
+ * @return bool
+ */
+ private function fileExistsInTmp(string $filePath): bool
+ {
+ return in_array($filePath, $this->tmpFiles, true);
+ }
+
+ /**
+ * Prepare destination path
+ *
+ * @param AbstractAdapter $image
+ * @param string|null $destination
+ * @param string|null $newName
+ * @return string
+ */
+ private function prepareDestination(
+ AbstractAdapter $image,
+ string $destination = null,
+ string $newName = null
+ ): string {
+ if (empty($destination)) {
+ $destination = $image->getFileSrcPath();
+ } elseif (empty($newName)) {
+ $info = $this->ioFile->getPathInfo($destination);
+ $newName = $info['basename'];
+ $destination = $info['dirname'];
+ }
+
+ if (empty($newName)) {
+ $newFileName = $image->getFileSrcName();
+ } else {
+ $newFileName = $newName;
+ }
+ return rtrim($destination, '/') . '/' . $newFileName;
+ }
+}
diff --git a/app/code/Magento/RemoteStorage/Plugin/MediaStorage.php b/app/code/Magento/RemoteStorage/Plugin/MediaStorage.php
new file mode 100644
index 0000000000000..12837545c533b
--- /dev/null
+++ b/app/code/Magento/RemoteStorage/Plugin/MediaStorage.php
@@ -0,0 +1,83 @@
+isEnabled = $config->isEnabled();
+ $this->remoteDirectory = $filesystem->getDirectoryWrite(DirectoryList::PUB, RemoteDriverPool::REMOTE);
+ $this->localDirectory = $filesystem->getDirectoryWrite(DirectoryList::PUB, LocalDriverPool::FILE);
+ }
+
+ /**
+ * Download remote file
+ *
+ * @param Synchronization $subject
+ * @param string $relativeFileName
+ * @return null
+ * @throws FileSystemException
+ * @throws ValidatorException
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function beforeSynchronize(Synchronization $subject, string $relativeFileName): void
+ {
+ if ($this->isEnabled && $this->remoteDirectory->isExist($relativeFileName)) {
+ $file = $this->localDirectory->openFile($relativeFileName, 'w');
+ try {
+ $file->lock();
+ $file->write($this->remoteDirectory->readFile($relativeFileName));
+ $file->unlock();
+ $file->close();
+ } catch (FileSystemException $e) {
+ $file->close();
+ }
+ }
+ }
+}
diff --git a/app/code/Magento/RemoteStorage/Plugin/Scope.php b/app/code/Magento/RemoteStorage/Plugin/Scope.php
new file mode 100644
index 0000000000000..6a05b63dee3a6
--- /dev/null
+++ b/app/code/Magento/RemoteStorage/Plugin/Scope.php
@@ -0,0 +1,63 @@
+isEnabled = $config->isEnabled() && $config->getExposeUrls();
+ $this->filesystem = $filesystem;
+ }
+
+ /**
+ * Modifies the base URL.
+ *
+ * @param ScopeInterface $subject
+ * @param string $result
+ * @param string $type
+ * @return string
+ * @throws ValidatorException
+ *
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function afterGetBaseUrl(ScopeInterface $subject, string $result, string $type = ''): string
+ {
+ if ($type === UrlInterface::URL_TYPE_MEDIA && $this->isEnabled) {
+ return $this->filesystem->getDirectoryRead(DirectoryList::MEDIA, DriverPool::REMOTE)
+ ->getAbsolutePath();
+ }
+
+ return $result;
+ }
+}
diff --git a/app/code/Magento/RemoteStorage/README.md b/app/code/Magento/RemoteStorage/README.md
new file mode 100644
index 0000000000000..f33b25795a995
--- /dev/null
+++ b/app/code/Magento/RemoteStorage/README.md
@@ -0,0 +1 @@
+# Magento_RemoteStorage module
diff --git a/app/code/Magento/RemoteStorage/Setup/ConfigOptionsList.php b/app/code/Magento/RemoteStorage/Setup/ConfigOptionsList.php
new file mode 100644
index 0000000000000..b625661479962
--- /dev/null
+++ b/app/code/Magento/RemoteStorage/Setup/ConfigOptionsList.php
@@ -0,0 +1,201 @@
+ self::CONFIG_PATH__REMOTE_STORAGE_PREFIX,
+ self::OPTION_REMOTE_STORAGE_BUCKET => self::CONFIG_PATH__REMOTE_STORAGE_BUCKET,
+ self::OPTION_REMOTE_STORAGE_REGION => self::CONFIG_PATH__REMOTE_STORAGE_REGION,
+ self::OPTION_REMOTE_STORAGE_ACCESS_KEY => self::CONFIG_PATH__REMOTE_STORAGE_ACCESS_KEY,
+ self::OPTION_REMOTE_STORAGE_SECRET_KEY => self::CONFIG_PATH__REMOTE_STORAGE_SECRET_KEY
+ ];
+
+ /**
+ * @var DriverFactoryPool
+ */
+ private $driverFactoryPool;
+
+ /**
+ * @var LoggerInterface
+ */
+ private $logger;
+
+ /**
+ * @param DriverFactoryPool $driverFactoryPool
+ * @param LoggerInterface $logger
+ */
+ public function __construct(DriverFactoryPool $driverFactoryPool, LoggerInterface $logger)
+ {
+ $this->driverFactoryPool = $driverFactoryPool;
+ $this->logger = $logger;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function getOptions(): array
+ {
+ return [
+ new TextConfigOption(
+ self::OPTION_REMOTE_STORAGE_DRIVER,
+ TextConfigOption::FRONTEND_WIZARD_TEXT,
+ self::CONFIG_PATH__REMOTE_STORAGE_DRIVER,
+ 'Remote storage driver',
+ DriverPool::FILE
+ ),
+ new TextConfigOption(
+ self::OPTION_REMOTE_STORAGE_PREFIX,
+ TextConfigOption::FRONTEND_WIZARD_TEXT,
+ self::CONFIG_PATH__REMOTE_STORAGE_PREFIX,
+ 'Remote storage prefix',
+ ''
+ ),
+ new TextConfigOption(
+ self::OPTION_REMOTE_STORAGE_BUCKET,
+ TextConfigOption::FRONTEND_WIZARD_TEXT,
+ self::CONFIG_PATH__REMOTE_STORAGE_BUCKET,
+ 'Remote storage bucket'
+ ),
+ new TextConfigOption(
+ self::OPTION_REMOTE_STORAGE_REGION,
+ TextConfigOption::FRONTEND_WIZARD_TEXT,
+ self::CONFIG_PATH__REMOTE_STORAGE_REGION,
+ 'Remote storage region'
+ ),
+ new TextConfigOption(
+ self::OPTION_REMOTE_STORAGE_ACCESS_KEY,
+ TextConfigOption::FRONTEND_WIZARD_PASSWORD,
+ self::CONFIG_PATH__REMOTE_STORAGE_ACCESS_KEY,
+ 'Remote storage access key',
+ ''
+ ),
+ new TextConfigOption(
+ self::OPTION_REMOTE_STORAGE_SECRET_KEY,
+ TextConfigOption::FRONTEND_WIZARD_PASSWORD,
+ self::CONFIG_PATH__REMOTE_STORAGE_SECRET_KEY,
+ 'Remote storage secret key',
+ ''
+ )
+ ];
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function createConfig(array $options, DeploymentConfig $deploymentConfig): array
+ {
+ $driver = $options[self::OPTION_REMOTE_STORAGE_DRIVER] ?? DriverPool::FILE;
+
+ if ($driver === DriverPool::FILE) {
+ $configData = new ConfigData(ConfigFilePool::APP_ENV);
+ $configData->setOverrideWhenSave(true);
+ $configData->set(self::CONFIG_PATH__REMOTE_STORAGE_DRIVER, $driver);
+ } else {
+ $configData = $this->createConfigData($driver, $options);
+ }
+
+ return [$configData];
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public function validate(array $options, DeploymentConfig $deploymentConfig): array
+ {
+ $driver = $options[self::OPTION_REMOTE_STORAGE_DRIVER] ?? DriverPool::FILE;
+
+ if ($driver === DriverPool::FILE) {
+ return [];
+ }
+
+ $errors = [];
+
+ if (empty($options[self::OPTION_REMOTE_STORAGE_REGION])) {
+ $errors[] = 'Region is required';
+ }
+
+ if (empty($options[self::OPTION_REMOTE_STORAGE_BUCKET])) {
+ $errors[] = 'Bucket is required';
+ }
+
+ if (!$errors) {
+ $configData = $this->createConfigData($driver, $options);
+
+ try {
+ $this->driverFactoryPool->get($driver)->create(
+ $configData->getData()['remote_storage']['config'],
+ $options[self::OPTION_REMOTE_STORAGE_PREFIX]
+ )->test();
+ } catch (LocalizedException $exception) {
+ $message = $exception->getMessage();
+
+ $this->logger->critical($message);
+
+ $errors[] = 'Adapter error: ' . $message;
+ }
+ }
+
+ return $errors;
+ }
+
+ /**
+ * Creates pre-configured config data object.
+ *
+ * @param string $driver
+ * @param array $options
+ * @return ConfigData
+ */
+ private function createConfigData(string $driver, array $options): ConfigData
+ {
+ $configData = new ConfigData(ConfigFilePool::APP_ENV);
+ $configData->setOverrideWhenSave(true);
+ $configData->set(self::CONFIG_PATH__REMOTE_STORAGE_DRIVER, $driver);
+
+ foreach (self::$map as $option => $configPath) {
+ if (!empty($options[$option])) {
+ $configData->set($configPath, $options[$option]);
+ }
+ }
+
+ return $configData;
+ }
+}
diff --git a/app/code/Magento/RemoteStorage/Test/Unit/Model/SynchronizerTest.php b/app/code/Magento/RemoteStorage/Test/Unit/Model/SynchronizerTest.php
new file mode 100644
index 0000000000000..5c3ddb74bb0cf
--- /dev/null
+++ b/app/code/Magento/RemoteStorage/Test/Unit/Model/SynchronizerTest.php
@@ -0,0 +1,109 @@
+filesystemMock = $this->createMock(Filesystem::class);
+
+ $this->synchronizer = new Synchronizer(
+ $this->filesystemMock
+ );
+ }
+
+ /**
+ * @throws FileSystemException
+ * @throws ValidatorException
+ */
+ public function testExecute(): void
+ {
+ $this->filesystemMock->method('getDirectoryCodes')
+ ->willReturn(['test']);
+
+ $localDriver = $this->createMock(DriverInterface::class);
+ $remoteDriver = $this->createMock(DriverInterface::class);
+
+ $localDirectory = $this->createMock(WriteInterface::class);
+ $localDirectory->method('getDriver')
+ ->willReturn($localDriver);
+ $remoteDirectory = $this->createMock(WriteInterface::class);
+ $remoteDirectory->method('getDriver')
+ ->willReturn($remoteDriver);
+
+ $this->filesystemMock->method('getDirectoryWrite')
+ ->willReturnMap([
+ ['test', DriverPool::FILE, $localDirectory],
+ ['test', RemoteDriverPool::REMOTE, $remoteDirectory]
+ ]);
+ $localDirectory->method('getAbsolutePath')
+ ->willReturnMap([
+ [null, __DIR__ . '/_files/test']
+ ]);
+ $localDirectory->method('getRelativePath')
+ ->willReturnCallback(function ($arg) {
+ return str_replace(__DIR__, '', $arg);
+ });
+ $remoteDirectory->expects(self::exactly(2))
+ ->method('isExist')
+ ->willReturnMap([
+ [
+ 'remote:/_files/test/root_file.txt',
+ false
+ ],
+ [
+ 'remote:/_files/test/.dot_directory/child_file.txt',
+ true
+ ]
+ ]);
+ $remoteDirectory->method('getAbsolutePath')
+ ->willReturnCallback(function ($arg) {
+ return 'remote:' . $arg;
+ });
+ $localDriver->expects(self::once())
+ ->method('copy')
+ ->withConsecutive(
+ [__DIR__ . '/_files/test/root_file.txt', 'remote:/_files/test/root_file.txt', $remoteDriver]
+ );
+
+ self::assertSame(
+ [
+ '/_files/test/root_file.txt',
+ '/_files/test/.dot_directory'
+ ],
+ iterator_to_array($this->synchronizer->execute(), false)
+ );
+ }
+}
diff --git a/app/code/Magento/RemoteStorage/Test/Unit/Model/_files/test/.dot_directory/child_file.txt b/app/code/Magento/RemoteStorage/Test/Unit/Model/_files/test/.dot_directory/child_file.txt
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/app/code/Magento/RemoteStorage/Test/Unit/Model/_files/test/.dot_file.txt b/app/code/Magento/RemoteStorage/Test/Unit/Model/_files/test/.dot_file.txt
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/app/code/Magento/RemoteStorage/Test/Unit/Model/_files/test/root_file.txt b/app/code/Magento/RemoteStorage/Test/Unit/Model/_files/test/root_file.txt
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/app/code/Magento/RemoteStorage/Test/Unit/Plugin/ImageTest.php b/app/code/Magento/RemoteStorage/Test/Unit/Plugin/ImageTest.php
new file mode 100644
index 0000000000000..13d170946e343
--- /dev/null
+++ b/app/code/Magento/RemoteStorage/Test/Unit/Plugin/ImageTest.php
@@ -0,0 +1,188 @@
+getMockBuilder(Filesystem::class)->disableOriginalConstructor()->getMock();
+ $this->ioFile = $this->getMockBuilder(File::class)->disableOriginalConstructor()->getMock();
+ /** @var TargetDirectory|MockObject $targetDirectory */
+ $targetDirectory = $this->getMockBuilder(TargetDirectory::class)->disableOriginalConstructor()->getMock();
+ /** @var Config|MockObject $config */
+ $config = $this->getMockBuilder(Config::class)->disableOriginalConstructor()->getMock();
+ $config->expects(self::atLeastOnce())->method('isEnabled')->willReturn(true);
+ $this->tmpDirectoryWrite = $this->getMockBuilder(WriteInterface::class)
+ ->disableOriginalConstructor()->getMock();
+ $this->targetDirectoryWrite = $this->getMockBuilder(WriteInterface::class)
+ ->disableOriginalConstructor()->getMock();
+ $filesystem->expects(self::atLeastOnce())->method('getDirectoryWrite')->with(DirectoryList::TMP)
+ ->willReturn($this->tmpDirectoryWrite);
+ $targetDirectory->expects(self::atLeastOnce())->method('getDirectoryWrite')->with(DirectoryList::ROOT)
+ ->willReturn($this->targetDirectoryWrite);
+ /** @var LoggerInterface|MockObject $logger */
+ $logger = $this->getMockBuilder(LoggerInterface::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->plugin = new Image(
+ $filesystem,
+ $this->ioFile,
+ $targetDirectory,
+ $config,
+ $logger
+ );
+ }
+
+ /**
+ * @dataProvider aroundSaveDataProvider
+ * @param string $destination
+ * @param string $newDestination
+ * @param string|null $newName
+ * @param string|null $oldName
+ * @return void
+ * @throws \Magento\Framework\Exception\FileSystemException
+ */
+ public function testAroundSaveWithNewName(
+ string $destination,
+ string $newDestination,
+ ?string $newName,
+ ?string $oldName
+ ): void {
+ $tmpDestination = '/tmp/' . $destination;
+ /** @var AbstractAdapter $subject */
+ $subject = $this->getMockBuilder(AbstractAdapter::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $proceed = function () {
+ };
+ $targetDriver = $this->getMockBuilder(DriverInterface::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->targetDirectoryWrite->expects(self::atLeastOnce())->method('getRelativePath')
+ ->willReturn($destination . $oldName);
+ $this->targetDirectoryWrite->expects(self::atLeastOnce())->method('getDriver')
+ ->willReturn($targetDriver);
+ $this->tmpDirectoryWrite->expects(self::atLeastOnce())->method('getAbsolutePath')
+ ->willReturn($tmpDestination);
+ $driver = $this->getMockBuilder(DriverInterface::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $actualName = $newName ?? $oldName;
+ $driver->expects(self::atLeastOnce())->method('rename')
+ ->with($tmpDestination . $actualName, $newDestination, $driver);
+ $this->tmpDirectoryWrite->expects(self::atLeastOnce())->method('getDriver')->willReturn($driver);
+ $this->ioFile->method('getPathInfo')
+ ->willReturnMap(
+ [
+ [$tmpDestination, ['dirname' => $tmpDestination, 'basename' => 'old_name.file']],
+ [$destination . $oldName, ['dirname' => $destination, 'basename' => 'old_name.file']]
+ ]
+ );
+ $this->plugin->aroundSave($subject, $proceed, $destination . $oldName, $newName);
+ }
+
+ /**
+ * @return array
+ */
+ public function aroundSaveDataProvider(): array
+ {
+ return [
+ 'with_new_name' => [
+ 'destination' => 'destination/',
+ 'new_destination' => 'destination/new_name.file',
+ 'new_name' => 'new_name.file',
+ 'old_name' => null
+ ],
+ 'with_old_name' => [
+ 'destination' => 'destination/',
+ 'new_destination' => 'destination/old_name.file',
+ 'new_name' => null,
+ 'old_name' => 'old_name.file'
+ ]
+ ];
+ }
+
+ /**
+ * @return void
+ * @throws \Magento\Framework\Exception\FileSystemException
+ */
+ public function testBeforeOpen(): void
+ {
+ /** @var AbstractAdapter $subject */
+ $subject = $this->getMockBuilder(AbstractAdapter::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $filename = '/path/file_name.file';
+ $absolutePath = 'absolute' . $filename;
+ $tmpAbsolutePath = '/var/www/magento2/tmp';
+ $tmpFilePath = $tmpAbsolutePath . 'file_name.file';
+ $content = 'Just a test';
+
+ $targetDriver = $this->getMockBuilder(DriverInterface::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $targetDriver->expects(self::atLeastOnce())->method('fileGetContents')->with($filename)
+ ->willReturn($content);
+ $tmpDriver = $this->getMockBuilder(DriverInterface::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $tmpDriver->expects(self::atLeastOnce())->method('filePutContents')->with($tmpFilePath, $content)
+ ->willReturn(true);
+ $this->targetDirectoryWrite->expects(self::atLeastOnce())->method('getAbsolutePath')->with($filename)
+ ->willReturn($absolutePath);
+ $this->targetDirectoryWrite->expects(self::atLeastOnce())->method('isFile')->with($absolutePath)
+ ->willReturn(true);
+ $this->targetDirectoryWrite->expects(self::atLeastOnce())->method('getDriver')
+ ->willReturn($targetDriver);
+ $this->tmpDirectoryWrite->expects(self::atLeastOnce())->method('getDriver')
+ ->willReturn($tmpDriver);
+ $this->tmpDirectoryWrite->expects(self::atLeastOnce())->method('create');
+ $this->tmpDirectoryWrite->expects(self::atLeastOnce())->method('getAbsolutePath')
+ ->willReturn($tmpAbsolutePath);
+
+ self::assertEquals([$tmpFilePath], $this->plugin->beforeOpen($subject, $filename));
+ }
+}
diff --git a/app/code/Magento/RemoteStorage/composer.json b/app/code/Magento/RemoteStorage/composer.json
new file mode 100644
index 0000000000000..7345048a159e3
--- /dev/null
+++ b/app/code/Magento/RemoteStorage/composer.json
@@ -0,0 +1,32 @@
+{
+ "name": "magento/module-remote-storage",
+ "description": "N/A",
+ "require": {
+ "php": "~7.3.0||~7.4.0",
+ "magento/framework": "^100.0.2"
+ },
+ "suggest": {
+ "magento/module-backend": "*",
+ "magento/module-sitemap": "*",
+ "magento/module-cms": "*",
+ "magento/module-downloadable": "*",
+ "magento/module-catalog": "*",
+ "magento/module-media-storage": "*",
+ "magento/module-import-export": "*",
+ "magento/module-catalog-import-export": "*",
+ "magento/module-downloadable-import-export": "*"
+ },
+ "type": "magento2-module",
+ "license": [
+ "OSL-3.0",
+ "AFL-3.0"
+ ],
+ "autoload": {
+ "files": [
+ "registration.php"
+ ],
+ "psr-4": {
+ "Magento\\RemoteStorage\\": ""
+ }
+ }
+}
diff --git a/app/code/Magento/RemoteStorage/etc/adminhtml/system.xml b/app/code/Magento/RemoteStorage/etc/adminhtml/system.xml
new file mode 100644
index 0000000000000..5009a05d8b602
--- /dev/null
+++ b/app/code/Magento/RemoteStorage/etc/adminhtml/system.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+ Warning! Database media storage will be ignored if remote storage is enabled.]]>
+
+
+
+
+
diff --git a/app/code/Magento/RemoteStorage/etc/di.xml b/app/code/Magento/RemoteStorage/etc/di.xml
new file mode 100644
index 0000000000000..9fdde517b952c
--- /dev/null
+++ b/app/code/Magento/RemoteStorage/etc/di.xml
@@ -0,0 +1,137 @@
+
+
+
+
+
+ Magento\RemoteStorage\Driver\DriverPool
+
+
+
+
+ Magento\RemoteStorage\Driver\DriverPool
+
+
+
+
+ remoteWriteFactory
+ remoteReadFactory
+
+
+
+
+
+ - Magento\Framework\App\Filesystem\DirectoryList::MEDIA
+ - Magento\Framework\App\Filesystem\DirectoryList::VAR_EXPORT
+
+
+
+
+
+ fullRemoteFilesystem
+ Magento\RemoteStorage\Driver\DriverPool::REMOTE
+
+
+
+
+ fullRemoteFilesystem
+
+
+
+
+ fullRemoteFilesystem
+
+
+
+
+ fullRemoteFilesystem
+
+
+
+
+ fullRemoteFilesystem
+
+
+
+
+
+ - Magento\RemoteStorage\Console\Command\RemoteStorageSynchronizeCommand
+
+
+
+
+
+ fullRemoteFilesystem
+
+
+
+
+
+
+ fullRemoteFilesystem
+
+
+
+
+ fullRemoteFilesystem
+
+
+
+
+ fullRemoteFilesystem
+
+
+
+
+
+
+ fullRemoteFilesystem
+
+
+
+
+
+
+ fullRemoteFilesystem
+
+
+
+
+ fullRemoteFilesystem
+
+
+
+
+ fullRemoteFilesystem
+
+
+
+
+ fullRemoteFilesystem
+
+
+
+
+ fullRemoteFilesystem
+
+
+
+
+ fullRemoteFilesystem
+
+
+
+
+ customRemoteFilesystem
+
+
+
diff --git a/app/code/Magento/RemoteStorage/etc/module.xml b/app/code/Magento/RemoteStorage/etc/module.xml
new file mode 100644
index 0000000000000..c06658c11ea90
--- /dev/null
+++ b/app/code/Magento/RemoteStorage/etc/module.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/RemoteStorage/registration.php b/app/code/Magento/RemoteStorage/registration.php
new file mode 100644
index 0000000000000..3a6d6b67a8dcf
--- /dev/null
+++ b/app/code/Magento/RemoteStorage/registration.php
@@ -0,0 +1,11 @@
+getRequest()->getParam('website')) {
$storeIds = $this->_storeManager->getWebsite($this->getRequest()->getParam('website'))->getStoreIds();
} elseif ($this->getRequest()->getParam('group')) {
- $storeIds = $storeIds = $this->_storeManager->getGroup(
+ $storeIds = $this->_storeManager->getGroup(
$this->getRequest()->getParam('group')
)->getStoreIds();
}
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
index f22b3e7bb963b..1ebfd64b2f37c 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Currency.php
@@ -3,36 +3,164 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
namespace Magento\Reports\Block\Adminhtml\Grid\Column\Renderer;
+use Magento\Backend\Block\Widget\Grid\Column\Renderer\Currency as BackendCurrency;
+use Magento\Backend\Block\Context;
+use Magento\Directory\Model\Currency\DefaultLocator;
+use Magento\Directory\Model\CurrencyFactory;
+use Magento\Framework\DataObject;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Locale\CurrencyInterface;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
+use Magento\Store\Model\StoreManagerInterface;
+use Zend_Currency_Exception;
+
/**
* Adminhtml grid item renderer currency
*
* @author Magento Core Team
* @api
* @since 100.0.2
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
-class Currency extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Currency
+class Currency extends BackendCurrency
{
+ /**
+ * @var CurrencyFactory
+ */
+ private $currencyFactory;
+
+ /**
+ * @param Context $context
+ * @param StoreManagerInterface $storeManager
+ * @param DefaultLocator $currencyLocator
+ * @param CurrencyFactory $currencyFactory
+ * @param CurrencyInterface $localeCurrency
+ * @param array $data
+ */
+ public function __construct(
+ Context $context,
+ StoreManagerInterface $storeManager,
+ DefaultLocator $currencyLocator,
+ CurrencyFactory $currencyFactory,
+ CurrencyInterface $localeCurrency,
+ array $data = []
+ ) {
+ parent::__construct(
+ $context,
+ $storeManager,
+ $currencyLocator,
+ $currencyFactory,
+ $localeCurrency,
+ $data
+ );
+ $this->currencyFactory = $currencyFactory;
+ }
+
/**
* Renders grid column
*
- * @param \Magento\Framework\DataObject $row
+ * @param DataObject $row
* @return string
+ * @throws LocalizedException
+ * @throws NoSuchEntityException
+ * @throws Zend_Currency_Exception
*/
- public function render(\Magento\Framework\DataObject $row)
+ public function render(DataObject $row)
{
$data = $row->getData($this->getColumn()->getIndex());
- $currencyCode = $this->_getCurrencyCode($row);
+ $currencyCode = $this->getStoreCurrencyCode($row);
if (!$currencyCode) {
return $data;
}
- $data = (float)$data * $this->_getRate($row);
+ $rate = $this->getStoreCurrencyRate($currencyCode, $row);
+
+ $data = (float)$data * $rate;
$data = sprintf("%f", $data);
$data = $this->_localeCurrency->getCurrency($currencyCode)->toCurrency($data);
return $data;
}
+
+ /**
+ * Get admin currency code
+ *
+ * @return string
+ * @throws LocalizedException
+ * @throws NoSuchEntityException
+ */
+ private function getAdminCurrencyCode(): string
+ {
+ $adminWebsiteId = (int) $this->_storeManager
+ ->getStore(Store::ADMIN_CODE)
+ ->getWebsiteId();
+ return (string) $this->_storeManager
+ ->getWebsite($adminWebsiteId)
+ ->getBaseCurrencyCode();
+ }
+
+ /**
+ * Get store currency code
+ *
+ * @param DataObject $row
+ * @return string
+ * @throws NoSuchEntityException
+ */
+ private function getStoreCurrencyCode(DataObject $row): string
+ {
+ $catalogPriceScope = $this->getCatalogPriceScope();
+ $storeId = $this->_request->getParam('store_ids');
+ if ($catalogPriceScope != 0 && !empty($storeId)) {
+ $currencyCode = $this->_storeManager->getStore($storeId)->getBaseCurrencyCode();
+ } elseif ($catalogPriceScope != 0) {
+ $currencyCode = $this->_currencyLocator->getDefaultCurrency($this->_request);
+ } else {
+ $currencyCode = $this->_getCurrencyCode($row);
+ }
+ return $currencyCode;
+ }
+
+ /**
+ * Get store currency rate
+ *
+ * @param string $currencyCode
+ * @param DataObject $row
+ * @return float
+ * @throws LocalizedException
+ * @throws NoSuchEntityException
+ */
+ private function getStoreCurrencyRate(string $currencyCode, DataObject $row): float
+ {
+ $catalogPriceScope = $this->getCatalogPriceScope();
+ $adminCurrencyCode = $this->getAdminCurrencyCode();
+
+ if (($catalogPriceScope != 0
+ && $adminCurrencyCode !== $currencyCode)) {
+ $storeCurrency = $this->currencyFactory->create()->load($adminCurrencyCode);
+ $currencyRate = $storeCurrency->getRate($currencyCode);
+ } else {
+ $currencyRate = $this->_getRate($row);
+ }
+ return (float) $currencyRate;
+ }
+
+ /**
+ * Get catalog price scope from the admin config
+ *
+ * @return int
+ */
+ private function getCatalogPriceScope(): int
+ {
+ return (int) $this->_scopeConfig->getValue(
+ Store::XML_PATH_PRICE_SCOPE,
+ ScopeInterface::SCOPE_WEBSITE
+ );
+ }
}
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid/Shopcart.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/Shopcart.php
index afa0ce79aca6e..1d65dd5874c6e 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid/Shopcart.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/Shopcart.php
@@ -28,6 +28,7 @@ class Shopcart extends \Magento\Backend\Block\Widget\Grid\Extended
/**
* StoreIds setter
+ *
* @codeCoverageIgnore
*
* @param array $storeIds
@@ -46,6 +47,10 @@ public function setStoreIds($storeIds)
*/
public function getCurrentCurrencyCode()
{
+ if (empty($this->_storeIds)) {
+ $this->setStoreIds(array_keys($this->_storeManager->getStores()));
+ }
+
if ($this->_currentCurrencyCode === null) {
reset($this->_storeIds);
$this->_currentCurrencyCode = count(
diff --git a/app/code/Magento/Reports/Block/Product/Viewed.php b/app/code/Magento/Reports/Block/Product/Viewed.php
index ba4d03182213a..09d59e475905b 100644
--- a/app/code/Magento/Reports/Block/Product/Viewed.php
+++ b/app/code/Magento/Reports/Block/Product/Viewed.php
@@ -76,10 +76,10 @@ protected function _toHtml()
*/
public function getIdentities()
{
- $identities = [[]];
+ $identities = [];
foreach ($this->getItemsCollection() as $item) {
$identities[] = $item->getIdentities();
}
- return array_merge(...$identities);
+ return array_merge([], ...$identities);
}
}
diff --git a/app/code/Magento/Reports/Model/Product/DataRetriever.php b/app/code/Magento/Reports/Model/Product/DataRetriever.php
new file mode 100644
index 0000000000000..c6260a4e7bacc
--- /dev/null
+++ b/app/code/Magento/Reports/Model/Product/DataRetriever.php
@@ -0,0 +1,106 @@
+productCollectionFactory = $productCollectionFactory;
+ $this->storeManager = $storeManager;
+ }
+
+ /**
+ * Retrieve products data by entity id's
+ *
+ * @param array $entityIds
+ * @return array
+ */
+ public function execute(array $entityIds = []): array
+ {
+ $productCollection = $this->getProductCollection($entityIds);
+
+ return $this->prepareDataByCollection($productCollection);
+ }
+
+ /**
+ * Get product collection filtered by entity id's
+ *
+ * @param array $entityIds
+ * @return ProductCollection
+ */
+ private function getProductCollection(array $entityIds = []): ProductCollection
+ {
+ $productCollection = $this->productCollectionFactory->create();
+ $productCollection->addAttributeToSelect('name');
+ $productCollection->addIdFilter($entityIds);
+ $productCollection->addPriceData(null, $this->getWebsiteIdForFilter());
+
+ return $productCollection;
+ }
+
+ /**
+ * Retrieve website id for filter collection
+ *
+ * @return int
+ */
+ private function getWebsiteIdForFilter(): int
+ {
+ $defaultStoreView = $this->storeManager->getDefaultStoreView();
+ if ($defaultStoreView) {
+ $websiteId = (int)$defaultStoreView->getWebsiteId();
+ } else {
+ $websites = $this->storeManager->getWebsites();
+ $website = reset($websites);
+ $websiteId = (int)$website->getId();
+ }
+
+ return $websiteId;
+ }
+
+ /**
+ * Prepare data by collection
+ *
+ * @param ProductCollection $productCollection
+ * @return array
+ */
+ private function prepareDataByCollection(ProductCollection $productCollection): array
+ {
+ $productsData = [];
+ foreach ($productCollection as $product) {
+ $productsData[$product->getId()] = $product->getData();
+ }
+
+ return $productsData;
+ }
+}
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Event.php b/app/code/Magento/Reports/Model/ResourceModel/Event.php
index 1f621a3fde39d..d27b8a03fecec 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Event.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Event.php
@@ -93,6 +93,9 @@ public function applyLogToCollection(
$skipIds = []
) {
$idFieldName = $collection->getResource()->getIdFieldName();
+ $predefinedStoreIds = ($collection->getStoreId() === null)
+ ? null
+ : [$collection->getStoreId()];
$derivedSelect = $this->getConnection()
->select()
@@ -103,7 +106,7 @@ public function applyLogToCollection(
->where('event_type_id = ?', (int) $eventTypeId)
->where('subject_id = ?', (int) $eventSubjectId)
->where('subtype = ?', (int) $subtype)
- ->where('store_id IN(?)', $this->getCurrentStoreIds())
+ ->where('store_id IN(?)', $this->getCurrentStoreIds($predefinedStoreIds))
->group('object_id');
if ($skipIds) {
@@ -132,13 +135,11 @@ public function getCurrentStoreIds(array $predefinedStoreIds = null)
{
$stores = [];
// get all or specified stores
- if ($this->_storeManager->getStore()->getId() == 0) {
- if (null !== $predefinedStoreIds) {
- $stores = $predefinedStoreIds;
- } else {
- foreach ($this->_storeManager->getStores() as $store) {
- $stores[] = $store->getId();
- }
+ if ($predefinedStoreIds !== null) {
+ $stores = $predefinedStoreIds;
+ } elseif ($this->_storeManager->getStore()->getId() == 0) {
+ foreach ($this->_storeManager->getStores() as $store) {
+ $stores[] = $store->getId();
}
} else {
// get all stores, required by configuration in current store scope
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
index 44571550459c2..47583c27370fb 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Order/Collection.php
@@ -159,7 +159,7 @@ public function prepareSummary($range, $customStart, $customEnd, $isFilter = 0)
if ($this->_isLive) {
$this->_prepareSummaryLive($range, $customStart, $customEnd, $isFilter);
} else {
- $this->_prepareSummaryAggregated($range, $customStart, $customEnd, $isFilter);
+ $this->_prepareSummaryAggregated($range, $customStart, $customEnd);
}
return $this;
diff --git a/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php
index 16df2d30db40d..e7dc28eb74a49 100644
--- a/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php
+++ b/app/code/Magento/Reports/Model/ResourceModel/Quote/Item/Collection.php
@@ -7,7 +7,8 @@
namespace Magento\Reports\Model\ResourceModel\Quote\Item;
-use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\App\ObjectManager;
+use Magento\Reports\Model\Product\DataRetriever as ProductDataRetriever;
/**
* Collection of Magento\Quote\Model\Quote\Item
@@ -49,6 +50,11 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
*/
protected $orderResource;
+ /**
+ * @var ProductDataRetriever
+ */
+ private $productDataRetriever;
+
/**
* @param \Magento\Framework\Data\Collection\EntityFactory $entityFactory
* @param \Psr\Log\LoggerInterface $logger
@@ -59,6 +65,9 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\Ab
* @param \Magento\Sales\Model\ResourceModel\Order\Collection $orderResource
* @param \Magento\Framework\DB\Adapter\AdapterInterface $connection
* @param \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource
+ * @param ProductDataRetriever|null $productDataRetriever
+ *
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Framework\Data\Collection\EntityFactory $entityFactory,
@@ -69,7 +78,8 @@ public function __construct(
\Magento\Customer\Model\ResourceModel\Customer $customerResource,
\Magento\Sales\Model\ResourceModel\Order\Collection $orderResource,
\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
- \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
+ \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null,
+ ?ProductDataRetriever $productDataRetriever = null
) {
parent::__construct(
$entityFactory,
@@ -82,6 +92,8 @@ public function __construct(
$this->productResource = $productResource;
$this->customerResource = $customerResource;
$this->orderResource = $orderResource;
+ $this->productDataRetriever = $productDataRetriever
+ ?? ObjectManager::getInstance()->get(ProductDataRetriever::class);
}
/**
@@ -225,7 +237,7 @@ protected function _afterLoad()
foreach ($items as $item) {
$productIds[] = $item->getProductId();
}
- $productData = $this->getProductData($productIds);
+ $productData = $this->productDataRetriever->execute($productIds);
$orderData = $this->getOrdersData($productIds);
foreach ($items as $item) {
$item->setId($item->getProductId());
diff --git a/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml b/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml
index 3e79eb044b5cb..6e9e8e800e076 100644
--- a/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml
+++ b/app/code/Magento/Reports/Test/Mftf/Test/CancelOrdersInOrderSalesReportTest.xml
@@ -47,7 +47,7 @@
+
diff --git a/app/code/Magento/ReviewGraphQl/etc/graphql/di.xml b/app/code/Magento/ReviewGraphQl/etc/graphql/di.xml
new file mode 100644
index 0000000000000..34e309f0b151a
--- /dev/null
+++ b/app/code/Magento/ReviewGraphQl/etc/graphql/di.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+ - catalog/review/active
+ - catalog/review/allow_guest
+
+
+
+
diff --git a/app/code/Magento/ReviewGraphQl/etc/schema.graphqls b/app/code/Magento/ReviewGraphQl/etc/schema.graphqls
index 14b4fc60e8b09..709e25598a737 100644
--- a/app/code/Magento/ReviewGraphQl/etc/schema.graphqls
+++ b/app/code/Magento/ReviewGraphQl/etc/schema.graphqls
@@ -39,14 +39,14 @@ type ProductReviewRatingsMetadata {
}
type ProductReviewRatingMetadata {
- id: String! @doc(description: "Base64 encoded rating ID.")
+ id: String! @doc(description: "An encoded rating ID.")
name: String! @doc(description: "The label assigned to an aspect of a product that is being rated, such as quality or price")
values: [ProductReviewRatingValueMetadata!]! @doc(description: "List of product review ratings sorted by position.") @resolver(class: "Magento\\ReviewGraphQl\\Model\\Resolver\\ProductReviewRatingValueMetadata")
}
type ProductReviewRatingValueMetadata {
- value_id: String! @doc(description: "Base 64 encoded rating value id.")
- value: String! @doc(description: "e.g Good, Perfect, 3, 4, 5")
+ value_id: String! @doc(description: "An encoded rating value id.")
+ value: String! @doc(description: "A ratings scale, such as the number of stars awarded")
}
type Customer {
@@ -73,6 +73,11 @@ input CreateProductReviewInput {
}
input ProductReviewRatingInput {
- id: String! @doc(description: "Base64 encoded rating ID.")
- value_id: String! @doc(description: "Base 64 encoded rating value id.")
+ id: String! @doc(description: "An encoded rating ID.")
+ value_id: String! @doc(description: "An encoded rating value id.")
+}
+
+type StoreConfig @doc(description: "The type contains information about a store config") {
+ product_reviews_enabled : String @doc(description: "Indicates whether product reviews are enabled. Possible values: 1 (Yes) and 0 (No)")
+ allow_guests_to_write_product_reviews : String @doc(description: "Indicates whether guest users can write product reviews. Possible values: 1 (Yes) and 0 (No)")
}
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php
index efef617acf900..81f670de91805 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Items/Column/DefaultColumn.php
@@ -68,7 +68,7 @@ public function getItem()
*/
public function getOrderOptions()
{
- $result = [[]];
+ $result = [];
if ($options = $this->getItem()->getProductOptions()) {
if (isset($options['options'])) {
$result[] = $options['options'];
@@ -80,7 +80,7 @@ public function getOrderOptions()
$result[] = $options['attributes_info'];
}
}
- return array_merge(...$result);
+ return array_merge([], ...$result);
}
/**
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
index e4b12c30e71b4..d70df80038193 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
@@ -1,7 +1,5 @@
getItem()->getOrderItem()->getProductOptions()) {
if (isset($options['options'])) {
$result[] = $options['options'];
@@ -52,7 +52,7 @@ public function getItemOptions()
}
}
- return array_merge(...$result);
+ return array_merge([], ...$result);
}
/**
diff --git a/app/code/Magento/Sales/Block/Order/Email/Items/Order/DefaultOrder.php b/app/code/Magento/Sales/Block/Order/Email/Items/Order/DefaultOrder.php
index 0291a1275c350..cb9c7315244ac 100644
--- a/app/code/Magento/Sales/Block/Order/Email/Items/Order/DefaultOrder.php
+++ b/app/code/Magento/Sales/Block/Order/Email/Items/Order/DefaultOrder.php
@@ -34,7 +34,7 @@ public function getOrder()
*/
public function getItemOptions()
{
- $result = [[]];
+ $result = [];
if ($options = $this->getItem()->getProductOptions()) {
if (isset($options['options'])) {
$result[] = $options['options'];
@@ -47,7 +47,7 @@ public function getItemOptions()
}
}
- return array_merge(...$result);
+ return array_merge([], ...$result);
}
/**
diff --git a/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php b/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
index bca6d49760d9a..010878559c2f0 100644
--- a/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
+++ b/app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php
@@ -105,7 +105,7 @@ public function getOrderItem()
*/
public function getItemOptions()
{
- $result = [[]];
+ $result = [];
$options = $this->getOrderItem()->getProductOptions();
if ($options) {
if (isset($options['options'])) {
@@ -118,7 +118,7 @@ public function getItemOptions()
$result[] = $options['attributes_info'];
}
}
- return array_merge(...$result);
+ return array_merge([], ...$result);
}
/**
diff --git a/app/code/Magento/Sales/Block/Order/Recent.php b/app/code/Magento/Sales/Block/Order/Recent.php
index 934f1b5efdcdd..6aef07ce8eb14 100644
--- a/app/code/Magento/Sales/Block/Order/Recent.php
+++ b/app/code/Magento/Sales/Block/Order/Recent.php
@@ -6,9 +6,9 @@
namespace Magento\Sales\Block\Order;
use Magento\Framework\View\Element\Template\Context;
-use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
use Magento\Customer\Model\Session;
use Magento\Sales\Model\Order\Config;
+use Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface;
use Magento\Store\Model\StoreManagerInterface;
use Magento\Framework\App\ObjectManager;
@@ -26,7 +26,7 @@ class Recent extends \Magento\Framework\View\Element\Template
const ORDER_LIMIT = 5;
/**
- * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory
+ * @var CollectionFactoryInterface
*/
protected $_orderCollectionFactory;
@@ -47,7 +47,7 @@ class Recent extends \Magento\Framework\View\Element\Template
/**
* @param \Magento\Framework\View\Element\Template\Context $context
- * @param \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $orderCollectionFactory
+ * @param CollectionFactoryInterface $orderCollectionFactory
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\Sales\Model\Order\Config $orderConfig
* @param array $data
@@ -55,7 +55,7 @@ class Recent extends \Magento\Framework\View\Element\Template
*/
public function __construct(
Context $context,
- CollectionFactory $orderCollectionFactory,
+ CollectionFactoryInterface $orderCollectionFactory,
Session $customerSession,
Config $orderConfig,
array $data = [],
@@ -84,11 +84,12 @@ protected function _construct()
*/
private function getRecentOrders()
{
- $orders = $this->_orderCollectionFactory->create()->addAttributeToSelect(
+ $customerId = $this->_customerSession->getCustomerId();
+ $orders = $this->_orderCollectionFactory->create($customerId)->addAttributeToSelect(
'*'
)->addAttributeToFilter(
'customer_id',
- $this->_customerSession->getCustomerId()
+ $customerId
)->addAttributeToFilter(
'store_id',
$this->storeManager->getStore()->getId()
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php
index e85083a50d725..492d2d71df8d9 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/AddComment.php
@@ -10,6 +10,8 @@
/**
* Class AddComment
+ *
+ * Controller responsible for addition of the order comment to the order
*/
class AddComment extends \Magento\Sales\Controller\Adminhtml\Order implements HttpPostActionInterface
{
@@ -42,6 +44,7 @@ public function execute()
);
}
+ $order->setStatus($data['status']);
$notify = $data['is_customer_notified'] ?? false;
$visible = $data['is_visible_on_front'] ?? false;
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
index 45cd504be201a..6dbaa188b89e6 100644
--- a/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
+++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/Create.php
@@ -344,6 +344,8 @@ protected function _processActionData($action = null)
$this->messageManager->addSuccessMessage(__('The coupon code has been accepted.'));
}
}
+ } elseif (isset($data['coupon']['code']) && empty($couponCode)) {
+ $this->messageManager->addSuccessMessage(__('The coupon code has been removed.'));
}
return $this;
diff --git a/app/code/Magento/Sales/CustomerData/LastOrderedItems.php b/app/code/Magento/Sales/CustomerData/LastOrderedItems.php
index f2f36979f30b2..5319e9d7e328b 100644
--- a/app/code/Magento/Sales/CustomerData/LastOrderedItems.php
+++ b/app/code/Magento/Sales/CustomerData/LastOrderedItems.php
@@ -23,7 +23,7 @@ class LastOrderedItems implements SectionSourceInterface
const SIDEBAR_ORDER_LIMIT = 5;
/**
- * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactory
+ * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface
*/
protected $_orderCollectionFactory;
@@ -68,7 +68,7 @@ class LastOrderedItems implements SectionSourceInterface
private $logger;
/**
- * @param \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $orderCollectionFactory
+ * @param \Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface $orderCollectionFactory
* @param \Magento\Sales\Model\Order\Config $orderConfig
* @param \Magento\Customer\Model\Session $customerSession
* @param \Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry
@@ -77,7 +77,7 @@ class LastOrderedItems implements SectionSourceInterface
* @param LoggerInterface $logger
*/
public function __construct(
- \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $orderCollectionFactory,
+ \Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface $orderCollectionFactory,
\Magento\Sales\Model\Order\Config $orderConfig,
\Magento\Customer\Model\Session $customerSession,
\Magento\CatalogInventory\Api\StockRegistryInterface $stockRegistry,
@@ -103,7 +103,7 @@ protected function initOrders()
{
$customerId = $this->_customerSession->getCustomerId();
- $orders = $this->_orderCollectionFactory->create()
+ $orders = $this->_orderCollectionFactory->create($customerId)
->addAttributeToFilter('customer_id', $customerId)
->addAttributeToFilter('status', ['in' => $this->_orderConfig->getVisibleOnFrontStatuses()])
->addAttributeToSort('created_at', 'desc')
@@ -138,7 +138,7 @@ protected function getItems()
$this->logger->critical($noEntityException);
continue;
}
- if (isset($product) && in_array($website, $product->getWebsiteIds())) {
+ if (in_array($website, $product->getWebsiteIds())) {
$url = $product->isVisibleInSiteVisibility() ? $product->getProductUrl() : null;
$items[] = [
'id' => $item->getId(),
@@ -188,7 +188,7 @@ protected function getLastOrder()
}
/**
- * {@inheritdoc}
+ * @inheritdoc
*/
public function getSectionData()
{
diff --git a/app/code/Magento/Sales/Helper/Guest.php b/app/code/Magento/Sales/Helper/Guest.php
index a3f2ac6ba3556..3b7e491086b17 100644
--- a/app/code/Magento/Sales/Helper/Guest.php
+++ b/app/code/Magento/Sales/Helper/Guest.php
@@ -15,6 +15,7 @@
/**
* Sales module base helper
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
*/
class Guest extends \Magento\Framework\App\Helper\AbstractHelper
{
@@ -71,7 +72,7 @@ class Guest extends \Magento\Framework\App\Helper\AbstractHelper
const COOKIE_NAME = 'guest-view';
/**
- * Cookie path
+ * Cookie path value
*/
const COOKIE_PATH = '/';
@@ -151,6 +152,7 @@ public function loadValidOrder(App\RequestInterface $request)
return $this->resultRedirectFactory->create()->setPath('sales/order/history');
}
$post = $request->getPostValue();
+ $post = filter_var($post, FILTER_CALLBACK, ['options' => 'trim']);
$fromCookie = $this->cookieManager->getCookie(self::COOKIE_NAME);
if (empty($post) && !$fromCookie) {
return $this->resultRedirectFactory->create()->setPath('sales/guest/form');
@@ -224,6 +226,7 @@ private function setGuestViewCookie($cookieValue)
*/
private function loadFromCookie($fromCookie)
{
+ // phpcs:ignore Magento2.Functions.DiscouragedFunction
$cookieData = explode(':', base64_decode($fromCookie));
$protectCode = isset($cookieData[0]) ? $cookieData[0] : null;
$incrementId = isset($cookieData[1]) ? $cookieData[1] : null;
diff --git a/app/code/Magento/Sales/Model/AdminOrder/Create.php b/app/code/Magento/Sales/Model/AdminOrder/Create.php
index 8ef12e5889520..1f23e4480ec1c 100644
--- a/app/code/Magento/Sales/Model/AdminOrder/Create.php
+++ b/app/code/Magento/Sales/Model/AdminOrder/Create.php
@@ -550,6 +550,9 @@ public function initFromOrder(\Magento\Sales\Model\Order $order)
$quote = $this->getQuote();
if (!$quote->isVirtual() && $this->getShippingAddress()->getSameAsBilling()) {
+ $quote->getBillingAddress()->setCustomerAddressId(
+ $quote->getShippingAddress()->getCustomerAddressId()
+ );
$this->setShippingAsBilling(1);
}
@@ -642,6 +645,7 @@ protected function _initShippingAddressFromOrder(\Magento\Sales\Model\Order $ord
* @param \Magento\Sales\Model\Order\Item $orderItem
* @param int $qty
* @return \Magento\Quote\Model\Quote\Item|string|$this
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function initFromOrderItem(\Magento\Sales\Model\Order\Item $orderItem, $qty = null)
{
@@ -667,9 +671,18 @@ public function initFromOrderItem(\Magento\Sales\Model\Order\Item $orderItem, $q
if ($productOptions !== null && !empty($productOptions['options'])) {
$formattedOptions = [];
foreach ($productOptions['options'] as $option) {
+ if (in_array($option['option_type'], ['date', 'date_time', 'time', 'file'])) {
+ $product->setSkipCheckRequiredOption(false);
+ $formattedOptions[$option['option_id']] =
+ $buyRequest->getDataByKey('options')[$option['option_id']];
+ continue;
+ }
+
$formattedOptions[$option['option_id']] = $option['option_value'];
}
- $buyRequest->setData('options', $formattedOptions);
+ if (!empty($formattedOptions)) {
+ $buyRequest->setData('options', $formattedOptions);
+ }
}
$item = $this->getQuote()->addProduct($product, $buyRequest);
if (is_string($item)) {
@@ -1999,15 +2012,17 @@ protected function _validate()
$this->_errors[] = __('Please specify order items.');
}
+ $errors = [];
foreach ($items as $item) {
/** @var \Magento\Quote\Model\Quote\Item $item */
$messages = $item->getMessage(false);
if ($item->getHasError() && is_array($messages) && !empty($messages)) {
- // phpcs:ignore Magento2.Performance.ForeachArrayMerge
- $this->_errors = array_merge($this->_errors, $messages);
+ $errors[] = $messages;
}
}
+ $this->_errors = array_merge([], $this->_errors, ...$errors);
+
if (!$this->getQuote()->isVirtual()) {
if (!$this->getQuote()->getShippingAddress()->getShippingMethod()) {
$this->_errors[] = __('The shipping method is missing. Select the shipping method and try again.');
@@ -2110,6 +2125,9 @@ private function isAddressesAreEqual(Order $order)
$billingData['address_type'],
$billingData['entity_id']
);
+ if (isset($shippingData['customer_address_id']) && !isset($billingData['customer_address_id'])) {
+ unset($shippingData['customer_address_id']);
+ }
return $shippingData == $billingData;
}
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
index 0af42b0a99d09..fc8088ffc8383 100644
--- a/app/code/Magento/Sales/Model/Order.php
+++ b/app/code/Magento/Sales/Model/Order.php
@@ -7,6 +7,7 @@
use Magento\Config\Model\Config\Source\Nooptreq;
use Magento\Directory\Model\Currency;
+use Magento\Directory\Model\RegionFactory;
use Magento\Framework\Api\AttributeValueFactory;
use Magento\Framework\Api\SearchCriteriaBuilder;
use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -42,17 +43,17 @@
*
* @api
* @method int getGiftMessageId()
- * @method \Magento\Sales\Model\Order setGiftMessageId(int $value)
+ * @method Order setGiftMessageId(int $value)
* @method bool hasBillingAddressId()
- * @method \Magento\Sales\Model\Order unsBillingAddressId()
+ * @method Order unsBillingAddressId()
* @method bool hasShippingAddressId()
- * @method \Magento\Sales\Model\Order unsShippingAddressId()
+ * @method Order unsShippingAddressId()
* @method int getShippigAddressId()
* @method bool hasCustomerNoteNotify()
* @method bool hasForcedCanCreditmemo()
* @method bool getIsInProcess()
* @method \Magento\Customer\Model\Customer|null getCustomer()
- * @method \Magento\Sales\Model\Order setSendEmail(bool $value)
+ * @method Order setSendEmail(bool $value)
* @SuppressWarnings(PHPMD.ExcessivePublicCount)
* @SuppressWarnings(PHPMD.TooManyFields)
* @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
@@ -307,6 +308,16 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
*/
private $scopeConfig;
+ /**
+ * @var RegionFactory
+ */
+ private $regionFactory;
+
+ /**
+ * @var array
+ */
+ private $regionItems;
+
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
@@ -340,6 +351,7 @@ class Order extends AbstractModel implements EntityInterface, OrderInterface
* @param OrderItemRepositoryInterface $itemRepository
* @param SearchCriteriaBuilder $searchCriteriaBuilder
* @param ScopeConfigInterface $scopeConfig
+ * @param RegionFactory $regionFactory
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
@@ -374,7 +386,8 @@ public function __construct(
ProductOption $productOption = null,
OrderItemRepositoryInterface $itemRepository = null,
SearchCriteriaBuilder $searchCriteriaBuilder = null,
- ScopeConfigInterface $scopeConfig = null
+ ScopeConfigInterface $scopeConfig = null,
+ RegionFactory $regionFactory = null
) {
$this->_storeManager = $storeManager;
$this->_orderConfig = $orderConfig;
@@ -403,6 +416,8 @@ public function __construct(
$this->searchCriteriaBuilder = $searchCriteriaBuilder ?: ObjectManager::getInstance()
->get(SearchCriteriaBuilder::class);
$this->scopeConfig = $scopeConfig ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
+ $this->regionFactory = $regionFactory ?: ObjectManager::getInstance()->get(RegionFactory::class);
+ $this->regionItems = [];
parent::__construct(
$context,
@@ -494,7 +509,7 @@ public function setCanSendNewEmailFlag($flag)
* Load order by system increment identifier
*
* @param string $incrementId
- * @return \Magento\Sales\Model\Order
+ * @return Order
*/
public function loadByIncrementId($incrementId)
{
@@ -506,7 +521,7 @@ public function loadByIncrementId($incrementId)
*
* @param string $incrementId
* @param string $storeId
- * @return \Magento\Sales\Model\Order
+ * @return Order
*/
public function loadByIncrementIdAndStoreId($incrementId, $storeId)
{
@@ -1346,9 +1361,21 @@ public function getShippingMethod($asObject = false)
*/
public function getAddressesCollection()
{
+ $region = $this->regionFactory->create();
$collection = $this->_addressCollectionFactory->create()->setOrderFilter($this);
if ($this->getId()) {
foreach ($collection as $address) {
+ if (isset($this->regionItems[$address->getCountryId()][$address->getRegion()])) {
+ if ($this->regionItems[$address->getCountryId()][$address->getRegion()]) {
+ $address->setRegion($this->regionItems[$address->getCountryId()][$address->getRegion()]);
+ }
+ } else {
+ $region->loadByName($address->getRegion(), $address->getCountryId());
+ $this->regionItems[$address->getCountryId()][$address->getRegion()] = $region->getName();
+ if ($region->getName()) {
+ $address->setRegion($region->getName());
+ }
+ }
$address->setOrder($this);
}
}
@@ -1818,7 +1845,7 @@ public function getTotalDue()
$total = $this->priceCurrency->round($total);
return max($total, 0);
}
-
+
/**
* Retrieve order total due value
*
@@ -2052,7 +2079,7 @@ public function getStoreGroupName()
{
$storeId = $this->getStoreId();
if ($storeId === null) {
- return $this->getStoreName(1);
+ return $this->getStoreName();
}
return $this->getStore()->getGroup()->getName();
}
diff --git a/app/code/Magento/Sales/Model/Order/Config.php b/app/code/Magento/Sales/Model/Order/Config.php
index 32b9298be2b5f..20aee5c76cc1f 100644
--- a/app/code/Magento/Sales/Model/Order/Config.php
+++ b/app/code/Magento/Sales/Model/Order/Config.php
@@ -52,7 +52,7 @@ class Config
*/
protected $maskStatusesMapping = [
\Magento\Framework\App\Area::AREA_FRONTEND => [
- \Magento\Sales\Model\Order::STATUS_FRAUD => \Magento\Sales\Model\Order::STATE_PROCESSING,
+ \Magento\Sales\Model\Order::STATUS_FRAUD => \Magento\Sales\Model\Order::STATUS_FRAUD,
\Magento\Sales\Model\Order::STATE_PAYMENT_REVIEW => \Magento\Sales\Model\Order::STATE_PROCESSING
]
];
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php b/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php
index 93c8ed00f9daa..a92a1480bd023 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo/Sender/EmailSender.php
@@ -111,6 +111,12 @@ public function send(
'store' => $order->getStore(),
'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
+ 'order_data' => [
+ 'customer_name' => $order->getCustomerName(),
+ 'is_not_virtual' => $order->getIsNotVirtual(),
+ 'email_customer_note' => $order->getEmailCustomerNote(),
+ 'frontend_status_label' => $order->getFrontendStatusLabel()
+ ]
];
$transportObject = new DataObject($transport);
diff --git a/app/code/Magento/Sales/Model/Order/Email/NotifySender.php b/app/code/Magento/Sales/Model/Order/Email/NotifySender.php
index 9e40ab769b0a6..468842d7b2ce4 100644
--- a/app/code/Magento/Sales/Model/Order/Email/NotifySender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/NotifySender.php
@@ -10,6 +10,7 @@
/**
* Class NotifySender
+ * phpcs:disable Magento2.Classes.AbstractApi
* @api
* @since 100.0.2
*/
@@ -35,7 +36,7 @@ protected function checkAndSend(Order $order, $notify = true)
if ($notify) {
$sender->send();
- } else {
+ } elseif ($this->identityContainer->getCopyMethod() === 'copy') {
// Email copies are sent as separated emails if their copy method
// is 'copy' or a customer should not be notified
$sender->sendCopyTo();
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/GetLogoFile.php b/app/code/Magento/Sales/Model/Order/Invoice/GetLogoFile.php
new file mode 100644
index 0000000000000..eec3fcdd59092
--- /dev/null
+++ b/app/code/Magento/Sales/Model/Order/Invoice/GetLogoFile.php
@@ -0,0 +1,77 @@
+scopeConfig = $scopeConfig;
+ $this->urlBuilder = $urlBuilder;
+ }
+
+ /**
+ * Return Custom Invoice Logo file url if configured in admin
+ *
+ * @return string|null
+ */
+ public function execute(): ?string
+ {
+ $invoiceLogoPath = $this->getIdentityLogoHtml();
+ if (!$invoiceLogoPath) {
+ return null;
+ }
+
+ return sprintf(
+ "%s%s%s",
+ $this->urlBuilder->getBaseUrl(['_type' => UrlInterface::URL_TYPE_MEDIA]),
+ self::LOGO_BASE_DIR,
+ $invoiceLogoPath
+ );
+ }
+
+ /**
+ * Get Admin Configuration for Invoice Logo HTML
+ *
+ * @return null|string
+ */
+ private function getIdentityLogoHtml(): ?string
+ {
+ return $this->scopeConfig->getValue(
+ self::XML_PATH_SALES_IDENTITY_LOGO_HTML,
+ ScopeInterface::SCOPE_STORE,
+ null
+ );
+ }
+}
diff --git a/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php b/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php
index 004f36c277028..44b4df17619d8 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice/Sender/EmailSender.php
@@ -111,6 +111,12 @@ public function send(
'store' => $order->getStore(),
'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
+ 'order_data' => [
+ 'customer_name' => $order->getCustomerName(),
+ 'is_not_virtual' => $order->getIsNotVirtual(),
+ 'email_customer_note' => $order->getEmailCustomerNote(),
+ 'frontend_status_label' => $order->getFrontendStatusLabel()
+ ]
];
$transportObject = new DataObject($transport);
diff --git a/app/code/Magento/Sales/Model/Order/Payment.php b/app/code/Magento/Sales/Model/Order/Payment.php
index 6a2a77b52927a..d1a34b496b1ac 100644
--- a/app/code/Magento/Sales/Model/Order/Payment.php
+++ b/app/code/Magento/Sales/Model/Order/Payment.php
@@ -742,7 +742,7 @@ public function refund($creditmemo)
$this->formatPrice($baseAmountToRefund)
);
}
- $message = $message = $this->prependMessage($message);
+ $message = $this->prependMessage($message);
$message = $this->_appendTransactionToMessage($transaction, $message);
$orderState = $this->getOrderStateResolver()->getStateForOrder($this->getOrder());
$statuses = $this->getOrder()->getConfig()->getStateStatuses($orderState, false);
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php
index 29e011217ef20..a7315aeb9e3be 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php
@@ -326,7 +326,7 @@ public function getItemPricesForDisplay()
*/
public function getItemOptions()
{
- $result = [[]];
+ $result = [];
$options = $this->getItem()->getOrderItem()->getProductOptions();
if ($options) {
if (isset($options['options'])) {
@@ -339,7 +339,7 @@ public function getItemOptions()
$result[] = $options['attributes_info'];
}
}
- return array_merge(...$result);
+ return array_merge([], ...$result);
}
/**
diff --git a/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php b/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
index fe68555d9f7c7..534bb127db067 100644
--- a/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
+++ b/app/code/Magento/Sales/Model/Order/Shipment/Sender/EmailSender.php
@@ -5,9 +5,21 @@
*/
namespace Magento\Sales\Model\Order\Shipment\Sender;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\Event\ManagerInterface;
+use Magento\Payment\Helper\Data;
+use Magento\Sales\Api\Data\OrderInterface;
+use Magento\Sales\Api\Data\ShipmentCommentCreationInterface;
+use Magento\Sales\Api\Data\ShipmentInterface;
+use Magento\Sales\Model\Order\Address\Renderer;
+use Magento\Sales\Model\Order\Email\Container\ShipmentIdentity;
+use Magento\Sales\Model\Order\Email\Container\Template;
use Magento\Sales\Model\Order\Email\Sender;
+use Magento\Sales\Model\Order\Email\SenderBuilderFactory;
use Magento\Sales\Model\Order\Shipment\SenderInterface;
use Magento\Framework\DataObject;
+use Magento\Sales\Model\ResourceModel\Order\Shipment;
+use Psr\Log\LoggerInterface;
/**
* Email notification sender for Shipment.
@@ -17,46 +29,46 @@
class EmailSender extends Sender implements SenderInterface
{
/**
- * @var \Magento\Payment\Helper\Data
+ * @var Data
*/
private $paymentHelper;
/**
- * @var \Magento\Sales\Model\ResourceModel\Order\Shipment
+ * @var Shipment
*/
private $shipmentResource;
/**
- * @var \Magento\Framework\App\Config\ScopeConfigInterface
+ * @var ScopeConfigInterface
*/
private $globalConfig;
/**
- * @var \Magento\Framework\Event\ManagerInterface
+ * @var ManagerInterface
*/
private $eventManager;
/**
- * @param \Magento\Sales\Model\Order\Email\Container\Template $templateContainer
- * @param \Magento\Sales\Model\Order\Email\Container\ShipmentIdentity $identityContainer
- * @param \Magento\Sales\Model\Order\Email\SenderBuilderFactory $senderBuilderFactory
- * @param \Psr\Log\LoggerInterface $logger
- * @param \Magento\Sales\Model\Order\Address\Renderer $addressRenderer
- * @param \Magento\Payment\Helper\Data $paymentHelper
- * @param \Magento\Sales\Model\ResourceModel\Order\Shipment $shipmentResource
- * @param \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig
- * @param \Magento\Framework\Event\ManagerInterface $eventManager
+ * @param Template $templateContainer
+ * @param ShipmentIdentity $identityContainer
+ * @param SenderBuilderFactory $senderBuilderFactory
+ * @param LoggerInterface $logger
+ * @param Renderer $addressRenderer
+ * @param Data $paymentHelper
+ * @param Shipment $shipmentResource
+ * @param ScopeConfigInterface $globalConfig
+ * @param ManagerInterface $eventManager
*/
public function __construct(
- \Magento\Sales\Model\Order\Email\Container\Template $templateContainer,
- \Magento\Sales\Model\Order\Email\Container\ShipmentIdentity $identityContainer,
- \Magento\Sales\Model\Order\Email\SenderBuilderFactory $senderBuilderFactory,
- \Psr\Log\LoggerInterface $logger,
- \Magento\Sales\Model\Order\Address\Renderer $addressRenderer,
- \Magento\Payment\Helper\Data $paymentHelper,
- \Magento\Sales\Model\ResourceModel\Order\Shipment $shipmentResource,
- \Magento\Framework\App\Config\ScopeConfigInterface $globalConfig,
- \Magento\Framework\Event\ManagerInterface $eventManager
+ Template $templateContainer,
+ ShipmentIdentity $identityContainer,
+ SenderBuilderFactory $senderBuilderFactory,
+ LoggerInterface $logger,
+ Renderer $addressRenderer,
+ Data $paymentHelper,
+ Shipment $shipmentResource,
+ ScopeConfigInterface $globalConfig,
+ ManagerInterface $eventManager
) {
parent::__construct(
$templateContainer,
@@ -83,18 +95,18 @@ public function __construct(
* Otherwise, email will be sent later during running of
* corresponding cron job.
*
- * @param \Magento\Sales\Api\Data\OrderInterface $order
- * @param \Magento\Sales\Api\Data\ShipmentInterface $shipment
- * @param \Magento\Sales\Api\Data\ShipmentCommentCreationInterface|null $comment
+ * @param OrderInterface $order
+ * @param ShipmentInterface $shipment
+ * @param ShipmentCommentCreationInterface|null $comment
* @param bool $forceSyncMode
*
* @return bool
* @throws \Exception
*/
public function send(
- \Magento\Sales\Api\Data\OrderInterface $order,
- \Magento\Sales\Api\Data\ShipmentInterface $shipment,
- \Magento\Sales\Api\Data\ShipmentCommentCreationInterface $comment = null,
+ OrderInterface $order,
+ ShipmentInterface $shipment,
+ ShipmentCommentCreationInterface $comment = null,
$forceSyncMode = false
) {
$shipment->setSendEmail($this->identityContainer->isEnabled());
@@ -112,7 +124,13 @@ public function send(
'payment_html' => $this->getPaymentHtml($order),
'store' => $order->getStore(),
'formattedShippingAddress' => $this->getFormattedShippingAddress($order),
- 'formattedBillingAddress' => $this->getFormattedBillingAddress($order)
+ 'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
+ 'order_data' => [
+ 'customer_name' => $order->getCustomerName(),
+ 'is_not_virtual' => $order->getIsNotVirtual(),
+ 'email_customer_note' => $order->getEmailCustomerNote(),
+ 'frontend_status_label' => $order->getFrontendStatusLabel()
+ ]
];
$transportObject = new DataObject($transport);
@@ -147,12 +165,12 @@ public function send(
/**
* Returns payment info block as HTML.
*
- * @param \Magento\Sales\Api\Data\OrderInterface $order
+ * @param OrderInterface $order
*
* @return string
* @throws \Exception
*/
- private function getPaymentHtml(\Magento\Sales\Api\Data\OrderInterface $order)
+ private function getPaymentHtml(OrderInterface $order)
{
return $this->paymentHelper->getInfoBlockHtml(
$order->getPayment(),
diff --git a/app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php b/app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php
index 72ce60d32877c..eccfc8e56e6e5 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php
@@ -87,7 +87,7 @@ public function __construct(
* Perform actions after object save
*
* @param \Magento\Framework\Model\AbstractModel $object
- * @param string $attribute
+ * @param AbstractAttribute|string[]|string $attribute
* @return $this
* @throws \Exception
*/
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Address/Collection.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Address/Collection.php
index f2a28b613cfea..5cc170c8bfa4b 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Address/Collection.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Address/Collection.php
@@ -7,15 +7,8 @@
use Magento\Sales\Api\Data\OrderAddressSearchResultInterface;
use Magento\Sales\Model\ResourceModel\Order\Collection\AbstractCollection;
-use Magento\Framework\Locale\ResolverInterface;
-use Magento\Framework\Data\Collection\EntityFactoryInterface;
-use Magento\Framework\Data\Collection\Db\FetchStrategyInterface;
-use Magento\Framework\Event\ManagerInterface;
-use Magento\Framework\Model\ResourceModel\Db\VersionControl\Snapshot;
-use Magento\Framework\DB\Adapter\AdapterInterface;
-use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
-use Magento\Framework\App\ObjectManager;
-use Psr\Log\LoggerInterface;
+use Magento\Sales\Model\Order\Address;
+use Magento\Sales\Model\ResourceModel\Order\Address as AddressResource;
/**
* Order addresses collection
@@ -36,44 +29,6 @@ class Collection extends AbstractCollection implements OrderAddressSearchResultI
*/
protected $_eventObject = 'order_address_collection';
- /**
- * @var ResolverInterface
- */
- private $localeResolver;
-
- /**
- * @param EntityFactoryInterface $entityFactory
- * @param LoggerInterface $logger
- * @param FetchStrategyInterface $fetchStrategy
- * @param ManagerInterface $eventManager
- * @param Snapshot $entitySnapshot
- * @param AdapterInterface|null $connection
- * @param AbstractDb|null $resource
- * @param ResolverInterface|null $localeResolver
- */
- public function __construct(
- EntityFactoryInterface $entityFactory,
- LoggerInterface $logger,
- FetchStrategyInterface $fetchStrategy,
- ManagerInterface $eventManager,
- Snapshot $entitySnapshot,
- AdapterInterface $connection = null,
- AbstractDb $resource = null,
- ResolverInterface $localeResolver = null
- ) {
- $this->localeResolver = $localeResolver ?: ObjectManager::getInstance()
- ->get(ResolverInterface::class);
- parent::__construct(
- $entityFactory,
- $logger,
- $fetchStrategy,
- $eventManager,
- $entitySnapshot,
- $connection,
- $resource
- );
- }
-
/**
* Model initialization
*
@@ -82,21 +37,11 @@ public function __construct(
protected function _construct()
{
$this->_init(
- \Magento\Sales\Model\Order\Address::class,
- \Magento\Sales\Model\ResourceModel\Order\Address::class
+ Address::class,
+ AddressResource::class
);
}
- /**
- * @inheritdoc
- */
- protected function _initSelect()
- {
- parent::_initSelect();
- $this->joinRegions();
- return $this;
- }
-
/**
* Redeclare after load method for dispatch event
*
@@ -110,31 +55,4 @@ protected function _afterLoad()
return $this;
}
-
- /**
- * Join region name table with current locale
- *
- * @return $this
- */
- private function joinRegions()
- {
- $locale = $this->localeResolver->getLocale();
- $connection = $this->getConnection();
-
- $defaultNameExpr = $connection->getIfNullSql(
- $connection->quoteIdentifier('rct.default_name'),
- $connection->quoteIdentifier('main_table.region')
- );
- $expression = $connection->getIfNullSql($connection->quoteIdentifier('rnt.name'), $defaultNameExpr);
-
- $regionId = $connection->quoteIdentifier('main_table.region_id');
- $condition = $connection->quoteInto("rnt.locale=?", $locale);
- $rctTable = $this->getTable('directory_country_region');
- $rntTable = $this->getTable('directory_country_region_name');
-
- $this->getSelect()
- ->joinLeft(['rct' => $rctTable], "rct.region_id={$regionId}", [])
- ->joinLeft(['rnt' => $rntTable], "rnt.region_id={$regionId} AND {$condition}", ['region' => $expression]);
- return $this;
- }
}
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order/Status.php b/app/code/Magento/Sales/Model/ResourceModel/Order/Status.php
index 58284759b2fee..3ff2ed66a846b 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Order/Status.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Order/Status.php
@@ -257,7 +257,7 @@ protected function getStatusByState($state)
{
return (string)$this->getConnection()->fetchOne(
$select = $this->getConnection()->select()
- ->from(['sss' => $this->stateTable, []])
+ ->from(['sss' => $this->stateTable], [])
->where('state = ?', $state)
->limit(1)
->columns(['status'])
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Provider/NotSyncedDataProvider.php b/app/code/Magento/Sales/Model/ResourceModel/Provider/NotSyncedDataProvider.php
index 645e411b80b67..10b3ca1bde996 100644
--- a/app/code/Magento/Sales/Model/ResourceModel/Provider/NotSyncedDataProvider.php
+++ b/app/code/Magento/Sales/Model/ResourceModel/Provider/NotSyncedDataProvider.php
@@ -37,11 +37,11 @@ public function __construct(TMapFactory $tmapFactory, array $providers = [])
*/
public function getIds($mainTableName, $gridTableName)
{
- $result = [[]];
+ $result = [];
foreach ($this->providers as $provider) {
$result[] = $provider->getIds($mainTableName, $gridTableName);
}
- return array_unique(array_merge(...$result));
+ return array_unique(array_merge([], ...$result));
}
}
diff --git a/app/code/Magento/Sales/Model/ShipOrder.php b/app/code/Magento/Sales/Model/ShipOrder.php
index 26fe5a8e4b457..3bb8527d6e516 100644
--- a/app/code/Magento/Sales/Model/ShipOrder.php
+++ b/app/code/Magento/Sales/Model/ShipOrder.php
@@ -5,25 +5,15 @@
*/
namespace Magento\Sales\Model;
-use DomainException;
use Magento\Framework\App\ResourceConnection;
-use Magento\Sales\Api\Data\ShipmentCommentCreationInterface;
-use Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface;
-use Magento\Sales\Api\Data\ShipmentItemCreationInterface;
-use Magento\Sales\Api\Data\ShipmentPackageCreationInterface;
-use Magento\Sales\Api\Data\ShipmentTrackCreationInterface;
-use Magento\Sales\Api\Exception\CouldNotShipExceptionInterface;
-use Magento\Sales\Api\Exception\DocumentValidationExceptionInterface;
use Magento\Sales\Api\OrderRepositoryInterface;
use Magento\Sales\Api\ShipmentRepositoryInterface;
use Magento\Sales\Api\ShipOrderInterface;
-use Magento\Sales\Exception\CouldNotShipException;
-use Magento\Sales\Exception\DocumentValidationException;
use Magento\Sales\Model\Order\Config as OrderConfig;
use Magento\Sales\Model\Order\OrderStateResolverInterface;
+use Magento\Sales\Model\Order\ShipmentDocumentFactory;
use Magento\Sales\Model\Order\Shipment\NotifierInterface;
use Magento\Sales\Model\Order\Shipment\OrderRegistrarInterface;
-use Magento\Sales\Model\Order\ShipmentDocumentFactory;
use Magento\Sales\Model\Order\Validation\ShipOrderInterface as ShipOrderValidator;
use Psr\Log\LoggerInterface;
@@ -126,27 +116,29 @@ public function __construct(
* Process the shipment and save shipment and order data
*
* @param int $orderId
- * @param ShipmentItemCreationInterface[] $items
+ * @param \Magento\Sales\Api\Data\ShipmentItemCreationInterface[] $items
* @param bool $notify
* @param bool $appendComment
- * @param ShipmentCommentCreationInterface|null $comment
- * @param ShipmentTrackCreationInterface[] $tracks
- * @param ShipmentPackageCreationInterface[] $packages
- * @param ShipmentCreationArgumentsInterface|null $arguments
+ * @param \Magento\Sales\Api\Data\ShipmentCommentCreationInterface|null $comment
+ * @param \Magento\Sales\Api\Data\ShipmentTrackCreationInterface[] $tracks
+ * @param \Magento\Sales\Api\Data\ShipmentPackageCreationInterface[] $packages
+ * @param \Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface|null $arguments
* @return int
- * @throws DocumentValidationExceptionInterface
- * @throws CouldNotShipExceptionInterface
- * @throws DomainException
+ * @throws \Magento\Sales\Api\Exception\DocumentValidationExceptionInterface
+ * @throws \Magento\Sales\Api\Exception\CouldNotShipExceptionInterface
+ * @throws \Magento\Framework\Exception\InputException
+ * @throws \Magento\Framework\Exception\NoSuchEntityException
+ * @throws \DomainException
*/
public function execute(
$orderId,
array $items = [],
$notify = false,
$appendComment = false,
- ShipmentCommentCreationInterface $comment = null,
+ \Magento\Sales\Api\Data\ShipmentCommentCreationInterface $comment = null,
array $tracks = [],
array $packages = [],
- ShipmentCreationArgumentsInterface $arguments = null
+ \Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface $arguments = null
) {
$connection = $this->resourceConnection->getConnection('sales');
$order = $this->orderRepository->get($orderId);
@@ -170,30 +162,30 @@ public function execute(
$packages
);
if ($validationMessages->hasMessages()) {
- throw new DocumentValidationException(
+ throw new \Magento\Sales\Exception\DocumentValidationException(
__("Shipment Document Validation Error(s):\n" . implode("\n", $validationMessages->getMessages()))
);
}
$connection->beginTransaction();
try {
$this->orderRegistrar->register($order, $shipment);
- $order->setState(
- $this->orderStateResolver->getStateForOrder($order, [OrderStateResolverInterface::IN_PROGRESS])
- );
- $order->setStatus($this->config->getStateDefaultStatus($order->getState()));
- $shippingData = $this->shipmentRepository->save($shipment);
+ $shipment = $this->shipmentRepository->save($shipment);
+ if ($order->getState() === Order::STATE_NEW) {
+ $order->setState(
+ $this->orderStateResolver->getStateForOrder($order, [OrderStateResolverInterface::IN_PROGRESS])
+ );
+ $order->setStatus($this->config->getStateDefaultStatus($order->getState()));
+ }
$this->orderRepository->save($order);
$connection->commit();
} catch (\Exception $e) {
$this->logger->critical($e);
$connection->rollBack();
- throw new CouldNotShipException(
+ throw new \Magento\Sales\Exception\CouldNotShipException(
__('Could not save a shipment, see error log for details')
);
}
- if ($shipment && empty($shipment->getEntityId())) {
- $shipment->setEntityId($shippingData->getEntityId());
- }
+
if ($notify) {
if (!$appendComment) {
$comment = null;
diff --git a/app/code/Magento/Sales/Plugin/Model/Service/Invoice/AddTransactionCommentAfterCapture.php b/app/code/Magento/Sales/Plugin/Model/Service/Invoice/AddTransactionCommentAfterCapture.php
new file mode 100644
index 0000000000000..256d097b9eef0
--- /dev/null
+++ b/app/code/Magento/Sales/Plugin/Model/Service/Invoice/AddTransactionCommentAfterCapture.php
@@ -0,0 +1,63 @@
+transactionFactory = $transactionFactory;
+ $this->invoiceRepository = $invoiceRepository;
+ }
+
+ /**
+ * Add transaction comment to the order after capture invoice
+ *
+ * @param InvoiceService $subject
+ * @param bool $result
+ * @param int $invoiceId
+ * @return bool
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function afterSetCapture(InvoiceService $subject, bool $result, $invoiceId): bool
+ {
+ if ($result) {
+ $invoice = $this->invoiceRepository->get($invoiceId);
+ $invoice->getOrder()->setIsInProcess(true);
+ $this->transactionFactory->create()
+ ->addObject($invoice)
+ ->addObject($invoice->getOrder())
+ ->save();
+ }
+
+ return $result;
+ }
+}
diff --git a/app/code/Magento/Sales/Plugin/ProcessOrderAndShipmentViaAPI.php b/app/code/Magento/Sales/Plugin/ProcessOrderAndShipmentViaAPI.php
deleted file mode 100644
index 2f81de65fad74..0000000000000
--- a/app/code/Magento/Sales/Plugin/ProcessOrderAndShipmentViaAPI.php
+++ /dev/null
@@ -1,241 +0,0 @@
-shipmentLoader = $shipmentLoader;
- $this->transaction = $transaction;
- }
-
- /**
- * Process shipping details before saving shipment via API
- *
- * @param ShipmentRepository $shipmentRepository
- * @param ShipmentInterface $shipmentData
- * @return array
- * @throws LocalizedException
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- * @SuppressWarnings(PHPMD.NPathComplexity)
- * @SuppressWarnings(PHPMD.CyclomaticComplexity)
- */
- public function beforeSave(
- ShipmentRepository $shipmentRepository,
- ShipmentInterface $shipmentData
- ): array {
- $this->shipmentLoader->setOrderId($shipmentData->getOrderId());
- $trackData = !empty($shipmentData->getTracks()) ?
- $this->getShipmentTracking($shipmentData) : [];
- $this->shipmentLoader->setTracking($trackData);
- $shipmentItems = !empty($shipmentData) ?
- $this->getShipmentItems($shipmentData) : [];
- $orderItems = [];
- if (!empty($shipmentData)) {
- $order = $shipmentData->getOrder();
- $orderItems = $order ? $this->getOrderItems($order) : [];
- }
- $data = (!empty($shipmentItems) && !empty($orderItems)) ?
- $this->getShippingData($shipmentItems, $orderItems) : [];
- $this->shipmentLoader->setShipment($data);
- $shipment = $this->shipmentLoader->load();
- $shipment = empty($shipment) ? $shipmentData
- : $this->processShippingDetails($shipmentData, $shipment);
- return [$shipment];
- }
-
- /**
- * Save order data after saving shipment via API
- *
- * @param ShipmentRepository $shipmentRepository
- * @param ShipmentInterface $shipment
- * @return ShipmentInterface
- * @throws Exception
- */
- public function afterSave(
- ShipmentRepository $shipmentRepository,
- ShipmentInterface $shipment
- ): ShipmentInterface {
- $shipmentDetails = $shipmentRepository->get($shipment->getEntityId());
- $order = $shipmentDetails->getOrder();
- $shipmentItems = !empty($shipment) ?
- $this->getShipmentItems($shipment) : [];
- $this->processOrderItems($order, $shipmentItems);
- $order->setIsInProcess(true);
- $this->transaction
- ->addObject($order)
- ->save();
- return $shipment;
- }
-
- /**
- * Process shipment items
- *
- * @param ShipmentInterface $shipment
- * @return array
- * @throws LocalizedException
- */
- private function getShipmentItems(ShipmentInterface $shipment): array
- {
- $shipmentItems = [];
- foreach ($shipment->getItems() as $item) {
- $sku = $item->getSku();
- if (isset($sku)) {
- $shipmentItems[$sku]['qty'] = $item->getQty();
- }
- }
- return $shipmentItems;
- }
-
- /**
- * Get shipment tracking data from the shipment array
- *
- * @param ShipmentInterface $shipment
- * @return array
- */
- private function getShipmentTracking(ShipmentInterface $shipment): array
- {
- $trackData = [];
- foreach ($shipment->getTracks() as $key => $track) {
- $trackData[$key]['number'] = $track->getTrackNumber();
- $trackData[$key]['title'] = $track->getTitle();
- $trackData[$key]['carrier_code'] = $track->getCarrierCode();
- }
- return $trackData;
- }
-
- /**
- * Get orderItems from shipment order
- *
- * @param Order $order
- * @return array
- */
- private function getOrderItems(Order $order): array
- {
- $orderItems = [];
- foreach ($order->getItems() as $item) {
- $orderItems[$item->getSku()] = $item->getItemId();
- }
- return $orderItems;
- }
-
- /**
- * Get available shipping data from shippingItems and orderItems
- *
- * @param array $shipmentItems
- * @param array $orderItems
- * @return array
- * @throws LocalizedException
- */
- private function getShippingData(array $shipmentItems, array $orderItems): array
- {
- $data = [];
- foreach ($shipmentItems as $shippingItemSku => $shipmentItem) {
- if (isset($orderItems[$shippingItemSku])) {
- $itemId = (int) $orderItems[$shippingItemSku];
- $data['items'][$itemId] = $shipmentItem['qty'];
- }
- }
- return $data;
- }
-
- /**
- * Process shipping comments if available
- *
- * @param ShipmentInterface $shipmentData
- * @param ShipmentInterface $shipment
- * @return void
- */
- private function processShippingComments(ShipmentInterface $shipmentData, ShipmentInterface $shipment): void
- {
- foreach ($shipmentData->getComments() as $comment) {
- $shipment->addComment(
- $comment->getComment(),
- $comment->getIsCustomerNotified(),
- $comment->getIsVisibleOnFront()
- );
- $shipment->setCustomerNote($comment->getComment());
- $shipment->setCustomerNoteNotify((bool) $comment->getIsCustomerNotified());
- }
- }
-
- /**
- * Process shipping details
- *
- * @param ShipmentInterface $shipmentData
- * @param ShipmentInterface $shipment
- * @return ShipmentInterface
- */
- private function processShippingDetails(
- ShipmentInterface $shipmentData,
- ShipmentInterface $shipment
- ): ShipmentInterface {
- if (empty($shipment->getItems())) {
- $shipment->setItems($shipmentData->getItems());
- }
- if (!empty($shipmentData->getComments())) {
- $this->processShippingComments($shipmentData, $shipment);
- }
- if ((int) $shipment->getTotalQty() < 1) {
- $shipment->setTotalQty($shipmentData->getTotalQty());
- }
- return $shipment;
- }
-
- /**
- * Process order items data and set the proper item qty
- *
- * @param Order $order
- * @param array $shipmentItems
- * @throws LocalizedException
- */
- private function processOrderItems(Order $order, array $shipmentItems): void
- {
- /** @var Item $item */
- foreach ($order->getAllItems() as $item) {
- if (isset($shipmentItems[$item->getSku()])) {
- $qty = (float)$shipmentItems[$item->getSku()]['qty'];
- $item->setQty($qty);
- if ((float)$item->getQtyToShip() > 0) {
- $item->setQtyShipped((float)$item->getQtyToShip());
- }
- }
- }
- }
-}
diff --git a/app/code/Magento/Sales/Setup/Patch/Data/WishlistDataCleanUp.php b/app/code/Magento/Sales/Setup/Patch/Data/WishlistDataCleanUp.php
new file mode 100644
index 0000000000000..7a10d5cd191bf
--- /dev/null
+++ b/app/code/Magento/Sales/Setup/Patch/Data/WishlistDataCleanUp.php
@@ -0,0 +1,157 @@
+json = $json;
+ $this->queryGenerator = $queryGenerator;
+ $this->salesSetupFactory = $salesSetupFactory;
+ $this->logger = $logger;
+ }
+
+ /**
+ * @inheritdoc
+ *
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ */
+ public function apply()
+ {
+ try {
+ $this->cleanSalesOrderItemTable();
+ } catch (\Throwable $e) {
+ $this->logger->warning(
+ 'Sales module WishlistDataCleanUp patch experienced an error and could not be completed.'
+ . ' Please submit a support ticket or email us at security@magento.com.'
+ );
+
+ return $this;
+ }
+
+ return $this;
+ }
+
+ /**
+ * Remove login data from sales_order_item table.
+ *
+ * @throws LocalizedException
+ */
+ private function cleanSalesOrderItemTable()
+ {
+ $salesSetup = $this->salesSetupFactory->create();
+ $tableName = $salesSetup->getTable('sales_order_item');
+ $select = $salesSetup
+ ->getConnection()
+ ->select()
+ ->from(
+ $tableName,
+ ['item_id', 'product_options']
+ )
+ ->where(
+ 'product_options LIKE ?',
+ '%login%'
+ );
+ $iterator = $this->queryGenerator->generate('item_id', $select, self::BATCH_SIZE);
+ $rowErrorFlag = false;
+ foreach ($iterator as $selectByRange) {
+ $itemRows = $salesSetup->getConnection()->fetchAll($selectByRange);
+ foreach ($itemRows as $itemRow) {
+ try {
+ $rowValue = $this->json->unserialize($itemRow['product_options']);
+ if (is_array($rowValue)
+ && array_key_exists('info_buyRequest', $rowValue)
+ && array_key_exists('login', $rowValue['info_buyRequest'])
+ ) {
+ unset($rowValue['info_buyRequest']['login']);
+ }
+ $rowValue = $this->json->serialize($rowValue);
+ $salesSetup->getConnection()->update(
+ $tableName,
+ ['product_options' => $rowValue],
+ ['item_id = ?' => $itemRow['item_id']]
+ );
+ } catch (\Throwable $e) {
+ $rowErrorFlag = true;
+ continue;
+ }
+ }
+ }
+ if ($rowErrorFlag) {
+ $this->logger->warning(
+ 'Data clean up could not be completed due to unexpected data format in the table "'
+ . $tableName
+ . '". Please submit a support ticket or email us at security@magento.com.'
+ );
+ }
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public static function getDependencies()
+ {
+ return [
+ ConvertSerializedDataToJson::class
+ ];
+ }
+
+ /**
+ * @inheritdoc
+ */
+ public function getAliases()
+ {
+ return [];
+ }
+}
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAssertOrderShippingMethodActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAssertOrderShippingMethodActionGroup.xml
new file mode 100644
index 0000000000000..d6d5c9e7315d9
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminAssertOrderShippingMethodActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+ Assert that shipping method and shipping price is present for the order.
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminClickInvoiceButtonOrderViewActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminClickInvoiceButtonOrderViewActionGroup.xml
new file mode 100644
index 0000000000000..4617437595c9c
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminClickInvoiceButtonOrderViewActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ Click 'Invoice' button on the order view page.
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrdersGridClearFiltersActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrdersGridClearFiltersActionGroup.xml
index b301864212c8b..877f7946d7609 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrdersGridClearFiltersActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrdersGridClearFiltersActionGroup.xml
@@ -16,5 +16,6 @@
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminSelectFieldToColumnActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminSelectFieldToColumnActionGroup.xml
new file mode 100644
index 0000000000000..361787948a133
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminSelectFieldToColumnActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+ Select or clear the checkbox to display the column on the Orders grid page.
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminStartReorderFromOrderPageActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminStartReorderFromOrderPageActionGroup.xml
new file mode 100644
index 0000000000000..28a179faff9ac
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminStartReorderFromOrderPageActionGroup.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+ Reorder existing order. Requires admin order page to be opened.
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertAdminFreePaymentMethodExistsOnCreateOrderPageActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertAdminFreePaymentMethodExistsOnCreateOrderPageActionGroup.xml
new file mode 100644
index 0000000000000..75146e891a02a
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertAdminFreePaymentMethodExistsOnCreateOrderPageActionGroup.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+ Checks the free payment on the Admin Create Order page.
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/StorefrontClickRefundTabCustomerOrderViewActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/StorefrontClickRefundTabCustomerOrderViewActionGroup.xml
new file mode 100644
index 0000000000000..fda22395f359c
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/StorefrontClickRefundTabCustomerOrderViewActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ Click "Refund" tab for customer order view.
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/StorefrontFillOrdersAndReturnsFormTypeZipActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/StorefrontFillOrdersAndReturnsFormTypeZipActionGroup.xml
new file mode 100644
index 0000000000000..ad7f5011af954
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/StorefrontFillOrdersAndReturnsFormTypeZipActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Data/AddressData.xml b/app/code/Magento/Sales/Test/Mftf/Data/AddressData.xml
index 920618a70dfb8..f96028405c4e5 100644
--- a/app/code/Magento/Sales/Test/Mftf/Data/AddressData.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Data/AddressData.xml
@@ -24,6 +24,7 @@
78758
joe.buyer@email.com
512-345-6789
+ United States
Joe
@@ -41,5 +42,6 @@
78758
joe.buyer@email.com
512-345-6789
+ United States
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsSection.xml
index a8b499ca7b02a..28573b4a68309 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormItemsSection.xml
@@ -35,5 +35,6 @@
-
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderSearchSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderSearchSection.xml
index 5e420ee03bf75..efee68f2bd25f 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderSearchSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/StorefrontGuestOrderSearchSection.xml
@@ -13,6 +13,7 @@
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml
index c4656e394d349..6ed8510db777c 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCreateCreditMemoBankTransferPaymentTest.xml
@@ -129,13 +129,11 @@
-
+
+
+
+
+
+ 10
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml
index 188002f3938a6..b337af3753db3 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelCompleteAndClosedTest.xml
@@ -65,7 +65,6 @@
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelProcessingAndClosedTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelProcessingAndClosedTest.xml
index 055388570479e..6eb4195524224 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelProcessingAndClosedTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersCancelProcessingAndClosedTest.xml
@@ -65,7 +65,6 @@
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnCompleteTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnCompleteTest.xml
index 9b2ded574b737..41964cbf605da 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnCompleteTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnCompleteTest.xml
@@ -52,7 +52,6 @@
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnPendingAndProcessingTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnPendingAndProcessingTest.xml
index 1a89c5656b2f1..2a4ad174abae0 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnPendingAndProcessingTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersHoldOnPendingAndProcessingTest.xml
@@ -62,7 +62,6 @@
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersReleasePendingOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersReleasePendingOrderTest.xml
index 2252c0a813bcf..27ed62fee35e2 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersReleasePendingOrderTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersReleasePendingOrderTest.xml
@@ -49,7 +49,6 @@
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersUpdateCancelPendingOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersUpdateCancelPendingOrderTest.xml
index d4004c519b7df..163da4917b50a 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersUpdateCancelPendingOrderTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminMassOrdersUpdateCancelPendingOrderTest.xml
@@ -48,7 +48,6 @@
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminOrdersReleaseInUnholdStatusTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminOrdersReleaseInUnholdStatusTest.xml
index 28ce9661e259b..d2ded1cc73d2b 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminOrdersReleaseInUnholdStatusTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminOrdersReleaseInUnholdStatusTest.xml
@@ -54,7 +54,6 @@
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderAddressNotSavedInAddressBookTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderAddressNotSavedInAddressBookTest.xml
new file mode 100644
index 0000000000000..1c3ab70857151
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderAddressNotSavedInAddressBookTest.xml
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderOrderWithOfflinePaymentMethodTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderOrderWithOfflinePaymentMethodTest.xml
new file mode 100644
index 0000000000000..874164fdcdcf0
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminReorderOrderWithOfflinePaymentMethodTest.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminVerifyFieldToFilterOnOrdersGridTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminVerifyFieldToFilterOnOrdersGridTest.xml
new file mode 100644
index 0000000000000..b0c6b3a2fc6ca
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminVerifyFieldToFilterOnOrdersGridTest.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AssignCustomOrderStatusNotVisibleOnStorefrontTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AssignCustomOrderStatusNotVisibleOnStorefrontTest.xml
index 885f019b864de..a5d210a9765ad 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AssignCustomOrderStatusNotVisibleOnStorefrontTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AssignCustomOrderStatusNotVisibleOnStorefrontTest.xml
@@ -99,8 +99,7 @@
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceAndCheckInvoiceOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceAndCheckInvoiceOrderTest.xml
index d0c1b51008684..de6e7ff22b7af 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceAndCheckInvoiceOrderTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceAndCheckInvoiceOrderTest.xml
@@ -84,7 +84,7 @@
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithCashOnDeliveryPaymentMethodTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithCashOnDeliveryPaymentMethodTest.xml
index e5cfd5dc4afa0..57e42e9b190e3 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithCashOnDeliveryPaymentMethodTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithCashOnDeliveryPaymentMethodTest.xml
@@ -84,7 +84,7 @@
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithShipmentAndCheckInvoicedOrderTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithShipmentAndCheckInvoicedOrderTest.xml
index 12b956be22cfb..10c6be60f5ba1 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithShipmentAndCheckInvoicedOrderTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithShipmentAndCheckInvoicedOrderTest.xml
@@ -78,7 +78,7 @@
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithZeroSubtotalCheckoutTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithZeroSubtotalCheckoutTest.xml
index 780bffd359ba7..cd36547a877ec 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithZeroSubtotalCheckoutTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateInvoiceWithZeroSubtotalCheckoutTest.xml
@@ -93,7 +93,7 @@
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml
index ca705405809bd..77b119dd583de 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml
@@ -91,7 +91,7 @@
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/MoveSimpleProductsInComparedOnOrderPageTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/MoveSimpleProductsInComparedOnOrderPageTest.xml
index 176fb05bc74b3..00e401941036e 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/MoveSimpleProductsInComparedOnOrderPageTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/MoveSimpleProductsInComparedOnOrderPageTest.xml
@@ -70,9 +70,7 @@
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerDisplayedTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerDisplayedTest.xml
index e99ffa95495ff..6b6b0b2ef4a16 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerDisplayedTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerDisplayedTest.xml
@@ -213,8 +213,7 @@
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml
index 9fdf577abd873..807437510d045 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontPrintOrderGuestTest.xml
@@ -17,6 +17,9 @@
+
+
-
+
-
-
+
diff --git a/app/code/Magento/Sales/etc/webapi_soap/di.xml b/app/code/Magento/Sales/etc/webapi_soap/di.xml
index 1a8478438b04a..12ad410279a08 100644
--- a/app/code/Magento/Sales/etc/webapi_soap/di.xml
+++ b/app/code/Magento/Sales/etc/webapi_soap/di.xml
@@ -19,7 +19,7 @@
-
-
+
diff --git a/app/code/Magento/Sales/i18n/en_US.csv b/app/code/Magento/Sales/i18n/en_US.csv
index 97c1706f975da..0e65131b7c4b0 100644
--- a/app/code/Magento/Sales/i18n/en_US.csv
+++ b/app/code/Magento/Sales/i18n/en_US.csv
@@ -803,3 +803,4 @@ If set YES Email field will be required during Admin order creation for new Cust
"Could not save the shipment tracking","Could not save the shipment tracking"
"Please enter a coupon code!","Please enter a coupon code!"
"Reorder is not available.","Reorder is not available."
+"The coupon code has been removed.","The coupon code has been removed."
diff --git a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml
index c52f81d5cb56d..91148d86055fc 100644
--- a/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml
+++ b/app/code/Magento/Sales/view/adminhtml/layout/sales_order_create_load_block_billing_address.xml
@@ -12,6 +12,7 @@
Magento\Sales\ViewModel\Customer\AddressFormatter
Magento\Customer\Model\ResourceModel\Address\Collection
+ Magento\Sales\ViewModel\Customer\Address\Billing\AddressDataProvider
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
index dc007e4801b41..69b26d70e684a 100644
--- a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
+++ b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
@@ -24,6 +24,11 @@ endif;
*/
$customerAddressFormatter = $block->getData('customerAddressFormatter');
+/**
+ * @var \Magento\Sales\ViewModel\Customer\Address\Billing\AddressDataProvider $billingAddressDataProvider
+ */
+$billingAddressDataProvider = $block->getData('billingAddressDataProvider');
+
/**
* @var \Magento\Sales\Block\Adminhtml\Order\Create\Billing\Address|
* \Magento\Sales\Block\Adminhtml\Order\Create\Shipping\Address $block
@@ -114,7 +119,10 @@ endif; ?>
type="checkbox"
id="escapeHtmlAttr($block->getForm()->getHtmlIdPrefix()) ?>save_in_address_book"
value="1"
- getDontSaveInAddressBook()): ?> checked="checked"
+ getSaveInAddressBook() ||
+ $block->getIsShipping() && !$block->getDontSaveInAddressBook() && !$block->getAddressId()): ?>
+ checked="checked"
+
class="admin__control-checkbox"/>
diff --git a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_creditmemo_grid.xml b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_creditmemo_grid.xml
index e0b7dae8fdb1a..1fc8d41ce0900 100644
--- a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_creditmemo_grid.xml
+++ b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_creditmemo_grid.xml
@@ -42,7 +42,7 @@
store_id
- componentType = column, index = ${ $.index }:visible
+ ns = ${ $.ns }, index = ${ $.index }:visible
diff --git a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_grid.xml b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_grid.xml
index f6b1240402477..9105b4be8cda2 100644
--- a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_grid.xml
+++ b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_grid.xml
@@ -53,7 +53,7 @@
store_id
- ns = ${ $.ns }, componentType = column, index = ${ $.index }:visible
+ ns = ${ $.ns }, index = ${ $.index }:visible
diff --git a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_invoice_grid.xml b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_invoice_grid.xml
index 1e60e4a806fce..c88bc91a16641 100644
--- a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_invoice_grid.xml
+++ b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_invoice_grid.xml
@@ -42,7 +42,7 @@
store_id
- componentType = column, index = ${ $.index }:visible
+ ns = ${ $.ns }, index = ${ $.index }:visible
diff --git a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_shipment_grid.xml b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_shipment_grid.xml
index 9e02c31a20635..f6474b5db2fd8 100644
--- a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_shipment_grid.xml
+++ b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_shipment_grid.xml
@@ -42,7 +42,7 @@
store_id
- ns = ${ $.ns }, componentType = column, index = ${ $.index }:visible
+ ns = ${ $.ns }, index = ${ $.index }:visible
diff --git a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_creditmemo_grid.xml b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_creditmemo_grid.xml
index cf536c27a0ac3..09be15c5a3cf9 100644
--- a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_creditmemo_grid.xml
+++ b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_creditmemo_grid.xml
@@ -51,7 +51,7 @@
store_id
- ns = ${ $.ns }, componentType = column, index = ${ $.index }:visible
+ ns = ${ $.ns }, index = ${ $.index }:visible
diff --git a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_invoice_grid.xml b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_invoice_grid.xml
index ac1233c5e4961..4b6c8b3518e06 100644
--- a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_invoice_grid.xml
+++ b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_invoice_grid.xml
@@ -51,7 +51,7 @@
store_id
- ns = ${ $.ns }, componentType = column, index = ${ $.index }:visible
+ ns = ${ $.ns }, index = ${ $.index }:visible
diff --git a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_shipment_grid.xml b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_shipment_grid.xml
index 5f8ebde290664..8a11bc63a4318 100644
--- a/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_shipment_grid.xml
+++ b/app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_view_shipment_grid.xml
@@ -51,7 +51,7 @@
store_id
- ns = ${ $.ns }, componentType = column, index = ${ $.index }:visible
+ ns = ${ $.ns }, index = ${ $.index }:visible
diff --git a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
index a329524c58d41..ba93f5f88c387 100644
--- a/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
+++ b/app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js
@@ -1202,7 +1202,7 @@ define([
for (var i = 0; i < this.loadingAreas.length; i++) {
var id = this.loadingAreas[i];
if ($(this.getAreaId(id))) {
- if ('message' != id || response[id]) {
+ if ((id in response) && id !== 'message' || response[id]) {
$(this.getAreaId(id)).update(response[id]);
}
if ($(this.getAreaId(id)).callback) {
@@ -1507,12 +1507,17 @@ define([
if (action === 'change') {
var confirmText = message.replace(/%s/, customerGroupOption.text);
confirmText = confirmText.replace(/%s/, currentCustomerGroupTitle);
- if (confirm(confirmText)) {
- $$('#' + groupIdHtmlId + ' option').each(function (o) {
- o.selected = o.readAttribute('value') == groupId;
- });
- this.accountGroupChange();
- }
+ confirm({
+ content: confirmText,
+ actions: {
+ confirm: function() {
+ $$('#' + groupIdHtmlId + ' option').each(function (o) {
+ o.selected = o.readAttribute('value') == groupId;
+ });
+ this.accountGroupChange();
+ }.bind(this)
+ }
+ })
} else if (action === 'inform') {
alert({
content: message + '\n' + groupMessage
diff --git a/app/code/Magento/Sales/view/frontend/layout/sales_order_printinvoice.xml b/app/code/Magento/Sales/view/frontend/layout/sales_order_printinvoice.xml
index 3e33f050cb0e7..0272286696e24 100644
--- a/app/code/Magento/Sales/view/frontend/layout/sales_order_printinvoice.xml
+++ b/app/code/Magento/Sales/view/frontend/layout/sales_order_printinvoice.xml
@@ -11,6 +11,13 @@
+
+
+
+
+
+
+
+ Open cart price rules page.
+
+
+
+
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateBuyXGetYFreeTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateBuyXGetYFreeTest.xml
index ed2dd16b7df9d..5f2b40dc63e2a 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateBuyXGetYFreeTest.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateBuyXGetYFreeTest.xml
@@ -34,8 +34,7 @@
-
-
+
+
@@ -104,8 +107,7 @@
-
- renderStyleAsTag('display:none', '#package_template') ?>
+ renderStyleAsTag('display:none', '#package_template') ?>
addStoreFilter($storeIds);
$sitemapLinks = [];
+ /**
+ * @var Sitemap $sitemap
+ */
foreach ($collection as $sitemap) {
$sitemapUrl = $sitemap->getSitemapUrl($sitemap->getSitemapPath(), $sitemap->getSitemapFilename());
$sitemapLinks[$sitemapUrl] = 'Sitemap: ' . $sitemapUrl;
diff --git a/app/code/Magento/Sitemap/Model/Observer.php b/app/code/Magento/Sitemap/Model/Observer.php
index ce74d738c4bc3..4333c71c7497f 100644
--- a/app/code/Magento/Sitemap/Model/Observer.php
+++ b/app/code/Magento/Sitemap/Model/Observer.php
@@ -3,11 +3,15 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\Sitemap\Model;
-use Magento\Sitemap\Model\EmailNotification as SitemapEmail;
+use Magento\Framework\App\Area;
use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Sitemap\Model\EmailNotification as SitemapEmail;
use Magento\Sitemap\Model\ResourceModel\Sitemap\CollectionFactory;
+use Magento\Store\Model\App\Emulation;
use Magento\Store\Model\ScopeInterface;
/**
@@ -61,20 +65,28 @@ class Observer
*/
private $emailNotification;
+ /**
+ * @var Emulation
+ */
+ private $appEmulation;
+
/**
* Observer constructor.
* @param ScopeConfigInterface $scopeConfig
* @param CollectionFactory $collectionFactory
* @param EmailNotification $emailNotification
+ * @param Emulation $appEmulation
*/
public function __construct(
ScopeConfigInterface $scopeConfig,
CollectionFactory $collectionFactory,
- SitemapEmail $emailNotification
+ SitemapEmail $emailNotification,
+ Emulation $appEmulation
) {
$this->scopeConfig = $scopeConfig;
$this->collectionFactory = $collectionFactory;
$this->emailNotification = $emailNotification;
+ $this->appEmulation = $appEmulation;
}
/**
@@ -105,9 +117,16 @@ public function scheduledGenerateSitemaps()
foreach ($collection as $sitemap) {
/* @var $sitemap \Magento\Sitemap\Model\Sitemap */
try {
+ $this->appEmulation->startEnvironmentEmulation(
+ $sitemap->getStoreId(),
+ Area::AREA_FRONTEND,
+ true
+ );
$sitemap->generateXml();
} catch (\Exception $e) {
$errors[] = $e->getMessage();
+ } finally {
+ $this->appEmulation->stopEnvironmentEmulation();
}
}
if ($errors && $recipient) {
diff --git a/app/code/Magento/Sitemap/Model/Sitemap.php b/app/code/Magento/Sitemap/Model/Sitemap.php
index 9a8d2c57a280c..ddb04f28d58d1 100644
--- a/app/code/Magento/Sitemap/Model/Sitemap.php
+++ b/app/code/Magento/Sitemap/Model/Sitemap.php
@@ -475,12 +475,9 @@ public function generateXml()
if ($this->_sitemapIncrement == 1) {
// In case when only one increment file was created use it as default sitemap
- $path = rtrim(
- $this->getSitemapPath(),
- '/'
- ) . '/' . $this->_getCurrentSitemapFilename(
- $this->_sitemapIncrement
- );
+ $path = rtrim($this->getSitemapPath(), '/')
+ . '/'
+ . $this->_getCurrentSitemapFilename($this->_sitemapIncrement);
$destination = rtrim($this->getSitemapPath(), '/') . '/' . $this->getSitemapFilename();
$this->_directory->renameFile($path, $destination);
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/ProductTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/ProductTest.php
index 116a574b7c670..26f1f9cd6f56f 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/ProductTest.php
+++ b/app/code/Magento/Sitemap/Test/Unit/Model/ItemProvider/ProductTest.php
@@ -61,7 +61,7 @@ public function testGetItems(array $products)
*/
public function productProvider()
{
- $storeBaseMediaUrl = 'http://store.com/pub/media/catalog/product/cache/c9e0b0ef589f3508e5ba515cde53c5ff/';
+ $storeBaseMediaUrl = 'http://store.com/media/catalog/product/cache/c9e0b0ef589f3508e5ba515cde53c5ff/';
return [
[
[
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php
index 23ebe4f85f79e..70520862faee1 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php
+++ b/app/code/Magento/Sitemap/Test/Unit/Model/ObserverTest.php
@@ -142,4 +142,39 @@ public function testScheduledGenerateSitemapsSendsExceptionEmail()
$this->observer->scheduledGenerateSitemaps();
}
+
+ /**
+ * Test if cron scheduled XML sitemap generation will start and stop the store environment emulation
+ *
+ * @throws \Exception
+ */
+ public function testCronGenerateSitemapEnvironmentEmulation()
+ {
+ $storeId = 1;
+
+ $this->scopeConfigMock->expects($this->once())->method('isSetFlag')->willReturn(true);
+
+ $this->collectionFactoryMock->expects($this->once())
+ ->method('create')
+ ->willReturn($this->sitemapCollectionMock);
+
+ $this->sitemapCollectionMock->expects($this->any())
+ ->method('getIterator')
+ ->willReturn(new \ArrayIterator([$this->sitemapMock]));
+
+ $this->sitemapMock->expects($this->at(0))
+ ->method('getStoreId')
+ ->willReturn($storeId);
+
+ $this->sitemapMock->expects($this->once())
+ ->method('generateXml');
+
+ $this->appEmulationMock->expects($this->once())
+ ->method('startEnvironmentEmulation');
+
+ $this->appEmulationMock->expects($this->once())
+ ->method('stopEnvironmentEmulation');
+
+ $this->observer->scheduledGenerateSitemaps();
+ }
}
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php b/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php
index bfd2c47164cf6..866b3afd322a0 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php
+++ b/app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php
@@ -533,7 +533,7 @@ protected function getModelMock($mockBeforeSave = false)
$methods[] = 'beforeSave';
}
- $storeBaseMediaUrl = 'http://store.com/pub/media/catalog/product/cache/c9e0b0ef589f3508e5ba515cde53c5ff/';
+ $storeBaseMediaUrl = 'http://store.com/media/catalog/product/cache/c9e0b0ef589f3508e5ba515cde53c5ff/';
$this->itemProviderMock->expects($this->any())
->method('getItems')
diff --git a/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-1-4.xml b/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-1-4.xml
index ff8087a52e42f..03cfdaaead18a 100644
--- a/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-1-4.xml
+++ b/app/code/Magento/Sitemap/Test/Unit/Model/_files/sitemap-1-4.xml
@@ -13,18 +13,18 @@
escapeHtml(__('Export Tax Rates')) ?>
getUseContainer()):?>
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
index 2d55bbce2ec2c..5e3bb8774d246 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
@@ -194,8 +194,7 @@ protected function _addCustomCssFieldset()
Storage::PARAM_CONTENT_TYPE => \Magento\Theme\Model\Wysiwyg\Storage::TYPE_IMAGE
]
) . "', null, null,'" . $this->escapeJs(
- __('Upload Images'),
- true
+ __('Upload Images')
) . "');",
]
);
@@ -222,8 +221,7 @@ protected function _addCustomCssFieldset()
Storage::PARAM_CONTENT_TYPE => \Magento\Theme\Model\Wysiwyg\Storage::TYPE_FONT
]
) . "', null, null,'" . $this->escapeJs(
- __('Upload Fonts'),
- true
+ __('Upload Fonts')
) . "');",
]
);
diff --git a/app/code/Magento/Theme/Model/Indexer/Design/IndexerHandler.php b/app/code/Magento/Theme/Model/Indexer/Design/IndexerHandler.php
new file mode 100644
index 0000000000000..1acc75a6c949c
--- /dev/null
+++ b/app/code/Magento/Theme/Model/Indexer/Design/IndexerHandler.php
@@ -0,0 +1,76 @@
+flatScopeResolver = $flatScopeResolver;
+ }
+
+ /**
+ * Clean index table by deleting all records unconditionally or create the index table if not exists
+ *
+ * @param Dimension[] $dimensions
+ * @return IndexerInterface
+ */
+ public function cleanIndex($dimensions)
+ {
+ $tableName = $this->flatScopeResolver->resolve($this->getIndexName(), $dimensions);
+
+ if ($this->connection->isTableExists($tableName)) {
+ $this->connection->delete($tableName);
+ } else {
+ $this->indexStructure->create($this->getIndexName(), $this->fields, $dimensions);
+ }
+
+ return $this;
+ }
+}
diff --git a/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php b/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
index 13b8aa23073ce..c998c02d46b3c 100644
--- a/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
+++ b/app/code/Magento/Theme/Model/PageLayout/Config/Builder.php
@@ -5,25 +5,38 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
+
namespace Magento\Theme\Model\PageLayout\Config;
+use Magento\Framework\App\Cache\Type\Layout;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\View\Model\PageLayout\Config\BuilderInterface;
+use Magento\Framework\View\PageLayout\ConfigFactory;
+use Magento\Framework\View\PageLayout\File\Collector\Aggregated;
+use Magento\Theme\Model\ResourceModel\Theme\Collection;
+use Magento\Theme\Model\Theme\Data;
+use Magento\Framework\Serialize\SerializerInterface;
+
/**
* Page layout config builder
*/
-class Builder implements \Magento\Framework\View\Model\PageLayout\Config\BuilderInterface
+class Builder implements BuilderInterface
{
+ const CACHE_KEY_LAYOUTS = 'THEME_LAYOUTS_FILES_MERGED';
+
/**
- * @var \Magento\Framework\View\PageLayout\ConfigFactory
+ * @var ConfigFactory
*/
protected $configFactory;
/**
- * @var \Magento\Framework\View\PageLayout\File\Collector\Aggregated
+ * @var Aggregated
*/
protected $fileCollector;
/**
- * @var \Magento\Theme\Model\ResourceModel\Theme\Collection
+ * @var Collection
*/
protected $themeCollection;
@@ -33,19 +46,36 @@ class Builder implements \Magento\Framework\View\Model\PageLayout\Config\Builder
private $configFiles = [];
/**
- * @param \Magento\Framework\View\PageLayout\ConfigFactory $configFactory
- * @param \Magento\Framework\View\PageLayout\File\Collector\Aggregated $fileCollector
- * @param \Magento\Theme\Model\ResourceModel\Theme\Collection $themeCollection
+ * @var Layout|null
+ */
+ private $cacheModel;
+ /**
+ * @var SerializerInterface|null
+ */
+ private $serializer;
+
+ /**
+ * @param ConfigFactory $configFactory
+ * @param Aggregated $fileCollector
+ * @param Collection $themeCollection
+ * @param Layout|null $cacheModel
+ * @param SerializerInterface|null $serializer
*/
public function __construct(
- \Magento\Framework\View\PageLayout\ConfigFactory $configFactory,
- \Magento\Framework\View\PageLayout\File\Collector\Aggregated $fileCollector,
- \Magento\Theme\Model\ResourceModel\Theme\Collection $themeCollection
+ ConfigFactory $configFactory,
+ Aggregated $fileCollector,
+ Collection $themeCollection,
+ ?Layout $cacheModel = null,
+ ?SerializerInterface $serializer = null
) {
$this->configFactory = $configFactory;
$this->fileCollector = $fileCollector;
$this->themeCollection = $themeCollection;
- $this->themeCollection->setItemObjectClass(\Magento\Theme\Model\Theme\Data::class);
+ $this->themeCollection->setItemObjectClass(Data::class);
+ $this->cacheModel = $cacheModel
+ ?? ObjectManager::getInstance()->get(Layout::class);
+ $this->serializer = $serializer
+ ?? ObjectManager::getInstance()->get(SerializerInterface::class);
}
/**
@@ -57,18 +87,26 @@ public function getPageLayoutsConfig()
}
/**
- * Retrieve configuration files.
+ * Retrieve configuration files. Caches merged layouts.xml XML files.
*
* @return array
*/
protected function getConfigFiles()
{
if (!$this->configFiles) {
- $configFiles = [];
- foreach ($this->themeCollection->loadRegisteredThemes() as $theme) {
- $configFiles[] = $this->fileCollector->getFilesContent($theme, 'layouts.xml');
+ $this->configFiles = $this->cacheModel->load(self::CACHE_KEY_LAYOUTS);
+ if (!empty($this->configFiles)) {
+ //if value in cache is corrupted.
+ $this->configFiles = $this->serializer->unserialize($this->configFiles);
+ }
+ if (empty($this->configFiles)) {
+ $configFiles = [];
+ foreach ($this->themeCollection->loadRegisteredThemes() as $theme) {
+ $configFiles[] = $this->fileCollector->getFilesContent($theme, 'layouts.xml');
+ }
+ $this->configFiles = array_merge([], ...$configFiles);
+ $this->cacheModel->save($this->serializer->serialize($this->configFiles), self::CACHE_KEY_LAYOUTS);
}
- $this->configFiles = array_merge(...$configFiles);
}
return $this->configFiles;
diff --git a/app/code/Magento/Theme/Model/ResourceModel/Design/Config/Collection.php b/app/code/Magento/Theme/Model/ResourceModel/Design/Config/Collection.php
index 3a19ff99a9270..6db521978cfab 100644
--- a/app/code/Magento/Theme/Model/ResourceModel/Design/Config/Collection.php
+++ b/app/code/Magento/Theme/Model/ResourceModel/Design/Config/Collection.php
@@ -77,12 +77,13 @@ protected function _afterLoad()
'value',
$this->valueProcessor->process(
$item->getData('value'),
- $this->getData('scope'),
- $this->getData('scope_id'),
+ $item->getData('scope'),
+ $item->getData('scope_id'),
$item->getData('path')
)
);
}
- parent::_afterLoad();
+
+ return parent::_afterLoad();
}
}
diff --git a/app/code/Magento/Theme/Test/Mftf/Section/StorefrontHeaderSection.xml b/app/code/Magento/Theme/Test/Mftf/Section/StorefrontHeaderSection.xml
index e2f0a01fc733b..b9940fe42052c 100644
--- a/app/code/Magento/Theme/Test/Mftf/Section/StorefrontHeaderSection.xml
+++ b/app/code/Magento/Theme/Test/Mftf/Section/StorefrontHeaderSection.xml
@@ -10,5 +10,6 @@
- getButtonHtml(__('Export Tax Rates'), "this.form.submit()") ?>
+ getButtonHtml(__('Export Tax Rates'), "export_form.submit()") ?>
getLayout(); ?>
-
+
renderElement($name);
if (!trim($html) && ($block->getUseForce() != true)) {
diff --git a/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml b/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
index ddb6c4071a0e7..0ba20d201f909 100644
--- a/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
+++ b/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
@@ -25,8 +25,7 @@
diff --git a/app/code/Magento/Ui/Component/Form/Element/DataType/Date.php b/app/code/Magento/Ui/Component/Form/Element/DataType/Date.php
index ef2df77e7daff..3600992011ed6 100644
--- a/app/code/Magento/Ui/Component/Form/Element/DataType/Date.php
+++ b/app/code/Magento/Ui/Component/Form/Element/DataType/Date.php
@@ -111,7 +111,7 @@ public function getComponentName()
public function convertDate($date, $hour = 0, $minute = 0, $second = 0, $setUtcTimeZone = true)
{
try {
- $dateObj = $this->localeDate->date($date, $this->getLocale(), false);
+ $dateObj = $this->localeDate->date($date, $this->getLocale(), false, false);
$dateObj->setTime($hour, $minute, $second);
//convert store date to default date in UTC timezone without DST
if ($setUtcTimeZone) {
diff --git a/app/code/Magento/Ui/Component/Listing/Columns/Column.php b/app/code/Magento/Ui/Component/Listing/Columns/Column.php
index e69658540c51f..a4abf7551c5ce 100644
--- a/app/code/Magento/Ui/Component/Listing/Columns/Column.php
+++ b/app/code/Magento/Ui/Component/Listing/Columns/Column.php
@@ -5,10 +5,10 @@
*/
namespace Magento\Ui\Component\Listing\Columns;
-use Magento\Ui\Component\AbstractComponent;
+use Magento\Framework\View\Element\UiComponent\ContextInterface;
use Magento\Framework\View\Element\UiComponentFactory;
use Magento\Framework\View\Element\UiComponentInterface;
-use Magento\Framework\View\Element\UiComponent\ContextInterface;
+use Magento\Ui\Component\AbstractComponent;
/**
* @api
@@ -64,6 +64,7 @@ public function getComponentName()
* Prepare component configuration
*
* @return void
+ * @throws \Magento\Framework\Exception\LocalizedException
*/
public function prepare()
{
@@ -97,18 +98,19 @@ public function prepare()
}
/**
- * To prepare items of a column
+ * Prepares items of a column
*
* @param array $items
* @return array
*/
- public function prepareItems(array & $items)
+ public function prepareItems(array &$items)
{
return $items;
}
/**
- * Add field to select
+ * Adds additional field to select object
+ *
* @return void
*/
protected function addFieldToSelect()
@@ -131,6 +133,7 @@ protected function applySorting()
&& !empty($sorting['field'])
&& !empty($sorting['direction'])
&& $sorting['field'] === $this->getName()
+ && in_array(strtoupper($sorting['direction']), ['ASC', 'DESC'], true)
) {
$this->getContext()->getDataProvider()->addOrder(
$this->getName(),
diff --git a/app/code/Magento/Ui/Model/Manager.php b/app/code/Magento/Ui/Model/Manager.php
index 357a41285e275..ce9e4e51ea7fe 100644
--- a/app/code/Magento/Ui/Model/Manager.php
+++ b/app/code/Magento/Ui/Model/Manager.php
@@ -298,6 +298,7 @@ protected function createDataForComponent($name, array $componentsPool)
$createdComponents = [];
$rootComponent = $this->createRawComponentData($name, false);
foreach ($componentsPool as $key => $component) {
+ $resultConfiguration = [];
$resultConfiguration = [ManagerInterface::CHILDREN_KEY => []];
$instanceName = $this->createName($component, $key, $name);
$resultConfiguration[ManagerInterface::COMPONENT_ARGUMENTS_KEY] = $this->mergeArguments(
@@ -312,15 +313,16 @@ protected function createDataForComponent($name, array $componentsPool)
unset($component[Converter::DATA_ATTRIBUTES_KEY]);
// Create inner components
+ $children = [];
foreach ($component as $subComponentName => $subComponent) {
if (is_array($subComponent)) {
- // phpcs:ignore Magento2.Performance.ForeachArrayMerge
- $resultConfiguration[ManagerInterface::CHILDREN_KEY] = array_merge(
- $resultConfiguration[ManagerInterface::CHILDREN_KEY],
- $this->createDataForComponent($subComponentName, $subComponent)
- );
+ $children[] = $this->createDataForComponent($subComponentName, $subComponent);
}
}
+
+ // phpcs:ignore Magento2.Performance.ForeachArrayMerge
+ $resultConfiguration[ManagerInterface::CHILDREN_KEY] = array_merge([], ...$children);
+
$createdComponents[$instanceName] = $resultConfiguration;
}
diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminAssertNumberOfRecordsInUiGridActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminAssertNumberOfRecordsInUiGridActionGroup.xml
new file mode 100644
index 0000000000000..5928833bf4794
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminAssertNumberOfRecordsInUiGridActionGroup.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+ Validates that the Number of Records listed on the Ui grid page is present and correct.
+
+
+
+
+
diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridBulkActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridBulkActionGroup.xml
new file mode 100644
index 0000000000000..9db9ea7becfc8
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridBulkActionGroup.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+ Massive action for all rows on Admin Grid page.
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridColumnShowActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridColumnShowActionGroup.xml
new file mode 100644
index 0000000000000..6440cc01bcafe
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridColumnShowActionGroup.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+ Shows new column on Admin Grid page.
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridSelectAllActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridSelectAllActionGroup.xml
new file mode 100644
index 0000000000000..bbfb7e46d89ec
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/AdminGridSelectAllActionGroup.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+ Click on select all option on the grid
+
+
+
+
diff --git a/app/code/Magento/Ui/Test/Mftf/ActionGroup/ReloadPageActionGroup.xml b/app/code/Magento/Ui/Test/Mftf/ActionGroup/ReloadPageActionGroup.xml
new file mode 100644
index 0000000000000..3976a2ac0f872
--- /dev/null
+++ b/app/code/Magento/Ui/Test/Mftf/ActionGroup/ReloadPageActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ Reload page and wait for page load.
+
+
+
+
diff --git a/app/code/Magento/Ui/Test/Mftf/Section/AdminGridControlsSection/AdminGridHeadersSection.xml b/app/code/Magento/Ui/Test/Mftf/Section/AdminGridControlsSection/AdminGridHeadersSection.xml
index 89831359657bf..c7aa7604d7ade 100644
--- a/app/code/Magento/Ui/Test/Mftf/Section/AdminGridControlsSection/AdminGridHeadersSection.xml
+++ b/app/code/Magento/Ui/Test/Mftf/Section/AdminGridControlsSection/AdminGridHeadersSection.xml
@@ -11,5 +11,6 @@
![]()
+![]()
diff --git a/app/code/Magento/Ups/Model/Carrier.php b/app/code/Magento/Ups/Model/Carrier.php
index b6e539bdadcb9..28a4a3a7e0b41 100644
--- a/app/code/Magento/Ups/Model/Carrier.php
+++ b/app/code/Magento/Ups/Model/Carrier.php
@@ -1118,6 +1118,7 @@ protected function _getXmlTracking($trackings)
/** @var HttpResponseDeferredInterface[] $trackingResponses */
$trackingResponses = [];
+ $tracking = '';
foreach ($trackings as $tracking) {
/**
* RequestOption==>'1' to request all activities
@@ -1135,7 +1136,7 @@ protected function _getXmlTracking($trackings)
XMLAuth;
- $trackingResponses[] = $this->asyncHttpClient->request(
+ $trackingResponses[$tracking] = $this->asyncHttpClient->request(
new Request(
$url,
Request::METHOD_POST,
@@ -1144,13 +1145,9 @@ protected function _getXmlTracking($trackings)
)
);
}
- foreach ($trackingResponses as $response) {
+ foreach ($trackingResponses as $tracking => $response) {
$httpResponse = $response->get();
- if ($httpResponse->getStatusCode() >= 400) {
- $xmlResponse = '';
- } else {
- $xmlResponse = $httpResponse->getBody();
- }
+ $xmlResponse = $httpResponse->getStatusCode() >= 400 ? '' : $httpResponse->getBody();
$this->_parseXmlTrackingResponse($tracking, $xmlResponse);
}
@@ -1362,10 +1359,11 @@ public function getAllowedMethods()
protected function _formShipmentRequest(DataObject $request)
{
$packages = $request->getPackages();
+ $shipmentItems = [];
foreach ($packages as $package) {
$shipmentItems[] = $package['items'];
}
- $shipmentItems = array_merge(...$shipmentItems);
+ $shipmentItems = array_merge([], ...$shipmentItems);
$xmlRequest = $this->_xmlElFactory->create(
['data' => '
+
diff --git a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/EntityUrl.php b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/EntityUrl.php
index e6b03755bea47..6430f71765fe4 100644
--- a/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/EntityUrl.php
+++ b/app/code/Magento/UrlRewriteGraphQl/Model/Resolver/EntityUrl.php
@@ -64,7 +64,9 @@ public function resolve(
$storeId = (int)$context->getExtensionAttributes()->getStore()->getId();
$result = null;
- $url = $args['url'];
+ // phpcs:ignore Magento2.Functions.DiscouragedFunction
+ $urlParts = parse_url($args['url']);
+ $url = $urlParts['path'] ?? $args['url'];
if (substr($url, 0, 1) === '/' && $url !== '/') {
$url = ltrim($url, '/');
}
@@ -81,6 +83,9 @@ public function resolve(
'redirectCode' => $this->redirectType,
'type' => $this->sanitizeType($finalUrlRewrite->getEntityType())
];
+ if (!empty($urlParts['query'])) {
+ $resultArray['relative_url'] .= '?' . $urlParts['query'];
+ }
if (empty($resultArray['id'])) {
throw new GraphQlNoSuchEntityException(
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php
index 97ecb778b8cb1..39ee382709e56 100644
--- a/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php
+++ b/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php
@@ -102,11 +102,12 @@ public function execute()
'admin_permissions_role_prepare_save',
['object' => $role, 'request' => $this->getRequest()]
);
- $role->save();
-
- $this->_rulesFactory->create()->setRoleId($role->getId())->setResources($resource)->saveRel();
$this->processPreviousUsers($role, $oldRoleUsers);
$this->processCurrentUsers($role, $roleUsers);
+
+ $role->save();
+ $this->_rulesFactory->create()->setRoleId($role->getId())->setResources($resource)->saveRel();
+
$this->messageManager->addSuccessMessage(__('You saved the role.'));
} catch (UserLockedException $e) {
$this->_auth->logout();
@@ -155,6 +156,7 @@ protected function validateUser()
private function parseRequestVariable($paramName): array
{
$value = $this->getRequest()->getParam($paramName, null);
+ // phpcs:ignore Magento2.Functions.DiscouragedFunction
parse_str($value, $value);
$value = array_keys($value);
return $value;
diff --git a/app/code/Magento/User/Model/ResourceModel/User.php b/app/code/Magento/User/Model/ResourceModel/User.php
index d9bc555b8e391..5fa099c041165 100644
--- a/app/code/Magento/User/Model/ResourceModel/User.php
+++ b/app/code/Magento/User/Model/ResourceModel/User.php
@@ -14,6 +14,7 @@
use Magento\Framework\Acl\Data\CacheInterface;
use Magento\Framework\App\ObjectManager;
use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Model\AbstractModel;
use Magento\User\Model\Backend\Config\ObserverConfig;
use Magento\User\Model\User as ModelUser;
@@ -146,7 +147,7 @@ public function hasAssigned2Role($user)
{
if (is_numeric($user)) {
$userId = $user;
- } elseif ($user instanceof \Magento\Framework\Model\AbstractModel) {
+ } elseif ($user instanceof AbstractModel) {
$userId = $user->getUserId();
} else {
return null;
@@ -171,13 +172,25 @@ public function hasAssigned2Role($user)
}
}
+ /**
+ * @inheritDoc
+ */
+ protected function _beforeSave(AbstractModel $user)
+ {
+ if ($user->hasRoleId()) {
+ $user->setReloadAclFlag(1);
+ }
+
+ return parent::_beforeSave($user);
+ }
+
/**
* Unserialize user extra data after user save
*
- * @param \Magento\Framework\Model\AbstractModel $user
+ * @param AbstractModel $user
* @return $this
*/
- protected function _afterSave(\Magento\Framework\Model\AbstractModel $user)
+ protected function _afterSave(AbstractModel $user)
{
$user->setExtra($this->getSerializer()->unserialize($user->getExtra()));
if ($user->hasRoleId()) {
@@ -234,10 +247,10 @@ protected function _createUserRole($parentId, ModelUser $user)
/**
* Unserialize user extra data after user load
*
- * @param \Magento\Framework\Model\AbstractModel $user
+ * @param AbstractModel $user
* @return $this
*/
- protected function _afterLoad(\Magento\Framework\Model\AbstractModel $user)
+ protected function _afterLoad(AbstractModel $user)
{
if (is_string($user->getExtra())) {
$user->setExtra($this->getSerializer()->unserialize($user->getExtra()));
@@ -248,11 +261,11 @@ protected function _afterLoad(\Magento\Framework\Model\AbstractModel $user)
/**
* Delete user role record with user
*
- * @param \Magento\Framework\Model\AbstractModel $user
+ * @param AbstractModel $user
* @return bool
* @throws LocalizedException
*/
- public function delete(\Magento\Framework\Model\AbstractModel $user)
+ public function delete(AbstractModel $user)
{
$uid = $user->getId();
if (!$uid) {
@@ -283,10 +296,10 @@ public function delete(\Magento\Framework\Model\AbstractModel $user)
/**
* Get user roles
*
- * @param \Magento\Framework\Model\AbstractModel $user
+ * @param AbstractModel $user
* @return array
*/
- public function getRoles(\Magento\Framework\Model\AbstractModel $user)
+ public function getRoles(AbstractModel $user)
{
if (!$user->getId()) {
return [];
@@ -324,10 +337,10 @@ public function getRoles(\Magento\Framework\Model\AbstractModel $user)
/**
* Delete user role
*
- * @param \Magento\Framework\Model\AbstractModel $user
+ * @param AbstractModel $user
* @return $this
*/
- public function deleteFromRole(\Magento\Framework\Model\AbstractModel $user)
+ public function deleteFromRole(AbstractModel $user)
{
if ($user->getUserId() <= 0) {
return $this;
@@ -351,10 +364,10 @@ public function deleteFromRole(\Magento\Framework\Model\AbstractModel $user)
/**
* Check if role user exists
*
- * @param \Magento\Framework\Model\AbstractModel $user
+ * @param AbstractModel $user
* @return array
*/
- public function roleUserExists(\Magento\Framework\Model\AbstractModel $user)
+ public function roleUserExists(AbstractModel $user)
{
if ($user->getUserId() > 0) {
$roleTable = $this->getTable('authorization_role');
@@ -381,10 +394,10 @@ public function roleUserExists(\Magento\Framework\Model\AbstractModel $user)
/**
* Check if user exists
*
- * @param \Magento\Framework\Model\AbstractModel $user
+ * @param AbstractModel $user
* @return array
*/
- public function userExists(\Magento\Framework\Model\AbstractModel $user)
+ public function userExists(AbstractModel $user)
{
$connection = $this->getConnection();
$select = $connection->select();
@@ -409,10 +422,10 @@ public function userExists(\Magento\Framework\Model\AbstractModel $user)
/**
* Whether a user's identity is confirmed
*
- * @param \Magento\Framework\Model\AbstractModel $user
+ * @param AbstractModel $user
* @return bool
*/
- public function isUserUnique(\Magento\Framework\Model\AbstractModel $user)
+ public function isUserUnique(AbstractModel $user)
{
return !$this->userExists($user);
}
@@ -420,7 +433,7 @@ public function isUserUnique(\Magento\Framework\Model\AbstractModel $user)
/**
* Save user extra data
*
- * @param \Magento\Framework\Model\AbstractModel $object
+ * @param AbstractModel $object
* @param string $data
* @return $this
*/
diff --git a/app/code/Magento/User/Model/User.php b/app/code/Magento/User/Model/User.php
index 61af14d943615..f7d05decfeb01 100644
--- a/app/code/Magento/User/Model/User.php
+++ b/app/code/Magento/User/Model/User.php
@@ -65,6 +65,11 @@ class User extends AbstractModel implements StorageInterface, UserInterface
const MESSAGE_ID_PASSWORD_EXPIRED = 'magento_user_password_expired';
+ /**
+ * Tag to use for user assigned role caching.
+ */
+ private const CACHE_TAG = 'user_assigned_role';
+
/**
* Model event prefix
*
@@ -149,6 +154,14 @@ class User extends AbstractModel implements StorageInterface, UserInterface
*/
private $deploymentConfig;
+ /**
+ * @var array
+ */
+ protected $_cacheTag = [
+ \Magento\Backend\Block\Menu::CACHE_TAGS,
+ self::CACHE_TAG,
+ ];
+
/**
* @param \Magento\Framework\Model\Context $context
* @param \Magento\Framework\Registry $registry
@@ -684,7 +697,27 @@ public function loadByUsername($username)
*/
public function hasAssigned2Role($user)
{
- return $this->getResource()->hasAssigned2Role($user);
+ if ($user instanceof AbstractModel) {
+ $userId = $user->getUserId();
+ } elseif (is_numeric($user) && (int)$user !== 0) {
+ $userId = $user;
+ } else {
+ return null;
+ }
+ $data = $this->_cacheManager->load('assigned_role_' . $userId);
+ if (false === $data) {
+ $data = $this->getResource()->hasAssigned2Role($user);
+
+ $this->_cacheManager->save(
+ $this->serializer->serialize($data),
+ 'assigned_role_' . $userId,
+ [self::CACHE_TAG]
+ );
+ } else {
+ $data = $this->serializer->unserialize($data);
+ }
+
+ return $data;
}
/**
diff --git a/app/code/Magento/User/Observer/Backend/TrackAdminNewPasswordObserver.php b/app/code/Magento/User/Observer/Backend/TrackAdminNewPasswordObserver.php
index 059879ab9613f..9573aaa1547ab 100644
--- a/app/code/Magento/User/Observer/Backend/TrackAdminNewPasswordObserver.php
+++ b/app/code/Magento/User/Observer/Backend/TrackAdminNewPasswordObserver.php
@@ -8,52 +8,57 @@
use Magento\Framework\Event\Observer as EventObserver;
use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Message\ManagerInterface;
use Magento\User\Model\User;
+use Magento\User\Model\Backend\Config\ObserverConfig;
+use Magento\User\Model\ResourceModel\User as UserResource;
+use Magento\Backend\Model\Auth\Session as AuthSession;
/**
* User backend observer model for passwords
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
*/
class TrackAdminNewPasswordObserver implements ObserverInterface
{
/**
* Backend configuration interface
*
- * @var \Magento\User\Model\Backend\Config\ObserverConfig
+ * @var ObserverConfig
*/
protected $observerConfig;
/**
* Admin user resource model
*
- * @var \Magento\User\Model\ResourceModel\User
+ * @var UserResource
*/
protected $userResource;
/**
* Backend authorization session
*
- * @var \Magento\Backend\Model\Auth\Session
+ * @var AuthSession
*/
protected $authSession;
/**
* Message manager interface
*
- * @var \Magento\Framework\Message\ManagerInterface
+ * @var ManagerInterface
*/
protected $messageManager;
/**
- * @param \Magento\User\Model\Backend\Config\ObserverConfig $observerConfig
- * @param \Magento\User\Model\ResourceModel\User $userResource
- * @param \Magento\Backend\Model\Auth\Session $authSession
- * @param \Magento\Framework\Message\ManagerInterface $messageManager
+ * @param ObserverConfig $observerConfig
+ * @param UserResource $userResource
+ * @param AuthSession $authSession
+ * @param ManagerInterface $messageManager
*/
public function __construct(
- \Magento\User\Model\Backend\Config\ObserverConfig $observerConfig,
- \Magento\User\Model\ResourceModel\User $userResource,
- \Magento\Backend\Model\Auth\Session $authSession,
- \Magento\Framework\Message\ManagerInterface $messageManager
+ ObserverConfig $observerConfig,
+ UserResource $userResource,
+ AuthSession $authSession,
+ ManagerInterface $messageManager
) {
$this->observerConfig = $observerConfig;
$this->userResource = $userResource;
@@ -69,11 +74,11 @@ public function __construct(
*/
public function execute(EventObserver $observer)
{
- /* @var $user \Magento\User\Model\User */
+ /* @var $user User */
$user = $observer->getEvent()->getObject();
if ($user->getId()) {
$passwordHash = $user->getPassword();
- if ($passwordHash && !$user->getForceNewPassword()) {
+ if ($passwordHash && $user->dataHasChangedFor('password')) {
$this->userResource->trackPassword($user, $passwordHash);
$this->messageManager->getMessages()->deleteMessageByIdentifier(User::MESSAGE_ID_PASSWORD_EXPIRED);
$this->authSession->unsPciAdminUserIsPasswordExpired();
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminChooseUserRoleResourceActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminChooseUserRoleResourceActionGroup.xml
new file mode 100644
index 0000000000000..7072830e2036b
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminChooseUserRoleResourceActionGroup.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+ Check the resource access checkbox. Leave the form open.
+
+
+
+
+
+
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml
index 46ad2e228c6c1..1fd4b2fa4fe65 100644
--- a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteRoleActionGroup.xml
@@ -10,12 +10,13 @@
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
- Deletes a User Role.
+ DEPRECATED. Deletes a User Role. ActionGroup duplicates existing 'AdminDeleteUserRoleActionGroup'
-
+
+
+
+ Click to Save Role
+
+
+
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminStartCreateUserRoleActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminStartCreateUserRoleActionGroup.xml
new file mode 100644
index 0000000000000..2a1dec5b8574e
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminStartCreateUserRoleActionGroup.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+ Open Admin Edit Role page. Fills role, user password, resource access. Leave the form open.
+
+
+
+
+
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminUserSaveRoleActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminUserSaveRoleActionGroup.xml
index 824e9407125f5..e247db64deeab 100644
--- a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminUserSaveRoleActionGroup.xml
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminUserSaveRoleActionGroup.xml
@@ -9,7 +9,7 @@
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
- Click to Save Role
+ Deprecated. Please use AdminSaveUserRoleActionGroup
-
-
-
-
-
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminDeleteUserSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminDeleteUserSection.xml
deleted file mode 100644
index 21ca1cb36f988..0000000000000
--- a/app/code/Magento/User/Test/Mftf/Section/AdminDeleteUserSection.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleInfoSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleInfoSection.xml
index 57659e1aff075..b8430eb3b7313 100644
--- a/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleInfoSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminEditRoleInfoSection.xml
@@ -13,7 +13,7 @@
diff --git a/app/code/Magento/User/Test/Mftf/Section/AdminRoleGridSection/AdminDeleteRoleSection.xml b/app/code/Magento/User/Test/Mftf/Section/AdminRoleGridSection/AdminDeleteRoleSection.xml
index e369d037d28f6..dba7dd4cd520c 100644
--- a/app/code/Magento/User/Test/Mftf/Section/AdminRoleGridSection/AdminDeleteRoleSection.xml
+++ b/app/code/Magento/User/Test/Mftf/Section/AdminRoleGridSection/AdminDeleteRoleSection.xml
@@ -9,7 +9,8 @@
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
diff --git a/app/code/Magento/User/Test/Mftf/Test/AdminReviewOrderWithReportsPermissionTest.xml b/app/code/Magento/User/Test/Mftf/Test/AdminReviewOrderWithReportsPermissionTest.xml
new file mode 100644
index 0000000000000..8629187fe3ffb
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/Test/AdminReviewOrderWithReportsPermissionTest.xml
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/User/Test/Unit/Observer/Backend/TrackAdminNewPasswordObserverTest.php b/app/code/Magento/User/Test/Unit/Observer/Backend/TrackAdminNewPasswordObserverTest.php
index 10477bdf80303..90e5f04b9c73e 100644
--- a/app/code/Magento/User/Test/Unit/Observer/Backend/TrackAdminNewPasswordObserverTest.php
+++ b/app/code/Magento/User/Test/Unit/Observer/Backend/TrackAdminNewPasswordObserverTest.php
@@ -112,14 +112,17 @@ public function testTrackAdminPassword()
/** @var \Magento\User\Model\User|MockObject $userMock */
$userMock = $this->getMockBuilder(\Magento\User\Model\User::class)
->disableOriginalConstructor()
- ->setMethods(['getId', 'getPassword', 'getForceNewPassword'])
+ ->setMethods(['getId', 'getPassword', 'dataHasChangedFor'])
->getMock();
$eventObserverMock->expects($this->once())->method('getEvent')->willReturn($eventMock);
$eventMock->expects($this->once())->method('getObject')->willReturn($userMock);
$userMock->expects($this->once())->method('getId')->willReturn($uid);
$userMock->expects($this->once())->method('getPassword')->willReturn($newPW);
- $userMock->expects($this->once())->method('getForceNewPassword')->willReturn(false);
+ $userMock->expects($this->once())
+ ->method('dataHasChangedFor')
+ ->with('password')
+ ->willReturn(true);
/** @var Collection|MockObject $collectionMock */
$collectionMock = $this->getMockBuilder(Collection::class)
diff --git a/app/code/Magento/User/i18n/en_US.csv b/app/code/Magento/User/i18n/en_US.csv
index 064b6428387fe..cd550015401d0 100644
--- a/app/code/Magento/User/i18n/en_US.csv
+++ b/app/code/Magento/User/i18n/en_US.csv
@@ -106,8 +106,8 @@ username,username
Custom,Custom
All,All
Resources,Resources
-"Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?","Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?"
-"Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?","Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?"
+"Warning!
This action will remove this user from already assigned role.
Are you sure?","Warning!
This action will remove this user from already assigned role.
Are you sure?" +"Warning!
This action will remove those users from already assigned roles.
Are you sure?","Warning!
This action will remove those users from already assigned roles.
Are you sure?" "Password Reset Confirmation for %name","Password Reset Confirmation for %name" "%name,","%name," "There was recently a request to change the password for your account.","There was recently a request to change the password for your account." diff --git a/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml b/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml index 2042479832898..b0107a53593d3 100644 --- a/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml +++ b/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml @@ -51,8 +51,8 @@ if (is_object($myBlock) && $myBlock->getJsObjectName()): if (checked) { confirm({ - content: "{$myBlock->escapeJs(__('Warning!\r\nThis action will remove this user from already ' . - 'assigned role\r\nAre you sure?'))}", + content: "{$myBlock->escapeJs(__('Warning!
This action will remove this user from already ' . + 'assigned role.
Are you sure?'))}", actions: { confirm: function () { checkbox[0].checked = false; @@ -102,7 +102,7 @@ if (is_object($myBlock) && $myBlock->getJsObjectName()): allCheckbox.checked = true; confirm({ content: "{$myBlock->escapeJs( - __('Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?') + __('Warning!
This action will remove those users from already assigned roles.
Are you sure?') )}", actions: { confirm: function () { diff --git a/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml b/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml index 71a866f945693..7455c26334c02 100644 --- a/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml +++ b/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml @@ -45,7 +45,7 @@ if (is_object($myBlock) && $myBlock->getJsObjectName()): var checked = isInput ? checkbox[0].checked : !checkbox[0].checked; if (checked && warning && radioBoxes.size() > 0) { if ( !confirm("{$myBlock->escapeJs( - __('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?') + __('Warning!
This action will remove this user from already assigned role.
Are you sure?') )}") ) { checkbox[0].checked = false; for(i in radioBoxes) { diff --git a/app/code/Magento/User/view/adminhtml/web/app-config.js b/app/code/Magento/User/view/adminhtml/web/app-config.js index 6387bec03ea90..0567e95fcc6e9 100644 --- a/app/code/Magento/User/view/adminhtml/web/app-config.js +++ b/app/code/Magento/User/view/adminhtml/web/app-config.js @@ -26,7 +26,7 @@ require.config({ 'jquery/ui': 'jquery/jquery-ui-1.9.2', 'jquery/validate': 'jquery/jquery.validate', 'jquery/hover-intent': 'jquery/jquery.hoverIntent', - 'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-fp', + 'jquery/file-uploader': 'jquery/fileUploader/jquery.fileuploader', 'prototype': 'prototype/prototype-amd', 'text': 'requirejs/text', 'domReady': 'requirejs/domReady', diff --git a/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php b/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php index f38c0f0978536..5ead1beb722dd 100644 --- a/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php +++ b/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php @@ -33,10 +33,8 @@ class Generator extends AbstractSchemaGenerator */ const ERROR_SCHEMA = '#/definitions/error-response'; - /** Unauthorized description */ const UNAUTHORIZED_DESCRIPTION = '401 Unauthorized'; - /** Array signifier */ const ARRAY_SIGNIFIER = '[0]'; /** @@ -758,7 +756,7 @@ private function handleComplex($name, $type, $prefix, $isArray) ); } - return empty($queryNames) ? [] : array_merge(...$queryNames); + return array_merge([], ...$queryNames); } /** diff --git a/app/code/Magento/Weee/Model/Total/Quote/Weee.php b/app/code/Magento/Weee/Model/Total/Quote/Weee.php index 449c6cd688668..e7ae84c15a51f 100644 --- a/app/code/Magento/Weee/Model/Total/Quote/Weee.php +++ b/app/code/Magento/Weee/Model/Total/Quote/Weee.php @@ -306,12 +306,12 @@ protected function getNextIncrement() */ protected function recalculateParent(AbstractItem $item) { - $associatedTaxables = [[]]; + $associatedTaxables = []; foreach ($item->getChildren() as $child) { $associatedTaxables[] = $child->getAssociatedTaxables(); } $item->setAssociatedTaxables( - array_unique(array_merge(...$associatedTaxables)) + array_unique(array_merge([], ...$associatedTaxables)) ); } diff --git a/app/code/Magento/Weee/Plugin/Catalog/ResourceModel/Attribute/RemoveProductWeeData.php b/app/code/Magento/Weee/Plugin/Catalog/ResourceModel/Attribute/RemoveProductWeeData.php new file mode 100644 index 0000000000000..b1b228296eb6b --- /dev/null +++ b/app/code/Magento/Weee/Plugin/Catalog/ResourceModel/Attribute/RemoveProductWeeData.php @@ -0,0 +1,63 @@ +resourceConnection = $resourceConnection; + } + + /** + * Deletes wee tax attributes data on unassigning weee attribute from attribute set. + * + * @param RemoveProductAttributeData $subject + * @param \Closure $proceed + * @param AbstractModel $object + * @param int $attributeSetId + * @return void + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + */ + public function aroundRemoveData( + RemoveProductAttributeData $subject, + \Closure $proceed, + AbstractModel $object, + int $attributeSetId + ) { + if ($object->getFrontendInput() == 'weee') { + $select =$this->resourceConnection->getConnection()->select() + ->from(['b' => $this->resourceConnection->getTableName('weee_tax')]) + ->join( + ['e' => $object->getEntity()->getEntityTable()], + 'b.entity_id = e.entity_id' + )->where('b.attribute_id = ?', $object->getAttributeId()) + ->where('e.attribute_set_id = ?', $attributeSetId); + + $this->resourceConnection->getConnection()->query($select->deleteFromSelect('b')); + } else { + $proceed($object, $attributeSetId); + } + } +} diff --git a/app/code/Magento/Weee/etc/di.xml b/app/code/Magento/Weee/etc/di.xml index 8b433163cad22..ccc849f4d8493 100644 --- a/app/code/Magento/Weee/etc/di.xml +++ b/app/code/Magento/Weee/etc/di.xml @@ -81,4 +81,7 @@
+
+
diff --git a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Validate.php b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Validate.php
index f6eb42d1cfeb6..f30a44920dc6a 100644
--- a/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Validate.php
+++ b/app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Validate.php
@@ -6,7 +6,12 @@
*/
namespace Magento\Widget\Controller\Adminhtml\Widget\Instance;
-class Validate extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\DataObject;
+use Magento\Framework\Phrase;
+use Magento\Widget\Controller\Adminhtml\Widget\Instance;
+
+class Validate extends Instance implements HttpPostActionInterface
{
/**
* Validate action
@@ -15,12 +20,12 @@ class Validate extends \Magento\Widget\Controller\Adminhtml\Widget\Instance
*/
public function execute()
{
- $response = new \Magento\Framework\DataObject();
+ $response = new DataObject();
$response->setError(false);
$widgetInstance = $this->_initWidgetInstance();
$result = $widgetInstance->validate();
- if ($result !== true && is_string($result)) {
- $this->messageManager->addError($result);
+ if ($result !== true && (is_string($result) || $result instanceof Phrase)) {
+ $this->messageManager->addErrorMessage((string) $result);
$this->_view->getLayout()->initMessages();
$response->setError(true);
$response->setHtmlMessage($this->_view->getLayout()->getMessagesBlock()->getGroupedHtml());
diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateCatalogProductsListWidgetActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateCatalogProductsListWidgetActionGroup.xml
new file mode 100644
index 0000000000000..e1de4d7147df6
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateCatalogProductsListWidgetActionGroup.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+ EXTENDS: AdminCreateWidgetActionGroup. Creates a Product List Widget. Validates that the Success Message is present and correct.
+
+
+
+
+
diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateProductsListWidgetActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateProductsListWidgetActionGroup.xml
index e3845adc9cd4a..85389ddd59bf8 100644
--- a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateProductsListWidgetActionGroup.xml
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateProductsListWidgetActionGroup.xml
@@ -8,7 +8,7 @@
-
+
EXTENDS: AdminCreateWidgetActionGroup. Creates a Product List Widget. Validates that the Success Message is present and correct.
diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateSpecificEntityWidgetActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateSpecificEntityWidgetActionGroup.xml
new file mode 100644
index 0000000000000..1fcb6d47f555f
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminCreateSpecificEntityWidgetActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+ Fill widget main fields and widget layout by index for anchor categories DisplayOn option
+
+
+
diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSaveAndContinueWidgetActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSaveAndContinueWidgetActionGroup.xml
new file mode 100644
index 0000000000000..6d17a5c687b1a
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSaveAndContinueWidgetActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+ Click on the Save an Continue button and check the success message
+
+
+
diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetWidgetNameAndStoreActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetWidgetNameAndStoreActionGroup.xml
new file mode 100644
index 0000000000000..ce19c1b086328
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetWidgetNameAndStoreActionGroup.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+ Set widget name, store IDs and sort order on Widget edit page
+
+
+
+
+
diff --git a/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetWidgetTypeAndDesignActionGroup.xml b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetWidgetTypeAndDesignActionGroup.xml
new file mode 100644
index 0000000000000..3a9b4c53572c7
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/ActionGroup/AdminSetWidgetTypeAndDesignActionGroup.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+ Select type and design on Widget edit page
+
+
+
+
+
diff --git a/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml b/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml
index ffd2d025548cf..bb739aa88b1f0 100644
--- a/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Data/WidgetsData.xml
@@ -12,6 +12,7 @@
Catalog Products List
Magento Luma
TestWidget
+ 0
- All Store Views
@@ -19,6 +20,20 @@
All Pages
Main Content Area
+
+ Catalog Category Link
+ Magento Luma
+ TestCategoryLinkWidgetOnSpecifiedCategory
+
+ - All Store Views
+
+ 0
+ catalog_category_view
+ Category Link Block Template
+ SKU
+ Anchor Categories
+ Main Content Area
+
Dynamic Blocks Rotator
Magento Luma
diff --git a/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
index 0777e6cbd58d9..8a17b589d7ab2 100644
--- a/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
+++ b/app/code/Magento/Widget/Test/Mftf/Section/AdminNewWidgetSection.xml
@@ -12,6 +12,7 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Widget/Test/Mftf/Test/AdminResetWidgetTest.xml b/app/code/Magento/Widget/Test/Mftf/Test/AdminResetWidgetTest.xml
new file mode 100644
index 0000000000000..5e053778fe7ed
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Mftf/Test/AdminResetWidgetTest.xml
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Widget/Test/Unit/Controller/Adminhtml/Widget/Instance/ValidateTest.php b/app/code/Magento/Widget/Test/Unit/Controller/Adminhtml/Widget/Instance/ValidateTest.php
new file mode 100644
index 0000000000000..6aa78d43b09ea
--- /dev/null
+++ b/app/code/Magento/Widget/Test/Unit/Controller/Adminhtml/Widget/Instance/ValidateTest.php
@@ -0,0 +1,155 @@
+getMockForAbstractClass(RequestInterface::class);
+ $this->messageManagerMock = $this->createMock(ManagerInterface::class);
+ $viewMock = $this->createMock(ViewInterface::class);
+ $layoutMock = $this->getMockBuilder(LayoutInterface::class)
+ ->disableOriginalConstructor()
+ ->addMethods(['initMessages'])
+ ->getMockForAbstractClass();
+ $this->messagesBlock = $this->createMock(Messages::class);
+ $layoutMock->method('getMessagesBlock')->willReturn($this->messagesBlock);
+ $viewMock->method('getLayout')->willReturn($layoutMock);
+ $this->responseMock = $this->getMockBuilder(ResponseInterface::class)
+ ->disableOriginalConstructor()
+ ->addMethods(['representJson'])
+ ->getMockForAbstractClass();
+
+ $context = $this->createMock(Context::class);
+ $context->method('getRequest')->willReturn($request);
+ $context->method('getMessageManager')->willReturn($this->messageManagerMock);
+ $context->method('getView')->willReturn($viewMock);
+ $context->method('getResponse')->willReturn($this->responseMock);
+
+ $this->widgetMock = $this->getMockBuilder(Instance::class)
+ ->disableOriginalConstructor()
+ ->onlyMethods(['setType', 'setCode', 'getType'])
+ ->addMethods(['setThemeId', 'getThemeId'])
+ ->getMock();
+ $this->widgetMock->method('setType')->willReturnSelf();
+ $this->widgetMock->method('setCode')->willReturnSelf();
+ $this->widgetMock->method('setThemeId')->willReturnSelf();
+ $widgetFactoryMock = $this->createMock(InstanceFactory::class);
+ $widgetFactoryMock->method('create')->willReturn($this->widgetMock);
+
+ $this->model = $objectManager->getObject(
+ Validate::class,
+ [
+ 'widgetFactory' => $widgetFactoryMock,
+ 'context' => $context,
+ 'layout' => $this->layout
+ ]
+ );
+ }
+
+ /**
+ * Test execute
+ *
+ * @return void
+ */
+ public function testExecute(): void
+ {
+ $this->widgetMock->expects($this->once())
+ ->method('getThemeId')
+ ->willReturn(777);
+ $this->widgetMock->expects($this->once())
+ ->method('getType')
+ ->willReturn('some type');
+
+ $this->messageManagerMock->expects($this->never())
+ ->method('addErrorMessage')
+ ->with($this->errorMessage);
+ $this->responseMock->expects($this->once())
+ ->method('representJson')
+ ->with(json_encode(['error' => false]));
+
+ $this->model->execute();
+ }
+
+ /**
+ * Test execute with Phrase object
+ *
+ * @return void
+ */
+ public function testExecutePhraseObject(): void
+ {
+ $this->messageManagerMock->expects($this->once())
+ ->method('addErrorMessage')
+ ->with($this->errorMessage);
+ $this->messagesBlock->expects($this->once())
+ ->method('getGroupedHtml')
+ ->willReturn($this->errorMessage);
+ $this->responseMock->expects($this->once())
+ ->method('representJson')
+ ->with(json_encode(['error' => true, 'html_message' => $this->errorMessage]));
+
+ $this->model->execute();
+ }
+}
diff --git a/app/code/Magento/Widget/Test/Unit/Model/Template/FilterTest.php b/app/code/Magento/Widget/Test/Unit/Model/Template/FilterTest.php
index 7afc9dc93f46e..6a23b5c66e5ba 100644
--- a/app/code/Magento/Widget/Test/Unit/Model/Template/FilterTest.php
+++ b/app/code/Magento/Widget/Test/Unit/Model/Template/FilterTest.php
@@ -267,7 +267,7 @@ public function testMediaDirective()
{
$image = 'wysiwyg/VB.png';
$construction = ['{{media url="' . $image . '"}}', 'media', ' url="' . $image . '"'];
- $baseUrl = 'http://localhost/pub/media/';
+ $baseUrl = 'http://localhost/media/';
$this->storeMock->expects($this->once())
->method('getBaseUrl')
@@ -285,7 +285,7 @@ public function testMediaDirectiveWithEncodedQuotes()
{
$image = 'wysiwyg/VB.png';
$construction = ['{{media url="' . $image . '"}}', 'media', ' url="' . $image . '"'];
- $baseUrl = 'http://localhost/pub/media/';
+ $baseUrl = 'http://localhost/media/';
$this->storeMock->expects($this->once())
->method('getBaseUrl')
diff --git a/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml b/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
index 6dab476115cee..93c5cac33f947 100644
--- a/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
+++ b/app/code/Magento/Widget/view/adminhtml/templates/instance/edit/layout.phtml
@@ -5,11 +5,12 @@
*/
/** @var \Magento\Widget\Block\Adminhtml\Widget\Instance\Edit\Tab\Main\Layout $block */
+/** @var \Magento\Framework\Escaper $escaper */
/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
?>
This action will remove this user from already assigned role.
Are you sure?","Warning!
This action will remove this user from already assigned role.
Are you sure?" +"Warning!
This action will remove those users from already assigned roles.
Are you sure?","Warning!
This action will remove those users from already assigned roles.
Are you sure?" "Password Reset Confirmation for %name","Password Reset Confirmation for %name" "%name,","%name," "There was recently a request to change the password for your account.","There was recently a request to change the password for your account." diff --git a/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml b/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml index 2042479832898..b0107a53593d3 100644 --- a/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml +++ b/app/code/Magento/User/view/adminhtml/templates/role/users_grid_js.phtml @@ -51,8 +51,8 @@ if (is_object($myBlock) && $myBlock->getJsObjectName()): if (checked) { confirm({ - content: "{$myBlock->escapeJs(__('Warning!\r\nThis action will remove this user from already ' . - 'assigned role\r\nAre you sure?'))}", + content: "{$myBlock->escapeJs(__('Warning!
This action will remove this user from already ' . + 'assigned role.
Are you sure?'))}", actions: { confirm: function () { checkbox[0].checked = false; @@ -102,7 +102,7 @@ if (is_object($myBlock) && $myBlock->getJsObjectName()): allCheckbox.checked = true; confirm({ content: "{$myBlock->escapeJs( - __('Warning!\r\nThis action will remove those users from already assigned roles\r\nAre you sure?') + __('Warning!
This action will remove those users from already assigned roles.
Are you sure?') )}", actions: { confirm: function () { diff --git a/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml b/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml index 71a866f945693..7455c26334c02 100644 --- a/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml +++ b/app/code/Magento/User/view/adminhtml/templates/user/roles_grid_js.phtml @@ -45,7 +45,7 @@ if (is_object($myBlock) && $myBlock->getJsObjectName()): var checked = isInput ? checkbox[0].checked : !checkbox[0].checked; if (checked && warning && radioBoxes.size() > 0) { if ( !confirm("{$myBlock->escapeJs( - __('Warning!\r\nThis action will remove this user from already assigned role\r\nAre you sure?') + __('Warning!
This action will remove this user from already assigned role.
Are you sure?') )}") ) { checkbox[0].checked = false; for(i in radioBoxes) { diff --git a/app/code/Magento/User/view/adminhtml/web/app-config.js b/app/code/Magento/User/view/adminhtml/web/app-config.js index 6387bec03ea90..0567e95fcc6e9 100644 --- a/app/code/Magento/User/view/adminhtml/web/app-config.js +++ b/app/code/Magento/User/view/adminhtml/web/app-config.js @@ -26,7 +26,7 @@ require.config({ 'jquery/ui': 'jquery/jquery-ui-1.9.2', 'jquery/validate': 'jquery/jquery.validate', 'jquery/hover-intent': 'jquery/jquery.hoverIntent', - 'jquery/file-uploader': 'jquery/fileUploader/jquery.fileupload-fp', + 'jquery/file-uploader': 'jquery/fileUploader/jquery.fileuploader', 'prototype': 'prototype/prototype-amd', 'text': 'requirejs/text', 'domReady': 'requirejs/domReady', diff --git a/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php b/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php index f38c0f0978536..5ead1beb722dd 100644 --- a/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php +++ b/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php @@ -33,10 +33,8 @@ class Generator extends AbstractSchemaGenerator */ const ERROR_SCHEMA = '#/definitions/error-response'; - /** Unauthorized description */ const UNAUTHORIZED_DESCRIPTION = '401 Unauthorized'; - /** Array signifier */ const ARRAY_SIGNIFIER = '[0]'; /** @@ -758,7 +756,7 @@ private function handleComplex($name, $type, $prefix, $isArray) ); } - return empty($queryNames) ? [] : array_merge(...$queryNames); + return array_merge([], ...$queryNames); } /** diff --git a/app/code/Magento/Weee/Model/Total/Quote/Weee.php b/app/code/Magento/Weee/Model/Total/Quote/Weee.php index 449c6cd688668..e7ae84c15a51f 100644 --- a/app/code/Magento/Weee/Model/Total/Quote/Weee.php +++ b/app/code/Magento/Weee/Model/Total/Quote/Weee.php @@ -306,12 +306,12 @@ protected function getNextIncrement() */ protected function recalculateParent(AbstractItem $item) { - $associatedTaxables = [[]]; + $associatedTaxables = []; foreach ($item->getChildren() as $child) { $associatedTaxables[] = $child->getAssociatedTaxables(); } $item->setAssociatedTaxables( - array_unique(array_merge(...$associatedTaxables)) + array_unique(array_merge([], ...$associatedTaxables)) ); } diff --git a/app/code/Magento/Weee/Plugin/Catalog/ResourceModel/Attribute/RemoveProductWeeData.php b/app/code/Magento/Weee/Plugin/Catalog/ResourceModel/Attribute/RemoveProductWeeData.php new file mode 100644 index 0000000000000..b1b228296eb6b --- /dev/null +++ b/app/code/Magento/Weee/Plugin/Catalog/ResourceModel/Attribute/RemoveProductWeeData.php @@ -0,0 +1,63 @@ +resourceConnection = $resourceConnection; + } + + /** + * Deletes wee tax attributes data on unassigning weee attribute from attribute set. + * + * @param RemoveProductAttributeData $subject + * @param \Closure $proceed + * @param AbstractModel $object + * @param int $attributeSetId + * @return void + * @SuppressWarnings(PHPMD.UnusedFormalParameter) + */ + public function aroundRemoveData( + RemoveProductAttributeData $subject, + \Closure $proceed, + AbstractModel $object, + int $attributeSetId + ) { + if ($object->getFrontendInput() == 'weee') { + $select =$this->resourceConnection->getConnection()->select() + ->from(['b' => $this->resourceConnection->getTableName('weee_tax')]) + ->join( + ['e' => $object->getEntity()->getEntityTable()], + 'b.entity_id = e.entity_id' + )->where('b.attribute_id = ?', $object->getAttributeId()) + ->where('e.attribute_set_id = ?', $attributeSetId); + + $this->resourceConnection->getConnection()->query($select->deleteFromSelect('b')); + } else { + $proceed($object, $attributeSetId); + } + } +} diff --git a/app/code/Magento/Weee/etc/di.xml b/app/code/Magento/Weee/etc/di.xml index 8b433163cad22..ccc849f4d8493 100644 --- a/app/code/Magento/Weee/etc/di.xml +++ b/app/code/Magento/Weee/etc/di.xml @@ -81,4 +81,7 @@