Skip to content

Commit d9b60f3

Browse files
Rrego6Rrego6
committed
Merge remote-tracking branch 'mainline/2.2.10-develop' into MC-18831
2 parents 805c8f4 + 2ef08da commit d9b60f3

File tree

59 files changed

+1974
-105
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1974
-105
lines changed

‎app/code/Magento/Catalog/Model/Product/Compare/ListCompare.php

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
*/
66
namespace Magento\Catalog\Model\Product\Compare;
77

8+
use Magento\Catalog\Model\ProductRepository;
89
use Magento\Catalog\Model\ResourceModel\Product\Compare\Item\Collection;
10+
use Magento\Framework\App\ObjectManager;
11+
use Magento\Framework\Exception\NoSuchEntityException;
912

1013
/**
1114
* Product Compare List Model
@@ -51,6 +54,11 @@ class ListCompare extends \Magento\Framework\DataObject
5154
*/
5255
protected $_compareItemFactory;
5356

57+
/**
58+
* @var ProductRepository
59+
*/
60+
private $productRepository;
61+
5462
/**
5563
* Constructor
5664
*
@@ -60,20 +68,23 @@ class ListCompare extends \Magento\Framework\DataObject
6068
* @param \Magento\Customer\Model\Session $customerSession
6169
* @param \Magento\Customer\Model\Visitor $customerVisitor
6270
* @param array $data
71+
* @param ProductRepository|null $productRepository
6372
*/
6473
public function __construct(
6574
\Magento\Catalog\Model\Product\Compare\ItemFactory $compareItemFactory,
6675
\Magento\Catalog\Model\ResourceModel\Product\Compare\Item\CollectionFactory $itemCollectionFactory,
6776
\Magento\Catalog\Model\ResourceModel\Product\Compare\Item $catalogProductCompareItem,
6877
\Magento\Customer\Model\Session $customerSession,
6978
\Magento\Customer\Model\Visitor $customerVisitor,
70-
array $data = []
79+
array $data = [],
80+
ProductRepository $productRepository = null
7181
) {
7282
$this->_compareItemFactory = $compareItemFactory;
7383
$this->_itemCollectionFactory = $itemCollectionFactory;
7484
$this->_catalogProductCompareItem = $catalogProductCompareItem;
7585
$this->_customerSession = $customerSession;
7686
$this->_customerVisitor = $customerVisitor;
87+
$this->productRepository = $productRepository ?: ObjectManager::getInstance()->create(ProductRepository::class);
7788
parent::__construct($data);
7889
}
7990

@@ -82,6 +93,7 @@ public function __construct(
8293
*
8394
* @param int|\Magento\Catalog\Model\Product $product
8495
* @return $this
96+
* @throws \Exception
8597
*/
8698
public function addProduct($product)
8799
{
@@ -90,14 +102,33 @@ public function addProduct($product)
90102
$this->_addVisitorToItem($item);
91103
$item->loadByProduct($product);
92104

93-
if (!$item->getId()) {
105+
if (!$item->getId() && $this->productExists($product)) {
94106
$item->addProductData($product);
95107
$item->save();
96108
}
97109

98110
return $this;
99111
}
100112

113+
/**
114+
* Check product exists.
115+
*
116+
* @param int|\Magento\Catalog\Model\Product $product
117+
* @return bool
118+
*/
119+
private function productExists($product)
120+
{
121+
if ($product instanceof \Magento\Catalog\Model\Product && $product->getId()) {
122+
return true;
123+
}
124+
try {
125+
$product = $this->productRepository->getById((int)$product);
126+
return !empty($product->getId());
127+
} catch (NoSuchEntityException $e) {
128+
return false;
129+
}
130+
}
131+
101132
/**
102133
* Add products to compare list
103134
*

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@
6464
<see selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product." stepKey="seeSaveConfirmation"/>
6565
</actionGroup>
6666

67+
<!-- Save product but do not expect a success message -->
68+
<actionGroup name="SaveProductFormNoSuccessCheck" extends="saveProductForm">
69+
<remove keyForRemoval="seeSaveConfirmation"/>
70+
</actionGroup>
71+
6772
<!--Upload image for product-->
6873
<actionGroup name="addProductImage">
6974
<arguments>
@@ -283,4 +288,16 @@
283288
</arguments>
284289
<amOnPage url="{{AdminProductEditPage.url(productId)}}" stepKey="goToProduct"/>
285290
</actionGroup>
291+
292+
<!-- This action group goes to the product index page, opens the drop down and clicks the specified product type for adding a product -->
293+
<actionGroup name="GoToSpecifiedCreateProductPage">
294+
<arguments>
295+
<argument type="string" name="productType" defaultValue="simple"/>
296+
</arguments>
297+
<comment userInput="actionGroup:GoToSpecifiedCreateProductPage" stepKey="actionGroupComment"/>
298+
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex"/>
299+
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickAddProductDropdown"/>
300+
<click selector="{{AdminProductGridActionSection.addTypeProduct(productType)}}" stepKey="clickAddProduct"/>
301+
<waitForPageLoad stepKey="waitForFormToLoad"/>
302+
</actionGroup>
286303
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertProductInStorefrontProductPageActionGroup.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,15 @@
1919
<see userInput="{{product.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
2020
<see userInput="{{product.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
2121
</actionGroup>
22+
<actionGroup name="AssertProductNameAndSkuInStorefrontProductPage">
23+
<arguments>
24+
<argument name="product"/>
25+
</arguments>
26+
<!-- Go to storefront product page, assert product name and sku -->
27+
<amOnPage url="{{product.urlKey}}.html" stepKey="navigateToProductPage"/>
28+
<waitForPageLoad stepKey="waitForPageLoad2"/>
29+
<seeInTitle userInput="{{product.name}}" stepKey="assertProductNameTitle"/>
30+
<see userInput="{{product.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
31+
<see userInput="{{product.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
32+
</actionGroup>
2233
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCheckProductPriceInCategoryActionGroup.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<!-- You must already be on the category page -->
12+
<actionGroup name="StorefrontCheckProductPriceInCategoryActionGroup" extends="StorefrontCheckCategorySimpleProduct">
13+
<remove keyForRemoval="AssertProductPrice"/>
14+
<see userInput="{{product.price}}" selector="{{StorefrontCategoryProductSection.ProductPriceByName(product.name)}}" stepKey="AssertProductPrice"/>
15+
</actionGroup>
16+
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminProductMessagesSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
1111
<section name="AdminProductMessagesSection">
1212
<element name="successMessage" type="text" selector=".message-success"/>
13+
<element name="errorMessage" type="text" selector=".message.message-error.error"/>
1314
</section>
1415
</sections>

‎app/code/Magento/Downloadable/Api/DomainManagerInterface.php

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Downloadable\Api;
7+
8+
/**
9+
* Interface DomainManagerInterface
10+
* Manage downloadable domains whitelist.
11+
*/
12+
interface DomainManagerInterface
13+
{
14+
/**
15+
* Get the whitelist.
16+
*
17+
* @return array
18+
*/
19+
public function getDomains(): array;
20+
21+
/**
22+
* Add host to the whitelist.
23+
*
24+
* @param array $hosts
25+
* @return void
26+
*/
27+
public function addDomains(array $hosts);
28+
29+
/**
30+
* Remove host from the whitelist.
31+
*
32+
* @param array $hosts
33+
* @return void
34+
*/
35+
public function removeDomains(array $hosts);
36+
}

‎app/code/Magento/Downloadable/Console/Command/DomainsAddCommand.php

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
<?php
2+
/**
3+
*
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
namespace Magento\Downloadable\Console\Command;
8+
9+
use Symfony\Component\Console\Command\Command;
10+
use Symfony\Component\Console\Output\OutputInterface;
11+
use Symfony\Component\Console\Input\InputInterface;
12+
use Symfony\Component\Console\Input\InputArgument;
13+
use Magento\Downloadable\Api\DomainManagerInterface as DomainManager;
14+
15+
/**
16+
* Class DomainsAddCommand
17+
*
18+
* Command for adding downloadable domain to the whitelist
19+
*/
20+
class DomainsAddCommand extends Command
21+
{
22+
/**
23+
* Name of domains input argument
24+
*/
25+
const INPUT_KEY_DOMAINS = 'domains';
26+
27+
/**
28+
* @var DomainManager
29+
*/
30+
private $domainManager;
31+
32+
/**
33+
* DomainsAddCommand constructor.
34+
* @param DomainManager $domainManager
35+
*/
36+
public function __construct(
37+
DomainManager $domainManager
38+
) {
39+
$this->domainManager = $domainManager;
40+
parent::__construct();
41+
}
42+
43+
/**
44+
* @inheritdoc
45+
*/
46+
protected function configure()
47+
{
48+
$description = 'Add domains to the downloadable domains whitelist';
49+
50+
$this->setName('downloadable:domains:add')
51+
->setDescription($description)
52+
->setDefinition(
53+
[
54+
new InputArgument(
55+
self::INPUT_KEY_DOMAINS,
56+
InputArgument::IS_ARRAY,
57+
'Domains name'
58+
)
59+
]
60+
);
61+
parent::configure();
62+
}
63+
64+
/**
65+
* @inheritdoc
66+
*/
67+
protected function execute(InputInterface $input, OutputInterface $output)
68+
{
69+
try {
70+
if ($input->getArgument(self::INPUT_KEY_DOMAINS)) {
71+
$whitelistBefore = $this->domainManager->getDomains();
72+
$newDomains = $input->getArgument(self::INPUT_KEY_DOMAINS);
73+
$newDomains = array_filter(array_map('trim', $newDomains), 'strlen');
74+
75+
$this->domainManager->addDomains($newDomains);
76+
77+
foreach (array_diff($this->domainManager->getDomains(), $whitelistBefore) as $newHost) {
78+
$output->writeln(
79+
$newHost . ' was added to the whitelist.'
80+
);
81+
}
82+
}
83+
} catch (\Exception $e) {
84+
$output->writeln('<error>' . $e->getMessage() . '</error>');
85+
if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
86+
$output->writeln($e->getTraceAsString());
87+
}
88+
return;
89+
}
90+
}
91+
}

‎app/code/Magento/Downloadable/Console/Command/DomainsRemoveCommand.php

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
<?php
2+
/**
3+
*
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
namespace Magento\Downloadable\Console\Command;
8+
9+
use Symfony\Component\Console\Command\Command;
10+
use Symfony\Component\Console\Output\OutputInterface;
11+
use Symfony\Component\Console\Input\InputInterface;
12+
use Symfony\Component\Console\Input\InputArgument;
13+
use Magento\Downloadable\Api\DomainManagerInterface as DomainManager;
14+
15+
/**
16+
* Class DomainsRemoveCommand
17+
*
18+
* Command for removing downloadable domain from the whitelist
19+
*/
20+
class DomainsRemoveCommand extends Command
21+
{
22+
/**
23+
* Name of domains input argument
24+
*/
25+
const INPUT_KEY_DOMAINS = 'domains';
26+
27+
/**
28+
* @var DomainManager
29+
*/
30+
private $domainManager;
31+
32+
/**
33+
* DomainsRemoveCommand constructor.
34+
*
35+
* @param DomainManager $domainManager
36+
*/
37+
public function __construct(
38+
DomainManager $domainManager
39+
) {
40+
$this->domainManager = $domainManager;
41+
parent::__construct();
42+
}
43+
44+
/**
45+
* @inheritdoc
46+
*/
47+
protected function configure()
48+
{
49+
$description = 'Remove domains from the downloadable domains whitelist';
50+
51+
$this->setName('downloadable:domains:remove')
52+
->setDescription($description)
53+
->setDefinition(
54+
[
55+
new InputArgument(
56+
self::INPUT_KEY_DOMAINS,
57+
InputArgument::IS_ARRAY,
58+
'Domain names'
59+
)
60+
]
61+
);
62+
parent::configure();
63+
}
64+
65+
/**
66+
* @inheritdoc
67+
*/
68+
protected function execute(InputInterface $input, OutputInterface $output)
69+
{
70+
try {
71+
if ($input->getArgument(self::INPUT_KEY_DOMAINS)) {
72+
$whitelistBefore = $this->domainManager->getDomains();
73+
$removeDomains = $input->getArgument(self::INPUT_KEY_DOMAINS);
74+
$removeDomains = array_filter(array_map('trim', $removeDomains), 'strlen');
75+
$this->domainManager->removeDomains($removeDomains);
76+
77+
foreach (array_diff($whitelistBefore, $this->domainManager->getDomains()) as $removedHost) {
78+
$output->writeln(
79+
$removedHost . ' was removed from the whitelist.'
80+
);
81+
}
82+
}
83+
} catch (\Exception $e) {
84+
$output->writeln('<error>' . $e->getMessage() . '</error>');
85+
if ($output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
86+
$output->writeln($e->getTraceAsString());
87+
}
88+
return;
89+
}
90+
}
91+
}

0 commit comments

Comments
 (0)