diff --git a/app/code/Magento/ConfigurableProduct/Plugin/Model/ResourceModel/Attribute/ScopedOptionSelectBuilder.php b/app/code/Magento/ConfigurableProduct/Plugin/Model/ResourceModel/Attribute/ScopedOptionSelectBuilder.php
new file mode 100644
index 0000000000000..20d1ac0c2d376
--- /dev/null
+++ b/app/code/Magento/ConfigurableProduct/Plugin/Model/ResourceModel/Attribute/ScopedOptionSelectBuilder.php
@@ -0,0 +1,61 @@
+storeManager = $storeManager;
+ $this->productWebsiteResource = $productWebsiteResource;
+ }
+
+ /**
+ * Add website filter to select.
+ *
+ * @param OptionSelectBuilderInterface $subject
+ * @param Select $select
+ * @return Select
+ * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ */
+ public function afterGetSelect(OptionSelectBuilderInterface $subject, Select $select)
+ {
+ $store = $this->storeManager->getStore();
+ $select->joinInner(
+ ['entity_website' => $this->productWebsiteResource->getMainTable()],
+ 'entity_website.product_id = entity.entity_id AND entity_website.website_id = ' . $store->getWebsiteId(),
+ []
+ );
+
+ return $select;
+ }
+}
diff --git a/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml b/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
index 3942ec52cbb8b..56418bbaad122 100644
--- a/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
+++ b/app/code/Magento/ConfigurableProduct/etc/frontend/di.xml
@@ -9,6 +9,7 @@
xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
index cd6d78e5c3ffb..7a327305fd27c 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
+++ b/app/code/Magento/ConfigurableProductGraphQl/Model/Variant/Collection.php
@@ -120,10 +120,10 @@ public function addEavAttributes(array $attributeCodes) : void
* Retrieve child products from for passed in parent id.
*
* @param int $id
- * @param ContextInterface|null $context
+ * @param ContextInterface $context
* @return array
*/
- public function getChildProductsByParentId(int $id, ContextInterface $context = null) : array
+ public function getChildProductsByParentId(int $id, ContextInterface $context) : array
{
$childrenMap = $this->fetch($context);
@@ -137,10 +137,10 @@ public function getChildProductsByParentId(int $id, ContextInterface $context =
/**
* Fetch all children products from parent id's.
*
- * @param ContextInterface|null $context
+ * @param ContextInterface $context
* @return array
*/
- private function fetch(ContextInterface $context = null) : array
+ private function fetch(ContextInterface $context) : array
{
if (empty($this->parentProducts) || !empty($this->childrenMap)) {
return $this->childrenMap;
@@ -151,6 +151,7 @@ private function fetch(ContextInterface $context = null) : array
/** @var ChildCollection $childCollection */
$childCollection = $this->childCollectionFactory->create();
$childCollection->setProductFilter($product);
+ $childCollection->addWebsiteFilter($context->getExtensionAttributes()->getStore()->getWebsiteId());
$this->collectionProcessor->process(
$childCollection,
$this->searchCriteriaBuilder->create(),
diff --git a/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml b/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml
index 06206e35712ad..56cff716ab6f8 100644
--- a/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml
+++ b/app/code/Magento/ConfigurableProductGraphQl/etc/graphql/di.xml
@@ -50,6 +50,7 @@
+
diff --git a/app/code/Magento/Cookie/Test/Mftf/Test/StorefrontVerifySecureCookieTest.xml b/app/code/Magento/Cookie/Test/Mftf/Test/StorefrontVerifySecureCookieTest.xml
index 337410d61c06d..d91093034dd2c 100644
--- a/app/code/Magento/Cookie/Test/Mftf/Test/StorefrontVerifySecureCookieTest.xml
+++ b/app/code/Magento/Cookie/Test/Mftf/Test/StorefrontVerifySecureCookieTest.xml
@@ -45,5 +45,10 @@
isCookieSecure
true
+
+
+ isCookieSecure2
+ true
+
diff --git a/app/code/Magento/Cookie/Test/Mftf/Test/StorefrontVerifyUnsecureCookieTest.xml b/app/code/Magento/Cookie/Test/Mftf/Test/StorefrontVerifyUnsecureCookieTest.xml
index dccb432273b89..fbf90df6bf898 100644
--- a/app/code/Magento/Cookie/Test/Mftf/Test/StorefrontVerifyUnsecureCookieTest.xml
+++ b/app/code/Magento/Cookie/Test/Mftf/Test/StorefrontVerifyUnsecureCookieTest.xml
@@ -32,5 +32,10 @@
isCookieSecure
false
+
+
+ isCookieSecure2
+ false
+
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderViewSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderViewSection.xml
index 4eb5e8aa02401..4dcedb12c96b2 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderViewSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/StorefrontCustomerOrderViewSection.xml
@@ -20,6 +20,7 @@
+
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Index/Builder.php b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Builder.php
index f5a70d2d09538..50317809ffcfe 100644
--- a/app/code/Magento/Elasticsearch/Model/Adapter/Index/Builder.php
+++ b/app/code/Magento/Elasticsearch/Model/Adapter/Index/Builder.php
@@ -58,7 +58,7 @@ public function build()
'type' => 'custom',
'tokenizer' => key($tokenizer),
'filter' => array_merge(
- ['lowercase', 'keyword_repeat'],
+ ['lowercase', 'keyword_repeat', 'asciifolding'],
array_keys($filter)
),
'char_filter' => array_keys($charFilter)
@@ -67,16 +67,14 @@ public function build()
'prefix_search' => [
'type' => 'custom',
'tokenizer' => key($tokenizer),
- 'filter' => array_merge(
- ['lowercase', 'keyword_repeat']
- ),
+ 'filter' => ['lowercase', 'keyword_repeat', 'asciifolding'],
'char_filter' => array_keys($charFilter)
],
'sku' => [
'type' => 'custom',
'tokenizer' => 'keyword',
'filter' => array_merge(
- ['lowercase', 'keyword_repeat'],
+ ['lowercase', 'keyword_repeat', 'asciifolding'],
array_keys($filter)
),
],
@@ -84,9 +82,7 @@ public function build()
'sku_prefix_search' => [
'type' => 'custom',
'tokenizer' => 'keyword',
- 'filter' => array_merge(
- ['lowercase', 'keyword_repeat']
- ),
+ 'filter' => ['lowercase', 'keyword_repeat', 'asciifolding']
]
],
'tokenizer' => $tokenizer,
diff --git a/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php b/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php
index 54b8c1966ee12..07d05bae73d4c 100644
--- a/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php
+++ b/app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php
@@ -69,22 +69,11 @@ public function apply()
foreach ($items as $item) {
$ids[] = (int)$item->getId();
}
+ $orderList = join(',', $ids);
$this->collection->getSelect()
->where('e.entity_id IN (?)', $ids)
- ->reset(\Magento\Framework\DB\Select::ORDER);
- $sortOrder = $this->searchResult->getSearchCriteria()
- ->getSortOrders();
- if (!empty($sortOrder['price']) && $this->collection->getLimitationFilters()->isUsingPriceIndex()) {
- $sortDirection = $sortOrder['price'];
- $this->collection->getSelect()
- ->order(
- new \Zend_Db_Expr("price_index.min_price = 0, price_index.min_price {$sortDirection}")
- );
- } else {
- $orderList = join(',', $ids);
- $this->collection->getSelect()
- ->order(new \Zend_Db_Expr("FIELD(e.entity_id,$orderList)"));
- }
+ ->reset(\Magento\Framework\DB\Select::ORDER)
+ ->order(new \Zend_Db_Expr("FIELD(e.entity_id,$orderList)"));
}
/**
diff --git a/app/code/Magento/Email/Model/Template/Filter.php b/app/code/Magento/Email/Model/Template/Filter.php
index 18435d85574f3..120d67931597f 100644
--- a/app/code/Magento/Email/Model/Template/Filter.php
+++ b/app/code/Magento/Email/Model/Template/Filter.php
@@ -36,6 +36,8 @@
use Magento\Variable\Model\Variable;
use Magento\Variable\Model\VariableFactory;
use Psr\Log\LoggerInterface;
+use Magento\Store\Model\Information as StoreInformation;
+use Magento\Framework\App\ObjectManager;
/**
* Core Email Template Filter Model
@@ -201,6 +203,11 @@ class Filter extends Template
*/
private $pubDirectoryRead;
+ /**
+ * @var StoreInformation
+ */
+ private $storeInformation;
+
/**
* Filter constructor.
@@ -222,6 +229,7 @@ class Filter extends Template
* @param CssInliner $cssInliner
* @param array $variables
* @param array $directiveProcessors
+ * @param StoreInformation|null $storeInformation
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
@@ -242,7 +250,8 @@ public function __construct(
Filesystem $pubDirectory,
CssInliner $cssInliner,
$variables = [],
- array $directiveProcessors = []
+ array $directiveProcessors = [],
+ ?StoreInformation $storeInformation = null
) {
$this->_escaper = $escaper;
$this->_assetRepo = $assetRepo;
@@ -259,6 +268,8 @@ public function __construct(
$this->cssProcessor = $cssProcessor;
$this->pubDirectory = $pubDirectory;
$this->configVariables = $configVariables;
+ $this->storeInformation = $storeInformation ?:
+ ObjectManager::getInstance()->get(StoreInformation::class);
parent::__construct($string, $variables, $directiveProcessors, $variableResolver);
}
@@ -825,18 +836,29 @@ private function validateProtocolDirectiveHttpScheme(array $params) : void
*
* @param string[] $construction
* @return string
+ * @throws NoSuchEntityException
*/
public function configDirective($construction)
{
$configValue = '';
$params = $this->getParameters($construction[2]);
$storeId = $this->getStoreId();
+ $store = $this->_storeManager->getStore($storeId);
+ $storeInformationObj = $this->storeInformation
+ ->getStoreInformationObject($store);
if (isset($params['path']) && $this->isAvailableConfigVariable($params['path'])) {
$configValue = $this->_scopeConfig->getValue(
$params['path'],
ScopeInterface::SCOPE_STORE,
$storeId
);
+ if ($params['path'] == $this->storeInformation::XML_PATH_STORE_INFO_COUNTRY_CODE) {
+ $configValue = $storeInformationObj->getData('country');
+ } elseif ($params['path'] == $this->storeInformation::XML_PATH_STORE_INFO_REGION_CODE) {
+ $configValue = $storeInformationObj->getData('region')?
+ $storeInformationObj->getData('region'):
+ $configValue;
+ }
}
return $configValue;
}
diff --git a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
index 97a684b92be5d..923193f6e6a92 100644
--- a/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
+++ b/app/code/Magento/Email/Test/Unit/Model/Template/FilterTest.php
@@ -14,6 +14,7 @@
use Magento\Framework\App\Area;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\DataObject;
use Magento\Framework\Exception\MailException;
use Magento\Framework\Exception\NoSuchEntityException;
use Magento\Framework\App\State;
@@ -35,12 +36,14 @@
use Magento\Framework\View\LayoutFactory;
use Magento\Framework\View\LayoutInterface;
use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\Store;
use Magento\Store\Model\StoreManagerInterface;
use Magento\Variable\Model\Source\Variables;
use Magento\Variable\Model\VariableFactory;
use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase;
use Psr\Log\LoggerInterface;
+use Magento\Store\Model\Information as StoreInformation;
/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -148,6 +151,16 @@ class FilterTest extends TestCase
*/
private $directiveProcessors;
+ /**
+ * @var StoreInformation
+ */
+ private $storeInformation;
+
+ /**
+ * @var store
+ */
+ private $store;
+
protected function setUp(): void
{
$this->objectManager = new ObjectManager($this);
@@ -232,6 +245,14 @@ protected function setUp(): void
->disableOriginalConstructor()
->getMock(),
];
+
+ $this->store = $this->getMockBuilder(Store::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->storeInformation = $this->getMockBuilder(StoreInformation::class)
+ ->disableOriginalConstructor()
+ ->getMock();
}
/**
@@ -260,7 +281,8 @@ protected function getModel($mockedMethods = null)
$this->pubDirectory,
$this->cssInliner,
[],
- $this->directiveProcessors
+ $this->directiveProcessors,
+ $this->storeInformation
]
)
->setMethods($mockedMethods)
@@ -421,12 +443,10 @@ public function testConfigDirectiveAvailable()
$construction = ["{{config path={$path}}}", 'config', " path={$path}"];
$scopeConfigValue = 'value';
- $storeMock = $this->getMockBuilder(StoreInterface::class)
- ->disableOriginalConstructor()
- ->getMockForAbstractClass();
-
- $this->storeManager->expects($this->once())->method('getStore')->willReturn($storeMock);
- $storeMock->expects($this->once())->method('getId')->willReturn(1);
+ $this->storeManager->expects($this->any())
+ ->method('getStore')
+ ->willReturn($this->store);
+ $this->store->expects($this->any())->method('getId')->willReturn(1);
$this->configVariables->expects($this->once())
->method('getData')
@@ -435,6 +455,10 @@ public function testConfigDirectiveAvailable()
->method('getValue')
->willReturn($scopeConfigValue);
+ $this->storeInformation->expects($this->once())
+ ->method('getStoreInformationObject')
+ ->willReturn(new DataObject([]));
+
$this->assertEquals($scopeConfigValue, $this->getModel()->configDirective($construction));
}
@@ -445,11 +469,10 @@ public function testConfigDirectiveUnavailable()
$construction = ["{{config path={$path}}}", 'config', " path={$path}"];
$scopeConfigValue = '';
- $storeMock = $this->getMockBuilder(StoreInterface::class)
- ->disableOriginalConstructor()
- ->getMockForAbstractClass();
- $this->storeManager->expects($this->once())->method('getStore')->willReturn($storeMock);
- $storeMock->expects($this->once())->method('getId')->willReturn(1);
+ $this->storeManager->expects($this->any())
+ ->method('getStore')
+ ->willReturn($this->store);
+ $this->store->expects($this->any())->method('getId')->willReturn(1);
$this->configVariables->expects($this->once())
->method('getData')
@@ -458,9 +481,65 @@ public function testConfigDirectiveUnavailable()
->method('getValue')
->willReturn($scopeConfigValue);
+ $this->storeInformation->expects($this->once())
+ ->method('getStoreInformationObject')
+ ->willReturn(new DataObject([]));
+
$this->assertEquals($scopeConfigValue, $this->getModel()->configDirective($construction));
}
+ /**
+ * @throws NoSuchEntityException
+ */
+ public function testConfigDirectiveGetCountry()
+ {
+ $path = "general/store_information/country_id";
+ $availableConfigs = [['value' => $path]];
+ $construction = ["{{config path={$path}}}", 'config', " path={$path}"];
+ $expectedCountry = 'United States';
+
+ $this->storeManager->expects($this->any())
+ ->method('getStore')
+ ->willReturn($this->store);
+ $this->store->expects($this->any())->method('getId')->willReturn(1);
+
+ $this->configVariables->expects($this->once())
+ ->method('getData')
+ ->willReturn($availableConfigs);
+
+ $this->storeInformation->expects($this->once())
+ ->method('getStoreInformationObject')
+ ->willReturn(new DataObject(['country_id' => 'US', 'country' => 'United States']));
+
+ $this->assertEquals($expectedCountry, $this->getModel()->configDirective($construction));
+ }
+
+ /**
+ * @throws NoSuchEntityException
+ */
+ public function testConfigDirectiveGetRegion()
+ {
+ $path = "general/store_information/region_id";
+ $availableConfigs = [['value' => $path]];
+ $construction = ["{{config path={$path}}}", 'config', " path={$path}"];
+ $expectedRegion = 'Texas';
+
+ $this->storeManager->expects($this->any())
+ ->method('getStore')
+ ->willReturn($this->store);
+ $this->store->expects($this->any())->method('getId')->willReturn(1);
+
+ $this->configVariables->expects($this->once())
+ ->method('getData')
+ ->willReturn($availableConfigs);
+
+ $this->storeInformation->expects($this->once())
+ ->method('getStoreInformationObject')
+ ->willReturn(new DataObject(['region_id' => '57', 'region' => 'Texas']));
+
+ $this->assertEquals($expectedRegion, $this->getModel()->configDirective($construction));
+ }
+
/**
* @throws MailException
* @throws NoSuchEntityException
diff --git a/app/code/Magento/Persistent/Model/QuoteManager.php b/app/code/Magento/Persistent/Model/QuoteManager.php
index 35b07ebdb7c44..c649d0252c298 100644
--- a/app/code/Magento/Persistent/Model/QuoteManager.php
+++ b/app/code/Magento/Persistent/Model/QuoteManager.php
@@ -182,6 +182,7 @@ public function convertCustomerCartToGuest()
$quote->getAddressesCollection()->walk('setCustomerId', ['customerId' => null]);
$quote->getAddressesCollection()->walk('setEmail', ['email' => null]);
$quote->collectTotals();
+ $quote->getCustomer()->setId(null);
$this->persistentSession->getSession()->removePersistentCookie();
$this->persistentSession->setSession(null);
$this->quoteRepository->save($quote);
diff --git a/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php b/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
index ece36673c1e82..f3c70a2c8550f 100644
--- a/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
+++ b/app/code/Magento/Persistent/Test/Unit/Model/QuoteManagerTest.php
@@ -134,6 +134,7 @@ protected function setUp(): void
'setExtensionAttributes',
'__wakeup',
'setCustomer',
+ 'getCustomer'
])
->disableOriginalConstructor()
->getMock();
@@ -343,6 +344,13 @@ public function testConvertCustomerCartToGuest()
->method('setIsPersistent')->with(false)->willReturn($this->quoteMock);
$this->quoteMock->expects($this->exactly(3))
->method('getAddressesCollection')->willReturn($this->abstractCollectionMock);
+ $customerMock = $this->createMock(CustomerInterface::class);
+ $customerMock->expects($this->once())
+ ->method('setId')
+ ->with(null)
+ ->willReturnSelf();
+ $this->quoteMock->expects($this->once())
+ ->method('getCustomer')->willReturn($customerMock);
$this->abstractCollectionMock->expects($this->exactly(3))->method('walk')->with(
$this->logicalOr(
$this->equalTo('setCustomerAddressId'),
diff --git a/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminUploadSameVimeoVideoForMultipleProductsTest.xml b/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminUploadSameVimeoVideoForMultipleProductsTest.xml
new file mode 100644
index 0000000000000..5b346040db818
--- /dev/null
+++ b/app/code/Magento/ProductVideo/Test/Mftf/Test/AdminUploadSameVimeoVideoForMultipleProductsTest.xml
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Quote/Test/Mftf/Data/CustomerCartData.xml b/app/code/Magento/Quote/Test/Mftf/Data/CustomerCartData.xml
index b09f2fb376327..cf47b2f8e18c4 100755
--- a/app/code/Magento/Quote/Test/Mftf/Data/CustomerCartData.xml
+++ b/app/code/Magento/Quote/Test/Mftf/Data/CustomerCartData.xml
@@ -30,4 +30,8 @@
CashOnDeliveryPaymentMethod
BillingAddressTX
+
+
+
+
diff --git a/app/code/Magento/Quote/Test/Mftf/Metadata/CustomerCartMeta.xml b/app/code/Magento/Quote/Test/Mftf/Metadata/CustomerCartMeta.xml
index f233954f2cdcf..95773d82beb29 100644
--- a/app/code/Magento/Quote/Test/Mftf/Metadata/CustomerCartMeta.xml
+++ b/app/code/Magento/Quote/Test/Mftf/Metadata/CustomerCartMeta.xml
@@ -60,4 +60,9 @@
string
+
+
+ application/json
+
+
diff --git a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php
index ad305c8b7199f..3a4e8184f82cb 100644
--- a/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php
+++ b/app/code/Magento/Sales/Model/Order/Email/Sender/ShipmentCommentSender.php
@@ -75,6 +75,7 @@ public function send(Shipment $shipment, $notify = true, $comment = '')
'formattedBillingAddress' => $this->getFormattedBillingAddress($order),
'order_data' => [
'customer_name' => $order->getCustomerName(),
+ 'is_not_virtual' => $order->getIsNotVirtual(),
'frontend_status_label' => $order->getFrontendStatusLabel()
]
];
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenOrderViewPageByOrderIdActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenOrderViewPageByOrderIdActionGroup.xml
new file mode 100644
index 0000000000000..5bd1d5907f69d
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOpenOrderViewPageByOrderIdActionGroup.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+ Opens the Order View Page in Admin using order_id
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminSalesOrderCommentsActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminSalesOrderCommentsActionGroup.xml
new file mode 100644
index 0000000000000..af0237d3a6606
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminSalesOrderCommentsActionGroup.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+ Adding comments on admin sales order details page
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/StorefrontOpenMyOrdersPageActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/StorefrontOpenMyOrdersPageActionGroup.xml
new file mode 100644
index 0000000000000..39f4e65f4c687
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/StorefrontOpenMyOrdersPageActionGroup.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+ Opens the "My Account->"My Orders" Page
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Data/OrderCommentsData.xml b/app/code/Magento/Sales/Test/Mftf/Data/OrderCommentsData.xml
new file mode 100644
index 0000000000000..b7c5bb457ca08
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Data/OrderCommentsData.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+ <a href="https://business.adobe.com/products/magento/magento-commerce.html">Testing Html Tags</a>
+
+
+ a href
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminSalesOrderCommentsSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminSalesOrderCommentsSection.xml
new file mode 100644
index 0000000000000..c7f2628a900e3
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminSalesOrderCommentsSection.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCashOnDeliveryPaymentMethodTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCashOnDeliveryPaymentMethodTest.xml
index 5f454152de20c..a4a24e77838db 100644
--- a/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCashOnDeliveryPaymentMethodTest.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Test/AdminCancelTheCreatedOrderWithCashOnDeliveryPaymentMethodTest.xml
@@ -22,19 +22,25 @@
-
-
-
-
-
10.00
+
+
+
+
+
+
+
+
+
+
+
@@ -43,39 +49,34 @@
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
-
-
-
-
+
+
-
-
-
+
+
+
-
-
-
+
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/StorefrontVerifyOrderHistoryCommentsTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontVerifyOrderHistoryCommentsTest.xml
new file mode 100644
index 0000000000000..2f4042d4d9760
--- /dev/null
+++ b/app/code/Magento/Sales/Test/Mftf/Test/StorefrontVerifyOrderHistoryCommentsTest.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentCommentSenderTest.php b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentCommentSenderTest.php
index 91e7ae18d3550..a3bf17ec4b27f 100644
--- a/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentCommentSenderTest.php
+++ b/app/code/Magento/Sales/Test/Unit/Model/Order/Email/Sender/ShipmentCommentSenderTest.php
@@ -62,8 +62,9 @@ public function testSendTrueWithoutCustomerCopy()
{
$billingAddress = $this->addressMock;
$comment = 'comment_test';
- $customerName='Test Customer';
- $frontendStatusLabel='Processing';
+ $customerName = 'Test Customer';
+ $frontendStatusLabel = 'Processing';
+ $isNotVirtual = true;
$this->orderMock->expects($this->once())
->method('getCustomerIsGuest')
@@ -76,6 +77,9 @@ public function testSendTrueWithoutCustomerCopy()
$this->orderMock->expects($this->any())
->method('getCustomerName')
->willReturn($customerName);
+ $this->orderMock->expects($this->any())
+ ->method('getIsNotVirtual')
+ ->willReturn($isNotVirtual);
$this->orderMock->expects($this->once())
->method('getFrontendStatusLabel')
->willReturn($frontendStatusLabel);
@@ -92,7 +96,8 @@ public function testSendTrueWithoutCustomerCopy()
'formattedBillingAddress' => 1,
'order_data' => [
'customer_name' => $customerName,
- 'frontend_status_label' => $frontendStatusLabel
+ 'frontend_status_label' => $frontendStatusLabel,
+ 'is_not_virtual' => $isNotVirtual,
]
]
);
@@ -105,8 +110,9 @@ public function testSendTrueWithCustomerCopy()
{
$billingAddress = $this->addressMock;
$comment = 'comment_test';
- $customerName='Test Customer';
- $frontendStatusLabel='Processing';
+ $customerName = 'Test Customer';
+ $frontendStatusLabel = 'Processing';
+ $isNotVirtual = true;
$this->orderMock->expects($this->once())
->method('getCustomerIsGuest')
@@ -122,6 +128,9 @@ public function testSendTrueWithCustomerCopy()
$this->orderMock->expects($this->any())
->method('getCustomerName')
->willReturn($customerName);
+ $this->orderMock->expects($this->any())
+ ->method('getIsNotVirtual')
+ ->willReturn($isNotVirtual);
$this->orderMock->expects($this->once())
->method('getFrontendStatusLabel')
->willReturn($frontendStatusLabel);
@@ -138,7 +147,8 @@ public function testSendTrueWithCustomerCopy()
'formattedBillingAddress' => 1,
'order_data' => [
'customer_name' => $customerName,
- 'frontend_status_label' => $frontendStatusLabel
+ 'frontend_status_label' => $frontendStatusLabel,
+ 'is_not_virtual' => $isNotVirtual,
]
]
);
@@ -152,8 +162,9 @@ public function testSendVirtualOrder()
$isVirtualOrder = true;
$this->orderMock->setData(OrderInterface::IS_VIRTUAL, $isVirtualOrder);
$this->stepAddressFormat($this->addressMock, $isVirtualOrder);
- $customerName='Test Customer';
- $frontendStatusLabel='Complete';
+ $customerName = 'Test Customer';
+ $frontendStatusLabel = 'Complete';
+ $isNotVirtual = false;
$this->identityContainerMock->expects($this->once())
->method('isEnabled')
@@ -161,6 +172,9 @@ public function testSendVirtualOrder()
$this->orderMock->expects($this->any())
->method('getCustomerName')
->willReturn($customerName);
+ $this->orderMock->expects($this->any())
+ ->method('getIsNotVirtual')
+ ->willReturn($isNotVirtual);
$this->orderMock->expects($this->once())
->method('getFrontendStatusLabel')
->willReturn($frontendStatusLabel);
@@ -177,7 +191,8 @@ public function testSendVirtualOrder()
'formattedBillingAddress' => 1,
'order_data' => [
'customer_name' => $customerName,
- 'frontend_status_label' => $frontendStatusLabel
+ 'frontend_status_label' => $frontendStatusLabel,
+ 'is_not_virtual' => $isNotVirtual
]
]
diff --git a/app/code/Magento/Sales/view/frontend/templates/order/order_comments.phtml b/app/code/Magento/Sales/view/frontend/templates/order/order_comments.phtml
index 6f2d8d87ade86..cb1e235566c8e 100644
--- a/app/code/Magento/Sales/view/frontend/templates/order/order_comments.phtml
+++ b/app/code/Magento/Sales/view/frontend/templates/order/order_comments.phtml
@@ -17,7 +17,7 @@
formatDate($_historyItem->getCreatedAt(), \IntlDateFormatter::MEDIUM, true) ?>
-
+
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
index cfafe110df22b..0bca04a955817 100644
--- a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
+++ b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/Generate.php
@@ -80,6 +80,10 @@ public function execute()
if (!$rule->getId()) {
$result['error'] = __('Rule is not defined');
+ } elseif ((int) $rule->getCouponType() !== \Magento\SalesRule\Model\Rule::COUPON_TYPE_AUTO
+ && !$rule->getUseAutoGeneration()) {
+ $result['error'] =
+ __('The rule coupon settings changed. Please save the rule before using auto-generation.');
} else {
try {
$data = $this->getRequest()->getParams();
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
index df126f05819d0..7eb95da0d7500 100644
--- a/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
+++ b/app/code/Magento/SalesRule/Test/Mftf/Section/AdminCartPriceRulesFormSection.xml
@@ -104,5 +104,6 @@
+
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/AdminBlockCouponGeneratesUntilCartPriceRuleSavedWithSpecificCouponTypeAndAutoGenerationTickedTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminBlockCouponGeneratesUntilCartPriceRuleSavedWithSpecificCouponTypeAndAutoGenerationTickedTest.xml
new file mode 100644
index 0000000000000..a4318103c4c00
--- /dev/null
+++ b/app/code/Magento/SalesRule/Test/Mftf/Test/AdminBlockCouponGeneratesUntilCartPriceRuleSavedWithSpecificCouponTypeAndAutoGenerationTickedTest.xml
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/SalesRule/Test/Unit/Controller/Adminhtml/Promo/Quote/GenerateTest.php b/app/code/Magento/SalesRule/Test/Unit/Controller/Adminhtml/Promo/Quote/GenerateTest.php
index 9c8761eb39738..fd0b864ab9201 100644
--- a/app/code/Magento/SalesRule/Test/Unit/Controller/Adminhtml/Promo/Quote/GenerateTest.php
+++ b/app/code/Magento/SalesRule/Test/Unit/Controller/Adminhtml/Promo/Quote/GenerateTest.php
@@ -137,9 +137,9 @@ protected function setUp(): void
}
/**
- * testExecute
+ * @covers \Magento\SalesRule\Controller\Adminhtml\Promo\Quote::execute
*/
- public function testExecute()
+ public function testExecuteWithCouponTypeAuto()
{
$helperData = $this->getMockBuilder(Data::class)
->disableOriginalConstructor()
@@ -157,6 +157,8 @@ public function testExecute()
->method('isAjax')
->willReturn(true);
$ruleMock = $this->getMockBuilder(Rule::class)
+ ->addMethods(['getCouponType'])
+ ->onlyMethods(['getId'])
->disableOriginalConstructor()
->getMock();
$this->registryMock->expects($this->once())
@@ -165,6 +167,9 @@ public function testExecute()
$ruleMock->expects($this->once())
->method('getId')
->willReturn(1);
+ $ruleMock->expects($this->once())
+ ->method('getCouponType')
+ ->willReturn(\Magento\SalesRule\Model\Rule::COUPON_TYPE_AUTO);
$this->requestMock->expects($this->once())
->method('getParams')
->willReturn($requestData);
@@ -202,4 +207,120 @@ public function testExecute()
->willReturn(__('%1 coupon(s) have been generated.', 2));
$this->model->execute();
}
+
+ /**
+ * @covers \Magento\SalesRule\Controller\Adminhtml\Promo\Quote::execute
+ */
+ public function testExecuteWithAutoGenerationEnabled()
+ {
+ $helperData = $this->getMockBuilder(Data::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->objectManagerMock->expects($this->any())
+ ->method('get')
+ ->with(Data::class)
+ ->willReturn($helperData);
+ $requestData = [
+ 'qty' => 2,
+ 'length' => 10,
+ 'rule_id' => 1
+ ];
+ $this->requestMock->expects($this->once())
+ ->method('isAjax')
+ ->willReturn(true);
+ $ruleMock = $this->getMockBuilder(Rule::class)
+ ->addMethods(['getUseAutoGeneration'])
+ ->onlyMethods(['getId'])
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->registryMock->expects($this->once())
+ ->method('registry')
+ ->willReturn($ruleMock);
+ $ruleMock->expects($this->once())
+ ->method('getId')
+ ->willReturn(1);
+ $ruleMock->expects($this->once())
+ ->method('getUseAutoGeneration')
+ ->willReturn(1);
+ $this->requestMock->expects($this->once())
+ ->method('getParams')
+ ->willReturn($requestData);
+ $requestData['quantity'] = isset($requestData['qty']) ? $requestData['qty'] : null;
+ $this->couponGenerationSpec->expects($this->once())
+ ->method('create')
+ ->with(['data' => $requestData])
+ ->willReturn(['some_data', 'some_data_2']);
+ $this->messageManager->expects($this->once())
+ ->method('addSuccessMessage');
+ $this->responseMock->expects($this->once())
+ ->method('representJson')
+ ->with();
+ $helperData->expects($this->once())
+ ->method('jsonEncode')
+ ->with([
+ 'messages' => __('%1 coupon(s) have been generated.', 2)
+ ]);
+ $layout = $this->getMockBuilder(Layout::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->view->expects($this->any())
+ ->method('getLayout')
+ ->willReturn($layout);
+ $messageBlock = $this->getMockBuilder(Messages::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $layout->expects($this->once())
+ ->method('initMessages');
+ $layout->expects($this->once())
+ ->method('getMessagesBlock')
+ ->willReturn($messageBlock);
+ $messageBlock->expects($this->once())
+ ->method('getGroupedHtml')
+ ->willReturn(__('%1 coupon(s) have been generated.', 2));
+ $this->model->execute();
+ }
+
+ /**
+ * @covers \Magento\SalesRule\Controller\Adminhtml\Promo\Quote::execute
+ */
+ public function testExecuteWithCouponTypeNotAutoAndAutoGenerationNotEnabled()
+ {
+ $helperData = $this->getMockBuilder(Data::class)
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->objectManagerMock->expects($this->any())
+ ->method('get')
+ ->with(Data::class)
+ ->willReturn($helperData);
+ $this->requestMock->expects($this->once())
+ ->method('isAjax')
+ ->willReturn(true);
+ $ruleMock = $this->getMockBuilder(Rule::class)
+ ->addMethods(['getUseAutoGeneration', 'getCouponType'])
+ ->onlyMethods(['getId'])
+ ->disableOriginalConstructor()
+ ->getMock();
+ $this->registryMock->expects($this->once())
+ ->method('registry')
+ ->willReturn($ruleMock);
+ $ruleMock->expects($this->once())
+ ->method('getId')
+ ->willReturn(1);
+ $ruleMock->expects($this->once())
+ ->method('getCouponType')
+ ->willReturn(\Magento\SalesRule\Model\Rule::COUPON_TYPE_NO_COUPON);
+ $ruleMock->expects($this->once())
+ ->method('getUseAutoGeneration')
+ ->willReturn(0);
+ $this->responseMock->expects($this->once())
+ ->method('representJson')
+ ->with();
+ $helperData->expects($this->once())
+ ->method('jsonEncode')
+ ->with([
+ 'error' =>
+ __('The rule coupon settings changed. Please save the rule before using auto-generation.')
+ ]);
+ $this->model->execute();
+ }
}
diff --git a/app/code/Magento/SalesRule/i18n/en_US.csv b/app/code/Magento/SalesRule/i18n/en_US.csv
index 83a5aa76ba0c8..d4f93c25dc46c 100644
--- a/app/code/Magento/SalesRule/i18n/en_US.csv
+++ b/app/code/Magento/SalesRule/i18n/en_US.csv
@@ -164,3 +164,4 @@ Apply,Apply
"Apply to Shipping Amount","Apply to Shipping Amount"
"Discard subsequent rules","Discard subsequent rules"
"Default Rule Label for All Store Views","Default Rule Label for All Store Views"
+"Rule is not saved with auto generate option enabled. Please save the rule and try again.", "Rule is not saved with auto generate option enabled. Please save the rule and try again."
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 d8645a86d2e20..51dd1d2d34f44 100644
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/CommonTaxCollector.php
@@ -6,6 +6,7 @@
namespace Magento\Tax\Model\Sales\Total\Quote;
+use Magento\Customer\Api\AccountManagementInterface as CustomerAccountManagement;
use Magento\Customer\Api\Data\AddressInterfaceFactory as CustomerAddressFactory;
use Magento\Customer\Api\Data\AddressInterface as CustomerAddress;
use Magento\Customer\Api\Data\RegionInterfaceFactory as CustomerAddressRegionFactory;
@@ -144,6 +145,11 @@ class CommonTaxCollector extends AbstractTotal
*/
private $quoteDetailsItemExtensionFactory;
+ /**
+ * @var CustomerAccountManagement
+ */
+ private $customerAccountManagement;
+
/**
* Class constructor
*
@@ -156,6 +162,8 @@ class CommonTaxCollector extends AbstractTotal
* @param CustomerAddressRegionFactory $customerAddressRegionFactory
* @param TaxHelper|null $taxHelper
* @param QuoteDetailsItemExtensionInterfaceFactory|null $quoteDetailsItemExtensionInterfaceFactory
+ * @param CustomerAccountManagement|null $customerAccountManagement
+ * @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Magento\Tax\Model\Config $taxConfig,
@@ -166,7 +174,8 @@ public function __construct(
CustomerAddressFactory $customerAddressFactory,
CustomerAddressRegionFactory $customerAddressRegionFactory,
TaxHelper $taxHelper = null,
- QuoteDetailsItemExtensionInterfaceFactory $quoteDetailsItemExtensionInterfaceFactory = null
+ QuoteDetailsItemExtensionInterfaceFactory $quoteDetailsItemExtensionInterfaceFactory = null,
+ ?CustomerAccountManagement $customerAccountManagement = null
) {
$this->taxCalculationService = $taxCalculationService;
$this->quoteDetailsDataObjectFactory = $quoteDetailsDataObjectFactory;
@@ -178,6 +187,8 @@ public function __construct(
$this->taxHelper = $taxHelper ?: ObjectManager::getInstance()->get(TaxHelper::class);
$this->quoteDetailsItemExtensionFactory = $quoteDetailsItemExtensionInterfaceFactory ?:
ObjectManager::getInstance()->get(QuoteDetailsItemExtensionInterfaceFactory::class);
+ $this->customerAccountManagement = $customerAccountManagement ??
+ ObjectManager::getInstance()->get(CustomerAccountManagement::class);
}
/**
@@ -411,7 +422,24 @@ public function mapItems(
public function populateAddressData(QuoteDetailsInterface $quoteDetails, QuoteAddress $address)
{
$quoteDetails->setBillingAddress($this->mapAddress($address->getQuote()->getBillingAddress()));
- $quoteDetails->setShippingAddress($this->mapAddress($address));
+ if ($address->getAddressType() === QuoteAddress::ADDRESS_TYPE_BILLING
+ && !$address->getCountryId()
+ && $address->getQuote()->isVirtual()
+ && $address->getQuote()->getCustomerId()
+ ) {
+ $defaultBillingAddress = $this->customerAccountManagement->getDefaultBillingAddress(
+ $address->getQuote()->getCustomerId()
+ );
+ $addressCopy = $address;
+ if ($defaultBillingAddress) {
+ $addressCopy = clone $address;
+ $addressCopy->importCustomerAddressData($defaultBillingAddress);
+ }
+
+ $quoteDetails->setShippingAddress($this->mapAddress($addressCopy));
+ } else {
+ $quoteDetails->setShippingAddress($this->mapAddress($address));
+ }
return $quoteDetails;
}
diff --git a/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminCreateTaxRuleWithTwoTaxRatesActionGroup.xml b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminCreateTaxRuleWithTwoTaxRatesActionGroup.xml
new file mode 100644
index 0000000000000..0232d2920370a
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/ActionGroup/AdminCreateTaxRuleWithTwoTaxRatesActionGroup.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Tax/Test/Mftf/Section/StorefrontCustomerOrderViewSection.xml b/app/code/Magento/Tax/Test/Mftf/Section/StorefrontCustomerOrderViewSection.xml
new file mode 100644
index 0000000000000..0ce06894ab007
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Section/StorefrontCustomerOrderViewSection.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
diff --git a/app/code/Magento/Tax/Test/Mftf/Test/StorefrontCustomerWithDefaultBillingAddressAndCartWithVirtualProductTaxTest.xml b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontCustomerWithDefaultBillingAddressAndCartWithVirtualProductTaxTest.xml
new file mode 100644
index 0000000000000..484135f96735d
--- /dev/null
+++ b/app/code/Magento/Tax/Test/Mftf/Test/StorefrontCustomerWithDefaultBillingAddressAndCartWithVirtualProductTaxTest.xml
@@ -0,0 +1,89 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Theme/ViewModel/Block/SessionConfig.php b/app/code/Magento/Theme/ViewModel/Block/SessionConfig.php
new file mode 100644
index 0000000000000..d697c0a61b448
--- /dev/null
+++ b/app/code/Magento/Theme/ViewModel/Block/SessionConfig.php
@@ -0,0 +1,45 @@
+sessionConfig = $sessionConfig;
+ }
+ /**
+ * Get session.cookie_secure
+ *
+ * @return bool
+ * @SuppressWarnings(PHPMD.BooleanGetMethodName)
+ */
+ public function getCookieSecure(): bool
+ {
+ return $this->sessionConfig->getCookieSecure();
+ }
+}
diff --git a/app/code/Magento/Theme/view/frontend/layout/default.xml b/app/code/Magento/Theme/view/frontend/layout/default.xml
index 933d4e588787c..321e6938388ef 100644
--- a/app/code/Magento/Theme/view/frontend/layout/default.xml
+++ b/app/code/Magento/Theme/view/frontend/layout/default.xml
@@ -12,7 +12,11 @@
-
+
+
+ Magento\Theme\ViewModel\Block\SessionConfig
+
+
diff --git a/app/code/Magento/Theme/view/frontend/templates/js/cookie.phtml b/app/code/Magento/Theme/view/frontend/templates/js/cookie.phtml
index 7ecfd18d0d3b0..10cf6957fa4c3 100644
--- a/app/code/Magento/Theme/view/frontend/templates/js/cookie.phtml
+++ b/app/code/Magento/Theme/view/frontend/templates/js/cookie.phtml
@@ -18,7 +18,7 @@
"expires": null,
"path": "escapeJs($block->getPath()) ?>",
"domain": "escapeJs($block->getDomain()) ?>",
- "secure": false,
+ "secure": getSessionConfig()->getCookieSecure() ? 'true' : 'false'; ?>,
"lifetime": "escapeJs($block->getLifetime()) ?>"
}
}
diff --git a/app/code/Magento/Ui/view/base/web/js/lib/core/collection.js b/app/code/Magento/Ui/view/base/web/js/lib/core/collection.js
index 33acba6103b10..ba6489a0291b8 100644
--- a/app/code/Magento/Ui/view/base/web/js/lib/core/collection.js
+++ b/app/code/Magento/Ui/view/base/web/js/lib/core/collection.js
@@ -21,7 +21,85 @@ define([
* @returns {Array}
*/
function compact(container) {
- return container.filter(utils.isObject);
+ return _.values(container).filter(utils.isObject);
+ }
+
+ /**
+ * Defines index of an item in a specified container.
+ *
+ * @param {*} item - Item whose index should be defined.
+ * @param {Array} container - Container upon which to perform search.
+ * @returns {Number}
+ */
+ function _findIndex(item, container) {
+ var index = _.findKey(container, function (value) {
+ return value === item;
+ });
+
+ if (typeof index === 'undefined') {
+ index = _.findKey(container, function (value) {
+ return value && value.name === item;
+ });
+ }
+
+ return typeof index === 'undefined' ? -1 : index;
+ }
+
+ /**
+ * Inserts specified item into container at a specified position.
+ *
+ * @param {*} item - Item to be inserted into container.
+ * @param {Array} container - Container of items.
+ * @param {*} [position=-1] - Position at which item should be inserted.
+ * Position can represent:
+ * - specific index in container
+ * - item which might already be present in container
+ * - structure with one of these properties: after, before
+ * @returns {Boolean|*}
+ * - true if element has changed its' position
+ * - false if nothing has changed
+ * - inserted value if it wasn't present in container
+ */
+ function _insertAt(item, container, position) {
+ var currentIndex = _findIndex(item, container),
+ newIndex,
+ target;
+
+ if (typeof position === 'undefined') {
+ position = -1;
+ } else if (typeof position === 'string') {
+ position = isNaN(+position) ? position : +position;
+ }
+
+ newIndex = position;
+
+ if (~currentIndex) {
+ target = container.splice(currentIndex, 1)[0];
+
+ if (typeof item === 'string') {
+ item = target;
+ }
+ }
+
+ if (typeof position !== 'number') {
+ target = position.after || position.before || position;
+
+ newIndex = _findIndex(target, container);
+
+ if (~newIndex && (position.after || newIndex >= currentIndex)) {
+ newIndex++;
+ }
+ }
+
+ if (newIndex < 0) {
+ newIndex += container.length + 1;
+ }
+
+ container[newIndex] ?
+ container.splice(newIndex, 0, item) :
+ container[newIndex] = item;
+
+ return !~currentIndex ? item : currentIndex !== newIndex;
}
return Element.extend({
@@ -90,8 +168,8 @@ define([
elems.map(function (item) {
return item.elem ?
- utils.insert(item.elem, container, item.position) :
- utils.insert(item, container, position);
+ _insertAt(item.elem, container, item.position) :
+ _insertAt(item, container, position);
}).forEach(function (item) {
if (item === true) {
update = true;
@@ -257,9 +335,11 @@ define([
* @param {Object} elem - Element to insert.
*/
_insert: function (elem) {
- var index = this._elems.indexOf(elem.name);
+ var index = _.findKey(this._elems, function (value) {
+ return value === elem.name;
+ });
- if (~index) {
+ if (typeof index !== 'undefined') {
this._elems[index] = elem;
}
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogGraphQl/ProductSearchTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogGraphQl/ProductSearchTest.php
new file mode 100644
index 0000000000000..4acc2d21cde02
--- /dev/null
+++ b/dev/tests/api-functional/testsuite/Magento/GraphQl/CatalogGraphQl/ProductSearchTest.php
@@ -0,0 +1,84 @@
+objectManager = Bootstrap::getObjectManager();
+ $this->getCustomerAuthenticationHeader = $this->objectManager->get(GetCustomerAuthenticationHeader::class);
+ }
+
+ /**
+ * Test for checking if graphQL query fpr configurable product returns
+ * expected visible items
+ *
+ * @magentoApiDataFixture Magento/ConfigurableProduct/_files/configurable_products_with_different_super_attribute.php
+ */
+ public function testCheckIfConfigurableProductVisibilityReturnsExpectedItem(): void
+ {
+ $productName = 'Configurable Product';
+ $productSku = 'configurable';
+ $query = $this->getProductSearchQuery($productName, $productSku);
+
+ $response = $this->graphQlQuery($query);
+
+ $this->assertNotEmpty($response['products']);
+ $this->assertEquals(1, $response['products']['total_count']);
+ $this->assertNotEmpty($response['products']['items']);
+ $this->assertEquals($productName, $response['products']['items'][0]['name']);
+ $this->assertEquals($productSku, $response['products']['items'][0]['sku']);
+ }
+
+ /**
+ * Get a query which user filter for product sku and search by product name
+ *
+ * @param string $productName
+ * @param string $productSku
+ * @return string
+ */
+ private function getProductSearchQuery(string $productName, string $productSku): string
+ {
+ return << $store];
+ $query = $this->getQuery('configurable');
+ $response = $this->graphQlQuery($query, [], '', $headers);
+ self::assertCount(1, $response['products']['items']);
+ $product = $response['products']['items'][0];
+ self::assertCount(1, $product['variants']);
+ $variant = $response['products']['items'][0]['variants'][0];
+ self::assertEquals($childSku, $variant['product']['sku']);
+ self::assertCount(1, $variant['attributes']);
+ $attribute = $variant['attributes'][0];
+ self::assertEquals($attributeLabel, $attribute['label']);
+ }
+
+ /**
+ * @return array
+ */
+ public function childrenAssignedToDifferentWebsitesDataProvider(): array
+ {
+ return [
+ ['default', 'simple_option_2', 'Option 2'],
+ ['fixture_second_store', 'simple_option_1', 'Option 1'],
+ ];
+ }
+
/**
* @param string $sku
* @return string
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/SkuTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/SkuTest.php
index f557919897869..d70f1404b33d6 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/SkuTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Attribute/Backend/SkuTest.php
@@ -49,15 +49,14 @@ public function testGenerateUniqueLongSku()
);
$product = $repository->get('simple');
$product->setSku('0123456789012345678901234567890123456789012345678901234567890123');
-
+ $product->save();
/** @var \Magento\Catalog\Model\Product\Copier $copier */
$copier = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
\Magento\Catalog\Model\Product\Copier::class
);
- $copier->copy($product);
+ $duplicate = $copier->copy($product);
$this->assertEquals('0123456789012345678901234567890123456789012345678901234567890123', $product->getSku());
- $product->getResource()->getAttribute('sku')->getBackend()->beforeSave($product);
- $this->assertEquals('01234567890123456789012345678901234567890123456789012345678901-1', $product->getSku());
+ $this->assertEquals('01234567890123456789012345678901234567890123456789012345678901-1', $duplicate->getSku());
}
/**
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductPriceTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductPriceTest.php
index 66e60a24e0a07..7ab9a7a50186f 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductPriceTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductPriceTest.php
@@ -133,4 +133,20 @@ public function testGetMinPriceForComposite(): void
$product = $collection->getFirstItem();
$this->assertEquals(20, $product->getData('min_price'));
}
+
+ /**
+ * @magentoDbIsolation disabled
+ * @magentoDataFixture Magento/Catalog/_files/simple_product_with_tier_price_equal_zero.php
+ */
+ public function testGetMinPriceWhenTierPriceEqualZero()
+ {
+ $product = $this->productRepository->get('simple-2');
+ $collection = Bootstrap::getObjectManager()->create(Collection::class);
+ $collection->addIdFilter($product->getId());
+ $collection->addPriceData(0);
+ $collection->load();
+ $product = $collection->getFirstItem();
+ $this->assertEquals(0, $product->getData('tier_price'));
+ $this->assertEquals(0, $product->getData('min_price'));
+ }
}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
index ceb3a2c7a94b2..d8275d78bfb79 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ProductTest.php
@@ -10,6 +10,7 @@
use Magento\Catalog\Api\ProductRepositoryInterface;
use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Copier;
use Magento\Catalog\Model\Product\Visibility;
use Magento\Framework\App\Filesystem\DirectoryList;
use Magento\Framework\Exception\CouldNotSaveException;
@@ -19,6 +20,7 @@
use Magento\Framework\Exception\StateException;
use Magento\Framework\Math\Random;
use Magento\Framework\ObjectManagerInterface;
+use Magento\Store\Model\Store;
use Magento\TestFramework\Helper\Bootstrap;
use Magento\TestFramework\ObjectManager;
@@ -252,30 +254,71 @@ protected function _copyFileToBaseTmpMediaPath($sourceFile)
}
/**
- * Test duplicate method
+ * Test Duplicate of product
*
+ * Product assigned to default and custom scope is used. After duplication the copied product
+ * should retain store view specific data
+ *
+ * @magentoDataFixture Magento/Catalog/_files/product_multistore_different_short_description.php
* @magentoAppIsolation enabled
* @magentoAppArea adminhtml
+ * @magentoDbIsolation disabled
*/
public function testDuplicate()
{
- $this->_model = $this->productRepository->get('simple');
-
- // fixture
- /** @var \Magento\Catalog\Model\Product\Copier $copier */
+ $fixtureProductSku = 'simple-different-short-description';
+ $fixtureCustomStoreCode = 'fixturestore';
+ $defaultStoreId = Store::DEFAULT_STORE_ID;
+ /** @var \Magento\Store\Api\StoreRepositoryInterface $storeRepository */
+ $storeRepository = $this->objectManager->create(\Magento\Store\Api\StoreRepositoryInterface::class);
+ $customStoreId = $storeRepository->get($fixtureCustomStoreCode)->getId();
+ $defaultScopeProduct = $this->productRepository->get($fixtureProductSku, true, $defaultStoreId);
+ $customScopeProduct = $this->productRepository->get($fixtureProductSku, true, $customStoreId);
+ /** @var Copier $copier */
$copier = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- \Magento\Catalog\Model\Product\Copier::class
+ Copier::class
);
- $duplicate = $copier->copy($this->_model);
+ $duplicate = $copier->copy($defaultScopeProduct);
+
+ /* Fetch duplicate after cloning */
+ $defaultScopeDuplicate = $this->productRepository->getById($duplicate->getId(), true, $defaultStoreId);
+ $customScopeDuplicate = $this->productRepository->getById($duplicate->getId(), true, $customStoreId);
+
try {
- $this->assertNotEmpty($duplicate->getId());
- $this->assertNotEquals($duplicate->getId(), $this->_model->getId());
- $this->assertNotEquals($duplicate->getSku(), $this->_model->getSku());
+ $this->assertNotEquals(
+ $customScopeDuplicate->getId(), $customScopeProduct->getId(),
+ 'Duplicate product Id should not equal to source product Id'
+ );
+ $this->assertNotEquals(
+ $customScopeDuplicate->getSku(), $customScopeProduct->getSku(),
+ 'Duplicate product SKU should not equal to source product SKU'
+ );
+ $this->assertNotEquals(
+ $customScopeDuplicate->getShortDescription(), $defaultScopeDuplicate->getShortDescription(),
+ 'Short description of the duplicated product on custom scope should not equal to ' .
+ 'duplicate product description on default scope'
+ );
+ $this->assertEquals(
+ $customScopeProduct->getShortDescription(), $customScopeDuplicate->getShortDescription(),
+ 'Short description of the duplicated product on custom scope should equal to ' .
+ 'source product description on custom scope'
+ );
+ $this->assertEquals(
+ $customScopeProduct->getStoreId(), $customScopeDuplicate->getStoreId(),
+ 'Store Id of the duplicated product on custom scope should equal to ' .
+ 'store Id of source product on custom scope'
+ );
$this->assertEquals(
- Status::STATUS_DISABLED,
- $duplicate->getStatus()
+ $defaultScopeProduct->getStoreId(), $defaultScopeDuplicate->getStoreId(),
+ 'Store Id of the duplicated product on default scope should equal to ' .
+ 'store Id of source product on default scope'
);
- $this->assertEquals(\Magento\Store\Model\Store::DEFAULT_STORE_ID, $duplicate->getStoreId());
+
+ $this->assertEquals(
+ Status::STATUS_DISABLED, $defaultScopeDuplicate->getStatus(),
+ 'Duplicate should be disabled'
+ );
+
$this->_undo($duplicate);
} catch (\Exception $e) {
$this->_undo($duplicate);
@@ -293,9 +336,9 @@ public function testDuplicateSkuGeneration()
$this->_model = $this->productRepository->get('simple');
$this->assertEquals('simple', $this->_model->getSku());
- /** @var \Magento\Catalog\Model\Product\Copier $copier */
+ /** @var Copier $copier */
$copier = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
- \Magento\Catalog\Model\Product\Copier::class
+ Copier::class
);
$duplicate = $copier->copy($this->_model);
$this->assertEquals('simple-5', $duplicate->getSku());
@@ -311,7 +354,7 @@ protected function _undo($duplicate)
\Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(
\Magento\Store\Model\StoreManagerInterface::class
)->getStore()->setId(
- \Magento\Store\Model\Store::DEFAULT_STORE_ID
+ Store::DEFAULT_STORE_ID
);
$duplicate->delete();
}
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/CollectionTest.php
index 552dd3fbbfdd5..885a7dff06633 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/CollectionTest.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/CollectionTest.php
@@ -206,26 +206,23 @@ public function testGetProductsWithTierPrice()
/**
* Test addAttributeToSort() with attribute 'is_saleable' works properly on frontend.
*
- * @dataProvider addAttributeToSortDataProvider
+ * @dataProvider addIsSaleableAttributeToSortDataProvider
* @magentoDataFixture Magento/Catalog/_files/multiple_products_with_non_saleable_product.php
* @magentoConfigFixture current_store cataloginventory/options/show_out_of_stock 1
* @magentoAppIsolation enabled
* @magentoAppArea frontend
*/
- public function testAddAttributeToSort(string $productSku, string $order)
+ public function testAddIsSaleableAttributeToSort(string $productSku, string $order)
{
- /** @var Collection $productCollection */
$this->collection->addAttributeToSort('is_saleable', $order);
- self::assertEquals(2, $this->collection->count());
- self::assertSame($productSku, $this->collection->getFirstItem()->getSku());
+ $this->assertEquals(2, $this->collection->count());
+ $this->assertEquals($productSku, $this->collection->getFirstItem()->getSku());
}
/**
- * Provide test data for testAddAttributeToSort().
- *
* @return array
*/
- public function addAttributeToSortDataProvider()
+ public function addIsSaleableAttributeToSortDataProvider(): array
{
return [
[
@@ -239,6 +236,42 @@ public function addAttributeToSortDataProvider()
];
}
+ /**
+ * Test addAttributeToSort() with attribute 'price' works properly on frontend.
+ *
+ * @dataProvider addPriceAttributeToSortDataProvider
+ * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+ * @magentoDataFixture Magento/Catalog/_files/simple_product_with_tier_price_equal_zero.php
+ * @magentoAppIsolation enabled
+ * @magentoDbIsolation disabled
+ * @magentoAppArea frontend
+ */
+ public function testAddPriceAttributeToSort(string $productSku, string $order)
+ {
+ $this->processor->getIndexer()->reindexAll();
+ $this->collection->setStoreId(1);
+ $this->collection->addAttributeToSort('price', $order);
+ $this->assertEquals(2, $this->collection->count());
+ $this->assertEquals($productSku, $this->collection->getFirstItem()->getSku());
+ }
+
+ /**
+ * @return array
+ */
+ public function addPriceAttributeToSortDataProvider(): array
+ {
+ return [
+ [
+ 'product_sku' => 'simple',
+ 'order' => Collection::SORT_ORDER_DESC,
+ ],
+ [
+ 'product_sku' => 'simple-2',
+ 'order' => Collection::SORT_ORDER_ASC,
+ ]
+ ];
+ }
+
/**
* Checks a case if table for join specified as an array.
*
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_tier_price_equal_zero.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_tier_price_equal_zero.php
new file mode 100644
index 0000000000000..f287223954c1b
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_tier_price_equal_zero.php
@@ -0,0 +1,34 @@
+requireDataFixture('Magento/Catalog/_files/product_simple_without_custom_options.php');
+
+$objectManager = Bootstrap::getObjectManager();
+
+$adminWebsite = $objectManager->get(WebsiteRepositoryInterface::class)
+ ->get('admin');
+$tierPriceExtensionAttributes = $objectManager->create(ProductTierPriceExtension::class)
+ ->setWebsiteId($adminWebsite->getId());
+$tierPrices = [];
+$tierPrice = $objectManager->create(ProductTierPriceInterface::class)
+ ->setCustomerGroupId(0)
+ ->setQty(1)
+ ->setValue(0)
+ ->setExtensionAttributes($tierPriceExtensionAttributes);
+$tierPrices[] = $tierPrice;
+
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$product = $productRepository->get('simple-2', false, null, true);
+$product->setTierPrices($tierPrices);
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_tier_price_equal_zero_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_tier_price_equal_zero_rollback.php
new file mode 100644
index 0000000000000..c98913e63d367
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_with_tier_price_equal_zero_rollback.php
@@ -0,0 +1,10 @@
+requireDataFixture('Magento/Catalog/_files/product_simple_without_custom_options_rollback.php');
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest/ProductMultipleStoresTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest/ProductMultipleStoresTest.php
index 892941162f588..17ca3d5b5b0ca 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest/ProductMultipleStoresTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest/ProductMultipleStoresTest.php
@@ -16,7 +16,7 @@
* Integration test for \Magento\CatalogImportExport\Model\Import\Product class.
*
* @magentoAppIsolation enabled
- * @magentoDbIsolation enabled
+ * @magentoDbIsolation disabled
* @magentoAppArea adminhtml
* @magentoDataFixtureBeforeTransaction Magento/Catalog/_files/enable_reindex_schedule.php
* @magentoDataFixtureBeforeTransaction Magento/Catalog/_files/enable_catalog_product_reindex_schedule.php
@@ -27,7 +27,6 @@ class ProductMultipleStoresTest extends ProductTestBase
/**
* @magentoDataFixture Magento/Store/_files/website.php
* @magentoDataFixture Magento/Store/_files/core_fixturestore.php
- * @magentoDbIsolation disabled
*/
public function testProductWithMultipleStoresInDifferentBunches()
{
@@ -124,6 +123,7 @@ function (ProductInterface $item) {
* Test import product into multistore system when media is disabled.
*
* @magentoDataFixture Magento/CatalogImportExport/Model/Import/_files/custom_category_store_media_disabled.php
+ * @magentoDbIsolation enabled
* @return void
*/
public function testProductsWithMultipleStoresWhenMediaIsDisabled(): void
@@ -165,7 +165,6 @@ function ($value) {
* @magentoDataFixture Magento/Store/_files/core_fixturestore.php
* @magentoDataFixture Magento/Catalog/Model/Layer/Filter/_files/attribute_with_option.php
* @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_attribute.php
- * @magentoDbIsolation disabled
*/
public function testProductsWithMultipleStores()
{
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest/ProductOptionsTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest/ProductOptionsTest.php
index b40c5a2a476b2..b3ce40437c53c 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest/ProductOptionsTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest/ProductOptionsTest.php
@@ -16,6 +16,7 @@
* Integration test for \Magento\CatalogImportExport\Model\Import\Product class.
*
* @magentoAppArea adminhtml
+ * @magentoDbIsolation disabled
* @magentoDataFixtureBeforeTransaction Magento/Catalog/_files/enable_reindex_schedule.php
* @magentoDataFixtureBeforeTransaction Magento/Catalog/_files/enable_catalog_product_reindex_schedule.php
*/
@@ -126,6 +127,12 @@ public function testSaveCustomOptions(string $importFile, string $sku, int $expe
$customOptionValues = $this->getCustomOptionValues($sku);
$this->createImportModel($pathToFile)->importData();
$this->assertEquals($customOptionValues, $this->getCustomOptionValues($sku));
+
+ // Cleanup imported products
+ try {
+ $this->productRepository->delete($product);
+ } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+ }
}
/**
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest/ProductUrlKeyTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest/ProductUrlKeyTest.php
index b050368b76239..a69603aca1e74 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest/ProductUrlKeyTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest/ProductUrlKeyTest.php
@@ -18,6 +18,7 @@
/**
* Integration test for \Magento\CatalogImportExport\Model\Import\Product class.
*
+ * @magentoDbIsolation disabled
* @magentoAppArea adminhtml
* @magentoDataFixtureBeforeTransaction Magento/Catalog/_files/enable_reindex_schedule.php
* @magentoDataFixtureBeforeTransaction Magento/Catalog/_files/enable_catalog_product_reindex_schedule.php
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_product_with_children_on_different_websites.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_product_with_children_on_different_websites.php
new file mode 100644
index 0000000000000..b13f29614a5ec
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_product_with_children_on_different_websites.php
@@ -0,0 +1,95 @@
+requireDataFixture('Magento/Store/_files/second_website_with_two_stores.php');
+Resolver::getInstance()->requireDataFixture('Magento/ConfigurableProduct/_files/configurable_attribute.php');
+
+$objectManager = Bootstrap::getObjectManager();
+/** @var ProductAttributeRepositoryInterface $productAttributeRepository */
+$productAttributeRepository = $objectManager->get(ProductAttributeRepositoryInterface::class);
+$attribute = $productAttributeRepository->get('test_configurable');
+$options = $attribute->getOptions();
+/** @var WebsiteRepositoryInterface $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
+$baseWebsite = $websiteRepository->get('base');
+$secondWebsite = $websiteRepository->get('test');
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$productRepository->cleanCache();
+/** @var ProductFactory $productFactory */
+$productFactory = $objectManager->get(ProductFactory::class);
+$attributeValues = [];
+$associatedProductIds = [];
+$rootCategoryId = $baseWebsite->getDefaultStore()->getRootCategoryId();
+array_shift($options);
+
+foreach ($options as $key => $option) {
+ $product = $productFactory->create();
+ $product->setTypeId(ProductType::TYPE_SIMPLE)
+ ->setAttributeSetId($product->getDefaultAttributeSetId())
+ ->setWebsiteIds([$key % 2 ? $baseWebsite->getId() : $secondWebsite->getId()])
+ ->setName('Configurable Option ' . $option->getLabel())
+ ->setSku(strtolower(str_replace(' ', '_', 'simple ' . $option->getLabel())))
+ ->setPrice(150)
+ ->setTestConfigurable($option->getValue())
+ ->setVisibility(Visibility::VISIBILITY_NOT_VISIBLE)
+ ->setStatus(Status::STATUS_ENABLED)
+ ->setCategoryIds([$rootCategoryId])
+ ->setStockData(['use_config_manage_stock' => 1, 'qty' => 100, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
+ $product = $productRepository->save($product);
+
+ $attributeValues[] = [
+ 'label' => 'test',
+ 'attribute_id' => $attribute->getId(),
+ 'value_index' => $option->getValue(),
+ ];
+ $associatedProductIds[] = $product->getId();
+}
+/** @var Factory $optionsFactory */
+$optionsFactory = $objectManager->get(Factory::class);
+$configurableAttributesData = [
+ [
+ 'attribute_id' => $attribute->getId(),
+ 'code' => $attribute->getAttributeCode(),
+ 'label' => $attribute->getStoreLabel(),
+ 'position' => '0',
+ 'values' => $attributeValues,
+ ],
+];
+$configurableOptions = $optionsFactory->create($configurableAttributesData);
+
+$product = $productFactory->create();
+/** @var ProductExtensionFactory $extensionAttributesFactory */
+$extensionAttributesFactory = $objectManager->get(ProductExtensionFactory::class);
+$extensionConfigurableAttributes = $product->getExtensionAttributes() ?: $extensionAttributesFactory->create();
+$extensionConfigurableAttributes->setConfigurableProductOptions($configurableOptions);
+$extensionConfigurableAttributes->setConfigurableProductLinks($associatedProductIds);
+$product->setExtensionAttributes($extensionConfigurableAttributes);
+
+$product->setTypeId(Configurable::TYPE_CODE)
+ ->setAttributeSetId($product->getDefaultAttributeSetId())
+ ->setWebsiteIds([$baseWebsite->getId(), $secondWebsite->getId()])
+ ->setName('Configurable Product')
+ ->setSku('configurable')
+ ->setVisibility(Visibility::VISIBILITY_BOTH)
+ ->setStatus(Status::STATUS_ENABLED)
+ ->setCategoryIds([$rootCategoryId])
+ ->setStockData(['use_config_manage_stock' => 1, 'is_in_stock' => 1]);
+$productRepository->save($product);
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_product_with_children_on_different_websites_rollback.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_product_with_children_on_different_websites_rollback.php
new file mode 100644
index 0000000000000..2633abdf167f5
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/_files/configurable_product_with_children_on_different_websites_rollback.php
@@ -0,0 +1,18 @@
+get(DeleteConfigurableProduct::class);
+$deleteConfigurableProduct->execute('configurable');
+
+Resolver::getInstance()->requireDataFixture('Magento/Store/_files/second_website_with_two_stores_rollback.php');
+Resolver::getInstance()->requireDataFixture('Magento/ConfigurableProduct/_files/configurable_attribute_rollback.php');
diff --git a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php
index 6df4d8fbb2d92..e344b61b3826f 100644
--- a/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php
+++ b/dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php
@@ -174,17 +174,30 @@ public function testSortCaseSensitive(): void
*
* @magentoConfigFixture current_store catalog/search/elasticsearch_index_prefix indexerhandlertest_configurable
* @magentoDataFixture Magento/ConfigurableProduct/_files/configurable_products.php
+ * @magentoDataFixture Magento/Catalog/_files/products.php
+ * @dataProvider searchSpecificProductDataProvider
+ * @param string $searchName
+ * @param string $sku
+ * @param int $expectedCount
*/
- public function testSearchSpecificProduct()
+ public function testSearchSpecificProduct(string $searchName, string $sku, int $expectedCount)
{
$this->reindexAll();
- $result = $this->searchByName('12345');
- self::assertCount(1, $result);
+ $result = $this->searchByName($searchName);
+ self::assertCount($expectedCount, $result);
- $specificProduct = $this->productRepository->get('configurable_12345');
+ $specificProduct = $this->productRepository->get($sku);
self::assertEquals($specificProduct->getId(), $result[0]['_id']);
}
+ public function searchSpecificProductDataProvider(): array
+ {
+ return [
+ 'search by numeric name' => ['12345', 'configurable_12345', 1],
+ 'search by name with diacritics' => ['Cùstöm Dèsign', 'custom-design-simple-product', 1],
+ ];
+ }
+
/**
* @param string $text
* @return array
diff --git a/dev/tests/integration/testsuite/Magento/Framework/DB/DataConverter/DataConverterTest.php b/dev/tests/integration/testsuite/Magento/Framework/DB/DataConverter/DataConverterTest.php
index 9ffdd6993644f..5f64b81802656 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/DB/DataConverter/DataConverterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/DB/DataConverter/DataConverterTest.php
@@ -3,9 +3,14 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+
namespace Magento\Framework\DB\DataConverter;
+use Magento\Framework\App\ResourceConnection;
+use Magento\Framework\DB\Adapter\AdapterInterface;
use Magento\Framework\DB\Adapter\Pdo\Mysql;
+use Magento\Framework\DB\Ddl\Table;
+use Magento\Framework\DB\FieldDataConversionException;
use Magento\Framework\DB\FieldDataConverter;
use Magento\Framework\DB\Select;
use Magento\Framework\DB\Select\QueryModifierInterface;
@@ -14,11 +19,13 @@
use Magento\Framework\DB\Query\Generator;
use Magento\Framework\DB\Query\BatchIterator;
use Magento\Framework\ObjectManagerInterface;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
-class DataConverterTest extends \PHPUnit\Framework\TestCase
+class DataConverterTest extends TestCase
{
/**
- * @var InQueryModifier|\PHPUnit\Framework\MockObject\MockObject
+ * @var InQueryModifier|MockObject
*/
private $queryModifierMock;
@@ -28,22 +35,22 @@ class DataConverterTest extends \PHPUnit\Framework\TestCase
private $dataConverter;
/**
- * @var BatchIterator|\PHPUnit\Framework\MockObject\MockObject
+ * @var BatchIterator|MockObject
*/
private $iteratorMock;
/**
- * @var Generator|\PHPUnit\Framework\MockObject\MockObject
+ * @var Generator|MockObject
*/
private $queryGeneratorMock;
/**
- * @var Select|\PHPUnit\Framework\MockObject\MockObject
+ * @var Select|MockObject
*/
private $selectByRangeMock;
/**
- * @var Mysql|\PHPUnit\Framework\MockObject\MockObject
+ * @var Mysql|MockObject
*/
private $adapterMock;
@@ -114,18 +121,22 @@ function () use (&$iterationComplete) {
$this->adapterMock = $this->getMockBuilder(Mysql::class)
->disableOriginalConstructor()
- ->setMethods(['fetchPairs', 'quoteInto', 'update'])
+ ->setMethods(['fetchPairs', 'fetchAll', 'quoteInto', 'update', 'prepareSqlCondition'])
->getMock();
$this->adapterMock->expects($this->any())
->method('quoteInto')
->willReturn('field=value');
+ $batchIteratorFactory = $this->createMock(\Magento\Framework\DB\Query\BatchRangeIteratorFactory::class);
+ $batchIteratorFactory->method('create')->willReturn($this->iteratorMock);
+
$this->fieldDataConverter = $this->objectManager->create(
FieldDataConverter::class,
[
'queryGenerator' => $this->queryGeneratorMock,
- 'dataConverter' => $this->dataConverter
+ 'dataConverter' => $this->dataConverter,
+ 'batchIteratorFactory' => $batchIteratorFactory,
]
);
}
@@ -136,7 +147,7 @@ function () use (&$iterationComplete) {
*/
public function testDataConvertErrorReporting()
{
- $this->expectException(\Magento\Framework\DB\FieldDataConversionException::class);
+ $this->expectException(FieldDataConversionException::class);
$this->expectExceptionMessage('Error converting field `value` in table `table` where `id`=2 using');
$rows = [
@@ -179,4 +190,158 @@ public function testAlreadyConvertedDataSkipped()
$this->fieldDataConverter->convert($this->adapterMock, 'table', 'id', 'value', $this->queryModifierMock);
}
+
+ public function testAlreadyConvertedDataSkippedWithCompositeIdentifier(): void
+ {
+ $rows = [
+ [
+ 'key_one' => 1,
+ 'key_two' => 1,
+ 'value' => '[]',
+ ],
+ [
+ 'key_one' => 1,
+ 'key_two' => 2,
+ 'value' => '{}',
+ ],
+ [
+ 'key_one' => 3,
+ 'key_two' => 3,
+ 'value' => 'N;',
+ ],
+ [
+ 'key_one' => 4,
+ 'key_two' => 1,
+ 'value' => '{"valid": "json value"}',
+ ]
+ ];
+
+ $this->adapterMock->expects($this->any())
+ ->method('prepareSqlCondition')
+ ->willReturnCallback(
+ function ($column, $value) {
+ return "$column = $value";
+ }
+ );
+
+ $this->adapterMock->expects($this->any())
+ ->method('fetchAll')
+ ->with($this->selectByRangeMock)
+ ->willReturn($rows);
+
+ $this->adapterMock->expects($this->once())
+ ->method('update')
+ ->with('table', ['value' => 'null'], 'key_one = 3 AND key_two = 3');
+
+ $this->fieldDataConverter->convert($this->adapterMock, 'table', 'id1,id2', 'value', $this->queryModifierMock);
+ }
+
+ /**
+ * @magentoDbIsolation disabled
+ * @magentoDataFixture createFixtureTable
+ */
+ public function testTableWithCompositeIdentifier(): void
+ {
+ $resource = Bootstrap::getObjectManager()->get(ResourceConnection::class);
+ $tableName = 'test_fixture_table';
+ $keyOneValues = range(1, 9);
+ $keyTwoValues = [3, 6, 9];
+ $records = [];
+ foreach ($keyOneValues as $keyOneValue) {
+ foreach (array_slice($keyTwoValues, 0, rand(1, 3)) as $keyTwoValue) {
+ $records[] = [
+ 'key_one' => $keyOneValue,
+ 'key_two' => $keyTwoValue,
+ // phpcs:ignore
+ 'value' => serialize(['key_one' => $keyOneValue, 'key_two' => $keyTwoValue]),
+ ];
+ }
+ }
+ // phpcs:ignore
+ $repeatedVal = serialize([]);
+ $records[] = [
+ 'key_one' => 10,
+ 'key_two' => 3,
+ 'value' => $repeatedVal,
+ ];
+ $records[] = [
+ 'key_one' => 10,
+ 'key_two' => 6,
+ 'value' => $repeatedVal,
+ ];
+ $records[] = [
+ 'key_one' => 11,
+ 'key_two' => 6,
+ 'value' => $repeatedVal,
+ ];
+
+ $resource->getConnection()->insertMultiple($tableName, $records);
+
+ $expected = [];
+
+ foreach ($records as $record) {
+ $record['value'] = $this->dataConverter->convert($record['value']);
+ $expected[] = $record;
+ }
+
+ $batchSize = 5;
+ $fieldDataConverter = $this->objectManager->create(
+ FieldDataConverter::class,
+ [
+ 'dataConverter' => $this->dataConverter,
+ 'envBatchSize' => $batchSize
+ ]
+ );
+ $fieldDataConverter->convert($resource->getConnection(), $tableName, 'key_one,key_two', 'value');
+ $actual = $resource->getConnection()->fetchAll(
+ $resource->getConnection()->select()->from($tableName)
+ );
+ $this->assertEquals($expected, $actual, json_encode($records));
+ }
+
+ public static function createFixtureTable(): void
+ {
+ $resource = Bootstrap::getObjectManager()->get(ResourceConnection::class);
+ $tableName = 'test_fixture_table';
+ $table = $resource->getConnection()
+ ->newTable(
+ $tableName
+ )
+ ->addColumn(
+ 'key_one',
+ Table::TYPE_INTEGER,
+ null,
+ ['unsigned' => true, 'nullable' => false]
+ )
+ ->addColumn(
+ 'key_two',
+ Table::TYPE_INTEGER,
+ null,
+ ['unsigned' => true, 'nullable' => false]
+ )
+ ->addColumn(
+ 'value',
+ Table::TYPE_TEXT,
+ null,
+ ['nullable' => true]
+ )
+ ->addIndex(
+ $tableName . '_index_key_one_key_two',
+ [
+ 'key_one',
+ 'key_two',
+ ],
+ [
+ 'type' => AdapterInterface::INDEX_TYPE_PRIMARY
+ ]
+ );
+ $resource->getConnection()->createTable($table);
+ }
+
+ public static function createFixtureTableRollback(): void
+ {
+ $resource = Bootstrap::getObjectManager()->get(ResourceConnection::class);
+ $tableName = 'test_fixture_table';
+ $resource->getConnection()->dropTable($tableName);
+ }
}
diff --git a/lib/internal/Magento/Framework/Amqp/Queue.php b/lib/internal/Magento/Framework/Amqp/Queue.php
index 84689c294af0c..7d950f70e557e 100644
--- a/lib/internal/Magento/Framework/Amqp/Queue.php
+++ b/lib/internal/Magento/Framework/Amqp/Queue.php
@@ -14,8 +14,6 @@
use Psr\Log\LoggerInterface;
/**
- * Class Queue
- *
* @api
* @since 103.0.0
*/
@@ -41,6 +39,13 @@ class Queue implements QueueInterface
*/
private $logger;
+ /**
+ * The prefetch value is used to specify how many messages that are being sent to the consumer at the same time.
+ * @see https://www.rabbitmq.com/consumer-prefetch.html
+ * @var int
+ */
+ private $prefetchCount;
+
/**
* Initialize dependencies.
*
@@ -48,17 +53,20 @@ class Queue implements QueueInterface
* @param EnvelopeFactory $envelopeFactory
* @param string $queueName
* @param LoggerInterface $logger
+ * @param int $prefetchCount
*/
public function __construct(
Config $amqpConfig,
EnvelopeFactory $envelopeFactory,
$queueName,
- LoggerInterface $logger
+ LoggerInterface $logger,
+ $prefetchCount = 100
) {
$this->amqpConfig = $amqpConfig;
$this->queueName = $queueName;
$this->envelopeFactory = $envelopeFactory;
$this->logger = $logger;
+ $this->prefetchCount = (int)$prefetchCount;
}
/**
@@ -144,6 +152,7 @@ public function subscribe($callback)
$channel = $this->amqpConfig->getChannel();
// @codingStandardsIgnoreStart
+ $channel->basic_qos(0, $this->prefetchCount, false);
$channel->basic_consume($this->queueName, '', false, false, false, false, $callbackConverter);
// @codingStandardsIgnoreEnd
while (count($channel->callbacks)) {
diff --git a/lib/internal/Magento/Framework/Amqp/Test/Unit/QueueTest.php b/lib/internal/Magento/Framework/Amqp/Test/Unit/QueueTest.php
new file mode 100644
index 0000000000000..b4e0b6c1fa53c
--- /dev/null
+++ b/lib/internal/Magento/Framework/Amqp/Test/Unit/QueueTest.php
@@ -0,0 +1,74 @@
+config = $this->createMock(Config::class);
+ $this->envelopeFactory = $this->createMock(EnvelopeFactory::class);
+ $this->logger = $this->createMock(LoggerInterface::class);
+
+ $this->model = new Queue(
+ $this->config,
+ $this->envelopeFactory,
+ 'testQueue',
+ $this->logger,
+ self::PREFETCH_COUNT
+ );
+ }
+
+ /**
+ * Test verifies that prefetch value is used to specify how many messages
+ * are being sent to the consumer at the same time.
+ */
+ public function testSubscribe()
+ {
+ $callback = function () {
+ };
+ $amqpChannel = $this->createMock(AMQPChannel::class);
+ $amqpChannel->expects($this->once())
+ ->method('basic_qos')
+ ->with(0, self::PREFETCH_COUNT, false);
+ $this->config->expects($this->once())
+ ->method('getChannel')
+ ->willReturn($amqpChannel);
+
+ $this->model->subscribe($callback);
+ }
+}
diff --git a/lib/internal/Magento/Framework/Api/AbstractSimpleObjectBuilder.php b/lib/internal/Magento/Framework/Api/AbstractSimpleObjectBuilder.php
index 35f115634ccda..fb0533bdf9c49 100644
--- a/lib/internal/Magento/Framework/Api/AbstractSimpleObjectBuilder.php
+++ b/lib/internal/Magento/Framework/Api/AbstractSimpleObjectBuilder.php
@@ -68,7 +68,7 @@ protected function _set($key, $value)
protected function _getDataObjectType()
{
$dataObjectType = '';
- $pattern = '/(?.*?)Builder(\\Interceptor)?/';
+ $pattern = '/(?.*?)Builder(\\\\Interceptor)?/';
if (preg_match($pattern, get_class($this), $match)) {
$dataObjectType = $match['data_object'];
}
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/AbstractSimpleObjectBuilderTest.php b/lib/internal/Magento/Framework/Api/Test/Unit/AbstractSimpleObjectBuilderTest.php
new file mode 100644
index 0000000000000..2393c2577f42b
--- /dev/null
+++ b/lib/internal/Magento/Framework/Api/Test/Unit/AbstractSimpleObjectBuilderTest.php
@@ -0,0 +1,42 @@
+objectFactoryMock = $this->createMock(ObjectFactory::class);
+ $this->stubSimpleObjectBuilder = new StubAbstractSimpleObjectBuilder($this->objectFactoryMock);
+ }
+
+ public function testCreate()
+ {
+ $stubSimpleObjectMock = $this->createMock(StubAbstractSimpleObject::class);
+ $this->objectFactoryMock->expects($this->once())
+ ->method('create')
+ ->with(StubAbstractSimpleObject::class, ['data' => []])
+ ->willReturn($stubSimpleObjectMock);
+ $object = $this->stubSimpleObjectBuilder->create();
+ $this->assertInstanceOf(StubAbstractSimpleObject::class, $object);
+ }
+}
diff --git a/lib/internal/Magento/Framework/Api/Test/Unit/StubAbstractSimpleObjectBuilder.php b/lib/internal/Magento/Framework/Api/Test/Unit/StubAbstractSimpleObjectBuilder.php
new file mode 100644
index 0000000000000..a8f1984750bc3
--- /dev/null
+++ b/lib/internal/Magento/Framework/Api/Test/Unit/StubAbstractSimpleObjectBuilder.php
@@ -0,0 +1,14 @@
+objectFactoryMock = $this->createMock(ObjectFactory::class);
+ $this->stubSimpleObjectBuilderInterceptor = new Interceptor($this->objectFactoryMock);
+ }
+
+ public function testCreate()
+ {
+ $stubSimpleObjectMock = $this->createMock(StubAbstractSimpleObject::class);
+ $this->objectFactoryMock->expects($this->once())
+ ->method('create')
+ ->with(StubAbstractSimpleObject::class, ['data' => []])
+ ->willReturn($stubSimpleObjectMock);
+ $object = $this->stubSimpleObjectBuilderInterceptor->create();
+ $this->assertInstanceOf(StubAbstractSimpleObject::class, $object);
+ }
+}
diff --git a/lib/internal/Magento/Framework/DB/FieldDataConverter.php b/lib/internal/Magento/Framework/DB/FieldDataConverter.php
index c25e7aff1762e..f60624880c919 100644
--- a/lib/internal/Magento/Framework/DB/FieldDataConverter.php
+++ b/lib/internal/Magento/Framework/DB/FieldDataConverter.php
@@ -5,9 +5,11 @@
*/
namespace Magento\Framework\DB;
+use Magento\Framework\App\ObjectManager;
use Magento\Framework\DB\Adapter\AdapterInterface;
use Magento\Framework\DB\DataConverter\DataConversionException;
use Magento\Framework\DB\DataConverter\DataConverterInterface;
+use Magento\Framework\DB\Query\BatchRangeIteratorFactory;
use Magento\Framework\DB\Query\Generator;
use Magento\Framework\DB\Select\QueryModifierInterface;
@@ -46,6 +48,11 @@ class FieldDataConverter
*/
private $envBatchSize;
+ /**
+ * @var BatchRangeIteratorFactory
+ */
+ private $batchIteratorFactory;
+
/**
* Constructor
*
@@ -53,17 +60,21 @@ class FieldDataConverter
* @param DataConverterInterface $dataConverter
* @param SelectFactory $selectFactory
* @param string|null $envBatchSize
+ * @param BatchRangeIteratorFactory|null $batchIteratorFactory
*/
public function __construct(
Generator $queryGenerator,
DataConverterInterface $dataConverter,
SelectFactory $selectFactory,
- $envBatchSize = null
+ $envBatchSize = null,
+ ?BatchRangeIteratorFactory $batchIteratorFactory = null
) {
$this->queryGenerator = $queryGenerator;
$this->dataConverter = $dataConverter;
$this->selectFactory = $selectFactory;
$this->envBatchSize = $envBatchSize;
+ $this->batchIteratorFactory = $batchIteratorFactory
+ ?? ObjectManager::getInstance()->get(BatchRangeIteratorFactory::class);
}
/**
@@ -84,6 +95,31 @@ public function convert(
$field,
QueryModifierInterface $queryModifier = null
) {
+ $identifiers = explode(',', $identifier);
+ if (count($identifiers) > 1) {
+ $this->processTableWithCompositeIdentifier($connection, $table, $identifiers, $field, $queryModifier);
+ } else {
+ $this->processTableWithUniqueIdentifier($connection, $table, $identifier, $field, $queryModifier);
+ }
+ }
+
+ /**
+ * Convert table (with unique identifier) field data from one representation to another
+ *
+ * @param AdapterInterface $connection
+ * @param string $table
+ * @param string $identifier
+ * @param string $field
+ * @param QueryModifierInterface|null $queryModifier
+ * @return void
+ */
+ private function processTableWithUniqueIdentifier(
+ AdapterInterface $connection,
+ $table,
+ $identifier,
+ $field,
+ QueryModifierInterface $queryModifier = null
+ ): void {
$select = $this->selectFactory->create($connection)
->from($table, [$identifier, $field])
->where($field . ' IS NOT NULL');
@@ -122,6 +158,82 @@ public function convert(
}
}
+ /**
+ * Convert table (with composite identifier) field data from one representation to another
+ *
+ * @param AdapterInterface $connection
+ * @param string $table
+ * @param array $identifiers
+ * @param string $field
+ * @param QueryModifierInterface|null $queryModifier
+ * @return void
+ */
+ private function processTableWithCompositeIdentifier(
+ AdapterInterface $connection,
+ $table,
+ $identifiers,
+ $field,
+ QueryModifierInterface $queryModifier = null
+ ): void {
+ $columns = $identifiers;
+ $columns[] = $field;
+ $select = $this->selectFactory->create($connection)
+ ->from($table, $columns)
+ ->where($field . ' IS NOT NULL');
+ if ($queryModifier) {
+ $queryModifier->modify($select);
+ }
+ $iterator = $this->batchIteratorFactory->create(
+ [
+ 'batchSize' => $this->getBatchSize(),
+ 'select' => $select,
+ 'correlationName' => $table,
+ 'rangeField' => $identifiers,
+ 'rangeFieldAlias' => '',
+ ]
+ );
+ foreach ($iterator as $selectByRange) {
+ $rows = [];
+ foreach ($connection->fetchAll($selectByRange) as $row) {
+ $value = $row[$field];
+ unset($row[$field]);
+ $constraints = [];
+ foreach ($row as $col => $val) {
+ $constraints[] = $connection->prepareSqlCondition($col, $val);
+ }
+ $rows[implode(' AND ', $constraints)] = $value;
+ }
+ $uniqueFieldDataArray = array_unique($rows);
+ foreach ($uniqueFieldDataArray as $uniqueFieldData) {
+ $constraints = array_keys($rows, $uniqueFieldData);
+ try {
+ $convertedValue = $this->dataConverter->convert($uniqueFieldData);
+ if ($uniqueFieldData === $convertedValue) {
+ // Skip for data rows that have been already converted
+ continue;
+ }
+ $bind = [$field => $convertedValue];
+ foreach ($constraints as $where) {
+ $connection->update($table, $bind, $where);
+ }
+
+ } catch (DataConversionException $e) {
+ throw new \Magento\Framework\DB\FieldDataConversionException(
+ sprintf(
+ \Magento\Framework\DB\FieldDataConversionException::MESSAGE_PATTERN,
+ $field,
+ $table,
+ implode(', ', $identifiers),
+ '(' . implode(') OR (', $constraints) . ')',
+ get_class($this->dataConverter),
+ $e->getMessage()
+ )
+ );
+ }
+ }
+ }
+ }
+
/**
* Get batch size from environment variable or default
*
diff --git a/lib/internal/Magento/Framework/File/Uploader.php b/lib/internal/Magento/Framework/File/Uploader.php
index 5e0bf593fef49..067e2611b406c 100644
--- a/lib/internal/Magento/Framework/File/Uploader.php
+++ b/lib/internal/Magento/Framework/File/Uploader.php
@@ -803,7 +803,8 @@ public static function getNewFileName($destinationFile)
$fileInfo = pathinfo($destinationFile);
$index = 1;
while ($fileExists($fileInfo['dirname'] . '/' . $fileInfo['basename'])) {
- $fileInfo['basename'] = $fileInfo['filename'] . '_' . $index++ . '.' . $fileInfo['extension'];
+ $fileInfo['basename'] = $fileInfo['filename'] . '_' . ($index++);
+ $fileInfo['basename'] .= isset($fileInfo['extension']) ? '.' . $fileInfo['extension'] : '';
}
return $fileInfo['basename'];
diff --git a/pub/index.php b/pub/index.php
index 9e91f3bfa5488..2cde8b91aa5a2 100644
--- a/pub/index.php
+++ b/pub/index.php
@@ -20,6 +20,7 @@
{$e->getMessage()}
HTML;
+ http_response_code(500);
exit(1);
}