Skip to content

Commit ba5c3da

Browse files
danielrenauddanielrenaud
committed
Merge remote-tracking branch 'mainline/2.3-qwerty' into MC-15941-media
2 parents 4b83444 + c1879e4 commit ba5c3da

File tree

486 files changed

+9681
-4943
lines changed

Some content is hidden

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

486 files changed

+9681
-4943
lines changed

‎app/code/Magento/AdminNotification/view/adminhtml/layout/adminhtml_notification_block.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<block class="Magento\Backend\Block\Widget\Grid" name="adminhtml.notification.container.grid" as="grid">
1212
<arguments>
1313
<argument name="id" xsi:type="string">notificationGrid</argument>
14-
<argument name="dataSource" xsi:type="object">Magento\AdminNotification\Model\ResourceModel\Grid\Collection</argument>
14+
<argument name="dataSource" xsi:type="object" shared="false">Magento\AdminNotification\Model\ResourceModel\Grid\Collection</argument>
1515
<argument name="default_dir" xsi:type="string">DESC</argument>
1616
<argument name="default_sort" xsi:type="string">date_added</argument>
1717
<argument name="save_parameters_in_session" xsi:type="string">1</argument>

‎app/code/Magento/AdvancedSearch/view/adminhtml/layout/catalog_search_block.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<block class="Magento\AdvancedSearch\Block\Adminhtml\Search\Grid" name="search.edit.grid" as="grid">
1212
<arguments>
1313
<argument name="id" xsi:type="string">catalog_search_grid</argument>
14-
<argument name="dataSource" xsi:type="object">Magento\AdvancedSearch\Model\ResourceModel\Search\Grid\Collection</argument>
14+
<argument name="dataSource" xsi:type="object" shared="false">Magento\AdvancedSearch\Model\ResourceModel\Search\Grid\Collection</argument>
1515
<argument name="default_sort" xsi:type="string">name</argument>
1616
<argument name="default_dir" xsi:type="string">ASC</argument>
1717
<argument name="save_parameters_in_session" xsi:type="string">1</argument>

‎app/code/Magento/Authorization/Model/Role.php

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,29 @@ public function __construct(
5151
}
5252

5353
/**
54-
* {@inheritdoc}
54+
* @inheritDoc
55+
*
56+
* @SuppressWarnings(PHPMD.SerializationAware)
57+
* @deprecated Do not use PHP serialization.
5558
*/
5659
public function __sleep()
5760
{
61+
trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
62+
5863
$properties = parent::__sleep();
5964
return array_diff($properties, ['_resource', '_resourceCollection']);
6065
}
6166

6267
/**
63-
* {@inheritdoc}
68+
* @inheritDoc
69+
*
70+
* @SuppressWarnings(PHPMD.SerializationAware)
71+
* @deprecated Do not use PHP serialization.
6472
*/
6573
public function __wakeup()
6674
{
75+
trigger_error('Using PHP serialization is deprecated', E_USER_DEPRECATED);
76+
6777
parent::__wakeup();
6878
$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
6979
$this->_resource = $objectManager->get(\Magento\Authorization\Model\ResourceModel\Role::class);

‎app/code/Magento/Authorizenet/Test/Mftf/Test/StorefrontVerifySecureURLRedirectAuthorizenetTest.xml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
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+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="StorefrontVerifySecureURLRedirectAuthorizenet">
12+
<annotations>
13+
<features value="Authorizenet"/>
14+
<stories value="Storefront Secure URLs"/>
15+
<title value="Verify Secure URLs For Storefront Authorizenet Pages"/>
16+
<description value="Verify that the Secure URL configuration applies to the Authorizenet pages on the Storefront"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="MC-15610"/>
19+
<group value="authorizenet"/>
20+
<group value="configuration"/>
21+
<group value="secure_storefront_url"/>
22+
</annotations>
23+
<before>
24+
<createData entity="Simple_US_Customer" stepKey="customer"/>
25+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefront">
26+
<argument name="Customer" value="$$customer$$"/>
27+
</actionGroup>
28+
<executeJS function="return window.location.host" stepKey="hostname"/>
29+
<magentoCLI command="config:set web/secure/base_url https://{$hostname}/" stepKey="setSecureBaseURL"/>
30+
<magentoCLI command="config:set web/secure/use_in_frontend 1" stepKey="useSecureURLsOnStorefront"/>
31+
<magentoCLI command="cache:flush" stepKey="flushCache"/>
32+
</before>
33+
<after>
34+
<magentoCLI command="config:set web/secure/use_in_frontend 0" stepKey="dontUseSecureURLsOnStorefront"/>
35+
<magentoCLI command="cache:flush" stepKey="flushCache"/>
36+
<deleteData createDataKey="customer" stepKey="deleteCustomer"/>
37+
</after>
38+
<executeJS function="return window.location.host" stepKey="hostname"/>
39+
<amOnUrl url="http://{$hostname}/authorizenet" stepKey="goToUnsecureAuthorizenetURL"/>
40+
<seeCurrentUrlEquals url="https://{$hostname}/authorizenet" stepKey="seeSecureAuthorizenetURL"/>
41+
</test>
42+
</tests>

‎app/code/Magento/Backend/Block/System/Design/Edit.php

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\Backend\Block\System\Design;
77

8+
/**
9+
* Edit store design schedule block.
10+
*/
811
class Edit extends \Magento\Backend\Block\Widget
912
{
1013
/**
@@ -20,6 +23,8 @@ class Edit extends \Magento\Backend\Block\Widget
2023
protected $_coreRegistry = null;
2124

2225
/**
26+
* @inheritdoc
27+
*
2328
* @param \Magento\Backend\Block\Template\Context $context
2429
* @param \Magento\Framework\Registry $registry
2530
* @param array $data
@@ -34,6 +39,8 @@ public function __construct(
3439
}
3540

3641
/**
42+
* @inheritdoc
43+
*
3744
* @return void
3845
*/
3946
protected function _construct()
@@ -44,7 +51,7 @@ protected function _construct()
4451
}
4552

4653
/**
47-
* {@inheritdoc}
54+
* @inheritdoc
4855
*/
4956
protected function _prepareLayout()
5057
{
@@ -66,7 +73,7 @@ protected function _prepareLayout()
6673
'label' => __('Delete'),
6774
'onclick' => 'deleteConfirm(\'' . __(
6875
'Are you sure?'
69-
) . '\', \'' . $this->getDeleteUrl() . '\')',
76+
) . '\', \'' . $this->getDeleteUrl() . '\', {data: {}})',
7077
'class' => 'delete'
7178
]
7279
);
@@ -88,6 +95,8 @@ protected function _prepareLayout()
8895
}
8996

9097
/**
98+
* Return design change Id.
99+
*
91100
* @return string
92101
*/
93102
public function getDesignChangeId()
@@ -96,6 +105,8 @@ public function getDesignChangeId()
96105
}
97106

98107
/**
108+
* Return delete url.
109+
*
99110
* @return string
100111
*/
101112
public function getDeleteUrl()
@@ -104,6 +115,8 @@ public function getDeleteUrl()
104115
}
105116

106117
/**
118+
* Return save url for edit form.
119+
*
107120
* @return string
108121
*/
109122
public function getSaveUrl()
@@ -112,6 +125,8 @@ public function getSaveUrl()
112125
}
113126

114127
/**
128+
* Return validation url for edit form.
129+
*
115130
* @return string
116131
*/
117132
public function getValidationUrl()
@@ -120,6 +135,8 @@ public function getValidationUrl()
120135
}
121136

122137
/**
138+
* Return page header.
139+
*
123140
* @return string
124141
*/
125142
public function getHeader()

‎app/code/Magento/Backend/Controller/Adminhtml/System/Design/Delete.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
<?php
22
/**
3-
*
43
* Copyright © Magento, Inc. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Backend\Controller\Adminhtml\System\Design;
87

9-
class Delete extends \Magento\Backend\Controller\Adminhtml\System\Design
8+
use Magento\Framework\App\Action\HttpPostActionInterface;
9+
10+
/**
11+
* Delete store design schedule action.
12+
*/
13+
class Delete extends \Magento\Backend\Controller\Adminhtml\System\Design implements HttpPostActionInterface
1014
{
1115
/**
16+
* Execute action.
17+
*
1218
* @return \Magento\Backend\Model\View\Result\Redirect
1319
*/
1420
public function execute()

0 commit comments

Comments
 (0)