Skip to content

Commit f215f3d

Browse files
author
Oleksii Korshenko
authored
Merge pull request #1307 from magento-engcom/develop-prs
Public Pull Requests #2204 #10181 #9852
2 parents 04c5b80 + 2c106fd commit f215f3d

File tree

179 files changed

+578
-879
lines changed

Some content is hidden

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

179 files changed

+578
-879
lines changed

‎app/code/Magento/AdminNotification/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_AdminNotification',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_AdminNotification', __DIR__);

‎app/code/Magento/AdvancedPricingImportExport/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_AdvancedPricingImportExport',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_AdvancedPricingImportExport', __DIR__);

‎app/code/Magento/Analytics/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_Analytics',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_Analytics', __DIR__);

‎app/code/Magento/Authorization/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_Authorization',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_Authorization', __DIR__);

‎app/code/Magento/Authorizenet/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_Authorizenet',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_Authorizenet', __DIR__);

‎app/code/Magento/Backend/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_Backend',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_Backend', __DIR__);

‎app/code/Magento/Backup/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_Backup',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_Backup', __DIR__);

‎app/code/Magento/Braintree/registration.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
\Magento\Framework\Component\ComponentRegistrar::register(
7-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
8-
'Magento_Braintree',
9-
__DIR__
10-
);
6+
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_Braintree', __DIR__);

‎app/code/Magento/Bundle/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_Bundle',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_Bundle', __DIR__);

‎app/code/Magento/BundleImportExport/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_BundleImportExport',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_BundleImportExport', __DIR__);

‎app/code/Magento/CacheInvalidate/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_CacheInvalidate',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CacheInvalidate', __DIR__);

‎app/code/Magento/Captcha/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_Captcha',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_Captcha', __DIR__);

‎app/code/Magento/Catalog/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_Catalog',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_Catalog', __DIR__);

‎app/code/Magento/CatalogAnalytics/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_CatalogAnalytics',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CatalogAnalytics', __DIR__);

‎app/code/Magento/CatalogImportExport/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_CatalogImportExport',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CatalogImportExport', __DIR__);

‎app/code/Magento/CatalogInventory/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_CatalogInventory',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CatalogInventory', __DIR__);

‎app/code/Magento/CatalogRule/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_CatalogRule',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CatalogRule', __DIR__);

‎app/code/Magento/CatalogRuleConfigurable/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_CatalogRuleConfigurable',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CatalogRuleConfigurable', __DIR__);

‎app/code/Magento/CatalogSearch/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_CatalogSearch',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CatalogSearch', __DIR__);

‎app/code/Magento/CatalogUrlRewrite/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_CatalogUrlRewrite',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CatalogUrlRewrite', __DIR__);

‎app/code/Magento/CatalogWidget/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_CatalogWidget',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CatalogWidget', __DIR__);

‎app/code/Magento/Checkout/Controller/Cart.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ protected function _goBack($backUrl = null)
7777
if ($backUrl || $backUrl = $this->getBackUrl($this->_redirect->getRefererUrl())) {
7878
$resultRedirect->setUrl($backUrl);
7979
}
80-
80+
8181
return $resultRedirect;
8282
}
8383

‎app/code/Magento/Checkout/Controller/Cart/Addgroup.php

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,42 @@
66
*/
77
namespace Magento\Checkout\Controller\Cart;
88

9+
use Magento\Checkout\Model\Cart as CustomerCart;
10+
use Magento\Framework\Escaper;
11+
use Magento\Framework\App\ObjectManager;
12+
13+
/**
14+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
15+
*/
916
class Addgroup extends \Magento\Checkout\Controller\Cart
1017
{
18+
/**
19+
* @var Escaper
20+
*/
21+
private $escaper;
22+
23+
/**
24+
* @param \Magento\Framework\App\Action\Context $context
25+
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
26+
* @param \Magento\Checkout\Model\Session $checkoutSession
27+
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
28+
* @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
29+
* @param CustomerCart $cart
30+
* @param Escaper|null $escaper
31+
*/
32+
public function __construct(
33+
\Magento\Framework\App\Action\Context $context,
34+
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
35+
\Magento\Checkout\Model\Session $checkoutSession,
36+
\Magento\Store\Model\StoreManagerInterface $storeManager,
37+
\Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
38+
CustomerCart $cart,
39+
Escaper $escaper = null
40+
) {
41+
$this->escaper = $escaper ?: ObjectManager::getInstance()->get(\Magento\Framework\Escaper::class);
42+
parent::__construct($context, $scopeConfig, $checkoutSession, $storeManager, $formKeyValidator, $cart);
43+
}
44+
1145
/**
1246
* @return \Magento\Framework\Controller\Result\Redirect
1347
*/
@@ -23,6 +57,13 @@ public function execute()
2357
foreach ($itemsCollection as $item) {
2458
try {
2559
$this->cart->addOrderItem($item, 1);
60+
if (!$this->cart->getQuote()->getHasError()) {
61+
$message = __(
62+
'You added %1 to your shopping cart.',
63+
$this->escaper->escapeHtml($item->getName())
64+
);
65+
$this->messageManager->addSuccessMessage($message);
66+
}
2667
} catch (\Magento\Framework\Exception\LocalizedException $e) {
2768
if ($this->_checkoutSession->getUseNotice(true)) {
2869
$this->messageManager->addNotice($e->getMessage());

‎app/code/Magento/Checkout/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_Checkout',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_Checkout', __DIR__);

‎app/code/Magento/CheckoutAgreements/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_CheckoutAgreements',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CheckoutAgreements', __DIR__);

‎app/code/Magento/Cms/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_Cms',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_Cms', __DIR__);

‎app/code/Magento/CmsUrlRewrite/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_CmsUrlRewrite',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_CmsUrlRewrite', __DIR__);

‎app/code/Magento/Config/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_Config',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_Config', __DIR__);

‎app/code/Magento/ConfigurableImportExport/registration.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
\Magento\Framework\Component\ComponentRegistrar::register(
8-
\Magento\Framework\Component\ComponentRegistrar::MODULE,
9-
'Magento_ConfigurableImportExport',
10-
__DIR__
11-
);
7+
use \Magento\Framework\Component\ComponentRegistrar;
8+
9+
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_ConfigurableImportExport', __DIR__);

0 commit comments

Comments
 (0)